tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kin...@apache.org
Subject cvs commit: jakarta-servletapi-5/jsr154/src/share/dtd j2ee_web_services_1_1.xsd j2ee_1_4.xsd web-app_2_4.xsd web-jsptaglibrary_2_0.xsd
Date Thu, 03 Oct 2002 23:01:44 GMT
kinman      2002/10/03 16:01:44

  Modified:    jsr152/src/share/dtd web-jsptaglibrary_2_0.xsd
               jsr152/src/share/javax/servlet/jsp JspContext.java
                        PageContext.java
               jsr152/src/share/javax/servlet/jsp/el ELException.java
                        ExpressionEvaluator.java VariableResolver.java
               jsr152/src/share/javax/servlet/jsp/tagext .nbattrs
               jsr154/src/share/dtd j2ee_1_4.xsd web-app_2_4.xsd
                        web-jsptaglibrary_2_0.xsd
  Added:       jsr154/src/share/dtd j2ee_web_services_1_1.xsd
  Log:
  - Patch submitted by Mark Roth
  
  NEW FILE (in jakarta-servletapi-5.newfiles.tar):
       - jsr154/src/share/dtd/j2ee_web_services_1_1.xsd
         (Required by latest j2ee_1_4.xsd)
  
  CHANGED FILES:
  
  jsr152/src/share/javax/servlet/jsp/JspContext.java:
       - getAttribute(name): Remove IllegalArgumentException
         for non-existent scope parameter.
       - Added javadoc for IllegalArgumentException for
         removeAttribute(name, scope)
       - Added javadoc for IllegalArgumentException for
         getAttributeNamesInScope(scope)
       - Added 'public JspWriter pushBody( java.io.Writer writer );'
       - Moved 'public JspWriter popBody()' from PageContext to JspContext.
  
  jsr152/src/share/javax/servlet/jsp/PageContext.java:
       - forward(path): Remove IllegalArgumentException and
         SecurityException, which are not declared in the RequestDispatcher
         counterpart methods.
       - include(path): Remove IllegalArgumentException and
         SecurityException, which are not declared in the RequestDispatcher
         counterpart methods.
       - include(path, flush): Remove IllegalArgumentException and
         SecurityException, which are not declared in the RequestDispatcher
         counterpart methods.
       - Moved 'public JspWriter popBody()' from PageContext to JspContext.
  
  jsr152/src/share/javax/servlet/jsp/el/ELException.java:
       - Removed toString() method, and constructors pass in localized
         message of root cause Throwable.
  
  jsr152/src/share/javax/servlet/jsp/el/VariableResolver.java:
       - resolveVariable( name, context ): Add description for
         context parameter.
  
  jsr152/src/share/javax/servlet/jsp/el/ExpressionEvaluator.java:
       - Elaborate on description of what should be passed for the
         expression parameter.  The expression parameter includes
         the tokens '${' and '}', which can appear more than once.
         For example, parseExpression( "Version ${major}.${minor}", ... )
         is valid.
       - Elaborate on caller requirements for passing in a FunctionMapper
         to evaluate() and parseExpression().
  
  jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd:
       - Escape markup in documentation with CDATA instead of <
  
  jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd:
       - Escape markup in documentation with CDATA instead of <
  
  jsr154/src/share/dtd/j2ee_1_4.xsd:
       - Escape markup in documentation with CDATA instead of <
       - Make CDATA sections use a consistent style
       - Make xsd:include schemaLocation point to IBM site
  
  jsr154/src/share/dtd/web-app_2_4.xsd:
       - Escape markup in documentation with CDATA instead of <
       - Added ERROR to list of legal values for request dispatcher
  
  Revision  Changes    Path
  1.4       +9 -7      jakarta-servletapi-5/jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd
  
  Index: web-jsptaglibrary_2_0.xsd
  ===================================================================
  RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- web-jsptaglibrary_2_0.xsd	20 Sep 2002 01:56:44 -0000	1.3
  +++ web-jsptaglibrary_2_0.xsd	3 Oct 2002 23:01:43 -0000	1.4
  @@ -10,7 +10,7 @@
   
   <xsd:annotation>
   <xsd:documentation>
  -@(#)web-jsptaglibrary_2_0.xsds	1.18 09/19/02
  +@(#)web-jsptaglibrary_2_0.xsds	1.19 09/30/02
   </xsd:documentation>
   </xsd:annotation>
   <xsd:annotation>
  @@ -50,6 +50,7 @@
   
   <xsd:annotation>
   <xsd:documentation>
  +<![CDATA[
   
   This is the XML Schema for the JSP Taglibrary deployment
   descriptor.  All Taglibrary deployment descriptors must
  @@ -61,12 +62,12 @@
   and by indicating the version of the schema by
   using the version element as shown below:
   
  -    &lt;taglib xmlns="http://java.sun.com/xml/ns/j2ee"
  -     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  -     xsi:schemaLocation="..."
  -     version="2.0">
  -    ...
  -    &lt;/taglib>
  +    <taglib xmlns="http://java.sun.com/xml/ns/j2ee"
  +      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  +      xsi:schemaLocation="..."
  +      version="2.0">
  +      ...
  +    </taglib>
   
   The instance documents may indicate the published
   version of the schema using xsi:schemaLocation attribute
  @@ -74,6 +75,7 @@
   
   http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd
   
  +]]>
   </xsd:documentation>
   </xsd:annotation>
   
  
  
  
  1.3       +43 -1     jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/JspContext.java
  
  Index: JspContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/JspContext.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JspContext.java	19 Aug 2002 16:29:49 -0000	1.2
  +++ JspContext.java	3 Oct 2002 23:01:43 -0000	1.3
  @@ -78,6 +78,12 @@
    *     scripting environment
    * </ul>
    *
  + * <p><B>Methods Intended for Container Generated Code</B>
  + * <p>
  + * The following methods enable the <B>management of nested</B> JspWriter 
  + * streams to implement Tag Extensions: <code>pushBody()</code> and
  + * <code>popBody()</code>
  + *
    * <p><B>Methods Intended for JSP authors</B>
    * <p>
    * The following methods provide <B>convenient access</B> to implicit objects:
  @@ -152,7 +158,6 @@
        *     or null if not found.
        * 
        * @throws NullPointerException if the name is null
  -     * @throws IllegalArgumentException if the scope is invalid
        */
   
       abstract public Object getAttribute(String name);
  @@ -198,6 +203,7 @@
        *
        * @param name The name of the object to remove.
        * @param scope The scope where to look.
  +     * @throws IllegalArgumentException if the scope is invalid
        */
   
       abstract public void removeAttribute(String name, int scope);
  @@ -217,6 +223,7 @@
        * @param scope the scope to enumerate all the attributes for
        * @return an enumeration of names (java.lang.String) of all the 
        *     attributes the specified scope
  +     * @throws IllegalArgumentException if the scope is invalid
        */
   
       abstract public Enumeration getAttributeNamesInScope(int scope);
  @@ -247,4 +254,39 @@
        * @since JSP2.0
        */
       public abstract VariableResolver getVariableResolver();
  +    
  +    /**
  +     * Return a new JspWriter object that sends output to the
  +     * provided Writer.  Saves the current "out" JspWriter,
  +     * and updates the value of the "out" attribute in the
  +     * page scope attribute namespace of the JspContext.
  +     * <p>The returned JspWriter must implement all methods and
  +     * behave as though it were unbuffered.  More specifically:
  +     * <ul>
  +     *   <li>clear() must throw an IOException</li>
  +     *   <li>clearBuffer() does nothing</li>
  +     *   <li>getBufferSize() always returns 0</li>
  +     *   <li>getRemaining() always returns 0</li>
  +     * </ul>
  +     * </p>
  +     *
  +     * @param writer The Writer for the returned JspWriter to send
  +     *     output to.
  +     * @return a new JspWriter that writes to the given Writer.
  +     * @since JSP2.0
  +     */
  +    public JspWriter pushBody( java.io.Writer writer ) {
  +        return null; // XXX to implement
  +    }
  +    
  +    /**
  +     * Return the previous JspWriter "out" saved by the matching
  +     * pushBody(), and update the value of the "out" attribute in
  +     * the page scope attribute namespace of the JspContext
  +     *
  +     * @return the saved JspWriter.
  +     */
  +    public JspWriter popBody() {
  +        return null; // XXX to implement
  +    }
   }
  
  
  
  1.4       +4 -24     jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/PageContext.java
  
  Index: PageContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/PageContext.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PageContext.java	20 Sep 2002 01:55:43 -0000	1.3
  +++ PageContext.java	3 Oct 2002 23:01:43 -0000	1.4
  @@ -115,8 +115,7 @@
    *
    * <p>
    * The following methods enable the <B>management of nested</B> JspWriter 
  - * streams to implement Tag Extensions: <code>pushBody()</code> and 
  - * <code>popBody()</code>
  + * streams to implement Tag Extensions: <code>pushBody()</code>
    *
    * <p><B>Methods Intended for JSP authors</B>
    * <p>
  @@ -300,9 +299,10 @@
       abstract public HttpSession getSession();
   
       /**
  -     * The current value of the page object (a Servlet).
  +     * The current value of the page object (In a Servlet environment, 
  +     * this is an instance of javax.servlet.Servlet).
        *
  -     * @return the Page implementation class instance (Servlet)  associated 
  +     * @return the Page implementation class instance associated 
        *     with this PageContext
        */
   
  @@ -377,10 +377,8 @@
        * @param relativeUrlPath specifies the relative URL path to the target 
        *     resource as described above
        *
  -     * @throws IllegalArgumentException if target resource URL is unresolvable
        * @throws IllegalStateException if <code> ServletResponse </code> is not 
        *     in a state where a forward can be performed
  -     * @throws SecurityException if target resource cannot be accessed by caller
        * @throws ServletException if the page that was forwarded to throws
        *     a ServletException
        * @throws IOException if an I/O error occurred while forwarding
  @@ -415,9 +413,6 @@
        * @param relativeUrlPath specifies the relative URL path to the target 
        *     resource to be included
        *
  -     * @throws IllegalArgumentException if the target resource URL is 
  -     *     unresolvable
  -     * @throws SecurityException if target resource cannot be accessed by caller
        * @throws ServletException if the page that was forwarded to throws
        *     a ServletException
        * @throws IOException if an I/O error occurred while forwarding
  @@ -457,9 +452,6 @@
        * @throws ServletException if the page that was forwarded to throws
        *     a ServletException
        * @throws IOException if an I/O error occurred while forwarding
  -     * @throws IllegalArgumentException if the target resource URL is 
  -     *     unresolvable
  -     * @throws SecurityException if target resource cannot be accessed by caller
        * @since JSP2.0
        */
       abstract public void include(String relativeUrlPath, boolean flush) 
  @@ -541,18 +533,6 @@
           return null; // XXX to implement
       }
            
  -
  -    /**
  -     * Return the previous JspWriter "out" saved by the matching
  -     * pushBody(), and update the value of the "out" attribute in
  -     * the page scope attribute namespace of the PageConxtext
  -     *
  -     * @return the saved JspWriter.
  -     */
  -
  -    public JspWriter popBody() {
  -        return null; // XXX to implement
  -    }
   
       /**
        * Provides convenient access to error information.
  
  
  
  1.3       +2 -22     jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/el/ELException.java
  
  Index: ELException.java
  ===================================================================
  RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/el/ELException.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ELException.java	19 Aug 2002 16:29:49 -0000	1.2
  +++ ELException.java	3 Oct 2002 23:01:44 -0000	1.3
  @@ -69,7 +69,7 @@
     // Member variables
     //-------------------------------------
   
  -  Throwable mRootCause;
  +  private Throwable mRootCause;
   
     //-------------------------------------
     /**
  @@ -99,6 +99,7 @@
      **/
     public ELException (Throwable pRootCause)
     {
  +    super( pRootCause.getLocalizedMessage() );
       mRootCause = pRootCause;
     }
   
  @@ -126,25 +127,4 @@
     {
       return mRootCause;
     }
  -
  -  //-------------------------------------
  -  /**
  -   * String representation
  -   *
  -   * @return a String representation of this ELException
  -   **/
  -  public String toString ()
  -  {
  -    if (getMessage () == null) {
  -      return mRootCause.toString ();
  -    }
  -    else if (mRootCause == null) {
  -      return getMessage ();
  -    }
  -    else {
  -      return getMessage () + ": " + mRootCause;
  -    }
  -  }
  -
  -  //-------------------------------------
   }
  
  
  
  1.3       +40 -18    jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/el/ExpressionEvaluator.java
  
  Index: ExpressionEvaluator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/el/ExpressionEvaluator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ExpressionEvaluator.java	19 Aug 2002 16:29:50 -0000	1.2
  +++ ExpressionEvaluator.java	3 Oct 2002 23:01:44 -0000	1.3
  @@ -74,23 +74,39 @@
    * assume that only one object of each ExpressionEvaluator type will be
    * instantiated; global caching should therefore be static.</p>
    *
  + * <p>For JSP EL expressions, an expression string without '${' and '}' 
  + * tokens is considered to be a static string.  One or more occurrences 
  + * of '${' and '}' can be used in the expression string to delimit 
  + * dynamic expressions.  Examples:
  + * <ul>
  + *   <li><code>${lastName}</code></li>
  + *   <li><code>${8 * 8}</code></li>
  + *   <li><code>Version ${major}.${minor}</code></li>
  + *   <li><code>${my:reverse('hello')}</code></li>
  + * </ul>
  + * </p>
  + *
    * @since JSP2.0
    */
   public interface ExpressionEvaluator {
   
       /**
        * Prepare an expression for later evaluation.  This method should perform
  -     * syntactic validation of the expression; if in doing so it detects errors, it
  -     * should raise an ELParseException.
  +     * syntactic validation of the expression; if in doing so it detects 
  +     * errors, it should raise an ELParseException.
        *
  -     * @param expression The expression to be evaluated
  +     * @param expression The expression to be evaluated.
        * @param expectedType The expected type of the result of the evaluation
  -     * @param fMapper A FuntionMapper to resolve functions found in the expression.
  -     *   It can be null, in which case no functions are supported for this invocation.
  +     * @param fMapper A FunctionMapper to resolve functions found in 
  +     *     the expression.  It can be null, in which case no functions 
  +     *     are supported for this invocation.  The FunctionMapper will be
  +     *     invoked one or more times between parsing the expression and
  +     *     evaluating it, and must return a consistent value each time
  +     *     it is invoked.
        * @param defaultPrefix The default prefix to use when a function is
  -     *   encountered with no prefix.
  -     * @return The Expression object encapsulating the arguments, or null if errors
  -     *   were encountered.
  +     *     encountered with no prefix.
  +     * @return The Expression object encapsulating the arguments, or null 
  +     *     if errors were encountered.
        *
        * @exception ELException Thrown if parsing errors were found.
        */ 
  @@ -102,19 +118,25 @@
   
   
       /** 
  -     * Evaluates an expression.  This method may perform some syntactic validation
  -     * and, if so, it should raise an ELParseException error if it encounters syntactic
  -     * errors.  EL evaluation errors should cause an ELException to be raised.
  +     * Evaluates an expression.  This method may perform some syntactic 
  +     * validation and, if so, it should raise an ELParseException error if 
  +     * it encounters syntactic errors.  EL evaluation errors should cause 
  +     * an ELException to be raised.
        *
  -     * @param expression The expression to be evaluated
  +     * @param expression The expression to be evaluated.
        * @param expectedType The expected type of the result of the evaluation
  -     * @param vResolver A VariableResolver instance that can be used at runtime to
  -     *   resolve the name of implicit objects into Objects.
  -     * @param fMapper A FuntionMapper to resolve functions found in the expression.
  -     *   It can be null, in which case no functions are supported for this invocation.
  +     * @param vResolver A VariableResolver instance that can be used at 
  +     *     runtime to resolve the name of implicit objects into Objects.
  +     * @param fMapper A FunctionMapper to resolve functions found in 
  +     *     the expression.  It can be null, in which case no functions 
  +     *     are supported for this invocation.  The FunctionMapper will be
  +     *     invoked one or more times between parsing the expression and
  +     *     evaluating it, and must return a consistent value each time
  +     *     it is invoked.
        * @param defaultPrefix The default prefix to use when a function is
  -     *      encountered with no prefix.
  -     * @return The result of the expression evaluation or null if errors were encountered.
  +     *     encountered with no prefix.
  +     * @return The result of the expression evaluation or null if errors 
  +     *     were encountered.
        *
        * @exception ELException Thrown if the expression evaluation failed.
        */ 
  
  
  
  1.3       +4 -0      jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/el/VariableResolver.java
  
  Index: VariableResolver.java
  ===================================================================
  RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/el/VariableResolver.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- VariableResolver.java	19 Aug 2002 16:29:50 -0000	1.2
  +++ VariableResolver.java	3 Oct 2002 23:01:44 -0000	1.3
  @@ -76,6 +76,10 @@
      * Returns null if the variable is not found.
      * 
      * @param pName the name of the variable to resolve
  +   * @param pContext the context in which the variable is being resolved.
  +   *     The actual instance varies depending on the environment in which
  +   *     the Expression Evaluator is used.  For example, in a JSP context, 
  +   *     the context would normally be an instance of JspContext.
      * @return the result of the variable resolution
      *
      * @throws ELException if a failure occurred while trying to resolve
  
  
  
  1.2       +0 -1      jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/.nbattrs
  
  Index: .nbattrs
  ===================================================================
  RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/.nbattrs,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- .nbattrs	13 Aug 2002 16:20:55 -0000	1.1
  +++ .nbattrs	3 Oct 2002 23:01:44 -0000	1.2
  @@ -3,6 +3,5 @@
   <attributes version="1.0">
       <fileobject name="SimpleTag.java">
           <attr name="class_dependency_javax.servlet.jsp.tagext.BodyTag" serialvalue="aced0005737200316f72672e6f70656e6964652e66696c6573797374656d732e4d756c746946696c654f626a65637424566f696456616c7565d9ec9c94d5fd3ca40c0000787077040000000078"/>
  -        <attr name="class_dependency_javax.servlet.jsp.tagext.Tag" stringvalue="SimpleTag"/>
       </fileobject>
   </attributes>
  
  
  
  1.3       +49 -25    jakarta-servletapi-5/jsr154/src/share/dtd/j2ee_1_4.xsd
  
  Index: j2ee_1_4.xsd
  ===================================================================
  RCS file: /home/cvs/jakarta-servletapi-5/jsr154/src/share/dtd/j2ee_1_4.xsd,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- j2ee_1_4.xsd	25 Sep 2002 17:01:32 -0000	1.2
  +++ j2ee_1_4.xsd	3 Oct 2002 23:01:44 -0000	1.3
  @@ -9,7 +9,7 @@
        version="1.4">
   <xsd:annotation>
   <xsd:documentation>
  -@(#)j2ee_1_4.xsds	1.28 02/09/19
  +@(#)j2ee_1_4.xsds	1.31 02/10/01
   </xsd:documentation>
   </xsd:annotation>
   
  @@ -74,7 +74,8 @@
   <xsd:import namespace="http://www.w3.org/XML/1998/namespace"
               schemaLocation="http://www.w3.org/2001/xml.xsd"/>
   
  -<xsd:include schemaLocation="j2ee_web_services_client_1_1.xsd"/>
  +<xsd:include schemaLocation=
  +"http://www.ibm.com/webservices/xsd/j2ee_web_services_client_1_1.xsd"/>
   
   
   <!-- **************************************************** -->
  @@ -207,6 +208,7 @@
   <xsd:complexType name="display-nameType">
   <xsd:annotation>
   <xsd:documentation>
  +<![CDATA[
   
   The display-name type contains a short name that is intended
   to be displayed by tools. It is used by display-name
  @@ -215,10 +217,11 @@
   Example:
   
   ...
  -   &lt;display-name xml:lang="en">Employee Self Service&lt;/display-name>
  +   <display-name xml:lang="en">Employee Self Service</display-name>
   
   The value of the xml:lang attribute is "en" (English) by default.
   
  +]]>
   </xsd:documentation>
   </xsd:annotation>
       <xsd:simpleContent>
  @@ -233,6 +236,7 @@
   <xsd:complexType name="ejb-linkType">
   <xsd:annotation>
   <xsd:documentation>
  +<![CDATA[
   
   The ejb-linkType is used by ejb-link
   elements in the ejb-ref or ejb-local-ref elements to specify
  @@ -252,12 +256,11 @@
   
   Examples:
   
  -<![CDATA[
       <ejb-link>EmployeeRecord</ejb-link>
   
       <ejb-link>../products/product.jar#ProductEJB</ejb-link>
  -]]>
   
  +]]>
   </xsd:documentation>
   </xsd:annotation>
       <xsd:simpleContent>
  @@ -316,6 +319,7 @@
   <xsd:complexType name="ejb-ref-nameType">
   <xsd:annotation>
   <xsd:documentation>
  +<![CDATA[
   
   The ejb-ref-name element contains the name of an EJB
   reference. The EJB reference is an entry in the
  @@ -327,8 +331,9 @@
   
   Example:
   
  -&lt;ejb-ref-name>ejb/Payroll&lt;/ejb-ref-name>
  +<ejb-ref-name>ejb/Payroll</ejb-ref-name>
   
  +]]>
   </xsd:documentation>
   </xsd:annotation>
       <xsd:simpleContent>
  @@ -428,6 +433,7 @@
   <xsd:complexType name="env-entry-type-valuesType">
   <xsd:annotation>
   <xsd:documentation>
  +<![CDATA[
   
   This type contains the fully-qualified Java type of the
   environment entry value that is expected by the
  @@ -447,8 +453,9 @@
   
   Example:
   
  -&lt;env-entry-type>java.lang.Boolean&lt;/env-entry-type>
  +<env-entry-type>java.lang.Boolean</env-entry-type>
   
  +]]>
   </xsd:documentation>
   </xsd:annotation>
       <xsd:simpleContent>
  @@ -492,6 +499,7 @@
                        type="j2ee:jndi-nameType">
           <xsd:annotation>
           <xsd:documentation>
  +        <![CDATA[
   
           The env-entry-name element contains the name of a
           Deployment Component's environment entry.  The name
  @@ -503,8 +511,9 @@
   
           Example:
   
  -        &lt;env-entry-name>minAmount&lt;/env-entry-name>
  +        <env-entry-name>minAmount</env-entry-name>
   
  +        ]]>
           </xsd:documentation>
           </xsd:annotation>
           </xsd:element>
  @@ -517,6 +526,7 @@
                        minOccurs="0">
           <xsd:annotation>
           <xsd:documentation>
  +        <![CDATA[
   
           The env-entry-value designates the value of a
           Deployment Component's environment entry. The value
  @@ -527,8 +537,9 @@
   
           Example:
   
  -        &lt;env-entry-value>100.00&lt;/env-entry-value>
  +        <env-entry-value>100.00</env-entry-value>
   
  +        ]]>
           </xsd:documentation>
           </xsd:annotation>
           </xsd:element>
  @@ -597,14 +608,16 @@
   <xsd:complexType name="homeType">
   <xsd:annotation>
   <xsd:documentation>
  +<![CDATA[
   
   The homeType defines the fully-qualified name of
   an enterprise bean's home interface.
   
   Example:
   
  -    &lt;home>com.aardvark.payroll.PayrollHome&lt;/home>
  +    <home>com.aardvark.payroll.PayrollHome</home>
   
  +]]>
   </xsd:documentation>
   </xsd:annotation>
       <xsd:simpleContent>
  @@ -635,6 +648,8 @@
                minOccurs="0">
           <xsd:annotation>
           <xsd:documentation>
  +        <![CDATA[
  +
           The small-icon element contains the name of a file
           containing a small (16 x 16) icon image. The file
           name is a relative path within the Deployment
  @@ -645,7 +660,9 @@
   
           Example:
   
  -        &lt;small-icon>employee-service-icon16x16.jpg&lt;/small-icon>
  +        <small-icon>employee-service-icon16x16.jpg</small-icon>
  +
  +        ]]>
           </xsd:documentation>
           </xsd:annotation>
           </xsd:element>
  @@ -653,6 +670,7 @@
                minOccurs="0">
           <xsd:annotation>
           <xsd:documentation>
  +        <![CDATA[
   
           The large-icon element contains the name of a file
           containing a large
  @@ -665,7 +683,9 @@
   
           Example:
   
  -        &lt;large-icon>employee-service-icon32x32.jpg&lt;/large-icon>
  +        <large-icon>employee-service-icon32x32.jpg</large-icon>
  +
  +        ]]>
           </xsd:documentation>
           </xsd:annotation>
           </xsd:element>
  @@ -784,6 +804,7 @@
   <xsd:complexType name="message-destination-refType">
   <xsd:annotation>
   <xsd:documentation>
  +<![CDATA[
   
   The message-destination-ref element contains a declaration
   of Deployment Component's reference to a message destination
  @@ -800,7 +821,6 @@
   
   Examples:
   
  -<![CDATA[
   <message-destination-ref>
           <message-destination-ref-name>jms/StockQueue
           </message-destination-ref-name>
  @@ -811,8 +831,8 @@
           <message-destination-link>CorporateStocks
           </message-destination-link>
   </message-destination-ref>
  -]]>
   
  +]]>
   </xsd:documentation>
   </xsd:annotation>
       <xsd:sequence>
  @@ -858,6 +878,7 @@
   <xsd:complexType name="message-destination-typeType">
   <xsd:annotation>
   <xsd:documentation>
  +<![CDATA[
   
   The message-destination-typeType specifies the type of
   the destination. The type is specified by the Java interface
  @@ -865,9 +886,10 @@
   
   Example:
   
  - &lt;message-destination-type>javax.jms.Queue
  - &lt;/message-destination-type>
  +  <message-destination-type>javax.jms.Queue
  +  </message-destination-type>
   
  +]]>
   </xsd:documentation>
   </xsd:annotation>
       <xsd:simpleContent>
  @@ -910,6 +932,7 @@
   <xsd:complexType name="message-destinationType">
   <xsd:annotation>
   <xsd:documentation>
  +<![CDATA[
   
   The message-destinationType specifies a message
   destination. The logical destination described by this
  @@ -926,13 +949,12 @@
   
   Example:
   
  -<![CDATA[
   <message-destination>
           <message-destination-name>CorporateStocks
           </message-destination-name>
   </message-destination>
  -]]>
   
  +]]>
   </xsd:documentation>
   </xsd:annotation>
       <xsd:sequence>
  @@ -1034,14 +1056,16 @@
   <xsd:complexType name="remoteType">
   <xsd:annotation>
   <xsd:documentation>
  +<![CDATA[
   
   The remote element contains the fully-qualified name
   of the enterprise bean's remote interface.
   
   Example:
   
  -    &lt;remote>com.wombat.empl.EmployeeService&lt;/remote>
  +    <remote>com.wombat.empl.EmployeeService</remote>
   
  +]]>
   </xsd:documentation>
   </xsd:annotation>
       <xsd:simpleContent>
  @@ -1108,6 +1132,7 @@
   <xsd:complexType name="resource-env-refType">
   <xsd:annotation>
   <xsd:documentation>
  +<![CDATA[
   
   The resource-env-refType is used to define
   resource-env-type elements.  It contains a declaration of a
  @@ -1120,15 +1145,14 @@
   
   Example:
   
  -<![CDATA[
   <resource-env-ref>
       <resource-env-ref-name>jms/StockQueue
       </resource-env-ref-name>
       <resource-env-ref-type>javax.jms.Queue
       </resource-env-ref-type>
   </resource-env-ref>
  -]]>
   
  +]]>
   </xsd:documentation>
   </xsd:annotation>
   
  @@ -1181,6 +1205,7 @@
   <xsd:complexType name="resource-refType">
   <xsd:annotation>
   <xsd:documentation>
  +<![CDATA[
   
   The resource-refType contains a declaration of a
   Deployment Component's reference to an external resource. It
  @@ -1194,15 +1219,14 @@
   
   Example:
   
  -<![CDATA[
   <resource-ref>
       <res-ref-name>jdbc/EmployeeAppDB</res-ref-name>
       <res-type>javax.sql.DataSource</res-type>
       <res-auth>Container</res-auth>
       <res-sharing-scope>Shareable</res-sharing-scope>
   </resource-ref>
  -]]>
   
  +]]>
   </xsd:documentation>
   </xsd:annotation>
   
  @@ -1356,6 +1380,7 @@
   <xsd:complexType name="security-roleType">
   <xsd:annotation>
   <xsd:documentation>
  +<![CDATA[
   
   The security-roleType contains the definition of a security
   role. The definition consists of an optional description of the
  @@ -1363,7 +1388,6 @@
   
   Example:
   
  -<![CDATA[
       <security-role>
       <description>
           This role includes all employees who are authorized
  @@ -1371,8 +1395,8 @@
       </description>
       <role-name>employee</role-name>
       </security-role>
  -]]>
   
  +]]>
   </xsd:documentation>
   </xsd:annotation>
   
  
  
  
  1.5       +24 -20    jakarta-servletapi-5/jsr154/src/share/dtd/web-app_2_4.xsd
  
  Index: web-app_2_4.xsd
  ===================================================================
  RCS file: /home/cvs/jakarta-servletapi-5/jsr154/src/share/dtd/web-app_2_4.xsd,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- web-app_2_4.xsd	25 Sep 2002 17:01:32 -0000	1.4
  +++ web-app_2_4.xsd	3 Oct 2002 23:01:44 -0000	1.5
  @@ -8,7 +8,7 @@
        version="2.4">
   <xsd:annotation>
   <xsd:documentation>
  -@(#)web-app_2_4.xsds	1.40 02/09/19
  +@(#)web-app_2_4.xsds	1.44 02/09/30
   </xsd:documentation>
   </xsd:annotation>
   
  @@ -49,10 +49,12 @@
   
   <xsd:annotation>
   <xsd:documentation>
  +<![CDATA[
   
  -This is the XML Schema for the Servlet 2.4 deployment
  -descriptor.  All Servlet deployment descriptors must
  -indicate the web application schema by using the J2EE
  +This is the XML Schema for the Servlet 2.4 deployment descriptor.
  +The deployment descriptor must be named "WEB-INF/web.xml" in the
  +web application's war file.  All Servlet deployment descriptors
  +must indicate the web application schema by using the J2EE
   namespace:
   
   http://java.sun.com/xml/ns/j2ee
  @@ -60,12 +62,12 @@
   and by indicating the version of the schema by
   using the version element as shown below:
   
  -    &lt;web-app xmlns="http://java.sun.com/xml/ns/j2ee"
  -     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  -     xsi:schemaLocation="..."
  -     version="2.4">
  -    ...
  -    &lt;/web-app>
  +    <web-app xmlns="http://java.sun.com/xml/ns/j2ee"
  +      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  +      xsi:schemaLocation="..."
  +      version="2.4">
  +      ...
  +    </web-app>
   
   The instance documents may indicate the published version of
   the schema using the xsi:schemaLocation attribute for J2EE
  @@ -73,6 +75,7 @@
   
   http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd
   
  +]]>
   </xsd:documentation>
   </xsd:annotation>
   
  @@ -332,16 +335,16 @@
   <xsd:annotation>
   <xsd:documentation>
   
  -The dispatcher has three legal values, FORWARD and REQUEST
  -and INCLUDE. A value of FORWARD means the Filter
  -will be applied under RequestDispatcher.forward() calls.
  -A value of REQUEST means the Filter will be applied
  -under ordinary client calls to the path or servlet. A value of
  -INCLUDE means the Filter will be applied under
  -RequestDispatcher.include() calls.
  -The absence of any dispatcher elements in a
  -filter-mapping indicates a default of applying
  -filters only under ordinary client calls to the path or servlet.
  +The dispatcher has four legal values: FORWARD, REQUEST, INCLUDE,
  +and ERROR. A value of FORWARD means the Filter will be applied
  +under RequestDispatcher.forward() calls.  A value of REQUEST
  +means the Filter will be applied under ordinary client calls to
  +the path or servlet. A value of INCLUDE means the Filter will be
  +applied under RequestDispatcher.include() calls.  A value of
  +ERROR means the Filter will be applied under the error page
  +mechanism.  The absence of any dispatcher elements in a
  +filter-mapping indicates a default of applying filters only under
  +ordinary client calls to the path or servlet.
   
   </xsd:documentation>
   </xsd:annotation>
  @@ -351,6 +354,7 @@
               <xsd:enumeration value="FORWARD"/>
               <xsd:enumeration value="INCLUDE"/>
               <xsd:enumeration value="REQUEST"/>
  +            <xsd:enumeration value="ERROR"/>
           </xsd:restriction>
       </xsd:simpleContent>
   </xsd:complexType>
  
  
  
  1.4       +9 -7      jakarta-servletapi-5/jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd
  
  Index: web-jsptaglibrary_2_0.xsd
  ===================================================================
  RCS file: /home/cvs/jakarta-servletapi-5/jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- web-jsptaglibrary_2_0.xsd	20 Sep 2002 01:56:44 -0000	1.3
  +++ web-jsptaglibrary_2_0.xsd	3 Oct 2002 23:01:44 -0000	1.4
  @@ -10,7 +10,7 @@
   
   <xsd:annotation>
   <xsd:documentation>
  -@(#)web-jsptaglibrary_2_0.xsds	1.18 09/19/02
  +@(#)web-jsptaglibrary_2_0.xsds	1.19 09/30/02
   </xsd:documentation>
   </xsd:annotation>
   <xsd:annotation>
  @@ -50,6 +50,7 @@
   
   <xsd:annotation>
   <xsd:documentation>
  +<![CDATA[
   
   This is the XML Schema for the JSP Taglibrary deployment
   descriptor.  All Taglibrary deployment descriptors must
  @@ -61,12 +62,12 @@
   and by indicating the version of the schema by
   using the version element as shown below:
   
  -    &lt;taglib xmlns="http://java.sun.com/xml/ns/j2ee"
  -     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  -     xsi:schemaLocation="..."
  -     version="2.0">
  -    ...
  -    &lt;/taglib>
  +    <taglib xmlns="http://java.sun.com/xml/ns/j2ee"
  +      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  +      xsi:schemaLocation="..."
  +      version="2.0">
  +      ...
  +    </taglib>
   
   The instance documents may indicate the published
   version of the schema using xsi:schemaLocation attribute
  @@ -74,6 +75,7 @@
   
   http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd
   
  +]]>
   </xsd:documentation>
   </xsd:annotation>
   
  
  
  
  1.1                  jakarta-servletapi-5/jsr154/src/share/dtd/j2ee_web_services_1_1.xsd
  
  Index: j2ee_web_services_1_1.xsd
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
       targetNamespace="http://java.sun.com/xml/ns/j2ee"
       xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
       xmlns:xsd="http://www.w3.org/2001/XMLSchema"
       elementFormDefault="qualified"
       attributeFormDefault="unqualified"
       version="1.1">
  <xsd:annotation>
  <xsd:documentation>
  @(#)j2ee_web_services_1_1.xsds	1.10 09/30/02
  </xsd:documentation>
  </xsd:annotation>
  
  <xsd:annotation>
  <xsd:documentation>
  
  Copyright 2002 Sun Microsystems, Inc., 901 San Antonio
  Road, Palo Alto, California 94303, U.S.A. All rights
  reserved.
  
  Sun Microsystems, Inc. has intellectual property rights
  relating to technology described in this document. In
  particular, and without limitation, these intellectual
  property rights may include one or more of the U.S. patents
  listed at http://www.sun.com/patents and one or more
  additional patents or pending patent applications in the
  U.S. and other countries.
  
  This document and the technology which it describes are
  distributed under licenses restricting their use, copying,
  distribution, and decompilation. No part of this document
  may be reproduced in any form by any means without prior
  written authorization of Sun and its licensors, if any.
  
  Third-party software, including font technology, is
  copyrighted and licensed from Sun suppliers.
  
  Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
  JavaServer Pages, Enterprise JavaBeans and the Java Coffee
  Cup logo are trademarks or registered trademarks of Sun
  Microsystems, Inc. in the U.S. and other countries.
  
  Federal Acquisitions: Commercial Software - Government Users
  Subject to Standard License Terms and Conditions.
  
  </xsd:documentation>
  </xsd:annotation>
  
  <xsd:annotation>
  <xsd:documentation>
  
  (C) Copyright International Business Machines Corporation 2002
  
  </xsd:documentation>
  </xsd:annotation>
  
  <xsd:annotation>
  <xsd:documentation>
  <![CDATA[
  
  The webservices element is the root element for the web services
  deployment descriptor.  It specifies the set of web service
  descriptions that are to be deployed into the J2EE Application
  Server and the dependencies they have on container resources and
  services.  The deployment descriptor must be named
  "META-INF/webservices.xml" in the web services' jar file.
  
  Used in: webservices.xml
  
  All webservices deployment descriptors must indicate the
  webservices schema by using the J2EE namespace:
  
  http://java.sun.com/xml/ns/j2ee
  
  and by indicating the version of the schema by using the version
  element as shown below:
  
      <webservices xmlns="http://java.sun.com/xml/ns/j2ee"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
          http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
        version="1.1">
        ...
      </webservices>
  
  The instance documents may indicate the published version of the
  schema using the xsi:schemaLocation attribute for the J2EE
  namespace with the following location:
  
  http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd
  
  ]]>
  </xsd:documentation>
  </xsd:annotation>
  
  <xsd:annotation>
  <xsd:documentation>
  
  The following conventions apply to all J2EE
  deployment descriptor elements unless indicated otherwise.
  
  - In elements that specify a pathname to a file within the
    same JAR file, relative filenames (i.e., those not
    starting with "/") are considered relative to the root of
    the JAR file's namespace.  Absolute filenames (i.e., those
    starting with "/") also specify names in the root of the
    JAR file's namespace.  In general, relative names are
    preferred.  The exception is .war files where absolute
    names are preferred for consistency with the Servlet API.
  
  </xsd:documentation>
  </xsd:annotation>
  
  <xsd:include schemaLocation="j2ee_1_4.xsd"/>
  
  
  <!-- **************************************************** -->
  
  
  <xsd:element name="webservices" type="j2ee:webservicesType">
      <xsd:annotation>
      <xsd:documentation>
  
      The webservices element is the root element for the web services
      deployment descriptor.  It specifies the set of web service
      descriptions that are to be deployed into the J2EE Application Server
      and the dependencies they have on container resources and services.
  
      Used in: webservices.xml
  
      </xsd:documentation>
      </xsd:annotation>
  
      <xsd:key name="webservice-description-name-key">
      <xsd:annotation>
      <xsd:documentation>
  
      The webservice-description-name identifies the collection of
      port-components associated with a WSDL file and JAX-RPC mapping. The
      name must be unique within the deployment descriptor.
  
      </xsd:documentation>
      </xsd:annotation>
          <xsd:selector xpath="j2ee:webservice-description"/>
          <xsd:field xpath="j2ee:webservice-description-name"/>
      </xsd:key>
  </xsd:element>
  
  <!-- **************************************************** -->
  
  <xsd:complexType name="port-componentType">
      <xsd:annotation>
      <xsd:documentation>
  
      The port-component element associates a WSDL port with a web service
      interface and implementation.  It defines the name of the port as a
      component, optional description, optional display name, optional iconic
      representations, WSDL port QName, Service Endpoint Interface, Service
      Implementation Bean.
  
      </xsd:documentation>
      </xsd:annotation>
  
      <xsd:sequence>
          <xsd:element name="description"
                       type="j2ee:descriptionType"
                       minOccurs="0" maxOccurs="1"/>
          <xsd:element name="display-name"
                       type="j2ee:display-nameType"
                       minOccurs="0" maxOccurs="1"/>
          <xsd:element name="icon"
                       type="j2ee:iconType"
                       minOccurs="0" maxOccurs="1"/>
          <xsd:element name="port-component-name"
                       type="j2ee:string">
          <xsd:annotation>
          <xsd:documentation>
          <![CDATA[
  
          The port-component-name element specifies a port component's
          name.  This name is assigned by the module producer to name
          the service implementation bean in the module's deployment
          descriptor. The name must be unique among the port component
          names defined in the same module.
  
          Used in: port-component
  
          Example:
                  <port-component-name>EmployeeService
                  </port-component-name>
  
          ]]>
          </xsd:documentation>
          </xsd:annotation>
          </xsd:element>
          <xsd:element name="wsdl-port"
                       type="j2ee:xsdQNameType">
          <xsd:annotation>
          <xsd:documentation>
  
          Defines the name space and local name part of the WSDL port QName.
  
          </xsd:documentation>
          </xsd:annotation>
          </xsd:element>
          <xsd:element name="service-endpoint-interface"
                       type="j2ee:fully-qualified-classType">
          <xsd:annotation>
          <xsd:documentation>
          <![CDATA[
  
          The service-endpoint-interface element contains the
          fully-qualified name of the port component's Service Endpoint
          Interface.
  
          Used in: port-component
  
          Example:
                  <remote>com.wombat.empl.EmployeeService</remote>
  
          ]]>
          </xsd:documentation>
          </xsd:annotation>
          </xsd:element>
          <xsd:element name="service-impl-bean"
                       type="j2ee:service-impl-beanType"/>
  
          <xsd:element name="handler"
                       type="j2ee:port-component_handlerType"
                       minOccurs="0" maxOccurs="unbounded"/>
      </xsd:sequence>
      <xsd:attribute name="id" type="xsd:ID"/>
  </xsd:complexType>
  
  <!-- **************************************************** -->
  
  <xsd:complexType name="port-component_handlerType">
      <xsd:annotation>
      <xsd:documentation>
  
      Declares the handler for a port-component. Handlers can access the
      init-param name/value pairs using the HandlerInfo interface.
  
      Used in: port-component
  
      </xsd:documentation>
      </xsd:annotation>
      <xsd:sequence>
          <xsd:group ref="j2ee:descriptionGroup"/>
          <xsd:element name="handler-name"
                       type="j2ee:string">
          <xsd:annotation>
          <xsd:documentation>
  
          Defines the name of the handler. The name must be unique within the
          module.
  
          </xsd:documentation>
          </xsd:annotation>
          </xsd:element>
          <xsd:element name="handler-class"
                       type="j2ee:fully-qualified-classType">
          <xsd:annotation>
          <xsd:documentation>
  
          Defines a fully qualified class name for the handler implementation.
  
          </xsd:documentation>
          </xsd:annotation>
          </xsd:element>
          <xsd:element name="init-param"
                       type="j2ee:param-valueType"
                       minOccurs="0" maxOccurs="unbounded"/>
  
          <xsd:element name="soap-header"
                       type="j2ee:xsdQNameType"
                       minOccurs="0" maxOccurs="unbounded">
          <xsd:annotation>
          <xsd:documentation>
  
          Defines the QName of a SOAP header that will be processed by the
          handler.
  
          </xsd:documentation>
          </xsd:annotation>
          </xsd:element>
          <xsd:element name="soap-role"
                       type="j2ee:string"
                       minOccurs="0" maxOccurs="unbounded">
          <xsd:annotation>
          <xsd:documentation>
  
          The soap-role element contains a SOAP actor definition that the
          Handler will play as a role.
  
          </xsd:documentation>
          </xsd:annotation>
          </xsd:element>
      </xsd:sequence>
      <xsd:attribute name="id" type="xsd:ID"/>
  </xsd:complexType>
  
  <!-- **************************************************** -->
  
  <xsd:complexType name="service-impl-beanType">
      <xsd:annotation>
      <xsd:documentation>
  
      The service-impl-bean element defines the web service implementation.
      A service implementation can be an EJB bean class or JAX-RPC web
      component.  Existing EJB implementations are exposed as a web service
      using an ejb-link.
  
      Used in: port-component
  
      </xsd:documentation>
      </xsd:annotation>
      <xsd:choice>
          <xsd:element name="ejb-link"
                       type="j2ee:ejb-linkType"/>
          <xsd:element name="servlet-link"
                       type="j2ee:servlet-linkType"/>
      </xsd:choice>
      <xsd:attribute name="id" type="xsd:ID"/>
  </xsd:complexType>
  
  <!-- **************************************************** -->
  
  <xsd:complexType name="servlet-linkType">
      <xsd:annotation>
      <xsd:documentation>
      <![CDATA[
  
      The servlet-link element is used in the service-impl-bean element
      to specify that a Service Implementation Bean is defined as a
      JAX-RPC Service Endpoint.
  
      The value of the servlet-link element must be the servlet-name of
      a JAX-RPC Service Endpoint in the same WAR file.
  
      Used in: service-impl-bean
  
      Example:
              <servlet-link>StockQuoteService</servlet-link>
  
      ]]>
      </xsd:documentation>
      </xsd:annotation>
      <xsd:simpleContent>
          <xsd:restriction base="j2ee:string"/>
      </xsd:simpleContent>
  </xsd:complexType>
  
  <!-- **************************************************** -->
  
  <xsd:complexType name="webservice-descriptionType">
      <xsd:annotation>
      <xsd:documentation>
  
      The webservice-description element defines a WSDL document file
      and the set of Port components associated with the WSDL ports
      defined in the WSDL document.  There may be multiple
      webservice-descriptions defined within a module.
  
      All WSDL file ports must have a corresponding port-component element
      defined.
  
      Used in: webservices
  
      </xsd:documentation>
      </xsd:annotation>
  
      <xsd:sequence>
          <xsd:element name="description"
                       type="j2ee:descriptionType"
                       minOccurs="0" maxOccurs="1"/>
          <xsd:element name="display-name"
                       type="j2ee:display-nameType"
                       minOccurs="0" maxOccurs="1"/>
          <xsd:element name="icon"
                       type="j2ee:iconType"
                       minOccurs="0" maxOccurs="1"/>
          <xsd:element name="webservice-description-name"
                       type="j2ee:string">
          <xsd:annotation>
          <xsd:documentation>
  
          The webservice-description-name identifies the collection of
          port-components associated with a WSDL file and JAX-RPC
          mapping. The name must be unique within the deployment descriptor.
  
          </xsd:documentation>
          </xsd:annotation>
          </xsd:element>
          <xsd:element name="wsdl-file"
                       type="j2ee:pathType">
          <xsd:annotation>
          <xsd:documentation>
  
          The wsdl-file element contains the name of a WSDL file in the
          module.  The file name is a relative path within the module.
  
          </xsd:documentation>
          </xsd:annotation>
          </xsd:element>
          <xsd:element name="jaxrpc-mapping-file"
                       type="j2ee:pathType">
          <xsd:annotation>
          <xsd:documentation>
  
          The jaxrpc-mapping-file element contains the name of a file that
          describes the JAX-RPC mapping between the Java interaces used by
          the application and the WSDL description in the wsdl-file.  The
          file name is a relative path within the module.
  
          </xsd:documentation>
          </xsd:annotation>
          </xsd:element>
          <xsd:element name="port-component"
                       type="j2ee:port-componentType"
                       minOccurs="1" maxOccurs="unbounded">
              <xsd:key name="port-component_handler-name-key">
              <xsd:annotation>
              <xsd:documentation>
  
              Defines the name of the handler. The name must be unique within the
              module.
  
              </xsd:documentation>
              </xsd:annotation>
                  <xsd:selector xpath="j2ee:handler"/>
                  <xsd:field xpath="j2ee:handler-name"/>
              </xsd:key>
          </xsd:element>
      </xsd:sequence>
      <xsd:attribute name="id" type="xsd:ID"/>
  </xsd:complexType>
  
  <!-- **************************************************** -->
  
  <xsd:complexType name="webservicesType">
      <xsd:sequence>
          <xsd:group ref="j2ee:descriptionGroup"/>
          <xsd:element name="webservice-description"
                       type="j2ee:webservice-descriptionType"
                       minOccurs="1" maxOccurs="unbounded">
              <xsd:key name="port-component-name-key">
              <xsd:annotation>
              <xsd:documentation>
              <![CDATA[
  
              The port-component-name element specifies a port
              component's name.  This name is assigned by the module
              producer to name the service implementation bean in the
              module's deployment descriptor. The name must be unique
              among the port component names defined in the same module.
  
              Used in: port-component
  
              Example:
                      <port-component-name>EmployeeService
                      </port-component-name>
  
              ]]>
              </xsd:documentation>
              </xsd:annotation>
                  <xsd:selector xpath="j2ee:port-component"/>
                  <xsd:field xpath="j2ee:port-component-name"/>
              </xsd:key>
          </xsd:element>
      </xsd:sequence>
  
      <xsd:attribute name="version"
                     type="j2ee:dewey-versionType"
                     fixed="1.1"
                     use="required">
      <xsd:annotation>
      <xsd:documentation>
  
      The required value for the version is 1.1.
  
      </xsd:documentation>
      </xsd:annotation>
      </xsd:attribute>
      <xsd:attribute name="id" type="xsd:ID"/>
  </xsd:complexType>
  
  </xsd:schema>
  
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message