You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ki...@apache.org on 2003/05/17 01:20:19 UTC

cvs commit: jakarta-servletapi-5/jsr154/src/share/dtd j2ee_1_4.xsd web-app_2_4.xsd web-jsptaglibrary_2_0.xsd

kinman      2003/05/16 16:20:18

  Modified:    jsr152/src/share/dtd web-jsptaglibrary_2_0.xsd
               jsr154/src/share/dtd j2ee_1_4.xsd web-app_2_4.xsd
                        web-jsptaglibrary_2_0.xsd
  Log:
  - Patch by Mark Roth
  
  jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd:
  jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd:
       - Removed listenerType (moved from web-app_2_4.xsd to j2ee_1_4.xsd)
       - Renamed taglibType to tldTaglibType
       - Changed taglib element to be of type tldTaglibType
  
  jsr154/src/share/dtd/j2ee_1_4.xsd:
       - Explained why description can occur more than once
       - Moved web-app_2_4.xsd#listenerType to j2ee_1_4.xsd#listenerType
  
  jsr154/src/share/dtd/web-app_2_4.xsd:
       - <welcome-file> should be "xsd:string"
       - Moved web-app_2_4.xsd#listenerType to j2ee_1_4.xsd#listenerType
  
  Revision  Changes    Path
  1.12      +143 -173  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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- web-jsptaglibrary_2_0.xsd	14 Apr 2003 17:36:38 -0000	1.11
  +++ web-jsptaglibrary_2_0.xsd	16 May 2003 23:20:17 -0000	1.12
  @@ -10,7 +10,7 @@
   
     <xsd:annotation>
       <xsd:documentation>
  -      @(#)web-jsptaglibrary_2_0.xsds	1.33 03/18/03
  +      %W% %G%
       </xsd:documentation>
     </xsd:annotation>
     <xsd:annotation>
  @@ -85,13 +85,13 @@
   <!-- **************************************************** -->
   
   
  -  <xsd:element name="taglib" type="j2ee:taglibType">
  +  <xsd:element name="taglib" type="j2ee:tldTaglibType">
       <xsd:annotation>
         <xsd:documentation>
   
   	The taglib tag is the document root.
   	The definition of taglib is provided
  -	by the taglibType.
  +	by the tldTaglibType.
   
         </xsd:documentation>
       </xsd:annotation>
  @@ -316,36 +316,6 @@
   
   <!-- **************************************************** -->
   
  -  <xsd:complexType name="listenerType">
  -    <xsd:annotation>
  -      <xsd:documentation>
  -
  -	Defines an event listener object to be instantiated and
  -	registered automatically.
  -
  -      </xsd:documentation>
  -    </xsd:annotation>
  -
  -    <xsd:sequence>
  -      <xsd:element name="listener-class"
  -		   type="j2ee:fully-qualified-classType">
  -	<xsd:annotation>
  -	  <xsd:documentation>
  -
  -	    The listener-class element declares a class in the
  -	    application that must be registered as a web
  -	    application listener bean.  See the Servlet
  -	    specification for details.
  -
  -	  </xsd:documentation>
  -	</xsd:annotation>
  -      </xsd:element>
  -    </xsd:sequence>
  -    <xsd:attribute name="id" type="xsd:ID"/>
  -  </xsd:complexType>
  -
  -<!-- **************************************************** -->
  -
     <xsd:complexType name="tagFileType">
       <xsd:annotation>
         <xsd:documentation>
  @@ -553,146 +523,6 @@
   
   <!-- **************************************************** -->
   
  -  <xsd:complexType name="taglibType">
  -    <xsd:annotation>
  -      <xsd:documentation>
  -
  -	The taglib tag is the document root, it defines:
  -
  -	description     a simple string describing the "use" of this taglib,
  -			should be user discernable
  -
  -	display-name    the display-name element contains a
  -			short name that is intended to be displayed
  -			by tools
  -
  -	icon            optional icon that can be used by tools
  -
  -	tlib-version    the version of the tag library implementation
  -
  -	short-name      a simple default short name that could be
  -			used by a JSP authoring tool to create
  -			names with a mnemonic value; for example,
  -			the it may be used as the prefered prefix
  -			value in taglib directives
  -
  -	uri             a uri uniquely identifying this taglib
  -
  -	validator       optional TagLibraryValidator information
  -
  -	listener        optional event listener specification
  -
  -	tag             tags in this tag library
  -
  -	tag-file        tag files in this tag library
  -
  -	function        zero or more EL functions defined in this
  -			tag library
  -
  -	taglib-extension zero or more extensions that provide extra
  -			information about this taglib, for tool
  -			consumption
  -
  -      </xsd:documentation>
  -    </xsd:annotation>
  -    <xsd:sequence>
  -      <xsd:group ref="j2ee:descriptionGroup"/>
  -      <xsd:element name="tlib-version"
  -		   type="j2ee:dewey-versionType">
  -	<xsd:annotation>
  -	  <xsd:documentation>
  -
  -	    Describes this version (number) of the taglibrary.
  -	    It is described as a dewey decimal.
  -
  -	  </xsd:documentation>
  -	</xsd:annotation>
  -
  -      </xsd:element>
  -
  -      <xsd:element name="short-name"
  -		   type="j2ee:tld-canonical-nameType">
  -	<xsd:annotation>
  -	  <xsd:documentation>
  -
  -	    Defines a simple default name that could be used by
  -	    a JSP authoring tool to create names with a
  -	    mnemonicvalue; for example, it may be used as the
  -	    preferred prefix value in taglib directives.  Do
  -	    not use white space, and do not start with digits
  -	    or underscore.
  -
  -	  </xsd:documentation>
  -	</xsd:annotation>
  -
  -      </xsd:element>
  -      <xsd:element name="uri"
  -		   type="j2ee:xsdAnyURIType"
  -		   minOccurs="0">
  -	<xsd:annotation>
  -	  <xsd:documentation>
  -
  -	    Defines a public URI that uniquely identifies this
  -	    version of the taglibrary.  Leave it empty if it
  -	    does not apply.
  -
  -	  </xsd:documentation>
  -	</xsd:annotation>
  -
  -      </xsd:element>
  -      <xsd:element name="validator"
  -		   type="j2ee:validatorType"
  -		   minOccurs="0">
  -      </xsd:element>
  -      <xsd:element name="listener"
  -		   type="j2ee:listenerType"
  -		   minOccurs="0" maxOccurs="unbounded">
  -      </xsd:element>
  -      <xsd:element name="tag"
  -		   type="j2ee:tagType"
  -		   minOccurs="0"
  -		   maxOccurs="unbounded"/>
  -      <xsd:element name="tag-file"
  -		   type="j2ee:tagFileType"
  -		   minOccurs="0"
  -		   maxOccurs="unbounded"/>
  -      <xsd:element name="function"
  -		   type="j2ee:functionType"
  -		   minOccurs="0"
  -		   maxOccurs="unbounded"/>
  -      <xsd:element name="taglib-extension"
  -		   type="j2ee:tld-extensionType"
  -		   minOccurs="0"
  -		   maxOccurs="unbounded">
  -	<xsd:annotation>
  -	  <xsd:documentation>
  -
  -	    Taglib extensions are for tool use only and must not affect
  -	    the behavior of a container.
  -
  -	  </xsd:documentation>
  -	</xsd:annotation>
  -      </xsd:element>
  -    </xsd:sequence>
  -    <xsd:attribute name="version"
  -		   type="j2ee:dewey-versionType"
  -		   fixed="2.0"
  -		   use="required">
  -      <xsd:annotation>
  -	<xsd:documentation>
  -
  -	  Describes the JSP version (number) this taglibrary
  -	  requires in order to function (dewey decimal)
  -
  -	</xsd:documentation>
  -      </xsd:annotation>
  -
  -    </xsd:attribute>
  -    <xsd:attribute name="id" type="xsd:ID"/>
  -  </xsd:complexType>
  -
  -<!-- **************************************************** -->
  -
     <xsd:complexType name="tld-attributeType">
       <xsd:annotation>
         <xsd:documentation>
  @@ -846,6 +676,146 @@
   		   type="xsd:anyURI"/>
       <xsd:attribute name="id" type="xsd:ID"/>
   
  +  </xsd:complexType>
  +
  +<!-- **************************************************** -->
  +
  +  <xsd:complexType name="tldTaglibType">
  +    <xsd:annotation>
  +      <xsd:documentation>
  +
  +	The taglib tag is the document root, it defines:
  +
  +	description     a simple string describing the "use" of this taglib,
  +			should be user discernable
  +
  +	display-name    the display-name element contains a
  +			short name that is intended to be displayed
  +			by tools
  +
  +	icon            optional icon that can be used by tools
  +
  +	tlib-version    the version of the tag library implementation
  +
  +	short-name      a simple default short name that could be
  +			used by a JSP authoring tool to create
  +			names with a mnemonic value; for example,
  +			the it may be used as the prefered prefix
  +			value in taglib directives
  +
  +	uri             a uri uniquely identifying this taglib
  +
  +	validator       optional TagLibraryValidator information
  +
  +	listener        optional event listener specification
  +
  +	tag             tags in this tag library
  +
  +	tag-file        tag files in this tag library
  +
  +	function        zero or more EL functions defined in this
  +			tag library
  +
  +	taglib-extension zero or more extensions that provide extra
  +			information about this taglib, for tool
  +			consumption
  +
  +      </xsd:documentation>
  +    </xsd:annotation>
  +    <xsd:sequence>
  +      <xsd:group ref="j2ee:descriptionGroup"/>
  +      <xsd:element name="tlib-version"
  +		   type="j2ee:dewey-versionType">
  +	<xsd:annotation>
  +	  <xsd:documentation>
  +
  +	    Describes this version (number) of the taglibrary.
  +	    It is described as a dewey decimal.
  +
  +	  </xsd:documentation>
  +	</xsd:annotation>
  +
  +      </xsd:element>
  +
  +      <xsd:element name="short-name"
  +		   type="j2ee:tld-canonical-nameType">
  +	<xsd:annotation>
  +	  <xsd:documentation>
  +
  +	    Defines a simple default name that could be used by
  +	    a JSP authoring tool to create names with a
  +	    mnemonicvalue; for example, it may be used as the
  +	    preferred prefix value in taglib directives.  Do
  +	    not use white space, and do not start with digits
  +	    or underscore.
  +
  +	  </xsd:documentation>
  +	</xsd:annotation>
  +
  +      </xsd:element>
  +      <xsd:element name="uri"
  +		   type="j2ee:xsdAnyURIType"
  +		   minOccurs="0">
  +	<xsd:annotation>
  +	  <xsd:documentation>
  +
  +	    Defines a public URI that uniquely identifies this
  +	    version of the taglibrary.  Leave it empty if it
  +	    does not apply.
  +
  +	  </xsd:documentation>
  +	</xsd:annotation>
  +
  +      </xsd:element>
  +      <xsd:element name="validator"
  +		   type="j2ee:validatorType"
  +		   minOccurs="0">
  +      </xsd:element>
  +      <xsd:element name="listener"
  +		   type="j2ee:listenerType"
  +		   minOccurs="0" maxOccurs="unbounded">
  +      </xsd:element>
  +      <xsd:element name="tag"
  +		   type="j2ee:tagType"
  +		   minOccurs="0"
  +		   maxOccurs="unbounded"/>
  +      <xsd:element name="tag-file"
  +		   type="j2ee:tagFileType"
  +		   minOccurs="0"
  +		   maxOccurs="unbounded"/>
  +      <xsd:element name="function"
  +		   type="j2ee:functionType"
  +		   minOccurs="0"
  +		   maxOccurs="unbounded"/>
  +      <xsd:element name="taglib-extension"
  +		   type="j2ee:tld-extensionType"
  +		   minOccurs="0"
  +		   maxOccurs="unbounded">
  +	<xsd:annotation>
  +	  <xsd:documentation>
  +
  +	    Taglib extensions are for tool use only and must not affect
  +	    the behavior of a container.
  +
  +	  </xsd:documentation>
  +	</xsd:annotation>
  +      </xsd:element>
  +    </xsd:sequence>
  +    <xsd:attribute name="version"
  +		   type="j2ee:dewey-versionType"
  +		   fixed="2.0"
  +		   use="required">
  +      <xsd:annotation>
  +	<xsd:documentation>
  +
  +	  Describes the JSP version (number) this taglibrary
  +	  requires in order to function (dewey decimal)
  +
  +	</xsd:documentation>
  +      </xsd:annotation>
  +
  +    </xsd:attribute>
  +    <xsd:attribute name="id" type="xsd:ID"/>
     </xsd:complexType>
   
   <!-- **************************************************** -->
  
  
  
  1.8       +35 -1     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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- j2ee_1_4.xsd	14 Apr 2003 17:36:39 -0000	1.7
  +++ j2ee_1_4.xsd	16 May 2003 23:20:18 -0000	1.8
  @@ -8,7 +8,7 @@
        version="1.4">
     <xsd:annotation>
       <xsd:documentation>
  -      @(#)j2ee_1_4.xsds	1.39 03/04/07
  +      %W% %E%
       </xsd:documentation>
     </xsd:annotation>
   
  @@ -85,6 +85,9 @@
   	This group keeps the usage of the contained description related
   	elements consistent across J2EE deployment descriptors.
   
  +	All elements may occur multiple times with different languages,
  +	to support localization of the content.
  +
         </xsd:documentation>
       </xsd:annotation>
       <xsd:sequence>
  @@ -689,6 +692,37 @@
   		   minOccurs="0" maxOccurs="unbounded"/>
       </xsd:sequence>
     </xsd:group>
  +
  +<!-- **************************************************** -->
  +
  +  <xsd:complexType name="listenerType">
  +    <xsd:annotation>
  +      <xsd:documentation>
  +
  +	The listenerType indicates the deployment properties for a web
  +	application listener bean.
  +
  +      </xsd:documentation>
  +    </xsd:annotation>
  +
  +    <xsd:sequence>
  +      <xsd:group ref="j2ee:descriptionGroup"/>
  +      <xsd:element name="listener-class"
  +		   type="j2ee:fully-qualified-classType">
  +	<xsd:annotation>
  +	  <xsd:documentation>
  +
  +	    The listener-class element declares a class in the
  +	    application must be registered as a web
  +	    application listener bean. The value is the fully
  +	    qualified classname of the listener class.
  +
  +	  </xsd:documentation>
  +	</xsd:annotation>
  +      </xsd:element>
  +    </xsd:sequence>
  +    <xsd:attribute name="id" type="xsd:ID"/>
  +  </xsd:complexType>
   
   <!-- **************************************************** -->
   
  
  
  
  1.11      +2 -35     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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- web-app_2_4.xsd	14 Apr 2003 17:36:40 -0000	1.10
  +++ web-app_2_4.xsd	16 May 2003 23:20:18 -0000	1.11
  @@ -8,7 +8,7 @@
   	    version="2.4">
     <xsd:annotation>
       <xsd:documentation>
  -      @(#)web-app_2_4.xsds     1.57 03/04/07
  +      %W% %E%
       </xsd:documentation>
     </xsd:annotation>
   
  @@ -643,39 +643,6 @@
   
   <!-- **************************************************** -->
   
  -  <xsd:complexType name="listenerType">
  -    <xsd:annotation>
  -      <xsd:documentation>
  -
  -	The listenerType indicates the deployment properties for a web
  -	application listener bean.
  -
  -	Used in: web-app:listenerType
  -
  -      </xsd:documentation>
  -    </xsd:annotation>
  -
  -    <xsd:sequence>
  -      <xsd:group ref="j2ee:descriptionGroup"/>
  -      <xsd:element name="listener-class"
  -		   type="j2ee:fully-qualified-classType">
  -	<xsd:annotation>
  -	  <xsd:documentation>
  -
  -	    The listener-class element declares a class in the
  -	    application must be registered as a web
  -	    application listener bean. The value is the fully
  -	    qualified classname of the listener class.
  -
  -	  </xsd:documentation>
  -	</xsd:annotation>
  -      </xsd:element>
  -    </xsd:sequence>
  -    <xsd:attribute name="id" type="xsd:ID"/>
  -  </xsd:complexType>
  -
  -<!-- **************************************************** -->
  -
     <xsd:complexType name="locale-encoding-mapping-listType">
       <xsd:annotation>
         <xsd:documentation>
  @@ -1247,7 +1214,7 @@
   
       <xsd:sequence>
         <xsd:element name="welcome-file"
  -		   type="j2ee:string"
  +		   type="xsd:string"
   		   maxOccurs="unbounded">
   	<xsd:annotation>
   	  <xsd:documentation>
  
  
  
  1.12      +143 -173  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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- web-jsptaglibrary_2_0.xsd	14 Apr 2003 17:36:40 -0000	1.11
  +++ web-jsptaglibrary_2_0.xsd	16 May 2003 23:20:18 -0000	1.12
  @@ -10,7 +10,7 @@
   
     <xsd:annotation>
       <xsd:documentation>
  -      @(#)web-jsptaglibrary_2_0.xsds	1.33 03/18/03
  +      %W% %G%
       </xsd:documentation>
     </xsd:annotation>
     <xsd:annotation>
  @@ -85,13 +85,13 @@
   <!-- **************************************************** -->
   
   
  -  <xsd:element name="taglib" type="j2ee:taglibType">
  +  <xsd:element name="taglib" type="j2ee:tldTaglibType">
       <xsd:annotation>
         <xsd:documentation>
   
   	The taglib tag is the document root.
   	The definition of taglib is provided
  -	by the taglibType.
  +	by the tldTaglibType.
   
         </xsd:documentation>
       </xsd:annotation>
  @@ -316,36 +316,6 @@
   
   <!-- **************************************************** -->
   
  -  <xsd:complexType name="listenerType">
  -    <xsd:annotation>
  -      <xsd:documentation>
  -
  -	Defines an event listener object to be instantiated and
  -	registered automatically.
  -
  -      </xsd:documentation>
  -    </xsd:annotation>
  -
  -    <xsd:sequence>
  -      <xsd:element name="listener-class"
  -		   type="j2ee:fully-qualified-classType">
  -	<xsd:annotation>
  -	  <xsd:documentation>
  -
  -	    The listener-class element declares a class in the
  -	    application that must be registered as a web
  -	    application listener bean.  See the Servlet
  -	    specification for details.
  -
  -	  </xsd:documentation>
  -	</xsd:annotation>
  -      </xsd:element>
  -    </xsd:sequence>
  -    <xsd:attribute name="id" type="xsd:ID"/>
  -  </xsd:complexType>
  -
  -<!-- **************************************************** -->
  -
     <xsd:complexType name="tagFileType">
       <xsd:annotation>
         <xsd:documentation>
  @@ -553,146 +523,6 @@
   
   <!-- **************************************************** -->
   
  -  <xsd:complexType name="taglibType">
  -    <xsd:annotation>
  -      <xsd:documentation>
  -
  -	The taglib tag is the document root, it defines:
  -
  -	description     a simple string describing the "use" of this taglib,
  -			should be user discernable
  -
  -	display-name    the display-name element contains a
  -			short name that is intended to be displayed
  -			by tools
  -
  -	icon            optional icon that can be used by tools
  -
  -	tlib-version    the version of the tag library implementation
  -
  -	short-name      a simple default short name that could be
  -			used by a JSP authoring tool to create
  -			names with a mnemonic value; for example,
  -			the it may be used as the prefered prefix
  -			value in taglib directives
  -
  -	uri             a uri uniquely identifying this taglib
  -
  -	validator       optional TagLibraryValidator information
  -
  -	listener        optional event listener specification
  -
  -	tag             tags in this tag library
  -
  -	tag-file        tag files in this tag library
  -
  -	function        zero or more EL functions defined in this
  -			tag library
  -
  -	taglib-extension zero or more extensions that provide extra
  -			information about this taglib, for tool
  -			consumption
  -
  -      </xsd:documentation>
  -    </xsd:annotation>
  -    <xsd:sequence>
  -      <xsd:group ref="j2ee:descriptionGroup"/>
  -      <xsd:element name="tlib-version"
  -		   type="j2ee:dewey-versionType">
  -	<xsd:annotation>
  -	  <xsd:documentation>
  -
  -	    Describes this version (number) of the taglibrary.
  -	    It is described as a dewey decimal.
  -
  -	  </xsd:documentation>
  -	</xsd:annotation>
  -
  -      </xsd:element>
  -
  -      <xsd:element name="short-name"
  -		   type="j2ee:tld-canonical-nameType">
  -	<xsd:annotation>
  -	  <xsd:documentation>
  -
  -	    Defines a simple default name that could be used by
  -	    a JSP authoring tool to create names with a
  -	    mnemonicvalue; for example, it may be used as the
  -	    preferred prefix value in taglib directives.  Do
  -	    not use white space, and do not start with digits
  -	    or underscore.
  -
  -	  </xsd:documentation>
  -	</xsd:annotation>
  -
  -      </xsd:element>
  -      <xsd:element name="uri"
  -		   type="j2ee:xsdAnyURIType"
  -		   minOccurs="0">
  -	<xsd:annotation>
  -	  <xsd:documentation>
  -
  -	    Defines a public URI that uniquely identifies this
  -	    version of the taglibrary.  Leave it empty if it
  -	    does not apply.
  -
  -	  </xsd:documentation>
  -	</xsd:annotation>
  -
  -      </xsd:element>
  -      <xsd:element name="validator"
  -		   type="j2ee:validatorType"
  -		   minOccurs="0">
  -      </xsd:element>
  -      <xsd:element name="listener"
  -		   type="j2ee:listenerType"
  -		   minOccurs="0" maxOccurs="unbounded">
  -      </xsd:element>
  -      <xsd:element name="tag"
  -		   type="j2ee:tagType"
  -		   minOccurs="0"
  -		   maxOccurs="unbounded"/>
  -      <xsd:element name="tag-file"
  -		   type="j2ee:tagFileType"
  -		   minOccurs="0"
  -		   maxOccurs="unbounded"/>
  -      <xsd:element name="function"
  -		   type="j2ee:functionType"
  -		   minOccurs="0"
  -		   maxOccurs="unbounded"/>
  -      <xsd:element name="taglib-extension"
  -		   type="j2ee:tld-extensionType"
  -		   minOccurs="0"
  -		   maxOccurs="unbounded">
  -	<xsd:annotation>
  -	  <xsd:documentation>
  -
  -	    Taglib extensions are for tool use only and must not affect
  -	    the behavior of a container.
  -
  -	  </xsd:documentation>
  -	</xsd:annotation>
  -      </xsd:element>
  -    </xsd:sequence>
  -    <xsd:attribute name="version"
  -		   type="j2ee:dewey-versionType"
  -		   fixed="2.0"
  -		   use="required">
  -      <xsd:annotation>
  -	<xsd:documentation>
  -
  -	  Describes the JSP version (number) this taglibrary
  -	  requires in order to function (dewey decimal)
  -
  -	</xsd:documentation>
  -      </xsd:annotation>
  -
  -    </xsd:attribute>
  -    <xsd:attribute name="id" type="xsd:ID"/>
  -  </xsd:complexType>
  -
  -<!-- **************************************************** -->
  -
     <xsd:complexType name="tld-attributeType">
       <xsd:annotation>
         <xsd:documentation>
  @@ -846,6 +676,146 @@
   		   type="xsd:anyURI"/>
       <xsd:attribute name="id" type="xsd:ID"/>
   
  +  </xsd:complexType>
  +
  +<!-- **************************************************** -->
  +
  +  <xsd:complexType name="tldTaglibType">
  +    <xsd:annotation>
  +      <xsd:documentation>
  +
  +	The taglib tag is the document root, it defines:
  +
  +	description     a simple string describing the "use" of this taglib,
  +			should be user discernable
  +
  +	display-name    the display-name element contains a
  +			short name that is intended to be displayed
  +			by tools
  +
  +	icon            optional icon that can be used by tools
  +
  +	tlib-version    the version of the tag library implementation
  +
  +	short-name      a simple default short name that could be
  +			used by a JSP authoring tool to create
  +			names with a mnemonic value; for example,
  +			the it may be used as the prefered prefix
  +			value in taglib directives
  +
  +	uri             a uri uniquely identifying this taglib
  +
  +	validator       optional TagLibraryValidator information
  +
  +	listener        optional event listener specification
  +
  +	tag             tags in this tag library
  +
  +	tag-file        tag files in this tag library
  +
  +	function        zero or more EL functions defined in this
  +			tag library
  +
  +	taglib-extension zero or more extensions that provide extra
  +			information about this taglib, for tool
  +			consumption
  +
  +      </xsd:documentation>
  +    </xsd:annotation>
  +    <xsd:sequence>
  +      <xsd:group ref="j2ee:descriptionGroup"/>
  +      <xsd:element name="tlib-version"
  +		   type="j2ee:dewey-versionType">
  +	<xsd:annotation>
  +	  <xsd:documentation>
  +
  +	    Describes this version (number) of the taglibrary.
  +	    It is described as a dewey decimal.
  +
  +	  </xsd:documentation>
  +	</xsd:annotation>
  +
  +      </xsd:element>
  +
  +      <xsd:element name="short-name"
  +		   type="j2ee:tld-canonical-nameType">
  +	<xsd:annotation>
  +	  <xsd:documentation>
  +
  +	    Defines a simple default name that could be used by
  +	    a JSP authoring tool to create names with a
  +	    mnemonicvalue; for example, it may be used as the
  +	    preferred prefix value in taglib directives.  Do
  +	    not use white space, and do not start with digits
  +	    or underscore.
  +
  +	  </xsd:documentation>
  +	</xsd:annotation>
  +
  +      </xsd:element>
  +      <xsd:element name="uri"
  +		   type="j2ee:xsdAnyURIType"
  +		   minOccurs="0">
  +	<xsd:annotation>
  +	  <xsd:documentation>
  +
  +	    Defines a public URI that uniquely identifies this
  +	    version of the taglibrary.  Leave it empty if it
  +	    does not apply.
  +
  +	  </xsd:documentation>
  +	</xsd:annotation>
  +
  +      </xsd:element>
  +      <xsd:element name="validator"
  +		   type="j2ee:validatorType"
  +		   minOccurs="0">
  +      </xsd:element>
  +      <xsd:element name="listener"
  +		   type="j2ee:listenerType"
  +		   minOccurs="0" maxOccurs="unbounded">
  +      </xsd:element>
  +      <xsd:element name="tag"
  +		   type="j2ee:tagType"
  +		   minOccurs="0"
  +		   maxOccurs="unbounded"/>
  +      <xsd:element name="tag-file"
  +		   type="j2ee:tagFileType"
  +		   minOccurs="0"
  +		   maxOccurs="unbounded"/>
  +      <xsd:element name="function"
  +		   type="j2ee:functionType"
  +		   minOccurs="0"
  +		   maxOccurs="unbounded"/>
  +      <xsd:element name="taglib-extension"
  +		   type="j2ee:tld-extensionType"
  +		   minOccurs="0"
  +		   maxOccurs="unbounded">
  +	<xsd:annotation>
  +	  <xsd:documentation>
  +
  +	    Taglib extensions are for tool use only and must not affect
  +	    the behavior of a container.
  +
  +	  </xsd:documentation>
  +	</xsd:annotation>
  +      </xsd:element>
  +    </xsd:sequence>
  +    <xsd:attribute name="version"
  +		   type="j2ee:dewey-versionType"
  +		   fixed="2.0"
  +		   use="required">
  +      <xsd:annotation>
  +	<xsd:documentation>
  +
  +	  Describes the JSP version (number) this taglibrary
  +	  requires in order to function (dewey decimal)
  +
  +	</xsd:documentation>
  +      </xsd:annotation>
  +
  +    </xsd:attribute>
  +    <xsd:attribute name="id" type="xsd:ID"/>
     </xsd:complexType>
   
   <!-- **************************************************** -->
  
  
  

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