Modified: tomcat/trunk/java/javax/servlet/resources/javaee_web_services_client_1_4.xsd URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/javaee_web_services_client_1_4.xsd?rev=1816622&r1=1816621&r2=1816622&view=diff ============================================================================== --- tomcat/trunk/java/javax/servlet/resources/javaee_web_services_client_1_4.xsd (original) +++ tomcat/trunk/java/javax/servlet/resources/javaee_web_services_client_1_4.xsd Wed Nov 29 10:46:54 2017 @@ -47,13 +47,9 @@ only if the new code is made subject to such option by the copyright holder. - </xsd:documentation> - </xsd:annotation> - - <xsd:annotation> - <xsd:documentation> The Apache Software Foundation elects to include this software under the CDDL license. + </xsd:documentation> </xsd:annotation> @@ -153,7 +149,7 @@ <xsd:documentation> The jaxrpc-mapping-file element contains the name of a file that - describes the JAX-RPC mapping between the Java interfaces used by + describes the JAX-RPC mapping between the Java interaces used by the application and the WSDL description in the wsdl-file. The file name is a relative path within the module file. @@ -200,13 +196,13 @@ <xsd:annotation> <xsd:documentation> - Declares the handler for a port-component. Handlers can - access the init-param name/value pairs using the - HandlerInfo interface. If port-name is not specified, the - handler is assumed to be associated with all ports of the - service. + Declares the handler for a port-component. Handlers can + access the init-param name/value pairs using the + HandlerInfo interface. If port-name is not specified, the + handler is assumed to be associated with all ports of the + service. - To be used with JAX-RPC based runtime only. + To be used with JAX-RPC based runtime only. </xsd:documentation> </xsd:annotation> @@ -218,7 +214,7 @@ <xsd:annotation> <xsd:documentation> - To be used with JAX-WS based runtime only. + To be used with JAX-WS based runtime only. </xsd:documentation> </xsd:annotation> @@ -488,31 +484,31 @@ Exact Name: service-name-pattern="ns1:EchoService" - In this case, handlers specified in this - handler-chain element will apply to all ports with - this exact service name. The namespace prefix must - have been declared in a namespace declaration - attribute in either the start-tag of the element - where the prefix is used or in an an ancestor - element (i.e. an element in whose content the - prefixed markup occurs) + In this case, handlers specified in this + handler-chain element will apply to all ports with + this exact service name. The namespace prefix must + have been declared in a namespace declaration + attribute in either the start-tag of the element + where the prefix is used or in an an ancestor + element (i.e. an element in whose content the + prefixed markup occurs) Pattern : service-name-pattern="ns1:EchoService*" - In this case, handlers specified in this - handler-chain element will apply to all ports whose - Service names are like EchoService1, EchoServiceFoo - etc. The namespace prefix must have been declared in - a namespace declaration attribute in either the - start-tag of the element where the prefix is used or - in an an ancestor element (i.e. an element in whose - content the prefixed markup occurs) + In this case, handlers specified in this + handler-chain element will apply to all ports whose + Service names are like EchoService1, EchoServiceFoo + etc. The namespace prefix must have been declared in + a namespace declaration attribute in either the + start-tag of the element where the prefix is used or + in an an ancestor element (i.e. an element in whose + content the prefixed markup occurs) Wild Card : service-name-pattern="*" - In this case, handlers specified in this handler-chain - element will apply to ports of all service names. + In this case, handlers specified in this handler-chain + element will apply to ports of all service names. The same can be applied to port-name attribute in handler-chain element.
Modified: tomcat/trunk/java/javax/servlet/resources/web-app_4_0.xsd URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/web-app_4_0.xsd?rev=1816622&r1=1816621&r2=1816622&view=diff ============================================================================== --- tomcat/trunk/java/javax/servlet/resources/web-app_4_0.xsd (original) +++ tomcat/trunk/java/javax/servlet/resources/web-app_4_0.xsd Wed Nov 29 10:46:54 2017 @@ -1,48 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- - - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - - Copyright (c) 2009-2015 Oracle and/or its affiliates. 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 "License"). You - may not use this file except in compliance with the License. You can - obtain a copy of the License at - https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html - or packager/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 packager/legal/LICENSE.txt. - - GPL Classpath Exception: - Oracle designates this particular file as subject to the "Classpath" - exception as provided by Oracle in the GPL Version 2 section of the License - file that accompanied this code. - - Modifications: - If applicable, add the following below the License Header, with the fields - enclosed by brackets [] replaced by your own identifying information: - "Portions Copyright [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 distribution under the [CDDL or GPL - Version 2] license." If you don't indicate a single choice of license, a - recipient has the option to distribute your version of this file under - either the CDDL, the GPL Version 2 or to extend the choice of license to - its licensees as provided above. However, if you add GPL Version 2 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. - - The Apache Software Foundation elects to include this software under the - CDDL license. - ---> <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"; targetNamespace="http://xmlns.jcp.org/xml/ns/javaee"; xmlns:javaee="http://xmlns.jcp.org/xml/ns/javaee"; @@ -50,58 +6,109 @@ elementFormDefault="qualified" attributeFormDefault="unqualified" version="4.0"> - <xsd:annotation> <xsd:documentation> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="license.inc" parse="text"/> + + DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + + Copyright (c) 2009-2017 Oracle and/or its affiliates. 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 "License"). You + may not use this file except in compliance with the License. You can + obtain a copy of the License at + https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html + or packager/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 packager/legal/LICENSE.txt. + + GPL Classpath Exception: + Oracle designates this particular file as subject to the "Classpath" + exception as provided by Oracle in the GPL Version 2 section of the License + file that accompanied this code. + + Modifications: + If applicable, add the following below the License Header, with the fields + enclosed by brackets [] replaced by your own identifying information: + "Portions Copyright [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 distribution under the [CDDL or GPL + Version 2] license." If you don't indicate a single choice of license, a + recipient has the option to distribute your version of this file under + either the CDDL, the GPL Version 2 or to extend the choice of license to + its licensees as provided above. However, if you add GPL Version 2 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. + + The Apache Software Foundation elects to include this software under the + CDDL license. + </xsd:documentation> </xsd:annotation> <xsd:annotation> <xsd:documentation> <![CDATA[ + This is the XML Schema for the Servlet 4.0 deployment descriptor. + The deployment descriptor must be named "WEB-INF/web.xml" in the + web application's war file. All Servlet deployment descriptors + must indicate the web application schema by using the Java EE + namespace: + + http://xmlns.jcp.org/xml/ns/javaee + + and by indicating the version of the schema by + using the version element as shown below: + + <web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="..." + version="4.0"> + ... + </web-app> + + The instance documents may indicate the published version of + the schema using the xsi:schemaLocation attribute for Java EE + namespace with the following location: - This is the XML Schema for the Servlet 4.0 deployment descriptor. - The deployment descriptor must be named "WEB-INF/web.xml" in the - web application's war file. All Servlet deployment descriptors - must indicate the web application schema by using the Java EE - namespace: - - http://xmlns.jcp.org/xml/ns/javaee - - and by indicating the version of the schema by - using the version element as shown below: - - <web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="..." - version="4.0"> - ... - </web-app> - - 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://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd + http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd - ]]> + ]]> </xsd:documentation> </xsd:annotation> <xsd:annotation> <xsd:documentation> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="common.inc" parse="text"/> + + 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. + </xsd:documentation> </xsd:annotation> - <!-- **************************************************** --> - <xsd:include schemaLocation="web-common_4_0.xsd"/> - <!-- **************************************************** --> - <xsd:element name="web-app" type="javaee:web-appType"> +<!-- **************************************************** --> + + <xsd:element name="web-app" + type="javaee:web-appType"> <xsd:annotation> <xsd:documentation> @@ -122,7 +129,6 @@ </xsd:documentation> </xsd:annotation> - <xsd:unique name="web-common-servlet-name-uniqueness"> <xsd:annotation> <xsd:documentation> @@ -133,9 +139,8 @@ </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> @@ -146,9 +151,8 @@ </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> @@ -164,9 +168,8 @@ </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> @@ -182,9 +185,8 @@ </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> @@ -198,9 +200,8 @@ </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> @@ -214,10 +215,8 @@ </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> @@ -230,9 +229,8 @@ </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> @@ -244,11 +242,9 @@ </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> @@ -259,9 +255,8 @@ </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"> <xsd:annotation> @@ -273,10 +268,11 @@ </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> + <!-- **************************************************** --> <xsd:complexType name="web-appType"> @@ -286,45 +282,53 @@ type="javaee:string" minOccurs="0"/> <xsd:group ref="javaee:web-commonType"/> - <xsd:element name="default-context-path" type="javaee:string"> + <xsd:element name="default-context-path" + type="javaee:string"> <xsd:annotation> <xsd:documentation> When specified, this element provides a default context path - of the web application. The default context path starts - with a / character. If it is not rooted at the root of the - server's name space, the path does not end with a / character. + of the web application. An empty value for this element must cause + the web application to be deployed at the root for the container. + Otherwise, the default context path must start with + a â/â character but not end with a â/â character. + Servlet containers may provide vendor specific configuration + options that allows specifying a value that overrides the value + specified here. </xsd:documentation> </xsd:annotation> </xsd:element> - <xsd:element name="request-encoding" type="javaee:string"> + <xsd:element name="request-character-encoding" + type="javaee:string"> <xsd:annotation> <xsd:documentation> When specified, this element provides a default request - encoding of the web application. + character encoding of the web application. </xsd:documentation> </xsd:annotation> </xsd:element> - <xsd:element name="response-encoding" type="javaee:string"> + <xsd:element name="response-character-encoding" + type="javaee:string"> <xsd:annotation> <xsd:documentation> When specified, this element provides a default response - encoding of the web application. + character encoding of the web application. </xsd:documentation> </xsd:annotation> </xsd:element> - <xsd:element name="deny-uncovered-http-methods" type="javaee:emptyType"> + <xsd:element name="deny-uncovered-http-methods" + type="javaee:emptyType"> <xsd:annotation> <xsd:documentation> When specified, this element causes uncovered http methods to be denied. For every url-pattern that is the target of a - security-constraint, this element causes all HTTP methods that + security-constrant, this element causes all HTTP methods that are NOT covered (by a security constraint) at the url-pattern to be denied. @@ -337,6 +341,7 @@ <xsd:attributeGroup ref="javaee:web-common-attributes"/> </xsd:complexType> + <!-- **************************************************** --> <xsd:complexType name="absoluteOrderingType"> Modified: tomcat/trunk/java/javax/servlet/resources/web-common_4_0.xsd URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/web-common_4_0.xsd?rev=1816622&r1=1816621&r2=1816622&view=diff ============================================================================== --- tomcat/trunk/java/javax/servlet/resources/web-common_4_0.xsd (original) +++ tomcat/trunk/java/javax/servlet/resources/web-common_4_0.xsd Wed Nov 29 10:46:54 2017 @@ -1,48 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- - - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - - Copyright (c) 2009-2015 Oracle and/or its affiliates. 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 "License"). You - may not use this file except in compliance with the License. You can - obtain a copy of the License at - https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html - or packager/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 packager/legal/LICENSE.txt. - - GPL Classpath Exception: - Oracle designates this particular file as subject to the "Classpath" - exception as provided by Oracle in the GPL Version 2 section of the License - file that accompanied this code. - - Modifications: - If applicable, add the following below the License Header, with the fields - enclosed by brackets [] replaced by your own identifying information: - "Portions Copyright [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 distribution under the [CDDL or GPL - Version 2] license." If you don't indicate a single choice of license, a - recipient has the option to distribute your version of this file under - either the CDDL, the GPL Version 2 or to extend the choice of license to - its licensees as provided above. However, if you add GPL Version 2 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. - - The Apache Software Foundation elects to include this software under the - CDDL license. - ---> <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"; targetNamespace="http://xmlns.jcp.org/xml/ns/javaee"; xmlns:javaee="http://xmlns.jcp.org/xml/ns/javaee"; @@ -50,58 +6,105 @@ elementFormDefault="qualified" attributeFormDefault="unqualified" version="4.0"> - <xsd:annotation> <xsd:documentation> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="license.inc" parse="text"/> + + DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + + Copyright (c) 2009-2017 Oracle and/or its affiliates. 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 "License"). You + may not use this file except in compliance with the License. You can + obtain a copy of the License at + https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html + or packager/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 packager/legal/LICENSE.txt. + + GPL Classpath Exception: + Oracle designates this particular file as subject to the "Classpath" + exception as provided by Oracle in the GPL Version 2 section of the License + file that accompanied this code. + + Modifications: + If applicable, add the following below the License Header, with the fields + enclosed by brackets [] replaced by your own identifying information: + "Portions Copyright [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 distribution under the [CDDL or GPL + Version 2] license." If you don't indicate a single choice of license, a + recipient has the option to distribute your version of this file under + either the CDDL, the GPL Version 2 or to extend the choice of license to + its licensees as provided above. However, if you add GPL Version 2 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. + + The Apache Software Foundation elects to include this software under the + CDDL license. + </xsd:documentation> </xsd:annotation> <xsd:annotation> <xsd:documentation> <![CDATA[ + This is the common XML Schema for the Servlet 4.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 + must indicate the web common schema by using the Java EE + namespace: + + http://xmlns.jcp.org/xml/ns/javaee + + and by indicating the version of the schema by + using the version element as shown below: + + <web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="..." + version="4.0"> + ... + </web-app> + + The instance documents may indicate the published version of + the schema using the xsi:schemaLocation attribute for Java EE + namespace with the following location: - This is the common XML Schema for the Servlet 4.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 - must indicate the web common schema by using the Java EE - namespace: - - http://xmlns.jcp.org/xml/ns/javaee - - and by indicating the version of the schema by - using the version element as shown below: - - <web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="..." - version="4.0"> - ... - </web-app> - - 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://xmlns.jcp.org/xml/ns/javaee/web-common_4_0.xsd - http://xmlns.jcp.org/xml/ns/javaee/web-common_4_0.xsd - - ]]> + ]]> </xsd:documentation> </xsd:annotation> <xsd:annotation> <xsd:documentation> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="common.inc" parse="text"/> - </xsd:documentation> - </xsd:annotation> + 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. + + </xsd:documentation> + </xsd:annotation> <xsd:include schemaLocation="javaee_7.xsd"/> - <xsd:include schemaLocation="jsp_2_3.xsd"/> -<!-- **************************************************** --> + <xsd:include schemaLocation="jsp_2_3.xsd"/> <xsd:group name="web-commonType"> <xsd:choice> @@ -120,7 +123,6 @@ </xsd:documentation> </xsd:annotation> </xsd:element> - <xsd:element name="filter" type="javaee:filterType"/> <xsd:element name="filter-mapping" @@ -155,15 +157,12 @@ </xsd:choice> </xsd:group> -<!-- **************************************************** --> - <xsd:attributeGroup name="web-common-attributes"> <xsd:attribute name="version" type="javaee:web-app-versionType" use="required"/> <xsd:attribute name="id" type="xsd:ID"/> - <xsd:attribute name="metadata-complete" type="xsd:boolean"> <xsd:annotation> @@ -192,6 +191,7 @@ </xsd:attribute> </xsd:attributeGroup> + <!-- **************************************************** --> <xsd:complexType name="auth-constraintType"> @@ -213,7 +213,6 @@ </xsd:documentation> </xsd:annotation> - <xsd:sequence> <xsd:element name="description" type="javaee:descriptionType" @@ -228,6 +227,7 @@ type="xsd:ID"/> </xsd:complexType> + <!-- **************************************************** --> <xsd:complexType name="auth-methodType"> @@ -246,12 +246,12 @@ </xsd:documentation> </xsd:annotation> - <xsd:simpleContent> <xsd:restriction base="javaee:string"/> </xsd:simpleContent> </xsd:complexType> + <!-- **************************************************** --> <xsd:complexType name="dispatcherType"> @@ -278,7 +278,6 @@ </xsd:documentation> </xsd:annotation> - <xsd:simpleContent> <xsd:restriction base="javaee:string"> <xsd:enumeration value="FORWARD"/> @@ -290,6 +289,7 @@ </xsd:simpleContent> </xsd:complexType> + <!-- **************************************************** --> <xsd:complexType name="error-codeType"> @@ -302,7 +302,6 @@ </xsd:documentation> </xsd:annotation> - <xsd:simpleContent> <xsd:restriction base="javaee:xsdPositiveIntegerType"> <xsd:pattern value="\d{3}"/> @@ -312,6 +311,7 @@ </xsd:simpleContent> </xsd:complexType> + <!-- **************************************************** --> <xsd:complexType name="error-pageType"> @@ -336,7 +336,6 @@ </xsd:documentation> </xsd:annotation> - <xsd:sequence> <xsd:choice minOccurs="0" maxOccurs="1"> @@ -354,7 +353,6 @@ </xsd:annotation> </xsd:element> </xsd:choice> - <xsd:element name="location" type="javaee:war-pathType"> <xsd:annotation> @@ -373,6 +371,7 @@ type="xsd:ID"/> </xsd:complexType> + <!-- **************************************************** --> <xsd:complexType name="filterType"> @@ -390,7 +389,6 @@ </xsd:documentation> </xsd:annotation> - <xsd:sequence> <xsd:group ref="javaee:descriptionGroup"/> <xsd:element name="filter-name" @@ -410,7 +408,6 @@ <xsd:element name="async-supported" type="javaee:true-falseType" minOccurs="0"/> - <xsd:element name="init-param" type="javaee:param-valueType" minOccurs="0" @@ -429,6 +426,7 @@ type="xsd:ID"/> </xsd:complexType> + <!-- **************************************************** --> <xsd:complexType name="filter-mappingType"> @@ -453,7 +451,6 @@ </xsd:documentation> </xsd:annotation> - <xsd:sequence> <xsd:element name="filter-name" type="javaee:filter-nameType"/> @@ -473,13 +470,16 @@ type="xsd:ID"/> </xsd:complexType> + <!-- **************************************************** --> <xsd:complexType name="nonEmptyStringType"> <xsd:annotation> <xsd:documentation> + This type defines a string which contains at least one character. + </xsd:documentation> </xsd:annotation> <xsd:simpleContent> @@ -489,6 +489,7 @@ </xsd:simpleContent> </xsd:complexType> + <!-- **************************************************** --> <xsd:complexType name="filter-nameType"> @@ -504,12 +505,12 @@ </xsd:documentation> </xsd:annotation> - <xsd:simpleContent> <xsd:extension base="javaee:nonEmptyStringType"/> </xsd:simpleContent> </xsd:complexType> + <!-- **************************************************** --> <xsd:complexType name="form-login-configType"> @@ -524,9 +525,7 @@ </xsd:documentation> </xsd:annotation> - <xsd:sequence> - <xsd:element name="form-login-page" type="javaee:war-pathType"> <xsd:annotation> @@ -540,7 +539,6 @@ </xsd:documentation> </xsd:annotation> </xsd:element> - <xsd:element name="form-error-page" type="javaee:war-pathType"> <xsd:annotation> @@ -555,44 +553,35 @@ </xsd:documentation> </xsd:annotation> </xsd:element> - </xsd:sequence> <xsd:attribute name="id" type="xsd:ID"/> </xsd:complexType> -<!-- **************************************************** --> - <xsd:simpleType name="http-methodType"> <xsd:annotation> - <xsd:documentation> A HTTP method type as defined in HTTP 1.1 section 2.2. </xsd:documentation> </xsd:annotation> - <xsd:restriction base="xsd:token"> - <xsd:pattern value="[!-~-[\(\)<>@,;:"/\[\]?=\{\}\\\p{Z}]]+"/> + <xsd:pattern value="[!-~-[\(\)<>@,;:"/\[\]?=\{\}\\\p{Z}]]+"/> </xsd:restriction> - </xsd:simpleType> -<!-- **************************************************** --> - <xsd:simpleType name="load-on-startupType"> <xsd:union memberTypes="javaee:null-charType xsd:integer"/> </xsd:simpleType> -<!-- **************************************************** --> - <xsd:simpleType name="null-charType"> <xsd:restriction base="xsd:string"> <xsd:enumeration value=""/> </xsd:restriction> </xsd:simpleType> + <!-- **************************************************** --> <xsd:complexType name="login-configType"> @@ -608,7 +597,6 @@ </xsd:documentation> </xsd:annotation> - <xsd:sequence> <xsd:element name="auth-method" type="javaee:auth-methodType" @@ -633,6 +621,7 @@ type="xsd:ID"/> </xsd:complexType> + <!-- **************************************************** --> <xsd:complexType name="mime-mappingType"> @@ -646,7 +635,6 @@ </xsd:documentation> </xsd:annotation> - <xsd:sequence> <xsd:annotation> <xsd:documentation> @@ -656,7 +644,6 @@ </xsd:documentation> </xsd:annotation> - <xsd:element name="extension" type="javaee:string"/> <xsd:element name="mime-type" @@ -666,6 +653,7 @@ type="xsd:ID"/> </xsd:complexType> + <!-- **************************************************** --> <xsd:complexType name="mime-typeType"> @@ -681,7 +669,6 @@ </xsd:documentation> </xsd:annotation> - <xsd:simpleContent> <xsd:restriction base="javaee:string"> <xsd:pattern value="[^\p{Cc}^\s]+/[^\p{Cc}^\s]+"/> @@ -689,6 +676,7 @@ </xsd:simpleContent> </xsd:complexType> + <!-- **************************************************** --> <xsd:complexType name="security-constraintType"> @@ -703,7 +691,6 @@ </xsd:documentation> </xsd:annotation> - <xsd:sequence> <xsd:element name="display-name" type="javaee:display-nameType" @@ -723,6 +710,7 @@ type="xsd:ID"/> </xsd:complexType> + <!-- **************************************************** --> <xsd:complexType name="servletType"> @@ -739,7 +727,6 @@ </xsd:documentation> </xsd:annotation> - <xsd:sequence> <xsd:group ref="javaee:descriptionGroup"/> <xsd:element name="servlet-name" @@ -757,12 +744,9 @@ </xsd:documentation> </xsd:annotation> </xsd:element> - <xsd:element name="jsp-file" type="javaee:jsp-fileType"/> - </xsd:choice> - <xsd:element name="init-param" type="javaee:param-valueType" minOccurs="0" @@ -815,6 +799,7 @@ type="xsd:ID"/> </xsd:complexType> + <!-- **************************************************** --> <xsd:complexType name="servlet-mappingType"> @@ -828,7 +813,6 @@ </xsd:documentation> </xsd:annotation> - <xsd:sequence> <xsd:element name="servlet-name" type="javaee:servlet-nameType"/> @@ -837,7 +821,8 @@ minOccurs="1" maxOccurs="unbounded"/> </xsd:sequence> - <xsd:attribute name="id" type="xsd:ID"/> + <xsd:attribute name="id" + type="xsd:ID"/> </xsd:complexType> @@ -853,12 +838,12 @@ </xsd:documentation> </xsd:annotation> - <xsd:simpleContent> <xsd:extension base="javaee:nonEmptyStringType"/> </xsd:simpleContent> </xsd:complexType> + <!-- **************************************************** --> <xsd:complexType name="session-configType"> @@ -872,7 +857,6 @@ </xsd:documentation> </xsd:annotation> - <xsd:sequence> <xsd:element name="session-timeout" type="javaee:xsdIntegerType" @@ -922,6 +906,7 @@ type="xsd:ID"/> </xsd:complexType> + <!-- **************************************************** --> <xsd:complexType name="cookie-configType"> @@ -935,7 +920,6 @@ </xsd:documentation> </xsd:annotation> - <xsd:sequence> <xsd:element name="name" type="javaee:cookie-nameType" @@ -1033,6 +1017,7 @@ type="xsd:ID"/> </xsd:complexType> + <!-- **************************************************** --> <xsd:complexType name="cookie-nameType"> @@ -1047,12 +1032,12 @@ </xsd:documentation> </xsd:annotation> - <xsd:simpleContent> <xsd:extension base="javaee:nonEmptyStringType"/> </xsd:simpleContent> </xsd:complexType> + <!-- **************************************************** --> <xsd:complexType name="cookie-domainType"> @@ -1066,12 +1051,12 @@ </xsd:documentation> </xsd:annotation> - <xsd:simpleContent> <xsd:extension base="javaee:nonEmptyStringType"/> </xsd:simpleContent> </xsd:complexType> + <!-- **************************************************** --> <xsd:complexType name="cookie-pathType"> @@ -1085,12 +1070,12 @@ </xsd:documentation> </xsd:annotation> - <xsd:simpleContent> <xsd:extension base="javaee:nonEmptyStringType"/> </xsd:simpleContent> </xsd:complexType> + <!-- **************************************************** --> <xsd:complexType name="cookie-commentType"> @@ -1104,12 +1089,12 @@ </xsd:documentation> </xsd:annotation> - <xsd:simpleContent> <xsd:extension base="javaee:nonEmptyStringType"/> </xsd:simpleContent> </xsd:complexType> + <!-- **************************************************** --> <xsd:complexType name="tracking-modeType"> @@ -1123,7 +1108,6 @@ </xsd:documentation> </xsd:annotation> - <xsd:simpleContent> <xsd:restriction base="javaee:string"> <xsd:enumeration value="COOKIE"/> @@ -1133,6 +1117,7 @@ </xsd:simpleContent> </xsd:complexType> + <!-- **************************************************** --> <xsd:complexType name="transport-guaranteeType"> @@ -1156,7 +1141,6 @@ </xsd:documentation> </xsd:annotation> - <xsd:simpleContent> <xsd:restriction base="javaee:string"> <xsd:enumeration value="NONE"/> @@ -1166,6 +1150,7 @@ </xsd:simpleContent> </xsd:complexType> + <!-- **************************************************** --> <xsd:complexType name="user-data-constraintType"> @@ -1180,7 +1165,6 @@ </xsd:documentation> </xsd:annotation> - <xsd:sequence> <xsd:element name="description" type="javaee:descriptionType" @@ -1193,7 +1177,8 @@ type="xsd:ID"/> </xsd:complexType> -<!-- ************************************************** --> + +<!-- **************************************************** --> <xsd:complexType name="war-pathType"> <xsd:annotation> @@ -1212,8 +1197,6 @@ </xsd:simpleContent> </xsd:complexType> -<!-- **************************************************** --> - <xsd:simpleType name="web-app-versionType"> <xsd:annotation> <xsd:documentation> @@ -1229,6 +1212,7 @@ </xsd:restriction> </xsd:simpleType> + <!-- **************************************************** --> <xsd:complexType name="web-resource-collectionType"> @@ -1249,7 +1233,6 @@ </xsd:documentation> </xsd:annotation> - <xsd:sequence> <xsd:element name="web-resource-name" type="javaee:string"> @@ -1277,8 +1260,10 @@ maxOccurs="unbounded"> <xsd:annotation> <xsd:documentation> + Each http-method names an HTTP method to which the constraint applies. + </xsd:documentation> </xsd:annotation> </xsd:element> @@ -1288,8 +1273,10 @@ maxOccurs="unbounded"> <xsd:annotation> <xsd:documentation> + Each http-method-omission names an HTTP method to which the constraint does not apply. + </xsd:documentation> </xsd:annotation> </xsd:element> @@ -1299,6 +1286,7 @@ type="xsd:ID"/> </xsd:complexType> + <!-- **************************************************** --> <xsd:complexType name="welcome-file-listType"> @@ -1312,7 +1300,6 @@ </xsd:documentation> </xsd:annotation> - <xsd:sequence> <xsd:element name="welcome-file" type="xsd:string" @@ -1331,8 +1318,6 @@ type="xsd:ID"/> </xsd:complexType> -<!-- **************************************************** --> - <xsd:simpleType name="localeType"> <xsd:annotation> <xsd:documentation> @@ -1342,14 +1327,11 @@ </xsd:documentation> </xsd:annotation> - <xsd:restriction base="xsd:string"> <xsd:pattern value="[a-z]{2}(_|-)?([\p{L}\-\p{Nd}]{2})?"/> </xsd:restriction> </xsd:simpleType> -<!-- **************************************************** --> - <xsd:simpleType name="encodingType"> <xsd:annotation> <xsd:documentation> @@ -1358,12 +1340,12 @@ </xsd:documentation> </xsd:annotation> - <xsd:restriction base="xsd:string"> <xsd:pattern value="[^\s]+"/> </xsd:restriction> </xsd:simpleType> + <!-- **************************************************** --> <xsd:complexType name="locale-encoding-mapping-listType"> @@ -1375,7 +1357,6 @@ </xsd:documentation> </xsd:annotation> - <xsd:sequence> <xsd:element name="locale-encoding-mapping" type="javaee:locale-encoding-mappingType" @@ -1385,6 +1366,7 @@ type="xsd:ID"/> </xsd:complexType> + <!-- **************************************************** --> <xsd:complexType name="locale-encoding-mappingType"> @@ -1398,7 +1380,6 @@ </xsd:documentation> </xsd:annotation> - <xsd:sequence> <xsd:element name="locale" type="javaee:localeType"/> @@ -1409,6 +1390,7 @@ type="xsd:ID"/> </xsd:complexType> + <!-- **************************************************** --> <xsd:complexType name="ordering-othersType"> @@ -1427,6 +1409,7 @@ type="xsd:ID"/> </xsd:complexType> + <!-- **************************************************** --> <xsd:complexType name="multipart-configType"> @@ -1445,7 +1428,9 @@ maxOccurs="1"> <xsd:annotation> <xsd:documentation> + The directory location where uploaded files will be stored + </xsd:documentation> </xsd:annotation> </xsd:element> @@ -1455,7 +1440,9 @@ maxOccurs="1"> <xsd:annotation> <xsd:documentation> + The maximum size limit of uploaded files + </xsd:documentation> </xsd:annotation> </xsd:element> @@ -1465,7 +1452,9 @@ maxOccurs="1"> <xsd:annotation> <xsd:documentation> + The maximum size limit of multipart/form-data requests + </xsd:documentation> </xsd:annotation> </xsd:element> @@ -1475,8 +1464,10 @@ 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> Modified: tomcat/trunk/java/javax/servlet/resources/web-fragment_4_0.xsd URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/web-fragment_4_0.xsd?rev=1816622&r1=1816621&r2=1816622&view=diff ============================================================================== --- tomcat/trunk/java/javax/servlet/resources/web-fragment_4_0.xsd (original) +++ tomcat/trunk/java/javax/servlet/resources/web-fragment_4_0.xsd Wed Nov 29 10:46:54 2017 @@ -1,48 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- - - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - - Copyright (c) 2009-2015 Oracle and/or its affiliates. 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 "License"). You - may not use this file except in compliance with the License. You can - obtain a copy of the License at - https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html - or packager/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 packager/legal/LICENSE.txt. - - GPL Classpath Exception: - Oracle designates this particular file as subject to the "Classpath" - exception as provided by Oracle in the GPL Version 2 section of the License - file that accompanied this code. - - Modifications: - If applicable, add the following below the License Header, with the fields - enclosed by brackets [] replaced by your own identifying information: - "Portions Copyright [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 distribution under the [CDDL or GPL - Version 2] license." If you don't indicate a single choice of license, a - recipient has the option to distribute your version of this file under - either the CDDL, the GPL Version 2 or to extend the choice of license to - its licensees as provided above. However, if you add GPL Version 2 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. - - The Apache Software Foundation elects to include this software under the - CDDL license. - ---> <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"; targetNamespace="http://xmlns.jcp.org/xml/ns/javaee"; xmlns:javaee="http://xmlns.jcp.org/xml/ns/javaee"; @@ -50,58 +6,109 @@ elementFormDefault="qualified" attributeFormDefault="unqualified" version="4.0"> - <xsd:annotation> <xsd:documentation> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="license.inc" parse="text"/> + + DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + + Copyright (c) 2009-2017 Oracle and/or its affiliates. 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 "License"). You + may not use this file except in compliance with the License. You can + obtain a copy of the License at + https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html + or packager/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 packager/legal/LICENSE.txt. + + GPL Classpath Exception: + Oracle designates this particular file as subject to the "Classpath" + exception as provided by Oracle in the GPL Version 2 section of the License + file that accompanied this code. + + Modifications: + If applicable, add the following below the License Header, with the fields + enclosed by brackets [] replaced by your own identifying information: + "Portions Copyright [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 distribution under the [CDDL or GPL + Version 2] license." If you don't indicate a single choice of license, a + recipient has the option to distribute your version of this file under + either the CDDL, the GPL Version 2 or to extend the choice of license to + its licensees as provided above. However, if you add GPL Version 2 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. + + The Apache Software Foundation elects to include this software under the + CDDL license. + </xsd:documentation> </xsd:annotation> <xsd:annotation> <xsd:documentation> <![CDATA[ + This is the XML Schema for the Servlet 4.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://xmlns.jcp.org/xml/ns/javaee + + and by indicating the version of the schema by + using the version element as shown below: + + <web-fragment xmlns="http://xmlns.jcp.org/xml/ns/javaee"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="..." + version="4.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: - This is the XML Schema for the Servlet 4.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://xmlns.jcp.org/xml/ns/javaee - - and by indicating the version of the schema by - using the version element as shown below: - - <web-fragment xmlns="http://xmlns.jcp.org/xml/ns/javaee"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="..." - version="4.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://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd - http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd - - ]]> + ]]> </xsd:documentation> </xsd:annotation> <xsd:annotation> <xsd:documentation> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="common.inc" parse="text"/> + + 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. + </xsd:documentation> </xsd:annotation> - <!-- **************************************************** --> - <xsd:include schemaLocation="web-common_4_0.xsd"/> - <!-- **************************************************** --> - <xsd:element name="web-fragment" type="javaee:web-fragmentType"> +<!-- **************************************************** --> + + <xsd:element name="web-fragment" + type="javaee:web-fragmentType"> <xsd:annotation> <xsd:documentation> @@ -122,7 +129,6 @@ </xsd:documentation> </xsd:annotation> - <xsd:unique name="web-common-servlet-name-uniqueness"> <xsd:annotation> <xsd:documentation> @@ -133,9 +139,8 @@ </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> @@ -146,9 +151,8 @@ </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> @@ -164,9 +168,8 @@ </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> @@ -182,9 +185,8 @@ </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> @@ -198,9 +200,8 @@ </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> @@ -214,10 +215,8 @@ </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> @@ -230,9 +229,8 @@ </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> @@ -244,11 +242,9 @@ </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> @@ -259,9 +255,8 @@ </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"> <xsd:annotation> @@ -273,10 +268,11 @@ </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> + <!-- **************************************************** --> <xsd:complexType name="web-fragmentType"> @@ -291,6 +287,7 @@ <xsd:attributeGroup ref="javaee:web-common-attributes"/> </xsd:complexType> + <!-- **************************************************** --> <xsd:complexType name="orderingType"> @@ -313,6 +310,7 @@ </xsd:sequence> </xsd:complexType> + <!-- **************************************************** --> <xsd:complexType name="ordering-orderingType"> Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1816622&r1=1816621&r2=1816622&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Wed Nov 29 10:46:54 2017 @@ -56,6 +56,9 @@ <fix> Add bare bones support for default context path. (remm) </fix> + <fix> + Update the Java EE 8 XML schema to the released versions. (markt) + </fix> </changelog> </subsection> <subsection name="Other"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
