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_1_4.xsd jsp_2_0.xsd jspxml.dtd jspxml.xsd web-app_2_4.xsd web-jsptaglibrary_2_0.xsd
Date Fri, 08 Nov 2002 21:30:21 GMT
kinman      2002/11/08 13:30:21

  Modified:    jsr152/src/share/dtd jsp_2_0.xsd jspxml.dtd jspxml.xsd
                        web-jsptaglibrary_2_0.xsd
               jsr152/src/share/javax/servlet/jsp JspContext.java
               jsr152/src/share/javax/servlet/jsp/tagext PageData.java
                        TagSupport.java
               jsr154/src/share/dtd j2ee_1_4.xsd jsp_2_0.xsd jspxml.dtd
                        jspxml.xsd web-app_2_4.xsd
                        web-jsptaglibrary_2_0.xsd
  Log:
  - Patch by Mark Roth
  
  Here is another set of JSP 2.0 API changes and clarifications, based on
  feedback from various sources.  Please let me know if there are any
  questions or concerns.
  
  jsr152/src/share/javax/servlet/jsp/JspContext.java
     - Clarified that removeAttribute( name ) removes from all scopes
     - Clarified that removeAttribute( name, scope ) does nothing if the
       object doesn't exist in that scope.
     - Clarified that setAttribute( name, null ) has the effect of removing
       that attribute from the page scope.
     - Clarified that setAttribute( name, null, scope ) has the effect of
       removing that attribute from the given scope.
  
  jsr152/src/share/javax/servlet/jsp/tagext/TagSupport.java
     - Clarified javadocs for getValues() that the keys are returned.
     - Updated release() method to clear id and values Hashtable
  
  jsr152/src/share/javax/servlet/jsp/tagext/PageData.java
     - Clarified the InputStream returned is in UTF-8
  
  jsr152/src/share/dtd/jspxml.dtd
  jsr152/src/share/dtd/jspxml.xsd
  jsr154/src/share/dtd/jspxml.dtd
  jsr154/src/share/dtd/jspxml.xsd
     - Removed i18n-related comment about contentType default
  
  jsr152/src/share/dtd/jsp_2_0.xsd
  jsr154/src/share/dtd/jsp_2_0.xsd
     - Changed i18n-related description relating to encoding name conflicts
  
  jsr154/src/share/dtd/web-app_2_4.xsd
  jsr154/src/share/dtd/j2ee_1_4.xsd
     - Moved warType from j2ee_1_4.xsd to web-app_2_4.xsd
  
  Revision  Changes    Path
  1.5       +10 -7     jakarta-servletapi-5/jsr152/src/share/dtd/jsp_2_0.xsd
  
  Index: jsp_2_0.xsd
  ===================================================================
  RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/dtd/jsp_2_0.xsd,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- jsp_2_0.xsd	9 Oct 2002 17:38:49 -0000	1.4
  +++ jsp_2_0.xsd	8 Nov 2002 21:30:20 -0000	1.5
  @@ -8,7 +8,7 @@
        version="2.0">
   <xsd:annotation>
   <xsd:documentation>
  -%W% %G%
  +@(#)jsp_2_0.xsds	1.14 11/06/02
   </xsd:documentation>
   </xsd:annotation>
   
  @@ -172,12 +172,15 @@
           <xsd:documentation>
   
           The valid values of page-encoding are those of the
  -        pageEncoding page directive. It is a
  -        translation-time error to define the pageEncoding
  -        of a JSP page through one value in the JSP
  -        configuration element and then give it a different
  -        value in a pageEncoding directive, but it is legal
  -        to give it the same value.
  +        pageEncoding page directive.  It is a
  +	translation-time error to name different encodings
  +	in the pageEncoding attribute of the page directive
  +	of a JSP page and in a JSP configuration element
  +	matching the page.  It is also a translation-time
  +	error to name different encodings in the prolog of
  +	a document in XML syntax and in a JSP configuration
  +	element matching the document.  It is legal to name
  +	the same encoding through mulitple mechanisms.
   
           </xsd:documentation>
           </xsd:annotation>
  
  
  
  1.2       +2 -9      jakarta-servletapi-5/jsr152/src/share/dtd/jspxml.dtd
  
  Index: jspxml.dtd
  ===================================================================
  RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/dtd/jspxml.dtd,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- jspxml.dtd	13 Aug 2002 16:20:58 -0000	1.1
  +++ jspxml.dtd	8 Nov 2002 21:30:20 -0000	1.2
  @@ -1,4 +1,4 @@
  -<!-- DTD for JSP 1.2
  +<!-- DTD for JSP 2.0
        thanks to Bob Foster, WebGain
   -->
   
  @@ -77,12 +77,6 @@
   >
   
   <!ELEMENT jsp:directive.page EMPTY>
  -<!--
  -    The contentType default is not relevant for XML views of
  -    JSP pages since it differs depending on the originating
  -    syntax (text/html;ISO-8859-1 for JSP Pages in standard syntax, or
  -    text/xml;UTF-8 for JSP Documents in XML syntax.
  --->
   <!ATTLIST jsp:directive.page
       language        CDATA           "java"
       extends         %ClassName;     #IMPLIED
  @@ -96,8 +90,7 @@
       errorPage       %URL;           #IMPLIED
       isErrorPage     %Bool;          "false"
       pageEncoding    CDATA           #IMPLIED
  -    isScriptingEnabled %Bool;       "true"
  -    isELEnabled     %Bool;          #IMPLIED
  +    isELIgnored     %Bool;          #IMPLIED
   >
   
   <!-- the jsp:directive.include only appears in JSP documents and does
  
  
  
  1.2       +5 -10     jakarta-servletapi-5/jsr152/src/share/dtd/jspxml.xsd
  
  Index: jspxml.xsd
  ===================================================================
  RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/dtd/jspxml.xsd,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- jspxml.xsd	13 Aug 2002 16:20:58 -0000	1.1
  +++ jspxml.xsd	8 Nov 2002 21:30:20 -0000	1.2
  @@ -29,7 +29,7 @@
   
     <xsd:annotation>
       <xsd:documentation>
  -      XML Schema for JSP 1.2.
  +      XML Schema for JSP 2.0.
   
         This schema is based upon the recent (May 5th, 2001)
         W3C recommendation for XML Schema.
  @@ -210,7 +210,7 @@
     <xsd:simpleType name = "ContentType">
       <xsd:annotation>
         <xsd:documentation>
  -        Contetn Type for this page
  +        Content type and character encoding for this page.
         </xsd:documentation>
       </xsd:annotation>
       <xsd:restriction base = "xsd:string">
  @@ -221,7 +221,7 @@
     <xsd:simpleType name = "PageEncoding">
       <xsd:annotation>
         <xsd:documentation>
  -        Page Encoding for this page.  Default is that of ContentType.
  +        Page Encoding for this page.
         </xsd:documentation>
       </xsd:annotation>
       <xsd:restriction base = "xsd:string">
  @@ -291,7 +291,7 @@
       <xsd:complexType>
         <xsd:complexContent>
           <xsd:extension base = "Body">
  -          <xsd:attribute name = "version" fixed = "1.2" type = "xsd:string"/>
  +          <xsd:attribute name = "version" fixed = "2.0" type = "xsd:string"/>
           </xsd:extension>
         </xsd:complexContent>
       </xsd:complexType>
  @@ -301,10 +301,6 @@
       <xsd:annotation>
         <xsd:documentation>
           directive.page is the "page directive".
  -        The contentType default is not relevant for XML views of
  -        JSP pages since it differs depending on the originating
  -        syntax (text/html;ISO-8859-1 for JSP Pages in standard syntax, or
  -        text/xml;UTF-8 for JSP Documents in XML syntax.
         </xsd:documentation>
       </xsd:annotation>
       <xsd:complexType>
  @@ -320,8 +316,7 @@
         <xsd:attribute name = "info" type = "xsd:string"/>
         <xsd:attribute name = "errorPage" type = "RelativeURL"/>
         <xsd:attribute name = "isErrorPage" default = "false" type = "Bool"/>
  -      <xsd:attribute name = "isScriptingEnabled" default = "true" type = "Bool"/>
  -      <xsd:attribute name = "isELEnabled" type = "Bool"/>
  +      <xsd:attribute name = "isELIgnored" type = "Bool"/>
       </xsd:complexType>
     </xsd:element>
     
  
  
  
  1.6       +21 -45    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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- web-jsptaglibrary_2_0.xsd	29 Oct 2002 01:18:11 -0000	1.5
  +++ web-jsptaglibrary_2_0.xsd	8 Nov 2002 21:30:20 -0000	1.6
  @@ -10,7 +10,7 @@
   
   <xsd:annotation>
   <xsd:documentation>
  -@(#)web-jsptaglibrary_2_0.xsds	1.21 10/15/02
  +@(#)web-jsptaglibrary_2_0.xsds	1.24 11/01/02
   </xsd:documentation>
   </xsd:annotation>
   <xsd:annotation>
  @@ -842,10 +842,6 @@
   scope                    The scope of the scripting varaible
                            defined.  NESTED is default.
   
  -fragment		 The fragment to which the variable
  -			 is scoped. (incompatible with scope
  -			 attribute)
  -
   </xsd:documentation>
   </xsd:annotation>
   
  @@ -892,51 +888,31 @@
   
           </xsd:element>
   
  -	<xsd:choice>
  -	    <xsd:sequence>
  -		<xsd:element name="declare"
  -			     type="j2ee:generic-booleanType"
  -			     minOccurs="0">
  -
  -		<xsd:annotation>
  -		<xsd:documentation>
  -
  -		Whether the scripting variable is to be defined
  -		or not.  See TagExtraInfo for details.  This
  -		element is optional and "true" is the default.
  +	<xsd:element name="declare"
  +		     type="j2ee:generic-booleanType"
  +		     minOccurs="0">
   
  -		</xsd:documentation>
  -		</xsd:annotation>
  -		</xsd:element>
  -		<xsd:element name="scope"
  -			     type="j2ee:variable-scopeType"
  -			     minOccurs="0">
  -		<xsd:annotation>
  -		<xsd:documentation>
  +	<xsd:annotation>
  +	<xsd:documentation>
   
  -		The element is optional and "NESTED" is the default.
  +	Whether the scripting variable is to be defined
  +	or not.  See TagExtraInfo for details.  This
  +	element is optional and "true" is the default.
   
  -		</xsd:documentation>
  -		</xsd:annotation>
  -		</xsd:element>
  -	    </xsd:sequence>
  -	    <xsd:element name="fragment"
  -			 type="j2ee:java-identifierType"
  -			 minOccurs="0">
  -		<xsd:annotation>
  -		<xsd:documentation>
  +	</xsd:documentation>
  +	</xsd:annotation>
  +	</xsd:element>
  +	<xsd:element name="scope"
  +		     type="j2ee:variable-scopeType"
  +		     minOccurs="0">
  +	<xsd:annotation>
  +	<xsd:documentation>
   
  -		Must match the value of a name attribute in an
  -		attribute element whose fragment attribute is
  -		set to "true".  If so specified, this variable's
  -		scope is restricted to that fragment invocation.
  -		If not specified, the default is declare="true"
  -		and scope="NESTED"
  +	The element is optional and "NESTED" is the default.
   
  -		</xsd:documentation>
  -		</xsd:annotation>
  -	    </xsd:element>
  -        </xsd:choice>
  +	</xsd:documentation>
  +	</xsd:annotation>
  +	</xsd:element>
       </xsd:sequence>
       <xsd:attribute name="id" type="xsd:ID"/>
   </xsd:complexType>
  
  
  
  1.5       +20 -11    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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JspContext.java	29 Oct 2002 01:18:11 -0000	1.4
  +++ JspContext.java	8 Nov 2002 21:30:21 -0000	1.5
  @@ -124,28 +124,37 @@
   
       public static final int APPLICATION_SCOPE	= 4;
   
  -    /** Register the name and object specified with page scope semantics.
  +    /** 
  +     * Register the name and value specified with page scope semantics.
  +     * If the value passed in is <code>null</code>, this has the same 
  +     * effect as calling 
  +     * <code>removeAttribute( name, JspContext.PAGE_SCOPE )</code>.
        *
        * @param name the name of the attribute to set
  -     * @param attribute the object to associate with the name
  -     * @throws NullPointerException if the name or object is null
  +     * @param value the value to associate with the name, or null if the
  +     *     attribute is to be removed from the page scope.
  +     * @throws NullPointerException if the name is null
        */
   
  -    abstract public void setAttribute(String name, Object attribute);
  +    abstract public void setAttribute(String name, Object value);
   
       /**
  -     * Register the name and object specified with appropriate scope semantics.
  +     * Register the name and value specified with appropriate 
  +     * scope semantics.  If the value passed in is <code>null</code>, 
  +     * this has the same effect as calling
  +     * <code>removeAttribute( name, scope )</code>.
        * 
        * @param name the name of the attribute to set
  -     * @param o    the object to associate with the name
  +     * @param value the object to associate with the name, or null if
  +     *     the attribute is to be removed from the specified scope.
        * @param scope the scope with which to associate the name/object
        * 
  -     * @throws NullPointerException if the name or object is null
  +     * @throws NullPointerException if the name is null
        * @throws IllegalArgumentException if the scope is invalid
        *
        */
   
  -    abstract public void setAttribute(String name, Object o, int scope);
  +    abstract public void setAttribute(String name, Object value, int scope);
   
       /**
        * Returns the object associated with the name in the page scope or null
  @@ -187,8 +196,8 @@
       abstract public Object findAttribute(String name);
   
       /**
  -     * Remove the object reference associated with the given name,
  -     * look in all scopes in the scope order.
  +     * Remove the object reference associated with the given name
  +     * from all scopes.  Does nothing if there is no such object.
        *
        * @param name The name of the object to remove.
        */
  @@ -197,7 +206,7 @@
   
       /**
        * Remove the object reference associated with the specified name
  -     * in the given scope.
  +     * in the given scope.  Does nothing if there is no such object.
        *
        * @param name The name of the object to remove.
        * @param scope The scope where to look.
  
  
  
  1.2       +2 -2      jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/PageData.java
  
  Index: PageData.java
  ===================================================================
  RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/PageData.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- PageData.java	13 Aug 2002 16:20:56 -0000	1.1
  +++ PageData.java	8 Nov 2002 21:30:21 -0000	1.2
  @@ -70,8 +70,8 @@
   
       /**
        * Returns an input stream on the XML view of a JSP page.
  -     * Recall tht the XML view of a JSP page has the include
  -     * directives expanded.
  +     * The stream is encoded in UTF-8.  Recall tht the XML view of a 
  +     * JSP page has the include directives expanded.
        * 
        * @return An input stream on the document.
        */
  
  
  
  1.4       +9 -3      jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/TagSupport.java
  
  Index: TagSupport.java
  ===================================================================
  RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/TagSupport.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TagSupport.java	29 Oct 2002 01:18:12 -0000	1.3
  +++ TagSupport.java	8 Nov 2002 21:30:21 -0000	1.4
  @@ -201,7 +201,12 @@
        */
   
       public void release() {
  -	parent          = null;
  +	parent = null;
  +	id = null;
  +	if( values != null ) {
  +	    values.clear();
  +	}
  +	values = null;
       }
   
       /**
  @@ -299,9 +304,10 @@
       }
   
       /**
  -     * Enumerate the values kept by this tag handler.
  +     * Enumerate the keys for the values kept by this tag handler.
        *
  -     * @return An enumeration of all the values set.
  +     * @return An enumeration of all the keys for the values set,
  +     *     or null or an empty Enumeration if no values have been set.
        */
   
       public Enumeration getValues() {
  
  
  
  1.5       +1 -21     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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- j2ee_1_4.xsd	7 Oct 2002 16:53:43 -0000	1.4
  +++ j2ee_1_4.xsd	8 Nov 2002 21:30:21 -0000	1.5
  @@ -1,5 +1,4 @@
   <?xml version="1.0" encoding="UTF-8"?>
  -<!--Generated by Umit Yalcinalp March 2002-->
   <xsd:schema
        targetNamespace="http://java.sun.com/xml/ns/j2ee"
        xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
  @@ -9,7 +8,7 @@
        version="1.4">
   <xsd:annotation>
   <xsd:documentation>
  -@(#)j2ee_1_4.xsds	1.32 02/10/04
  +@(#)j2ee_1_4.xsds	1.34 02/11/05
   </xsd:documentation>
   </xsd:annotation>
   
  @@ -1501,25 +1500,6 @@
   </xsd:annotation>
       <xsd:simpleContent>
           <xsd:restriction base="j2ee:string"/>
  -    </xsd:simpleContent>
  -</xsd:complexType>
  -
  -<!-- **************************************************** -->
  -
  -<xsd:complexType name="war-pathType">
  -<xsd:annotation>
  -<xsd:documentation>
  -
  -The elements that use this type designate a path starting
  -with a "/" and interpreted relative to the root of a WAR
  -file.
  -
  -</xsd:documentation>
  -</xsd:annotation>
  -    <xsd:simpleContent>
  -        <xsd:restriction base="j2ee:string">
  -            <xsd:pattern value="/.*"/>
  -        </xsd:restriction>
       </xsd:simpleContent>
   </xsd:complexType>
   
  
  
  
  1.5       +10 -7     jakarta-servletapi-5/jsr154/src/share/dtd/jsp_2_0.xsd
  
  Index: jsp_2_0.xsd
  ===================================================================
  RCS file: /home/cvs/jakarta-servletapi-5/jsr154/src/share/dtd/jsp_2_0.xsd,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- jsp_2_0.xsd	9 Oct 2002 17:38:49 -0000	1.4
  +++ jsp_2_0.xsd	8 Nov 2002 21:30:21 -0000	1.5
  @@ -8,7 +8,7 @@
        version="2.0">
   <xsd:annotation>
   <xsd:documentation>
  -%W% %G%
  +@(#)jsp_2_0.xsds	1.14 11/06/02
   </xsd:documentation>
   </xsd:annotation>
   
  @@ -172,12 +172,15 @@
           <xsd:documentation>
   
           The valid values of page-encoding are those of the
  -        pageEncoding page directive. It is a
  -        translation-time error to define the pageEncoding
  -        of a JSP page through one value in the JSP
  -        configuration element and then give it a different
  -        value in a pageEncoding directive, but it is legal
  -        to give it the same value.
  +        pageEncoding page directive.  It is a
  +	translation-time error to name different encodings
  +	in the pageEncoding attribute of the page directive
  +	of a JSP page and in a JSP configuration element
  +	matching the page.  It is also a translation-time
  +	error to name different encodings in the prolog of
  +	a document in XML syntax and in a JSP configuration
  +	element matching the document.  It is legal to name
  +	the same encoding through mulitple mechanisms.
   
           </xsd:documentation>
           </xsd:annotation>
  
  
  
  1.2       +2 -9      jakarta-servletapi-5/jsr154/src/share/dtd/jspxml.dtd
  
  Index: jspxml.dtd
  ===================================================================
  RCS file: /home/cvs/jakarta-servletapi-5/jsr154/src/share/dtd/jspxml.dtd,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- jspxml.dtd	13 Aug 2002 16:21:47 -0000	1.1
  +++ jspxml.dtd	8 Nov 2002 21:30:21 -0000	1.2
  @@ -1,4 +1,4 @@
  -<!-- DTD for JSP 1.2
  +<!-- DTD for JSP 2.0
        thanks to Bob Foster, WebGain
   -->
   
  @@ -77,12 +77,6 @@
   >
   
   <!ELEMENT jsp:directive.page EMPTY>
  -<!--
  -    The contentType default is not relevant for XML views of
  -    JSP pages since it differs depending on the originating
  -    syntax (text/html;ISO-8859-1 for JSP Pages in standard syntax, or
  -    text/xml;UTF-8 for JSP Documents in XML syntax.
  --->
   <!ATTLIST jsp:directive.page
       language        CDATA           "java"
       extends         %ClassName;     #IMPLIED
  @@ -96,8 +90,7 @@
       errorPage       %URL;           #IMPLIED
       isErrorPage     %Bool;          "false"
       pageEncoding    CDATA           #IMPLIED
  -    isScriptingEnabled %Bool;       "true"
  -    isELEnabled     %Bool;          #IMPLIED
  +    isELIgnored     %Bool;          #IMPLIED
   >
   
   <!-- the jsp:directive.include only appears in JSP documents and does
  
  
  
  1.2       +5 -10     jakarta-servletapi-5/jsr154/src/share/dtd/jspxml.xsd
  
  Index: jspxml.xsd
  ===================================================================
  RCS file: /home/cvs/jakarta-servletapi-5/jsr154/src/share/dtd/jspxml.xsd,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- jspxml.xsd	13 Aug 2002 16:21:48 -0000	1.1
  +++ jspxml.xsd	8 Nov 2002 21:30:21 -0000	1.2
  @@ -29,7 +29,7 @@
   
     <xsd:annotation>
       <xsd:documentation>
  -      XML Schema for JSP 1.2.
  +      XML Schema for JSP 2.0.
   
         This schema is based upon the recent (May 5th, 2001)
         W3C recommendation for XML Schema.
  @@ -210,7 +210,7 @@
     <xsd:simpleType name = "ContentType">
       <xsd:annotation>
         <xsd:documentation>
  -        Contetn Type for this page
  +        Content type and character encoding for this page.
         </xsd:documentation>
       </xsd:annotation>
       <xsd:restriction base = "xsd:string">
  @@ -221,7 +221,7 @@
     <xsd:simpleType name = "PageEncoding">
       <xsd:annotation>
         <xsd:documentation>
  -        Page Encoding for this page.  Default is that of ContentType.
  +        Page Encoding for this page.
         </xsd:documentation>
       </xsd:annotation>
       <xsd:restriction base = "xsd:string">
  @@ -291,7 +291,7 @@
       <xsd:complexType>
         <xsd:complexContent>
           <xsd:extension base = "Body">
  -          <xsd:attribute name = "version" fixed = "1.2" type = "xsd:string"/>
  +          <xsd:attribute name = "version" fixed = "2.0" type = "xsd:string"/>
           </xsd:extension>
         </xsd:complexContent>
       </xsd:complexType>
  @@ -301,10 +301,6 @@
       <xsd:annotation>
         <xsd:documentation>
           directive.page is the "page directive".
  -        The contentType default is not relevant for XML views of
  -        JSP pages since it differs depending on the originating
  -        syntax (text/html;ISO-8859-1 for JSP Pages in standard syntax, or
  -        text/xml;UTF-8 for JSP Documents in XML syntax.
         </xsd:documentation>
       </xsd:annotation>
       <xsd:complexType>
  @@ -320,8 +316,7 @@
         <xsd:attribute name = "info" type = "xsd:string"/>
         <xsd:attribute name = "errorPage" type = "RelativeURL"/>
         <xsd:attribute name = "isErrorPage" default = "false" type = "Bool"/>
  -      <xsd:attribute name = "isScriptingEnabled" default = "true" type = "Bool"/>
  -      <xsd:attribute name = "isELEnabled" type = "Bool"/>
  +      <xsd:attribute name = "isELIgnored" type = "Bool"/>
       </xsd:complexType>
     </xsd:element>
     
  
  
  
  1.7       +20 -1     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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- web-app_2_4.xsd	7 Oct 2002 16:53:43 -0000	1.6
  +++ web-app_2_4.xsd	8 Nov 2002 21:30:21 -0000	1.7
  @@ -8,7 +8,7 @@
        version="2.4">
   <xsd:annotation>
   <xsd:documentation>
  -@(#)web-app_2_4.xsds	1.45 02/10/04
  +@(#)web-app_2_4.xsds	1.46 02/10/30
   </xsd:documentation>
   </xsd:annotation>
   
  @@ -1033,6 +1033,25 @@
                        type="j2ee:transport-guaranteeType"/>
       </xsd:sequence>
       <xsd:attribute name="id" type="xsd:ID"/>
  +</xsd:complexType>
  +
  +<!-- **************************************************** -->
  +
  +<xsd:complexType name="war-pathType">
  +<xsd:annotation>
  +<xsd:documentation>
  +
  +The elements that use this type designate a path starting
  +with a "/" and interpreted relative to the root of a WAR
  +file.
  +
  +</xsd:documentation>
  +</xsd:annotation>
  +    <xsd:simpleContent>
  +        <xsd:restriction base="j2ee:string">
  +            <xsd:pattern value="/.*"/>
  +        </xsd:restriction>
  +    </xsd:simpleContent>
   </xsd:complexType>
   
   <!-- **************************************************** -->
  
  
  
  1.6       +21 -45    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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- web-jsptaglibrary_2_0.xsd	4 Nov 2002 17:44:25 -0000	1.5
  +++ web-jsptaglibrary_2_0.xsd	8 Nov 2002 21:30:21 -0000	1.6
  @@ -10,7 +10,7 @@
   
   <xsd:annotation>
   <xsd:documentation>
  -@(#)web-jsptaglibrary_2_0.xsds	1.21 10/15/02
  +@(#)web-jsptaglibrary_2_0.xsds	1.24 11/01/02
   </xsd:documentation>
   </xsd:annotation>
   <xsd:annotation>
  @@ -842,10 +842,6 @@
   scope                    The scope of the scripting varaible
                            defined.  NESTED is default.
   
  -fragment		 The fragment to which the variable
  -			 is scoped. (incompatible with scope
  -			 attribute)
  -
   </xsd:documentation>
   </xsd:annotation>
   
  @@ -892,51 +888,31 @@
   
           </xsd:element>
   
  -	<xsd:choice>
  -	    <xsd:sequence>
  -		<xsd:element name="declare"
  -			     type="j2ee:generic-booleanType"
  -			     minOccurs="0">
  -
  -		<xsd:annotation>
  -		<xsd:documentation>
  -
  -		Whether the scripting variable is to be defined
  -		or not.  See TagExtraInfo for details.  This
  -		element is optional and "true" is the default.
  +	<xsd:element name="declare"
  +		     type="j2ee:generic-booleanType"
  +		     minOccurs="0">
   
  -		</xsd:documentation>
  -		</xsd:annotation>
  -		</xsd:element>
  -		<xsd:element name="scope"
  -			     type="j2ee:variable-scopeType"
  -			     minOccurs="0">
  -		<xsd:annotation>
  -		<xsd:documentation>
  +	<xsd:annotation>
  +	<xsd:documentation>
   
  -		The element is optional and "NESTED" is the default.
  +	Whether the scripting variable is to be defined
  +	or not.  See TagExtraInfo for details.  This
  +	element is optional and "true" is the default.
   
  -		</xsd:documentation>
  -		</xsd:annotation>
  -		</xsd:element>
  -	    </xsd:sequence>
  -	    <xsd:element name="fragment"
  -			 type="j2ee:java-identifierType"
  -			 minOccurs="0">
  -		<xsd:annotation>
  -		<xsd:documentation>
  +	</xsd:documentation>
  +	</xsd:annotation>
  +	</xsd:element>
  +	<xsd:element name="scope"
  +		     type="j2ee:variable-scopeType"
  +		     minOccurs="0">
  +	<xsd:annotation>
  +	<xsd:documentation>
   
  -		Must match the value of a name attribute in an
  -		attribute element whose fragment attribute is
  -		set to "true".  If so specified, this variable's
  -		scope is restricted to that fragment invocation.
  -		If not specified, the default is declare="true"
  -		and scope="NESTED"
  +	The element is optional and "NESTED" is the default.
   
  -		</xsd:documentation>
  -		</xsd:annotation>
  -	    </xsd:element>
  -        </xsd:choice>
  +	</xsd:documentation>
  +	</xsd:annotation>
  +	</xsd:element>
       </xsd:sequence>
       <xsd:attribute name="id" type="xsd:ID"/>
   </xsd:complexType>
  
  
  

--
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