patrickl 2002/08/12 17:01:16
Modified: src/share/dtd web-app_2_4.xsd
Log:
The attached patch contains the latest fix of servlet 2.4 deployment descriptor,
web-app_2_4.xsd.
+ change xsd:string to j2ee:string
+ element <locale-encoding-mapping-list> moved up before
the element <deployment-extension>
Submitted by: Yutaka Yoshida ([EMAIL PROTECTED])
Revision Changes Path
1.2 +17 -16 jakarta-servletapi-5/src/share/dtd/web-app_2_4.xsd
Index: web-app_2_4.xsd
===================================================================
RCS file: /home/cvs/jakarta-servletapi-5/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 30 Jul 2002 22:59:45 -0000 1.1
+++ web-app_2_4.xsd 13 Aug 2002 00:01:16 -0000 1.2
@@ -8,7 +8,7 @@
version="2.4">
<xsd:annotation>
<xsd:documentation>
-@(#)web-app_2_4.xsds 1.32 02/07/26
+@(#)web-app_2_4.xsds 1.34 02/08/01
</xsd:documentation>
</xsd:annotation>
@@ -479,7 +479,7 @@
</xsd:documentation>
</xsd:annotation>
- <xsd:restriction base="xsd:string"/>
+ <xsd:restriction base="j2ee:string"/>
</xsd:simpleType>
@@ -694,9 +694,9 @@
<xsd:sequence>
<xsd:element name="locale"
- type="xsd:string"/>
+ type="j2ee:string"/>
<xsd:element name="encoding"
- type="xsd:string"/>
+ type="j2ee:string"/>
</xsd:sequence>
</xsd:complexType>
@@ -721,7 +721,7 @@
type="j2ee:auth-methodType"
minOccurs="0"/>
<xsd:element name="realm-name"
- type="xsd:string" minOccurs="0">
+ type="j2ee:string" minOccurs="0">
<xsd:annotation>
<xsd:documentation>
@@ -763,7 +763,7 @@
</xsd:annotation>
<xsd:element name="extension"
- type="xsd:string"/>
+ type="j2ee:string"/>
<xsd:element name="mime-type"
type="j2ee:mime-typeType"/>
</xsd:sequence>
@@ -786,7 +786,7 @@
</xsd:documentation>
</xsd:annotation>
- <xsd:restriction base="xsd:string">
+ <xsd:restriction base="j2ee:string">
<xsd:pattern value="[\p{L}\-\p{Nd}]+/[\p{L}\-\p{Nd}\.]+"/>
</xsd:restriction>
@@ -861,7 +861,7 @@
</xsd:documentation>
</xsd:annotation>
- <xsd:restriction base="xsd:string"/>
+ <xsd:restriction base="j2ee:string"/>
</xsd:simpleType>
@@ -981,7 +981,8 @@
must be expressed in a whole number of minutes.
If the timeout is 0 or less, the container ensures
the default behaviour of sessions is never to time
- out.
+ out. If this element is not specified, the container
+ must set its default timeout period.
</xsd:documentation>
</xsd:annotation>
@@ -1068,7 +1069,7 @@
</xsd:documentation>
</xsd:annotation>
- <xsd:restriction base="xsd:string">
+ <xsd:restriction base="j2ee:string">
<xsd:enumeration value="2.4"/>
</xsd:restriction>
@@ -1183,14 +1184,14 @@
type="j2ee:message-destinationType"
minOccurs="0"
maxOccurs="unbounded"/>
- <xsd:element name="deployment-extension"
- type="j2ee:deployment-extensionType"
- minOccurs="0"
- maxOccurs="unbounded"/>
<xsd:element name="locale-encoding-mapping-list"
type="j2ee:locale-encoding-mapping-listType"
minOccurs="0"
maxOccurs="1"/>
+ <xsd:element name="deployment-extension"
+ type="j2ee:deployment-extensionType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
</xsd:sequence>
<xsd:attribute name="version"
@@ -1218,7 +1219,7 @@
<xsd:sequence>
<xsd:element name="web-resource-name"
- type="xsd:string">
+ type="j2ee:string">
<xsd:annotation>
<xsd:documentation>
@@ -1258,7 +1259,7 @@
<xsd:sequence>
<xsd:element name="welcome-file"
- type="xsd:string"
+ type="j2ee:string"
maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
