patrickl 2002/09/19 18:56:44
Modified: jsr152/src/share/dtd jsp_2_0.xsd web-jsptaglibrary_2_0.xsd
jsr154/src/share/dtd jsp_2_0.xsd web-jsptaglibrary_2_0.xsd
Log:
Updates to conform to current spec draft
Submitted by: Mark Roth ([EMAIL PROTECTED])
Revision Changes Path
1.3 +10 -14 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jsp_2_0.xsd 21 Aug 2002 16:17:48 -0000 1.2
+++ jsp_2_0.xsd 20 Sep 2002 01:56:44 -0000 1.3
@@ -8,7 +8,7 @@
version="2.0">
<xsd:annotation>
<xsd:documentation>
-%W% %G%
+@(#)jsp_2_0.xsds 1.12 09/18/02
</xsd:documentation>
</xsd:annotation>
@@ -105,12 +105,12 @@
minOccurs="0"
maxOccurs="unbounded"/>
</xsd:sequence>
-
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
-<xsd:simpleType name="jsp-fileType">
+<xsd:complexType name="jsp-fileType">
<xsd:annotation>
<xsd:documentation>
@@ -120,9 +120,10 @@
</xsd:documentation>
</xsd:annotation>
- <xsd:restriction base="j2ee:pathType"/>
-
-</xsd:simpleType>
+ <xsd:simpleContent>
+ <xsd:restriction base="j2ee:pathType"/>
+ </xsd:simpleContent>
+</xsd:complexType>
<!-- **************************************************** -->
@@ -145,12 +146,7 @@
</xsd:annotation>
<xsd:sequence>
- <xsd:element name="description"
- type="j2ee:descriptionType"
- minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="display-name"
- type="j2ee:display-nameType"
- minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:group ref="j2ee:descriptionGroup"/>
<xsd:element name="url-pattern"
type="j2ee:url-patternType"
maxOccurs="unbounded"/>
@@ -249,7 +245,7 @@
</xsd:annotation>
</xsd:element>
</xsd:sequence>
-
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
@@ -297,7 +293,7 @@
</xsd:element>
</xsd:sequence>
-
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
</xsd:schema>
1.3 +71 -86
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- web-jsptaglibrary_2_0.xsd 19 Aug 2002 16:29:49 -0000 1.2
+++ web-jsptaglibrary_2_0.xsd 20 Sep 2002 01:56:44 -0000 1.3
@@ -10,7 +10,7 @@
<xsd:annotation>
<xsd:documentation>
-@(#)web-jsptaglibrary_2_0.xsds 1.14 08/14/02
+@(#)web-jsptaglibrary_2_0.xsds 1.18 09/19/02
</xsd:documentation>
</xsd:annotation>
<xsd:annotation>
@@ -61,12 +61,12 @@
and by indicating the version of the schema by
using the version element as shown below:
- <taglib xmlns="http://java.sun.com/xml/ns/j2ee";
+ <taglib xmlns="http://java.sun.com/xml/ns/j2ee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="..."
version="2.0">
...
- </taglib>
+ </taglib>
The instance documents may indicate the published
version of the schema using xsi:schemaLocation attribute
@@ -137,7 +137,7 @@
<!-- **************************************************** -->
-<xsd:simpleType name="body-contentType">
+<xsd:complexType name="body-contentType">
<xsd:annotation>
<xsd:documentation>
@@ -163,17 +163,18 @@
</xsd:documentation>
</xsd:annotation>
- <xsd:restriction base="j2ee:string">
- <xsd:enumeration value="tagdependent"/>
- <xsd:enumeration value="TAGDEPENDENT"/>
- <xsd:enumeration value="JSP"/>
- <xsd:enumeration value="empty"/>
- <xsd:enumeration value="EMPTY"/>
- <xsd:enumeration value="scriptless"/>
- <xsd:enumeration value="SCRIPTLESS"/>
- </xsd:restriction>
-
-</xsd:simpleType>
+ <xsd:simpleContent>
+ <xsd:restriction base="j2ee:string">
+ <xsd:enumeration value="tagdependent"/>
+ <xsd:enumeration value="TAGDEPENDENT"/>
+ <xsd:enumeration value="JSP"/>
+ <xsd:enumeration value="empty"/>
+ <xsd:enumeration value="EMPTY"/>
+ <xsd:enumeration value="scriptless"/>
+ <xsd:enumeration value="SCRIPTLESS"/>
+ </xsd:restriction>
+ </xsd:simpleContent>
+</xsd:complexType>
<!-- **************************************************** -->
@@ -211,15 +212,7 @@
</xsd:annotation>
<xsd:sequence>
- <xsd:element name="description"
- type="j2ee:descriptionType"
- minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="display-name"
- type="j2ee:display-nameType"
- minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="icon"
- type="j2ee:iconType"
- minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:group ref="j2ee:descriptionGroup"/>
<xsd:element name="name"
type="j2ee:tld-canonical-nameType">
<xsd:annotation>
@@ -244,7 +237,7 @@
</xsd:element>
<xsd:element name="function-signature"
- type="xsd:string">
+ type="j2ee:string">
<xsd:annotation>
<xsd:documentation>
@@ -261,7 +254,7 @@
</xsd:element>
<xsd:element name="example"
- type="xsd:string"
+ type="j2ee:xsdStringType"
minOccurs="0">
<xsd:annotation>
<xsd:documentation>
@@ -274,6 +267,7 @@
</xsd:element>
</xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
@@ -303,6 +297,7 @@
</xsd:annotation>
</xsd:element>
</xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
@@ -332,6 +327,7 @@
<xsd:element name="path"
type="j2ee:pathType"/>
</xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
@@ -385,15 +381,7 @@
</xsd:annotation>
<xsd:sequence>
- <xsd:element name="description"
- type="j2ee:descriptionType"
- minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="display-name"
- type="j2ee:display-nameType"
- minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="icon"
- type="j2ee:iconType"
- minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:group ref="j2ee:descriptionGroup"/>
<xsd:element name="name"
type="j2ee:tld-canonical-nameType"/>
<xsd:element name="tag-class"
@@ -445,7 +433,7 @@
type="j2ee:generic-booleanType"
minOccurs="0"/>
<xsd:element name="example"
- type="xsd:string"
+ type="j2ee:xsdStringType"
minOccurs="0">
<xsd:annotation>
<xsd:documentation>
@@ -475,6 +463,7 @@
</xsd:annotation>
</xsd:element>
</xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
@@ -522,16 +511,7 @@
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
- <xsd:element name="description"
- type="j2ee:descriptionType"
- minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="display-name"
- type="j2ee:display-nameType"
- minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="icon"
- type="j2ee:iconType"
- minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:group ref="j2ee:descriptionGroup"/>
<xsd:element name="tlib-version"
type="j2ee:dewey-versionType">
<xsd:annotation>
@@ -562,7 +542,7 @@
</xsd:element>
<xsd:element name="uri"
- type="xsd:anyURI"
+ type="j2ee:xsdAnyURIType"
minOccurs="0">
<xsd:annotation>
<xsd:documentation>
@@ -629,7 +609,7 @@
</xsd:annotation>
</xsd:attribute>
-
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
@@ -731,11 +711,12 @@
</xsd:element>
</xsd:choice>
</xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
-<xsd:simpleType name="tld-canonical-nameType">
+<xsd:complexType name="tld-canonical-nameType">
<xsd:annotation>
<xsd:documentation>
@@ -748,9 +729,10 @@
</xsd:documentation>
</xsd:annotation>
- <xsd:restriction base="xsd:NMTOKEN"/>
-
-</xsd:simpleType>
+ <xsd:simpleContent>
+ <xsd:restriction base="j2ee:xsdNMTOKENType"/>
+ </xsd:simpleContent>
+</xsd:complexType>
<!-- **************************************************** -->
@@ -765,43 +747,44 @@
</xsd:documentation>
</xsd:annotation>
-<xsd:sequence>
- <xsd:element name="description"
- type="j2ee:descriptionType"
- minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="validator-class"
- type="j2ee:fully-qualified-classType">
- <xsd:annotation>
- <xsd:documentation>
+ <xsd:sequence>
+ <xsd:element name="description"
+ type="j2ee:descriptionType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="validator-class"
+ type="j2ee:fully-qualified-classType">
+ <xsd:annotation>
+ <xsd:documentation>
- Defines the TagLibraryValidator class that can be used
- to validate the conformance of a JSP page to using this
- tag library.
+ Defines the TagLibraryValidator class that can be used
+ to validate the conformance of a JSP page to using this
+ tag library.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- <xsd:element name="init-param"
- type="j2ee:param-valueType"
- minOccurs="0" maxOccurs="unbounded">
- <xsd:annotation>
- <xsd:documentation>
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="init-param"
+ type="j2ee:param-valueType"
+ minOccurs="0" maxOccurs="unbounded">
+ <xsd:annotation>
+ <xsd:documentation>
- The init-param element contains a name/value pair as an
- initialization param.
+ The init-param element contains a name/value pair as an
+ initialization param.
- </xsd:documentation>
- </xsd:annotation>
+ </xsd:documentation>
+ </xsd:annotation>
- </xsd:element>
+ </xsd:element>
-</xsd:sequence>
+ </xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
-<xsd:simpleType name="variable-scopeType">
+<xsd:complexType name="variable-scopeType">
<xsd:annotation>
<xsd:documentation>
@@ -812,12 +795,14 @@
</xsd:documentation>
</xsd:annotation>
- <xsd:restriction base="j2ee:string">
- <xsd:enumeration value="NESTED"/>
- <xsd:enumeration value="AT_BEGIN"/>
- <xsd:enumeration value="AT_END"/>
- </xsd:restriction>
-</xsd:simpleType>
+ <xsd:simpleContent>
+ <xsd:restriction base="j2ee:string">
+ <xsd:enumeration value="NESTED"/>
+ <xsd:enumeration value="AT_BEGIN"/>
+ <xsd:enumeration value="AT_END"/>
+ </xsd:restriction>
+ </xsd:simpleContent>
+</xsd:complexType>
<!-- **************************************************** -->
@@ -949,7 +934,7 @@
</xsd:element>
</xsd:choice>
</xsd:sequence>
-
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
</xsd:schema>
1.3 +10 -14 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jsp_2_0.xsd 7 Sep 2002 00:48:02 -0000 1.2
+++ jsp_2_0.xsd 20 Sep 2002 01:56:44 -0000 1.3
@@ -8,7 +8,7 @@
version="2.0">
<xsd:annotation>
<xsd:documentation>
-%W% %G%
+@(#)jsp_2_0.xsds 1.12 09/18/02
</xsd:documentation>
</xsd:annotation>
@@ -105,12 +105,12 @@
minOccurs="0"
maxOccurs="unbounded"/>
</xsd:sequence>
-
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
-<xsd:simpleType name="jsp-fileType">
+<xsd:complexType name="jsp-fileType">
<xsd:annotation>
<xsd:documentation>
@@ -120,9 +120,10 @@
</xsd:documentation>
</xsd:annotation>
- <xsd:restriction base="j2ee:pathType"/>
-
-</xsd:simpleType>
+ <xsd:simpleContent>
+ <xsd:restriction base="j2ee:pathType"/>
+ </xsd:simpleContent>
+</xsd:complexType>
<!-- **************************************************** -->
@@ -145,12 +146,7 @@
</xsd:annotation>
<xsd:sequence>
- <xsd:element name="description"
- type="j2ee:descriptionType"
- minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="display-name"
- type="j2ee:display-nameType"
- minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:group ref="j2ee:descriptionGroup"/>
<xsd:element name="url-pattern"
type="j2ee:url-patternType"
maxOccurs="unbounded"/>
@@ -249,7 +245,7 @@
</xsd:annotation>
</xsd:element>
</xsd:sequence>
-
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
@@ -297,7 +293,7 @@
</xsd:element>
</xsd:sequence>
-
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
</xsd:schema>
1.3 +71 -86
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- web-jsptaglibrary_2_0.xsd 7 Sep 2002 00:48:02 -0000 1.2
+++ web-jsptaglibrary_2_0.xsd 20 Sep 2002 01:56:44 -0000 1.3
@@ -10,7 +10,7 @@
<xsd:annotation>
<xsd:documentation>
-@(#)web-jsptaglibrary_2_0.xsds 1.14 08/14/02
+@(#)web-jsptaglibrary_2_0.xsds 1.18 09/19/02
</xsd:documentation>
</xsd:annotation>
<xsd:annotation>
@@ -61,12 +61,12 @@
and by indicating the version of the schema by
using the version element as shown below:
- <taglib xmlns="http://java.sun.com/xml/ns/j2ee";
+ <taglib xmlns="http://java.sun.com/xml/ns/j2ee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="..."
version="2.0">
...
- </taglib>
+ </taglib>
The instance documents may indicate the published
version of the schema using xsi:schemaLocation attribute
@@ -137,7 +137,7 @@
<!-- **************************************************** -->
-<xsd:simpleType name="body-contentType">
+<xsd:complexType name="body-contentType">
<xsd:annotation>
<xsd:documentation>
@@ -163,17 +163,18 @@
</xsd:documentation>
</xsd:annotation>
- <xsd:restriction base="j2ee:string">
- <xsd:enumeration value="tagdependent"/>
- <xsd:enumeration value="TAGDEPENDENT"/>
- <xsd:enumeration value="JSP"/>
- <xsd:enumeration value="empty"/>
- <xsd:enumeration value="EMPTY"/>
- <xsd:enumeration value="scriptless"/>
- <xsd:enumeration value="SCRIPTLESS"/>
- </xsd:restriction>
-
-</xsd:simpleType>
+ <xsd:simpleContent>
+ <xsd:restriction base="j2ee:string">
+ <xsd:enumeration value="tagdependent"/>
+ <xsd:enumeration value="TAGDEPENDENT"/>
+ <xsd:enumeration value="JSP"/>
+ <xsd:enumeration value="empty"/>
+ <xsd:enumeration value="EMPTY"/>
+ <xsd:enumeration value="scriptless"/>
+ <xsd:enumeration value="SCRIPTLESS"/>
+ </xsd:restriction>
+ </xsd:simpleContent>
+</xsd:complexType>
<!-- **************************************************** -->
@@ -211,15 +212,7 @@
</xsd:annotation>
<xsd:sequence>
- <xsd:element name="description"
- type="j2ee:descriptionType"
- minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="display-name"
- type="j2ee:display-nameType"
- minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="icon"
- type="j2ee:iconType"
- minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:group ref="j2ee:descriptionGroup"/>
<xsd:element name="name"
type="j2ee:tld-canonical-nameType">
<xsd:annotation>
@@ -244,7 +237,7 @@
</xsd:element>
<xsd:element name="function-signature"
- type="xsd:string">
+ type="j2ee:string">
<xsd:annotation>
<xsd:documentation>
@@ -261,7 +254,7 @@
</xsd:element>
<xsd:element name="example"
- type="xsd:string"
+ type="j2ee:xsdStringType"
minOccurs="0">
<xsd:annotation>
<xsd:documentation>
@@ -274,6 +267,7 @@
</xsd:element>
</xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
@@ -303,6 +297,7 @@
</xsd:annotation>
</xsd:element>
</xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
@@ -332,6 +327,7 @@
<xsd:element name="path"
type="j2ee:pathType"/>
</xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
@@ -385,15 +381,7 @@
</xsd:annotation>
<xsd:sequence>
- <xsd:element name="description"
- type="j2ee:descriptionType"
- minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="display-name"
- type="j2ee:display-nameType"
- minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="icon"
- type="j2ee:iconType"
- minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:group ref="j2ee:descriptionGroup"/>
<xsd:element name="name"
type="j2ee:tld-canonical-nameType"/>
<xsd:element name="tag-class"
@@ -445,7 +433,7 @@
type="j2ee:generic-booleanType"
minOccurs="0"/>
<xsd:element name="example"
- type="xsd:string"
+ type="j2ee:xsdStringType"
minOccurs="0">
<xsd:annotation>
<xsd:documentation>
@@ -475,6 +463,7 @@
</xsd:annotation>
</xsd:element>
</xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
@@ -522,16 +511,7 @@
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
- <xsd:element name="description"
- type="j2ee:descriptionType"
- minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="display-name"
- type="j2ee:display-nameType"
- minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="icon"
- type="j2ee:iconType"
- minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:group ref="j2ee:descriptionGroup"/>
<xsd:element name="tlib-version"
type="j2ee:dewey-versionType">
<xsd:annotation>
@@ -562,7 +542,7 @@
</xsd:element>
<xsd:element name="uri"
- type="xsd:anyURI"
+ type="j2ee:xsdAnyURIType"
minOccurs="0">
<xsd:annotation>
<xsd:documentation>
@@ -629,7 +609,7 @@
</xsd:annotation>
</xsd:attribute>
-
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
@@ -731,11 +711,12 @@
</xsd:element>
</xsd:choice>
</xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
-<xsd:simpleType name="tld-canonical-nameType">
+<xsd:complexType name="tld-canonical-nameType">
<xsd:annotation>
<xsd:documentation>
@@ -748,9 +729,10 @@
</xsd:documentation>
</xsd:annotation>
- <xsd:restriction base="xsd:NMTOKEN"/>
-
-</xsd:simpleType>
+ <xsd:simpleContent>
+ <xsd:restriction base="j2ee:xsdNMTOKENType"/>
+ </xsd:simpleContent>
+</xsd:complexType>
<!-- **************************************************** -->
@@ -765,43 +747,44 @@
</xsd:documentation>
</xsd:annotation>
-<xsd:sequence>
- <xsd:element name="description"
- type="j2ee:descriptionType"
- minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="validator-class"
- type="j2ee:fully-qualified-classType">
- <xsd:annotation>
- <xsd:documentation>
+ <xsd:sequence>
+ <xsd:element name="description"
+ type="j2ee:descriptionType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="validator-class"
+ type="j2ee:fully-qualified-classType">
+ <xsd:annotation>
+ <xsd:documentation>
- Defines the TagLibraryValidator class that can be used
- to validate the conformance of a JSP page to using this
- tag library.
+ Defines the TagLibraryValidator class that can be used
+ to validate the conformance of a JSP page to using this
+ tag library.
- </xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- <xsd:element name="init-param"
- type="j2ee:param-valueType"
- minOccurs="0" maxOccurs="unbounded">
- <xsd:annotation>
- <xsd:documentation>
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="init-param"
+ type="j2ee:param-valueType"
+ minOccurs="0" maxOccurs="unbounded">
+ <xsd:annotation>
+ <xsd:documentation>
- The init-param element contains a name/value pair as an
- initialization param.
+ The init-param element contains a name/value pair as an
+ initialization param.
- </xsd:documentation>
- </xsd:annotation>
+ </xsd:documentation>
+ </xsd:annotation>
- </xsd:element>
+ </xsd:element>
-</xsd:sequence>
+ </xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
-<xsd:simpleType name="variable-scopeType">
+<xsd:complexType name="variable-scopeType">
<xsd:annotation>
<xsd:documentation>
@@ -812,12 +795,14 @@
</xsd:documentation>
</xsd:annotation>
- <xsd:restriction base="j2ee:string">
- <xsd:enumeration value="NESTED"/>
- <xsd:enumeration value="AT_BEGIN"/>
- <xsd:enumeration value="AT_END"/>
- </xsd:restriction>
-</xsd:simpleType>
+ <xsd:simpleContent>
+ <xsd:restriction base="j2ee:string">
+ <xsd:enumeration value="NESTED"/>
+ <xsd:enumeration value="AT_BEGIN"/>
+ <xsd:enumeration value="AT_END"/>
+ </xsd:restriction>
+ </xsd:simpleContent>
+</xsd:complexType>
<!-- **************************************************** -->
@@ -949,7 +934,7 @@
</xsd:element>
</xsd:choice>
</xsd:sequence>
-
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
</xsd:schema>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
