patrickl 2002/09/24 18:50:40
Modified: jsr154/src/share/dtd web-app_2_4.xsd
Log:
Back out last revision as the last commit contains post-PFD changes that have not
yet been finalized.
Revision Changes Path
1.3 +162 -128 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- web-app_2_4.xsd 24 Sep 2002 23:01:09 -0000 1.2
+++ web-app_2_4.xsd 25 Sep 2002 01:50:39 -0000 1.3
@@ -8,7 +8,7 @@
version="2.4">
<xsd:annotation>
<xsd:documentation>
-@(#)web-app_2_4.xsds 1.41 02/09/24
+@(#)web-app_2_4.xsds 1.34 02/08/01
</xsd:documentation>
</xsd:annotation>
@@ -60,12 +60,12 @@
and by indicating the version of the schema by
using the version element as shown below:
- <web-app xmlns="http://java.sun.com/xml/ns/j2ee";
+ <web-app xmlns="http://java.sun.com/xml/ns/j2ee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="..."
version="2.4">
...
- </web-app>
+ </web-app>
The instance documents may indicate the published version of
the schema using the xsi:schemaLocation attribute for J2EE
@@ -262,6 +262,7 @@
<xsd:selector xpath="j2ee:servlet/j2ee:security-role-ref"/>
<xsd:field xpath="j2ee:role-link"/>
</xsd:keyref>
+
</xsd:element>
@@ -295,12 +296,12 @@
type="j2ee:role-nameType"
minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
- <xsd:attribute name="id" type="xsd:ID"/>
+
</xsd:complexType>
<!-- **************************************************** -->
-<xsd:complexType name="auth-methodType">
+<xsd:simpleType name="auth-methodType">
<xsd:annotation>
<xsd:documentation>
@@ -316,31 +317,28 @@
</xsd:documentation>
</xsd:annotation>
- <xsd:simpleContent>
- <xsd:restriction base="j2ee:string">
- <xsd:enumeration value="BASIC"/>
- <xsd:enumeration value="DIGEST"/>
- <xsd:enumeration value="FORM"/>
- <xsd:enumeration value="CLIENT-CERT"/>
- </xsd:restriction>
- </xsd:simpleContent>
-</xsd:complexType>
+ <xsd:restriction base="j2ee:string">
+ <xsd:enumeration value="BASIC"/>
+ <xsd:enumeration value="DIGEST"/>
+ <xsd:enumeration value="FORM"/>
+ <xsd:enumeration value="CLIENT-CERT"/>
+ </xsd:restriction>
+
+</xsd:simpleType>
<!-- **************************************************** -->
-<xsd:complexType name="dispatcherType">
+<xsd:simpleType name="dispatcherType">
<xsd:annotation>
<xsd:documentation>
The dispatcher has three legal values, FORWARD and REQUEST
-and INCLUDE and ERROR. A value of FORWARD means the Filter
+and INCLUDE. A value of FORWARD means the Filter
will be applied under RequestDispatcher.forward() calls.
A value of REQUEST means the Filter will be applied
under ordinary client calls to the path or servlet. A value of
INCLUDE means the Filter will be applied under
RequestDispatcher.include() calls.
-A value of ERROR means the Filter will be applied under
-the error page mechanism.
The absence of any dispatcher elements in a
filter-mapping indicates a default of applying
filters only under ordinary client calls to the path or servlet.
@@ -348,19 +346,18 @@
</xsd:documentation>
</xsd:annotation>
- <xsd:simpleContent>
- <xsd:restriction base="j2ee:string">
- <xsd:enumeration value="FORWARD"/>
- <xsd:enumeration value="INCLUDE"/>
- <xsd:enumeration value="REQUEST"/>
- <xsd:enumeration value="ERROR"/>
- </xsd:restriction>
- </xsd:simpleContent>
-</xsd:complexType>
+ <xsd:restriction base="j2ee:string">
+ <xsd:enumeration value="FORWARD"/>
+ <xsd:enumeration value="INCLUDE"/>
+ <xsd:enumeration value="REQUEST"/>
+
+ </xsd:restriction>
+
+</xsd:simpleType>
<!-- **************************************************** -->
-<xsd:complexType name="error-codeType">
+<xsd:simpleType name="error-codeType">
<xsd:annotation>
<xsd:documentation>
@@ -371,12 +368,9 @@
</xsd:documentation>
</xsd:annotation>
- <xsd:simpleContent>
- <xsd:restriction base="j2ee:xsdPositiveIntegerType">
- <xsd:attribute name="id" type="xsd:ID"/>
- </xsd:restriction>
- </xsd:simpleContent>
-</xsd:complexType>
+ <xsd:restriction base="positiveInteger"/>
+
+</xsd:simpleType>
<!-- **************************************************** -->
@@ -394,7 +388,7 @@
</xsd:annotation>
<xsd:sequence>
- <xsd:choice>
+ <choice>
<xsd:element name="error-code"
type="j2ee:error-codeType"/>
@@ -409,7 +403,7 @@
</xsd:documentation>
</xsd:annotation>
</xsd:element>
- </xsd:choice>
+ </choice>
<xsd:element name="location"
type="j2ee:pathType">
@@ -425,7 +419,7 @@
</xsd:annotation>
</xsd:element>
</xsd:sequence>
- <xsd:attribute name="id" type="xsd:ID"/>
+
</xsd:complexType>
<!-- **************************************************** -->
@@ -456,22 +450,22 @@
<xsd:sequence>
<xsd:element name="filter-name"
type="j2ee:filter-nameType"/>
- <xsd:choice>
+ <choice>
<xsd:element name="url-pattern"
type="j2ee:url-patternType"/>
<xsd:element name="servlet-name"
type="j2ee:servlet-nameType"/>
- </xsd:choice>
+ </choice>
<xsd:element name="dispatcher"
type="j2ee:dispatcherType"
minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
- <xsd:attribute name="id" type="xsd:ID"/>
+
</xsd:complexType>
<!-- **************************************************** -->
-<xsd:complexType name="filter-nameType">
+<xsd:simpleType name="filter-nameType">
<xsd:annotation>
<xsd:documentation>
@@ -485,10 +479,9 @@
</xsd:documentation>
</xsd:annotation>
- <xsd:simpleContent>
- <xsd:restriction base="j2ee:string"/>
- </xsd:simpleContent>
-</xsd:complexType>
+ <xsd:restriction base="j2ee:string"/>
+
+</xsd:simpleType>
<!-- **************************************************** -->
@@ -509,7 +502,16 @@
</xsd:annotation>
<xsd:sequence>
- <xsd:group ref="j2ee:descriptionGroup"/>
+ <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:element name="filter-name"
type="j2ee:filter-nameType"/>
<xsd:element name="filter-class"
@@ -536,7 +538,7 @@
</xsd:annotation>
</xsd:element>
</xsd:sequence>
- <xsd:attribute name="id" type="xsd:ID"/>
+
</xsd:complexType>
<!-- **************************************************** -->
@@ -586,12 +588,12 @@
</xsd:element>
</xsd:sequence>
- <xsd:attribute name="id" type="xsd:ID"/>
+
</xsd:complexType>
<!-- **************************************************** -->
-<xsd:complexType name="http-methodType">
+<xsd:simpleType name="http-methodType">
<xsd:annotation>
<xsd:documentation>
@@ -601,18 +603,17 @@
</xsd:documentation>
</xsd:annotation>
- <xsd:simpleContent>
- <xsd:restriction base="j2ee:string">
- <xsd:enumeration value="GET"/>
- <xsd:enumeration value="POST"/>
- <xsd:enumeration value="PUT"/>
- <xsd:enumeration value="DELETE"/>
- <xsd:enumeration value="HEAD"/>
- <xsd:enumeration value="OPTIONS"/>
- <xsd:enumeration value="TRACE"/>
- </xsd:restriction>
- </xsd:simpleContent>
-</xsd:complexType>
+ <xsd:restriction base="j2ee:string">
+ <xsd:enumeration value="GET"/>
+ <xsd:enumeration value="POST"/>
+ <xsd:enumeration value="PUT"/>
+ <xsd:enumeration value="DELETE"/>
+ <xsd:enumeration value="HEAD"/>
+ <xsd:enumeration value="OPTIONS"/>
+ <xsd:enumeration value="TRACE"/>
+ </xsd:restriction>
+
+</xsd:simpleType>
<!-- **************************************************** -->
@@ -629,7 +630,18 @@
</xsd:annotation>
<xsd:sequence>
- <xsd:group ref="j2ee:descriptionGroup"/>
+ <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:element name="listener-class"
type="j2ee:fully-qualified-classType">
<xsd:annotation>
@@ -644,7 +656,7 @@
</xsd:annotation>
</xsd:element>
</xsd:sequence>
- <xsd:attribute name="id" type="xsd:ID"/>
+
</xsd:complexType>
<!-- **************************************************** -->
@@ -659,12 +671,11 @@
</xsd:documentation>
</xsd:annotation>
- <xsd:sequence>
- <xsd:element name="locale-encoding-mapping"
- type="j2ee:locale-encoding-mappingType"
- maxOccurs="unbounded"/>
- </xsd:sequence>
- <xsd:attribute name="id" type="xsd:ID"/>
+<xsd:sequence>
+ <xsd:element name="locale-encoding-mapping"
+ type="j2ee:locale-encoding-mappingType"
+ maxOccurs="unbounded"/>
+</xsd:sequence>
</xsd:complexType>
<!-- **************************************************** -->
@@ -681,13 +692,12 @@
</xsd:documentation>
</xsd:annotation>
- <xsd:sequence>
- <xsd:element name="locale"
- type="j2ee:string"/>
- <xsd:element name="encoding"
- type="j2ee:string"/>
- </xsd:sequence>
- <xsd:attribute name="id" type="xsd:ID"/>
+<xsd:sequence>
+ <xsd:element name="locale"
+ type="j2ee:string"/>
+ <xsd:element name="encoding"
+ type="j2ee:string"/>
+</xsd:sequence>
</xsd:complexType>
<!-- **************************************************** -->
@@ -725,7 +735,7 @@
type="j2ee:form-login-configType"
minOccurs="0"/>
</xsd:sequence>
- <xsd:attribute name="id" type="xsd:ID"/>
+
</xsd:complexType>
<!-- **************************************************** -->
@@ -757,12 +767,12 @@
<xsd:element name="mime-type"
type="j2ee:mime-typeType"/>
</xsd:sequence>
- <xsd:attribute name="id" type="xsd:ID"/>
+
</xsd:complexType>
<!-- **************************************************** -->
-<xsd:complexType name="mime-typeType">
+<xsd:simpleType name="mime-typeType">
<xsd:annotation>
<xsd:documentation>
@@ -776,12 +786,11 @@
</xsd:documentation>
</xsd:annotation>
- <xsd:simpleContent>
- <xsd:restriction base="j2ee:string">
- <xsd:pattern value="[\p{L}\-\p{Nd}]+/[\p{L}\-\p{Nd}\.]+"/>
- </xsd:restriction>
- </xsd:simpleContent>
-</xsd:complexType>
+ <xsd:restriction base="j2ee:string">
+ <xsd:pattern value="[\p{L}\-\p{Nd}]+/[\p{L}\-\p{Nd}\.]+"/>
+ </xsd:restriction>
+
+</xsd:simpleType>
<!-- **************************************************** -->
@@ -813,7 +822,7 @@
type="j2ee:user-data-constraintType"
minOccurs="0"/>
</xsd:sequence>
- <xsd:attribute name="id" type="xsd:ID"/>
+
</xsd:complexType>
<!-- **************************************************** -->
@@ -836,12 +845,12 @@
<xsd:element name="url-pattern"
type="j2ee:url-patternType"/>
</xsd:sequence>
- <xsd:attribute name="id" type="xsd:ID"/>
+
</xsd:complexType>
<!-- **************************************************** -->
-<xsd:complexType name="servlet-nameType">
+<xsd:simpleType name="servlet-nameType">
<xsd:annotation>
<xsd:documentation>
@@ -852,10 +861,9 @@
</xsd:documentation>
</xsd:annotation>
- <xsd:simpleContent>
- <xsd:restriction base="j2ee:string"/>
- </xsd:simpleContent>
-</xsd:complexType>
+ <xsd:restriction base="j2ee:string"/>
+
+</xsd:simpleType>
<!-- **************************************************** -->
@@ -875,10 +883,19 @@
</xsd:annotation>
<xsd:sequence>
- <xsd:group ref="j2ee:descriptionGroup"/>
+ <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:element name="servlet-name"
type="j2ee:servlet-nameType"/>
- <xsd:choice>
+ <choice>
<xsd:element name="servlet-class"
type="j2ee:fully-qualified-classType">
<xsd:annotation>
@@ -894,13 +911,13 @@
<xsd:element name="jsp-file"
type="j2ee:jsp-fileType"/>
- </xsd:choice>
+ </choice>
<xsd:element name="init-param"
type="j2ee:param-valueType"
minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="load-on-startup"
- type="j2ee:xsdIntegerType"
+ type="xsd:integer"
minOccurs="0">
<xsd:annotation>
<xsd:documentation>
@@ -935,7 +952,6 @@
type="j2ee:deployment-extensionType"
minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
- <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
@@ -954,8 +970,8 @@
<xsd:sequence>
<xsd:element name="session-timeout"
- type="j2ee:xsdNonNegativeIntegerType"
- minOccurs="0">
+ type="xsd:nonNegativeInteger"
+ minOccurs="0">
<xsd:annotation>
<xsd:documentation>
@@ -972,12 +988,12 @@
</xsd:annotation>
</xsd:element>
</xsd:sequence>
- <xsd:attribute name="id" type="xsd:ID"/>
+
</xsd:complexType>
<!-- **************************************************** -->
-<xsd:complexType name="transport-guaranteeType">
+<xsd:simpleType name="transport-guaranteeType">
<xsd:annotation>
<xsd:documentation>
@@ -999,14 +1015,13 @@
</xsd:documentation>
</xsd:annotation>
- <xsd:simpleContent>
- <xsd:restriction base="j2ee:string">
- <xsd:enumeration value="NONE"/>
- <xsd:enumeration value="INTEGRAL"/>
- <xsd:enumeration value="CONFIDENTIAL"/>
- </xsd:restriction>
- </xsd:simpleContent>
-</xsd:complexType>
+ <xsd:restriction base="j2ee:string">
+ <xsd:enumeration value="NONE"/>
+ <xsd:enumeration value="INTEGRAL"/>
+ <xsd:enumeration value="CONFIDENTIAL"/>
+ </xsd:restriction>
+
+</xsd:simpleType>
<!-- **************************************************** -->
@@ -1031,7 +1046,7 @@
<xsd:element name="transport-guarantee"
type="j2ee:transport-guaranteeType"/>
</xsd:sequence>
- <xsd:attribute name="id" type="xsd:ID"/>
+
</xsd:complexType>
<!-- **************************************************** -->
@@ -1044,11 +1059,20 @@
web-application supported. It is used to designate the
version of the web application.
+Example:
+
+<web-app>
+ <version>2.4</version>
+...
+</web-app>
+
</xsd:documentation>
</xsd:annotation>
- <xsd:restriction base="xsd:token">
+
+ <xsd:restriction base="j2ee:string">
<xsd:enumeration value="2.4"/>
</xsd:restriction>
+
</xsd:simpleType>
<!-- **************************************************** -->
@@ -1056,7 +1080,18 @@
<xsd:complexType name="web-appType">
<xsd:sequence>
- <xsd:group ref="j2ee:descriptionGroup"/>
+ <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:element name="distributable"
type="j2ee:emptyType"
minOccurs="0"/>
@@ -1110,6 +1145,18 @@
<xsd:element name="jsp-config"
type="j2ee:jsp-configType"
minOccurs="0"/>
+ <xsd:element name="resource-env-ref"
+ type="j2ee:resource-env-refType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="message-destination-ref"
+ type="j2ee:message-destination-refType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="resource-ref"
+ type="j2ee:resource-refType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
<xsd:element name="security-constraint"
type="j2ee:security-constraintType"
minOccurs="0"
@@ -1133,19 +1180,6 @@
type="j2ee:ejb-local-refType"
minOccurs="0"
maxOccurs="unbounded"/>
- <xsd:group ref="j2ee:service-refGroup"/>
- <xsd:element name="resource-ref"
- type="j2ee:resource-refType"
- minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="resource-env-ref"
- type="j2ee:resource-env-refType"
- minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="message-destination-ref"
- type="j2ee:message-destination-refType"
- minOccurs="0"
- maxOccurs="unbounded"/>
<xsd:element name="message-destination"
type="j2ee:message-destinationType"
minOccurs="0"
@@ -1163,7 +1197,7 @@
<xsd:attribute name="version"
type="j2ee:web-app-versionType"
use="required"/>
- <xsd:attribute name="id" type="xsd:ID"/>
+
</xsd:complexType>
<!-- **************************************************** -->
@@ -1206,7 +1240,7 @@
type="j2ee:http-methodType"
minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
- <xsd:attribute name="id" type="xsd:ID"/>
+
</xsd:complexType>
<!-- **************************************************** -->
@@ -1237,7 +1271,7 @@
</xsd:annotation>
</xsd:element>
</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]>
