patrickl 2002/09/24 16:01:09
Modified: jsr154/src/share/dtd web-app_2_4.xsd
Log:
Update file to match Servlet 2.4 Public Final Draft document
Revision Changes Path
1.2 +128 -162 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- web-app_2_4.xsd 13 Aug 2002 16:21:47 -0000 1.1
+++ web-app_2_4.xsd 24 Sep 2002 23:01:09 -0000 1.2
@@ -8,7 +8,7 @@
version="2.4">
<xsd:annotation>
<xsd:documentation>
-@(#)web-app_2_4.xsds 1.34 02/08/01
+@(#)web-app_2_4.xsds 1.41 02/09/24
</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,7 +262,6 @@
<xsd:selector xpath="j2ee:servlet/j2ee:security-role-ref"/>
<xsd:field xpath="j2ee:role-link"/>
</xsd:keyref>
-
</xsd:element>
@@ -296,12 +295,12 @@
type="j2ee:role-nameType"
minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
-
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
-<xsd:simpleType name="auth-methodType">
+<xsd:complexType name="auth-methodType">
<xsd:annotation>
<xsd:documentation>
@@ -317,28 +316,31 @@
</xsd:documentation>
</xsd:annotation>
- <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: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:simpleType name="dispatcherType">
+<xsd:complexType name="dispatcherType">
<xsd:annotation>
<xsd:documentation>
The dispatcher has three legal values, FORWARD and REQUEST
-and INCLUDE. A value of FORWARD means the Filter
+and INCLUDE and ERROR. 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.
@@ -346,18 +348,19 @@
</xsd:documentation>
</xsd:annotation>
- <xsd:restriction base="j2ee:string">
- <xsd:enumeration value="FORWARD"/>
- <xsd:enumeration value="INCLUDE"/>
- <xsd:enumeration value="REQUEST"/>
-
- </xsd:restriction>
-
-</xsd:simpleType>
+ <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:simpleType name="error-codeType">
+<xsd:complexType name="error-codeType">
<xsd:annotation>
<xsd:documentation>
@@ -368,9 +371,12 @@
</xsd:documentation>
</xsd:annotation>
- <xsd:restriction base="positiveInteger"/>
-
-</xsd:simpleType>
+ <xsd:simpleContent>
+ <xsd:restriction base="j2ee:xsdPositiveIntegerType">
+ <xsd:attribute name="id" type="xsd:ID"/>
+ </xsd:restriction>
+ </xsd:simpleContent>
+</xsd:complexType>
<!-- **************************************************** -->
@@ -388,7 +394,7 @@
</xsd:annotation>
<xsd:sequence>
- <choice>
+ <xsd:choice>
<xsd:element name="error-code"
type="j2ee:error-codeType"/>
@@ -403,7 +409,7 @@
</xsd:documentation>
</xsd:annotation>
</xsd:element>
- </choice>
+ </xsd:choice>
<xsd:element name="location"
type="j2ee:pathType">
@@ -419,7 +425,7 @@
</xsd:annotation>
</xsd:element>
</xsd:sequence>
-
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
@@ -450,22 +456,22 @@
<xsd:sequence>
<xsd:element name="filter-name"
type="j2ee:filter-nameType"/>
- <choice>
+ <xsd:choice>
<xsd:element name="url-pattern"
type="j2ee:url-patternType"/>
<xsd:element name="servlet-name"
type="j2ee:servlet-nameType"/>
- </choice>
+ </xsd:choice>
<xsd:element name="dispatcher"
type="j2ee:dispatcherType"
minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
-
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
-<xsd:simpleType name="filter-nameType">
+<xsd:complexType name="filter-nameType">
<xsd:annotation>
<xsd:documentation>
@@ -479,9 +485,10 @@
</xsd:documentation>
</xsd:annotation>
- <xsd:restriction base="j2ee:string"/>
-
-</xsd:simpleType>
+ <xsd:simpleContent>
+ <xsd:restriction base="j2ee:string"/>
+ </xsd:simpleContent>
+</xsd:complexType>
<!-- **************************************************** -->
@@ -502,16 +509,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="filter-name"
type="j2ee:filter-nameType"/>
<xsd:element name="filter-class"
@@ -538,7 +536,7 @@
</xsd:annotation>
</xsd:element>
</xsd:sequence>
-
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
@@ -588,12 +586,12 @@
</xsd:element>
</xsd:sequence>
-
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
-<xsd:simpleType name="http-methodType">
+<xsd:complexType name="http-methodType">
<xsd:annotation>
<xsd:documentation>
@@ -603,17 +601,18 @@
</xsd:documentation>
</xsd:annotation>
- <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>
+ <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>
<!-- **************************************************** -->
@@ -630,18 +629,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="listener-class"
type="j2ee:fully-qualified-classType">
<xsd:annotation>
@@ -656,7 +644,7 @@
</xsd:annotation>
</xsd:element>
</xsd:sequence>
-
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
@@ -671,11 +659,12 @@
</xsd:documentation>
</xsd:annotation>
-<xsd:sequence>
- <xsd:element name="locale-encoding-mapping"
- type="j2ee:locale-encoding-mappingType"
- maxOccurs="unbounded"/>
-</xsd:sequence>
+ <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:complexType>
<!-- **************************************************** -->
@@ -692,12 +681,13 @@
</xsd:documentation>
</xsd:annotation>
-<xsd:sequence>
- <xsd:element name="locale"
- type="j2ee:string"/>
- <xsd:element name="encoding"
- type="j2ee:string"/>
-</xsd:sequence>
+ <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:complexType>
<!-- **************************************************** -->
@@ -735,7 +725,7 @@
type="j2ee:form-login-configType"
minOccurs="0"/>
</xsd:sequence>
-
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
@@ -767,12 +757,12 @@
<xsd:element name="mime-type"
type="j2ee:mime-typeType"/>
</xsd:sequence>
-
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
-<xsd:simpleType name="mime-typeType">
+<xsd:complexType name="mime-typeType">
<xsd:annotation>
<xsd:documentation>
@@ -786,11 +776,12 @@
</xsd:documentation>
</xsd:annotation>
- <xsd:restriction base="j2ee:string">
- <xsd:pattern value="[\p{L}\-\p{Nd}]+/[\p{L}\-\p{Nd}\.]+"/>
- </xsd:restriction>
-
-</xsd:simpleType>
+ <xsd:simpleContent>
+ <xsd:restriction base="j2ee:string">
+ <xsd:pattern value="[\p{L}\-\p{Nd}]+/[\p{L}\-\p{Nd}\.]+"/>
+ </xsd:restriction>
+ </xsd:simpleContent>
+</xsd:complexType>
<!-- **************************************************** -->
@@ -822,7 +813,7 @@
type="j2ee:user-data-constraintType"
minOccurs="0"/>
</xsd:sequence>
-
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
@@ -845,12 +836,12 @@
<xsd:element name="url-pattern"
type="j2ee:url-patternType"/>
</xsd:sequence>
-
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
-<xsd:simpleType name="servlet-nameType">
+<xsd:complexType name="servlet-nameType">
<xsd:annotation>
<xsd:documentation>
@@ -861,9 +852,10 @@
</xsd:documentation>
</xsd:annotation>
- <xsd:restriction base="j2ee:string"/>
-
-</xsd:simpleType>
+ <xsd:simpleContent>
+ <xsd:restriction base="j2ee:string"/>
+ </xsd:simpleContent>
+</xsd:complexType>
<!-- **************************************************** -->
@@ -883,19 +875,10 @@
</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="servlet-name"
type="j2ee:servlet-nameType"/>
- <choice>
+ <xsd:choice>
<xsd:element name="servlet-class"
type="j2ee:fully-qualified-classType">
<xsd:annotation>
@@ -911,13 +894,13 @@
<xsd:element name="jsp-file"
type="j2ee:jsp-fileType"/>
- </choice>
+ </xsd:choice>
<xsd:element name="init-param"
type="j2ee:param-valueType"
minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="load-on-startup"
- type="xsd:integer"
+ type="j2ee:xsdIntegerType"
minOccurs="0">
<xsd:annotation>
<xsd:documentation>
@@ -952,6 +935,7 @@
type="j2ee:deployment-extensionType"
minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
@@ -970,8 +954,8 @@
<xsd:sequence>
<xsd:element name="session-timeout"
- type="xsd:nonNegativeInteger"
- minOccurs="0">
+ type="j2ee:xsdNonNegativeIntegerType"
+ minOccurs="0">
<xsd:annotation>
<xsd:documentation>
@@ -988,12 +972,12 @@
</xsd:annotation>
</xsd:element>
</xsd:sequence>
-
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
-<xsd:simpleType name="transport-guaranteeType">
+<xsd:complexType name="transport-guaranteeType">
<xsd:annotation>
<xsd:documentation>
@@ -1015,13 +999,14 @@
</xsd:documentation>
</xsd:annotation>
- <xsd:restriction base="j2ee:string">
- <xsd:enumeration value="NONE"/>
- <xsd:enumeration value="INTEGRAL"/>
- <xsd:enumeration value="CONFIDENTIAL"/>
- </xsd:restriction>
-
-</xsd:simpleType>
+ <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>
<!-- **************************************************** -->
@@ -1046,7 +1031,7 @@
<xsd:element name="transport-guarantee"
type="j2ee:transport-guaranteeType"/>
</xsd:sequence>
-
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
@@ -1059,20 +1044,11 @@
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="j2ee:string">
+ <xsd:restriction base="xsd:token">
<xsd:enumeration value="2.4"/>
</xsd:restriction>
-
</xsd:simpleType>
<!-- **************************************************** -->
@@ -1080,18 +1056,7 @@
<xsd:complexType name="web-appType">
<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="distributable"
type="j2ee:emptyType"
minOccurs="0"/>
@@ -1145,18 +1110,6 @@
<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"
@@ -1180,6 +1133,19 @@
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"
@@ -1197,7 +1163,7 @@
<xsd:attribute name="version"
type="j2ee:web-app-versionType"
use="required"/>
-
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
@@ -1240,7 +1206,7 @@
type="j2ee:http-methodType"
minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
-
+ <xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
<!-- **************************************************** -->
@@ -1271,7 +1237,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]>
