From: markt Date: Tue, 20 Oct 2009 14:00:44 +0000 (+0000) Subject: Update to the latest schemas. X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=603faa43e7be4fdd564b9f17278c19a4727220d3;p=tomcat7.0 Update to the latest schemas. Note the stated election to use the CDDL git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@827460 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/java/javax/servlet/resources/web-app_3_0.xsd b/java/javax/servlet/resources/web-app_3_0.xsd index d2cdfbe3d..cdad777d6 100644 --- a/java/javax/servlet/resources/web-app_3_0.xsd +++ b/java/javax/servlet/resources/web-app_3_0.xsd @@ -67,7 +67,7 @@ - + ]]> @@ -285,3 +285,4 @@ + diff --git a/java/javax/servlet/resources/web-common_3_0.xsd b/java/javax/servlet/resources/web-common_3_0.xsd index 8015d73b0..3ca6dbc63 100644 --- a/java/javax/servlet/resources/web-common_3_0.xsd +++ b/java/javax/servlet/resources/web-common_3_0.xsd @@ -67,7 +67,7 @@ - + ]]> @@ -211,10 +211,10 @@ - + @@ -433,7 +433,9 @@ + type="javaee:fully-qualified-classType" + minOccurs="0" + maxOccurs="1"> @@ -768,7 +770,8 @@ - + @@ -1526,12 +1529,8 @@ - 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. @@ -1539,20 +1538,54 @@ + maxOccurs="1"> + + + + The directory location where uploaded files will be stored + + + + + maxOccurs="1"> + + + + The maximum size limit of uploaded files + + + + + maxOccurs="1"> + + + + The maximum size limit of multipart/form-data requests + + + + + maxOccurs="1"> + + + + The size threshold after which an uploaded file will be + written to disk + + + + + diff --git a/java/javax/servlet/resources/web-fragment_3_0.xsd b/java/javax/servlet/resources/web-fragment_3_0.xsd index 0705689ef..40b087434 100644 --- a/java/javax/servlet/resources/web-fragment_3_0.xsd +++ b/java/javax/servlet/resources/web-fragment_3_0.xsd @@ -1,14 +1,16 @@ + 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"> - @(#)web-fragment_3_0.xsds + + $Id$ + @@ -16,9 +18,9 @@ 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. - + @@ -65,33 +67,32 @@ - - ... - - - 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 - - ]]> + + ... + + + 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 + + ]]> @@ -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. + @@ -118,178 +119,168 @@ - + - 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. + - - + - The servlet element contains the name of a servlet. - The name must be unique within the web application. - - + The servlet element contains the name of a servlet. + The name must be unique within the web application. + + - + - - - - The filter element contains the name of a filter. - The name must be unique within the web application. + - + The filter element contains the name of a filter. + The name must be unique within the web application. + + - + - - - - 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/". - - + + + 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/". + + - + - - - - 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/". - - + + + 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/". + + - + - - - - 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. - - + + + 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. + + - + - - - - 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. - - + + + 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. + + - + - - - - 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. - - + + + 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. + + - + - - - - 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. - - + + + 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. + + - - + - - - - A role-name-key is specified to allow the references - from the security-role-refs. + - + A role-name-key is specified to allow the references + from the security-role-refs. + + - + - + refer="javaee:web-common-role-name-key"> - - - The keyref indicates the references from - security-role-ref to a specified role-name. + - + The keyref indicates the references from + security-role-ref to a specified role-name. + + - +