Author: markt
Date: Tue Oct 20 14:00:44 2009
New Revision: 827460
URL: http://svn.apache.org/viewvc?rev=827460&view=rev
Log:
Update to the latest schemas.
Note the stated election to use the CDDL
Modified:
tomcat/trunk/java/javax/servlet/resources/web-app_3_0.xsd
tomcat/trunk/java/javax/servlet/resources/web-common_3_0.xsd
tomcat/trunk/java/javax/servlet/resources/web-fragment_3_0.xsd
Modified: tomcat/trunk/java/javax/servlet/resources/web-app_3_0.xsd
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/web-app_3_0.xsd?rev=827460&r1=827459&r2=827460&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/resources/web-app_3_0.xsd (original)
+++ tomcat/trunk/java/javax/servlet/resources/web-app_3_0.xsd Tue Oct 20
14:00:44 2009
@@ -67,7 +67,7 @@
<xsd:annotation>
<xsd:documentation>
-<![CDATA[[
+ <![CDATA[[
This is the XML Schema for the Servlet 3.0 deployment descriptor.
The deployment descriptor must be named "WEB-INF/web.xml" in the
web application's war file. All Servlet deployment descriptors
@@ -92,7 +92,7 @@
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd
-]]>
+ ]]>
</xsd:documentation>
</xsd:annotation>
@@ -285,3 +285,4 @@
</xsd:element>
</xsd:schema>
+
Modified: tomcat/trunk/java/javax/servlet/resources/web-common_3_0.xsd
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/web-common_3_0.xsd?rev=827460&r1=827459&r2=827460&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/resources/web-common_3_0.xsd (original)
+++ tomcat/trunk/java/javax/servlet/resources/web-common_3_0.xsd Tue Oct 20
14:00:44 2009
@@ -67,7 +67,7 @@
<xsd:annotation>
<xsd:documentation>
-<![CDATA[[
+ <![CDATA[[
This is the common XML Schema for the Servlet 3.0 deployment descriptor.
This file is in turn used by web.xml and web-fragment.xml
web application's war file. All Servlet deployment descriptors
@@ -92,7 +92,7 @@
http://java.sun.com/xml/ns/javaee/web-common_3_0.xsd
-]]>
+ ]]>
</xsd:documentation>
</xsd:annotation>
@@ -211,10 +211,10 @@
<xsd:complexType name="web-appType">
<xsd:choice minOccurs="0"
maxOccurs="unbounded">
- <xsd:group ref="javaee:web-commonType"/>
<xsd:element name="module-name"
type="javaee:string"
minOccurs="0"/>
+ <xsd:group ref="javaee:web-commonType"/>
<xsd:element name="absolute-ordering"
type="javaee:absoluteOrderingType"/>
</xsd:choice>
@@ -433,7 +433,9 @@
<xsd:element name="filter-name"
type="javaee:filter-nameType"/>
<xsd:element name="filter-class"
- type="javaee:fully-qualified-classType">
+ type="javaee:fully-qualified-classType"
+ minOccurs="0"
+ maxOccurs="1">
<xsd:annotation>
<xsd:documentation>
@@ -768,7 +770,8 @@
<xsd:group ref="javaee:descriptionGroup"/>
<xsd:element name="servlet-name"
type="javaee:servlet-nameType"/>
- <xsd:choice>
+ <xsd:choice minOccurs="0"
+ maxOccurs="1">
<xsd:element name="servlet-class"
type="javaee:fully-qualified-classType">
<xsd:annotation>
@@ -1526,12 +1529,8 @@
<xsd:annotation>
<xsd:documentation>
- This element contains a sequence of "name" elements, each of which
- refers to an application configuration resource by the "name"
- declared on its web.xml fragment. This element can also contain
- a single "others" element which specifies that this document comes
- before or after other documents within the application.
- See section 8.2.2 of the specification for details.
+ This element specifies configuration information related to the
+ handling of multipart/form-data requests.
</xsd:documentation>
</xsd:annotation>
@@ -1539,20 +1538,54 @@
<xsd:element name="location"
type="javaee:string"
minOccurs="0"
- maxOccurs="1"/>
+ maxOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The directory location where uploaded files will be stored
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
<xsd:element name="max-file-size"
type="xsd:long"
minOccurs="0"
- maxOccurs="1"/>
+ maxOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The maximum size limit of uploaded files
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
<xsd:element name="max-request-size"
type="xsd:long"
minOccurs="0"
- maxOccurs="1"/>
+ maxOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The maximum size limit of multipart/form-data requests
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
<xsd:element name="file-size-threshold"
type="xsd:integer"
minOccurs="0"
- maxOccurs="1"/>
+ maxOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The size threshold after which an uploaded file will be
+ written to disk
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
</xsd:sequence>
</xsd:complexType>
</xsd:schema>
+
Modified: tomcat/trunk/java/javax/servlet/resources/web-fragment_3_0.xsd
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/web-fragment_3_0.xsd?rev=827460&r1=827459&r2=827460&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/resources/web-fragment_3_0.xsd (original)
+++ tomcat/trunk/java/javax/servlet/resources/web-fragment_3_0.xsd Tue Oct 20
14:00:44 2009
@@ -1,14 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema";
- targetNamespace="http://java.sun.com/xml/ns/javaee";
- xmlns:javaee="http://java.sun.com/xml/ns/javaee";
- xmlns:xsd="http://www.w3.org/2001/XMLSchema";
- elementFormDefault="qualified"
- attributeFormDefault="unqualified"
- version="3.0">
+ targetNamespace="http://java.sun.com/xml/ns/javaee";
+ xmlns:javaee="http://java.sun.com/xml/ns/javaee";
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified"
+ version="3.0">
<xsd:annotation>
<xsd:documentation>
- @(#)web-fragment_3_0.xsds
+
+ $Id$
+
</xsd:documentation>
</xsd:annotation>
@@ -16,9 +18,9 @@
<xsd:documentation>
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
- Copyright 2003-2007 Sun Microsystems, Inc. All rights reserved.
-
+
+ Copyright 2003-2009 Sun Microsystems, Inc. All rights reserved.
+
The contents of this file are subject to the terms of either the
GNU General Public License Version 2 only ("GPL") or the Common
Development and Distribution License("CDDL") (collectively, the
@@ -28,7 +30,7 @@
glassfish/bootstrap/legal/LICENSE.txt. See the License for the
specific language governing permissions and limitations under the
License.
-
+
When distributing the software, include this License Header
Notice in each file and include the License file at
glassfish/bootstrap/legal/LICENSE.txt. Sun designates this
@@ -38,9 +40,9 @@
below the License Header, with the fields enclosed by brackets []
replaced by your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
-
+
Contributor(s):
-
+
If you wish your version of this file to be governed by only the
CDDL or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this
@@ -52,7 +54,7 @@
code and therefore, elected the GPL Version 2 license, then the
option applies only if the new code is made subject to such
option by the copyright holder.
-
+
</xsd:documentation>
</xsd:annotation>
@@ -65,33 +67,32 @@
<xsd:annotation>
<xsd:documentation>
- <![CDATA[
-
- This is the XML Schema for the Servlet 3.0 deployment descriptor.
- The deployment descriptor must be named "META-INF/web-fragment.xml" in
the
- web fragment's jar file. All Servlet deployment descriptors
- must indicate the web fragment schema by using the Java EE
- namespace:
-
- http://java.sun.com/xml/ns/javaee
-
- and by indicating the version of the schema by
- using the version element as shown below:
-
- <web-fragment xmlns="http://java.sun.com/xml/ns/javaee";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="..."
- version="3.0">
- ...
- </web-fragment>
-
- The instance documents may indicate the published version of
- the schema using the xsi:schemaLocation attribute for Java EE
- namespace with the following location:
-
- http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd
-
- ]]>
+ <![CDATA[[
+ This is the XML Schema for the Servlet 3.0 deployment descriptor.
+ The deployment descriptor must be named "META-INF/web-fragment.xml"
+ in the web fragment's jar file. All Servlet deployment descriptors
+ must indicate the web application schema by using the Java EE
+ namespace:
+
+ http://java.sun.com/xml/ns/javaee
+
+ and by indicating the version of the schema by
+ using the version element as shown below:
+
+ <web-fragment xmlns="http://java.sun.com/xml/ns/javaee";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="..."
+ version="3.0">
+ ...
+ </web-fragment>
+
+ The instance documents may indicate the published version of
+ the schema using the xsi:schemaLocation attribute for Java EE
+ namespace with the following location:
+
+ http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd
+
+ ]]>
</xsd:documentation>
</xsd:annotation>
@@ -100,16 +101,16 @@
The following conventions apply to all Java EE
deployment descriptor elements unless indicated otherwise.
-
+
- In elements that specify a pathname to a file within the
- same JAR file, relative filenames (i.e., those not
- starting with "/") are considered relative to the root of
- the JAR file's namespace. Absolute filenames (i.e., those
- starting with "/") also specify names in the root of the
- JAR file's namespace. In general, relative names are
- preferred. The exception is .war files where absolute
- names are preferred for consistency with the Servlet API.
-
+ same JAR file, relative filenames (i.e., those not
+ starting with "/") are considered relative to the root of
+ the JAR file's namespace. Absolute filenames (i.e., those
+ starting with "/") also specify names in the root of the
+ JAR file's namespace. In general, relative names are
+ preferred. The exception is .war files where absolute
+ names are preferred for consistency with the Servlet API.
+
</xsd:documentation>
</xsd:annotation>
@@ -118,178 +119,168 @@
<!-- **************************************************** -->
- <xsd:element name="web-fragment" type="javaee:web-fragmentType">
+ <xsd:element name="web-fragment"
+ type="javaee:web-fragmentType">
<xsd:annotation>
<xsd:documentation>
- The web-fragment element is the root of the deployment
- descriptor for a web fragment. Note that the sub-elements
- of this element can be in the arbitrary order. Because of
- that, the multiplicity of the elements of distributable,
- session-config, welcome-file-list, jsp-config, login-config,
- and locale-encoding-mapping-list was changed from "?" to "*"
- in this schema. However, the deployment descriptor instance
- file must not contain multiple elements of session-config,
- jsp-config, and login-config. When there are multiple elements of
- welcome-file-list or locale-encoding-mapping-list, the container
- must concatenate the element contents. The multiple occurence
- of the element distributable is redundant and the container
- treats that case exactly in the same way when there is only
- one distributable.
-
+ The web-fragment element is the root of the deployment
+ descriptor for a web fragment. Note that the sub-elements
+ of this element can be in the arbitrary order. Because of
+ that, the multiplicity of the elements of distributable,
+ session-config, welcome-file-list, jsp-config, login-config,
+ and locale-encoding-mapping-list was changed from "?" to "*"
+ in this schema. However, the deployment descriptor instance
+ file must not contain multiple elements of session-config,
+ jsp-config, and login-config. When there are multiple elements of
+ welcome-file-list or locale-encoding-mapping-list, the container
+ must concatenate the element contents. The multiple occurence
+ of the element distributable is redundant and the container
+ treats that case exactly in the same way when there is only
+ one distributable.
+
</xsd:documentation>
</xsd:annotation>
-
<xsd:unique name="web-common-servlet-name-uniqueness">
<xsd:annotation>
- <xsd:documentation>
+ <xsd:documentation>
- The servlet element contains the name of a servlet.
- The name must be unique within the web application.
-
- </xsd:documentation>
+ The servlet element contains the name of a servlet.
+ The name must be unique within the web application.
+
+ </xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:servlet"/>
- <xsd:field xpath="javaee:servlet-name"/>
+ <xsd:field xpath="javaee:servlet-name"/>
</xsd:unique>
-
<xsd:unique name="web-common-filter-name-uniqueness">
<xsd:annotation>
- <xsd:documentation>
+ <xsd:documentation>
- The filter element contains the name of a filter.
- The name must be unique within the web application.
-
- </xsd:documentation>
+ The filter element contains the name of a filter.
+ The name must be unique within the web application.
+
+ </xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:filter"/>
- <xsd:field xpath="javaee:filter-name"/>
+ <xsd:field xpath="javaee:filter-name"/>
</xsd:unique>
-
<xsd:unique name="web-common-ejb-local-ref-name-uniqueness">
<xsd:annotation>
- <xsd:documentation>
-
- The ejb-local-ref-name element contains the name of an EJB
- reference. The EJB reference is an entry in the web
- application's environment and is relative to the
- java:comp/env context. The name must be unique within
- the web application.
+ <xsd:documentation>
- It is recommended that name is prefixed with "ejb/".
-
- </xsd:documentation>
+ The ejb-local-ref-name element contains the name of an EJB
+ reference. The EJB reference is an entry in the web
+ application's environment and is relative to the
+ java:comp/env context. The name must be unique within
+ the web application.
+
+ It is recommended that name is prefixed with "ejb/".
+
+ </xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:ejb-local-ref"/>
- <xsd:field xpath="javaee:ejb-ref-name"/>
+ <xsd:field xpath="javaee:ejb-ref-name"/>
</xsd:unique>
-
<xsd:unique name="web-common-ejb-ref-name-uniqueness">
<xsd:annotation>
- <xsd:documentation>
+ <xsd:documentation>
- The ejb-ref-name element contains the name of an EJB
- reference. The EJB reference is an entry in the web
- application's environment and is relative to the
- java:comp/env context. The name must be unique within
- the web application.
-
- It is recommended that name is prefixed with "ejb/".
-
- </xsd:documentation>
+ The ejb-ref-name element contains the name of an EJB
+ reference. The EJB reference is an entry in the web
+ application's environment and is relative to the
+ java:comp/env context. The name must be unique within
+ the web application.
+
+ It is recommended that name is prefixed with "ejb/".
+
+ </xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:ejb-ref"/>
- <xsd:field xpath="javaee:ejb-ref-name"/>
+ <xsd:field xpath="javaee:ejb-ref-name"/>
</xsd:unique>
-
<xsd:unique name="web-common-resource-env-ref-uniqueness">
<xsd:annotation>
- <xsd:documentation>
+ <xsd:documentation>
- The resource-env-ref-name element specifies the name of
- a resource environment reference; its value is the
- environment entry name used in the web application code.
- The name is a JNDI name relative to the java:comp/env
- context and must be unique within a web application.
-
- </xsd:documentation>
+ The resource-env-ref-name element specifies the name of
+ a resource environment reference; its value is the
+ environment entry name used in the web application code.
+ The name is a JNDI name relative to the java:comp/env
+ context and must be unique within a web application.
+
+ </xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:resource-env-ref"/>
- <xsd:field xpath="javaee:resource-env-ref-name"/>
+ <xsd:field xpath="javaee:resource-env-ref-name"/>
</xsd:unique>
-
<xsd:unique name="web-common-message-destination-ref-uniqueness">
<xsd:annotation>
- <xsd:documentation>
+ <xsd:documentation>
- The message-destination-ref-name element specifies the name of
- a message destination reference; its value is the
- environment entry name used in the web application code.
- The name is a JNDI name relative to the java:comp/env
- context and must be unique within a web application.
-
- </xsd:documentation>
+ The message-destination-ref-name element specifies the name of
+ a message destination reference; its value is the
+ environment entry name used in the web application code.
+ The name is a JNDI name relative to the java:comp/env
+ context and must be unique within a web application.
+
+ </xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:message-destination-ref"/>
- <xsd:field xpath="javaee:message-destination-ref-name"/>
+ <xsd:field xpath="javaee:message-destination-ref-name"/>
</xsd:unique>
-
<xsd:unique name="web-common-res-ref-name-uniqueness">
<xsd:annotation>
- <xsd:documentation>
-
- The res-ref-name element specifies the name of a
- resource manager connection factory reference. The name
- is a JNDI name relative to the java:comp/env context.
- The name must be unique within a web application.
+ <xsd:documentation>
- </xsd:documentation>
+ The res-ref-name element specifies the name of a
+ resource manager connection factory reference. The name
+ is a JNDI name relative to the java:comp/env context.
+ The name must be unique within a web application.
+
+ </xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:resource-ref"/>
- <xsd:field xpath="javaee:res-ref-name"/>
+ <xsd:field xpath="javaee:res-ref-name"/>
</xsd:unique>
-
<xsd:unique name="web-common-env-entry-name-uniqueness">
<xsd:annotation>
- <xsd:documentation>
-
- The env-entry-name element contains the name of a web
- application's environment entry. The name is a JNDI
- name relative to the java:comp/env context. The name
- must be unique within a web application.
+ <xsd:documentation>
- </xsd:documentation>
+ The env-entry-name element contains the name of a web
+ application's environment entry. The name is a JNDI
+ name relative to the java:comp/env context. The name
+ must be unique within a web application.
+
+ </xsd:documentation>
</xsd:annotation>
-
<xsd:selector xpath="javaee:env-entry"/>
- <xsd:field xpath="javaee:env-entry-name"/>
+ <xsd:field xpath="javaee:env-entry-name"/>
</xsd:unique>
-
<xsd:key name="web-common-role-name-key">
<xsd:annotation>
- <xsd:documentation>
-
- A role-name-key is specified to allow the references
- from the security-role-refs.
+ <xsd:documentation>
- </xsd:documentation>
+ A role-name-key is specified to allow the references
+ from the security-role-refs.
+
+ </xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:security-role"/>
- <xsd:field xpath="javaee:role-name"/>
+ <xsd:field xpath="javaee:role-name"/>
</xsd:key>
-
<xsd:keyref name="web-common-role-name-references"
- refer="javaee:web-common-role-name-key">
+ refer="javaee:web-common-role-name-key">
<xsd:annotation>
- <xsd:documentation>
-
- The keyref indicates the references from
- security-role-ref to a specified role-name.
+ <xsd:documentation>
- </xsd:documentation>
+ The keyref indicates the references from
+ security-role-ref to a specified role-name.
+
+ </xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:servlet/javaee:security-role-ref"/>
- <xsd:field xpath="javaee:role-link"/>
+ <xsd:field xpath="javaee:role-link"/>
</xsd:keyref>
</xsd:element>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
