You are viewing a plain text version of this content. The canonical link for it is here.
Posted to servletapi-dev@jakarta.apache.org by ed...@apache.org on 2001/03/22 01:50:31 UTC

cvs commit: jakarta-servletapi-4/src/share/dtd web-jsptaglibrary_1_2.dtd

eduardop    01/03/21 16:50:31

  Modified:    src/share/dtd web-jsptaglibrary_1_2.dtd
  Log:
  Added changes to TLD as indicated in message to expert group
  
  Revision  Changes    Path
  1.2       +36 -6     jakarta-servletapi-4/src/share/dtd/web-jsptaglibrary_1_2.dtd
  
  Index: web-jsptaglibrary_1_2.dtd
  ===================================================================
  RCS file: /home/cvs/jakarta-servletapi-4/src/share/dtd/web-jsptaglibrary_1_2.dtd,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- web-jsptaglibrary_1_2.dtd	2001/01/09 03:24:24	1.1
  +++ web-jsptaglibrary_1_2.dtd	2001/03/22 00:50:29	1.2
  @@ -15,6 +15,17 @@
             "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN">
   
   <!--
  +This is the XML DTD for the JSP 1.2 Tag Library Descriptor.
  +All JSP 1.2 tag library descriptors must include a DOCTYPE
  +of the following form:
  +
  +  <!DOCTYPE taglib
  +        PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
  +	"http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_2.dtd">
  +
  +-->
  +
  +<!--
   The taglib tag is the document root, it defines:
   
   tlib-version	the version of the tag library implementation
  @@ -44,13 +55,13 @@
   
   -->
   
  -<!ELEMENT taglib (tlib-version, jsp-version?, short-name, uri?,
  +<!ELEMENT taglib (tlib-version, jsp-version, short-name, uri?,
                     display-name?, small-icon?, large-icon?, description?,
                     validator?, listener*, tag+) >
   
   <!ATTLIST taglib id ID #IMPLIED
   	  xmlns CDATA #FIXED
  -		"http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd"
  +		"http://java.sun.com/JSP/TagLibraryDescriptor"
   >
   
   <!--
  @@ -101,7 +112,7 @@
   validate the conformance of a JSP page to using this tag library.
   -->
   
  -<!ELEMENT validator (validator-class, init-param*) >
  +<!ELEMENT validator (validator-class, init-param*, description?) >
   
   
   <!--
  @@ -183,10 +194,14 @@
   
   attribute         All attributes of this action
   
  +example           Optional informal description of an example of a
  +                  use of this tag
  +
   -->
   
   <!ELEMENT tag (name, tag-class, tei-class?, body-content?, display-name?,
  -               small-icon?, large-icon?, description?, variable*, attribute*) >
  +               small-icon?, large-icon?, description?, variable*, attribute*,
  +               example?) >
   
   <!--
   Defines the subclass of javax.serlvet.jsp.tagext.Tag that implements
  @@ -263,6 +278,14 @@
   
   <!--
   
  +The example element contains an informal description of an example
  +of the use of a tag.
  +-->
  +
  +<!ELEMENT example (#PCDATA) >
  +
  +<!--
  +
   The variable tag provides information on the scripting variables
   defined by this tag.  It is a (translation time) error for a tag
   that has one or more variable subelements to have a TagExtraInfo
  @@ -285,10 +308,13 @@
   
   scope                    The scope of the scripting varaible
                            defined.  NESTED is default.
  +
  +description              Optional description of this variable
  +
   -->
   
   <!ELEMENT variable ( (name-given | name-from-attribute), variable-class?,
  -                    declare?, scope?) >
  +                    declare?, scope?, description?) >
   
   <!--
   
  @@ -344,6 +370,7 @@
   - if the attributes value may be dynamically calculated at runtime
     by a scriptlet expression (optional)
   - the type of the attributes value (optional)
  +- an informal description of the meaning of the attribute (optional)
   
   -->
   
  @@ -361,9 +388,11 @@
     by a scriptlet expression (optional)
   
   - the type of the attributes value (optional)
  +
  +- an informal description of the meaning of the attribute (optional)
   -->
   
  -<!ELEMENT attribute (name, required? , rtexprvalue?, type?) >
  +<!ELEMENT attribute (name, required? , rtexprvalue?, type?, description?) >
   
   <!--
   Defines the canonical name of a tag or attribute being defined
  @@ -416,6 +445,7 @@
   <!ATTLIST short-name id ID #IMPLIED>
   <!ATTLIST uri id ID #IMPLIED>
   <!ATTLIST description id ID #IMPLIED>
  +<!ATTLIST example id ID #IMPLIED>
   <!ATTLIST tag id ID #IMPLIED>
   <!ATTLIST tag-class id ID #IMPLIED>
   <!ATTLIST tei-class id ID #IMPLIED>