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 web-jsptaglibrary_2_0.xsd
Date Mon, 03 Feb 2003 23:36:20 GMT
kinman      2003/02/03 15:36:20

  Modified:    jsr152/src/share/dtd web-jsptaglibrary_2_0.xsd
               jsr152/src/share/javax/servlet/jsp SkipPageException.java
               jsr154/src/share/dtd web-jsptaglibrary_2_0.xsd
  Log:
  - Patch by Mark Roth
  
  jsr152/src/share/javax/servlet/jsp/tagext/SkipPageException.java
       - Made clear that this should not be thrown from within a tag file.
  
  jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd:
  jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd:
       - Added some useful subelements to tag-file element:
  	* description
  	* display-name
  	* icon
          * example
  	* tag-extension
  
  Revision  Changes    Path
  1.8       +54 -8     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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- web-jsptaglibrary_2_0.xsd	28 Jan 2003 00:19:10 -0000	1.7
  +++ web-jsptaglibrary_2_0.xsd	3 Feb 2003 23:36:20 -0000	1.8
  @@ -10,7 +10,7 @@
   
   <xsd:annotation>
   <xsd:documentation>
  -@(#)web-jsptaglibrary_2_0.xsds	1.26 01/24/03
  +%W% %G%
   </xsd:documentation>
   </xsd:annotation>
   <xsd:annotation>
  @@ -334,23 +334,69 @@
   
   The tag-file element has two required subelements:
   
  -name    The unique action name
  +description       Optional tag-specific information
   
  -path    Where to find the .tag file implementing this
  -        action, relative to the root of the web application or
  -	the root of the JAR file for a tag library packaged in
  -	a JAR.  This must begin with /WEB-INF/tags if the .tag
  -	file resides in the WAR, or /META-INF/tags if the .tag
  -	file resides in a JAR.
  +display-name      A short name that is intended to be
  +                  displayed by tools
  +
  +icon              Optional icon element that can be used
  +                  by tools
  +
  +name              The unique action name
  +
  +path              Where to find the .tag file implementing this
  +                  action, relative to the root of the web application or
  +	          the root of the JAR file for a tag library packaged in
  +	          a JAR.  This must begin with /WEB-INF/tags if the .tag
  +	          file resides in the WAR, or /META-INF/tags if the .tag
  +	          file resides in a JAR.
  +
  +example           Optional informal description of an
  +                  example of a use of this tag
  +
  +tag-extension     Zero or more extensions that provide extra
  +		  information about this tag, for tool
  +		  consumption
   
   </xsd:documentation>
   </xsd:annotation>
   
       <xsd:sequence>
  +        <xsd:group ref="j2ee:descriptionGroup"/>
           <xsd:element name="name"
                        type="j2ee:tld-canonical-nameType"/>
           <xsd:element name="path"
                        type="j2ee:pathType"/>
  +        <xsd:element name="example"
  +                     type="j2ee:xsdStringType"
  +                     minOccurs="0">
  +        <xsd:annotation>
  +        <xsd:documentation>
  +
  +        The example element contains an informal description
  +        of an example of the use of a tag.
  +
  +        </xsd:documentation>
  +        </xsd:annotation>
  +
  +        </xsd:element>
  +	<xsd:element name="tag-extension"
  +		     type="j2ee:deployment-extensionType"
  +		     minOccurs="0"
  +		     maxOccurs="unbounded">
  +	<xsd:annotation>
  +	<xsd:documentation>
  +
  +        Tag extensions are for tool use only and must not affect
  +	the behavior of a container.  The TLD extension mechanism
  +	only allows ignorable extensions (i.e. those without a
  +	mustUnderstand attribute).  A Tag Library is considered
  +	invalid if it requires an extension that must be
  +	understood by setting mustUnderstand="true".
  +
  +	</xsd:documentation>
  +	</xsd:annotation>
  +	</xsd:element>
       </xsd:sequence>
       <xsd:attribute name="id" type="xsd:ID"/>
   </xsd:complexType>
  
  
  
  1.4       +1 -1      jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/SkipPageException.java
  
  Index: SkipPageException.java
  ===================================================================
  RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/SkipPageException.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SkipPageException.java	29 Oct 2002 01:18:11 -0000	1.3
  +++ SkipPageException.java	3 Feb 2003 23:36:20 -0000	1.4
  @@ -62,7 +62,7 @@
    * the case with tag files).  The effect is similar to that of a 
    * Classic Tag Handler returning Tag.SKIP_PAGE from doEndTag().
    * Jsp Fragments may also throw this exception.  This exception
  - * should not be thrown manually in a JSP page - the behavior is
  + * should not be thrown manually in a JSP page or tag file - the behavior is
    * undefined.  The exception is intended to be thrown inside 
    * SimpleTag handlers and in JSP fragments.
    * 
  
  
  
  1.8       +54 -8     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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- web-jsptaglibrary_2_0.xsd	28 Jan 2003 00:19:10 -0000	1.7
  +++ web-jsptaglibrary_2_0.xsd	3 Feb 2003 23:36:20 -0000	1.8
  @@ -10,7 +10,7 @@
   
   <xsd:annotation>
   <xsd:documentation>
  -@(#)web-jsptaglibrary_2_0.xsds	1.26 01/24/03
  +%W% %G%
   </xsd:documentation>
   </xsd:annotation>
   <xsd:annotation>
  @@ -334,23 +334,69 @@
   
   The tag-file element has two required subelements:
   
  -name    The unique action name
  +description       Optional tag-specific information
   
  -path    Where to find the .tag file implementing this
  -        action, relative to the root of the web application or
  -	the root of the JAR file for a tag library packaged in
  -	a JAR.  This must begin with /WEB-INF/tags if the .tag
  -	file resides in the WAR, or /META-INF/tags if the .tag
  -	file resides in a JAR.
  +display-name      A short name that is intended to be
  +                  displayed by tools
  +
  +icon              Optional icon element that can be used
  +                  by tools
  +
  +name              The unique action name
  +
  +path              Where to find the .tag file implementing this
  +                  action, relative to the root of the web application or
  +	          the root of the JAR file for a tag library packaged in
  +	          a JAR.  This must begin with /WEB-INF/tags if the .tag
  +	          file resides in the WAR, or /META-INF/tags if the .tag
  +	          file resides in a JAR.
  +
  +example           Optional informal description of an
  +                  example of a use of this tag
  +
  +tag-extension     Zero or more extensions that provide extra
  +		  information about this tag, for tool
  +		  consumption
   
   </xsd:documentation>
   </xsd:annotation>
   
       <xsd:sequence>
  +        <xsd:group ref="j2ee:descriptionGroup"/>
           <xsd:element name="name"
                        type="j2ee:tld-canonical-nameType"/>
           <xsd:element name="path"
                        type="j2ee:pathType"/>
  +        <xsd:element name="example"
  +                     type="j2ee:xsdStringType"
  +                     minOccurs="0">
  +        <xsd:annotation>
  +        <xsd:documentation>
  +
  +        The example element contains an informal description
  +        of an example of the use of a tag.
  +
  +        </xsd:documentation>
  +        </xsd:annotation>
  +
  +        </xsd:element>
  +	<xsd:element name="tag-extension"
  +		     type="j2ee:deployment-extensionType"
  +		     minOccurs="0"
  +		     maxOccurs="unbounded">
  +	<xsd:annotation>
  +	<xsd:documentation>
  +
  +        Tag extensions are for tool use only and must not affect
  +	the behavior of a container.  The TLD extension mechanism
  +	only allows ignorable extensions (i.e. those without a
  +	mustUnderstand attribute).  A Tag Library is considered
  +	invalid if it requires an extension that must be
  +	understood by setting mustUnderstand="true".
  +
  +	</xsd:documentation>
  +	</xsd:annotation>
  +	</xsd:element>
       </xsd:sequence>
       <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


Mime
View raw message