[jboss-cvs] JBossAS SVN: r70606 - projects/metadata/trunk/src/main/resources/schema.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Mar 10 08:00:19 EDT 2008
Author: alex.loubyansky at jboss.com
Date: 2008-03-10 08:00:19 -0400 (Mon, 10 Mar 2008)
New Revision: 70606
Modified:
projects/metadata/trunk/src/main/resources/schema/web-app_2_4.xsd
Log:
JBMETA-5
Modified: projects/metadata/trunk/src/main/resources/schema/web-app_2_4.xsd
===================================================================
--- projects/metadata/trunk/src/main/resources/schema/web-app_2_4.xsd 2008-03-10 05:03:56 UTC (rev 70605)
+++ projects/metadata/trunk/src/main/resources/schema/web-app_2_4.xsd 2008-03-10 12:00:19 UTC (rev 70606)
@@ -1,48 +1,51 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://java.sun.com/xml/ns/j2ee"
- xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- elementFormDefault="qualified"
- attributeFormDefault="unqualified"
- version="2.4">
+<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://java.sun.com/xml/ns/j2ee" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.4">
<xsd:annotation>
<xsd:documentation>
- @(#)web-app_2_4.xsds 1.57 03/04/07
+ @(#)web-app_2_4.xsds 1.61 04/04/16
</xsd:documentation>
</xsd:annotation>
<xsd:annotation>
<xsd:documentation>
- Copyright 2002 Sun Microsystems, Inc., 901 San Antonio
- Road, Palo Alto, California 94303, U.S.A. All rights
- reserved.
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- Sun Microsystems, Inc. has intellectual property rights
- relating to technology described in this document. In
- particular, and without limitation, these intellectual
- property rights may include one or more of the U.S. patents
- listed at http://www.sun.com/patents and one or more
- additional patents or pending patent applications in the
- U.S. and other countries.
+ Copyright 2003-2007 Sun Microsystems, Inc. All rights reserved.
- This document and the technology which it describes are
- distributed under licenses restricting their use, copying,
- distribution, and decompilation. No part of this document
- may be reproduced in any form by any means without prior
- written authorization of Sun and its licensors, if any.
+ 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.html or
+ glassfish/bootstrap/legal/LICENSE.txt. See the License for the
+ specific language governing permissions and limitations under the
+ License.
- Third-party software, including font technology, is
- copyrighted and licensed from Sun suppliers.
+ 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
+ particular file as subject to the "Classpath" exception as
+ provided by Sun in the GPL Version 2 section of the License file
+ that accompanied this code. If applicable, add the following
+ below the License Header, with the fields enclosed by brackets []
+ replaced by your own identifying information:
+ "Portions Copyrighted [year] [name of copyright owner]"
- Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
- JavaServer Pages, Enterprise JavaBeans and the Java Coffee
- Cup logo are trademarks or registered trademarks of Sun
- Microsystems, Inc. in the U.S. and other countries.
+ Contributor(s):
- Federal Acquisitions: Commercial Software - Government Users
- Subject to Standard License Terms and Conditions.
+ 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.
</xsd:documentation>
</xsd:annotation>
@@ -126,7 +129,7 @@
</xsd:documentation>
</xsd:annotation>
- <xsd:unique name="servlet-name-uniqueness">
+ <xsd:unique name="web-app-servlet-name-uniqueness">
<xsd:annotation>
<xsd:documentation>
@@ -136,10 +139,10 @@
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="j2ee:servlet"/>
- <xsd:field xpath="j2ee:servlet-name"/>
+ <xsd:field xpath="j2ee:servlet-name"/>
</xsd:unique>
- <xsd:unique name="filter-name-uniqueness">
+ <xsd:unique name="web-app-filter-name-uniqueness">
<xsd:annotation>
<xsd:documentation>
@@ -149,10 +152,10 @@
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="j2ee:filter"/>
- <xsd:field xpath="j2ee:filter-name"/>
+ <xsd:field xpath="j2ee:filter-name"/>
</xsd:unique>
- <xsd:unique name="ejb-local-ref-name-uniqueness">
+ <xsd:unique name="web-app-ejb-local-ref-name-uniqueness">
<xsd:annotation>
<xsd:documentation>
@@ -167,10 +170,10 @@
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="j2ee:ejb-local-ref"/>
- <xsd:field xpath="j2ee:ejb-ref-name"/>
+ <xsd:field xpath="j2ee:ejb-ref-name"/>
</xsd:unique>
- <xsd:unique name="ejb-ref-name-uniqueness">
+ <xsd:unique name="web-app-ejb-ref-name-uniqueness">
<xsd:annotation>
<xsd:documentation>
@@ -185,10 +188,10 @@
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="j2ee:ejb-ref"/>
- <xsd:field xpath="j2ee:ejb-ref-name"/>
+ <xsd:field xpath="j2ee:ejb-ref-name"/>
</xsd:unique>
- <xsd:unique name="resource-env-ref-uniqueness">
+ <xsd:unique name="web-app-resource-env-ref-uniqueness">
<xsd:annotation>
<xsd:documentation>
@@ -201,10 +204,10 @@
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="j2ee:resource-env-ref"/>
- <xsd:field xpath="j2ee:resource-env-ref-name"/>
+ <xsd:field xpath="j2ee:resource-env-ref-name"/>
</xsd:unique>
- <xsd:unique name="message-destination-ref-uniqueness">
+ <xsd:unique name="web-app-message-destination-ref-uniqueness">
<xsd:annotation>
<xsd:documentation>
@@ -217,10 +220,10 @@
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="j2ee:message-destination-ref"/>
- <xsd:field xpath="j2ee:message-destination-ref-name"/>
+ <xsd:field xpath="j2ee:message-destination-ref-name"/>
</xsd:unique>
- <xsd:unique name="res-ref-name-uniqueness">
+ <xsd:unique name="web-app-res-ref-name-uniqueness">
<xsd:annotation>
<xsd:documentation>
@@ -232,10 +235,10 @@
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="j2ee:resource-ref"/>
- <xsd:field xpath="j2ee:res-ref-name"/>
+ <xsd:field xpath="j2ee:res-ref-name"/>
</xsd:unique>
- <xsd:unique name="env-entry-name-uniqueness">
+ <xsd:unique name="web-app-env-entry-name-uniqueness">
<xsd:annotation>
<xsd:documentation>
@@ -248,10 +251,10 @@
</xsd:annotation>
<xsd:selector xpath="j2ee:env-entry"/>
- <xsd:field xpath="j2ee:env-entry-name"/>
+ <xsd:field xpath="j2ee:env-entry-name"/>
</xsd:unique>
- <xsd:key name="role-name-key">
+ <xsd:key name="web-app-role-name-key">
<xsd:annotation>
<xsd:documentation>
@@ -261,11 +264,10 @@
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="j2ee:security-role"/>
- <xsd:field xpath="j2ee:role-name"/>
+ <xsd:field xpath="j2ee:role-name"/>
</xsd:key>
- <xsd:keyref name="role-name-references"
- refer="j2ee:role-name-key">
+ <xsd:keyref name="web-app-role-name-references" refer="j2ee:web-app-role-name-key">
<xsd:annotation>
<xsd:documentation>
@@ -275,7 +277,7 @@
</xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="j2ee:servlet/j2ee:security-role-ref"/>
- <xsd:field xpath="j2ee:role-link"/>
+ <xsd:field xpath="j2ee:role-link"/>
</xsd:keyref>
</xsd:element>
@@ -303,12 +305,8 @@
</xsd:annotation>
<xsd:sequence>
- <xsd:element name="description"
- type="j2ee:descriptionType"
- minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="role-name"
- type="j2ee:role-nameType"
- minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="description" type="j2ee:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="role-name" type="j2ee:role-nameType" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
<xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
@@ -421,11 +419,9 @@
<xsd:sequence>
<xsd:choice>
- <xsd:element name="error-code"
- type="j2ee:error-codeType"/>
+ <xsd:element name="error-code" type="j2ee:error-codeType"/>
- <xsd:element name="exception-type"
- type="j2ee:fully-qualified-classType">
+ <xsd:element name="exception-type" type="j2ee:fully-qualified-classType">
<xsd:annotation>
<xsd:documentation>
@@ -437,8 +433,7 @@
</xsd:element>
</xsd:choice>
- <xsd:element name="location"
- type="j2ee:war-pathType">
+ <xsd:element name="location" type="j2ee:war-pathType">
<xsd:annotation>
<xsd:documentation>
@@ -480,17 +475,12 @@
</xsd:annotation>
<xsd:sequence>
- <xsd:element name="filter-name"
- type="j2ee:filter-nameType"/>
+ <xsd:element name="filter-name" type="j2ee:filter-nameType"/>
<xsd:choice>
- <xsd:element name="url-pattern"
- type="j2ee:url-patternType"/>
- <xsd:element name="servlet-name"
- type="j2ee:servlet-nameType"/>
+ <xsd:element name="url-pattern" type="j2ee:url-patternType"/>
+ <xsd:element name="servlet-name" type="j2ee:servlet-nameType"/>
</xsd:choice>
- <xsd:element name="dispatcher"
- type="j2ee:dispatcherType"
- minOccurs="0" maxOccurs="4"/>
+ <xsd:element name="dispatcher" type="j2ee:dispatcherType" minOccurs="0" maxOccurs="4"/>
</xsd:sequence>
<xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
@@ -536,10 +526,8 @@
<xsd:sequence>
<xsd:group ref="j2ee:descriptionGroup"/>
- <xsd:element name="filter-name"
- type="j2ee:filter-nameType"/>
- <xsd:element name="filter-class"
- type="j2ee:fully-qualified-classType">
+ <xsd:element name="filter-name" type="j2ee:filter-nameType"/>
+ <xsd:element name="filter-class" type="j2ee:fully-qualified-classType">
<xsd:annotation>
<xsd:documentation>
@@ -549,9 +537,7 @@
</xsd:annotation>
</xsd:element>
- <xsd:element name="init-param"
- type="j2ee:param-valueType"
- minOccurs="0" maxOccurs="unbounded">
+ <xsd:element name="init-param" type="j2ee:param-valueType" minOccurs="0" maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation>
@@ -582,8 +568,7 @@
<xsd:sequence>
- <xsd:element name="form-login-page"
- type="j2ee:war-pathType">
+ <xsd:element name="form-login-page" type="j2ee:war-pathType">
<xsd:annotation>
<xsd:documentation>
@@ -596,8 +581,7 @@
</xsd:annotation>
</xsd:element>
- <xsd:element name="form-error-page"
- type="j2ee:war-pathType">
+ <xsd:element name="form-error-page" type="j2ee:war-pathType">
<xsd:annotation>
<xsd:documentation>
@@ -643,42 +627,6 @@
<!-- **************************************************** -->
- <!-- This is already defined in in j2ee_1_4.xsd
-
- <xsd:complexType name="listenerType">
- <xsd:annotation>
- <xsd:documentation>
-
- The listenerType indicates the deployment properties for a web
- application listener bean.
-
- Used in: web-app:listenerType
-
- </xsd:documentation>
- </xsd:annotation>
-
- <xsd:sequence>
- <xsd:group ref="j2ee:descriptionGroup"/>
- <xsd:element name="listener-class"
- type="j2ee:fully-qualified-classType">
- <xsd:annotation>
- <xsd:documentation>
-
- The listener-class element declares a class in the
- application must be registered as a web
- application listener bean. The value is the fully
- qualified classname of the listener class.
-
- </xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- </xsd:sequence>
- <xsd:attribute name="id" type="xsd:ID"/>
- </xsd:complexType>
- -->
-
-<!-- **************************************************** -->
-
<xsd:complexType name="locale-encoding-mapping-listType">
<xsd:annotation>
<xsd:documentation>
@@ -690,9 +638,7 @@
</xsd:annotation>
<xsd:sequence>
- <xsd:element name="locale-encoding-mapping"
- type="j2ee:locale-encoding-mappingType"
- maxOccurs="unbounded"/>
+ <xsd:element name="locale-encoding-mapping" type="j2ee:locale-encoding-mappingType" maxOccurs="unbounded"/>
</xsd:sequence>
<xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
@@ -712,10 +658,8 @@
</xsd:annotation>
<xsd:sequence>
- <xsd:element name="locale"
- type="j2ee:localeType"/>
- <xsd:element name="encoding"
- type="j2ee:encodingType"/>
+ <xsd:element name="locale" type="j2ee:localeType"/>
+ <xsd:element name="encoding" type="j2ee:encodingType"/>
</xsd:sequence>
<xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
@@ -754,11 +698,8 @@
</xsd:annotation>
<xsd:sequence>
- <xsd:element name="auth-method"
- type="j2ee:auth-methodType"
- minOccurs="0"/>
- <xsd:element name="realm-name"
- type="j2ee:string" minOccurs="0">
+ <xsd:element name="auth-method" type="j2ee:auth-methodType" minOccurs="0"/>
+ <xsd:element name="realm-name" type="j2ee:string" minOccurs="0">
<xsd:annotation>
<xsd:documentation>
@@ -768,9 +709,7 @@
</xsd:documentation>
</xsd:annotation>
</xsd:element>
- <xsd:element name="form-login-config"
- type="j2ee:form-login-configType"
- minOccurs="0"/>
+ <xsd:element name="form-login-config" type="j2ee:form-login-configType" minOccurs="0"/>
</xsd:sequence>
<xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
@@ -799,10 +738,8 @@
</xsd:documentation>
</xsd:annotation>
- <xsd:element name="extension"
- type="j2ee:string"/>
- <xsd:element name="mime-type"
- type="j2ee:mime-typeType"/>
+ <xsd:element name="extension" type="j2ee:string"/>
+ <xsd:element name="mime-type" type="j2ee:mime-typeType"/>
</xsd:sequence>
<xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
@@ -825,7 +762,7 @@
<xsd:simpleContent>
<xsd:restriction base="j2ee:string">
- <xsd:pattern value="[\p{L}\-\p{Nd}]+/[\p{L}\-\p{Nd}\.]+"/>
+ <xsd:pattern value="[^\p{Cc}^\s]+/[^\p{Cc}^\s]+"/>
</xsd:restriction>
</xsd:simpleContent>
</xsd:complexType>
@@ -862,19 +799,10 @@
</xsd:annotation>
<xsd:sequence>
- <xsd:element name="display-name"
- type="j2ee:display-nameType"
- minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="web-resource-collection"
- type="j2ee:web-resource-collectionType"
- maxOccurs="unbounded"/>
- <xsd:element name="auth-constraint"
- type="j2ee:auth-constraintType"
- minOccurs="0"/>
- <xsd:element name="user-data-constraint"
- type="j2ee:user-data-constraintType"
- minOccurs="0"/>
+ <xsd:element name="display-name" type="j2ee:display-nameType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="web-resource-collection" type="j2ee:web-resource-collectionType" maxOccurs="unbounded"/>
+ <xsd:element name="auth-constraint" type="j2ee:auth-constraintType" minOccurs="0"/>
+ <xsd:element name="user-data-constraint" type="j2ee:user-data-constraintType" minOccurs="0"/>
</xsd:sequence>
<xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
@@ -894,10 +822,8 @@
</xsd:annotation>
<xsd:sequence>
- <xsd:element name="servlet-name"
- type="j2ee:servlet-nameType"/>
- <xsd:element name="url-pattern"
- type="j2ee:url-patternType"/>
+ <xsd:element name="servlet-name" type="j2ee:servlet-nameType"/>
+ <xsd:element name="url-pattern" type="j2ee:url-patternType"/>
</xsd:sequence>
<xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
@@ -939,11 +865,9 @@
<xsd:sequence>
<xsd:group ref="j2ee:descriptionGroup"/>
- <xsd:element name="servlet-name"
- type="j2ee:servlet-nameType"/>
+ <xsd:element name="servlet-name" type="j2ee:servlet-nameType"/>
<xsd:choice>
- <xsd:element name="servlet-class"
- type="j2ee:fully-qualified-classType">
+ <xsd:element name="servlet-class" type="j2ee:fully-qualified-classType">
<xsd:annotation>
<xsd:documentation>
@@ -954,17 +878,12 @@
</xsd:annotation>
</xsd:element>
- <xsd:element name="jsp-file"
- type="j2ee:jsp-fileType"/>
+ <xsd:element name="jsp-file" type="j2ee:jsp-fileType"/>
</xsd:choice>
- <xsd:element name="init-param"
- type="j2ee:param-valueType"
- minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="load-on-startup"
- type="j2ee:xsdIntegerType"
- minOccurs="0">
+ <xsd:element name="init-param" type="j2ee:param-valueType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="load-on-startup" type="j2ee:xsdIntegerType" minOccurs="0">
<xsd:annotation>
<xsd:documentation>
@@ -988,12 +907,8 @@
</xsd:documentation>
</xsd:annotation>
</xsd:element>
- <xsd:element name="run-as"
- type="j2ee:run-asType"
- minOccurs="0"/>
- <xsd:element name="security-role-ref"
- type="j2ee:security-role-refType"
- minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="run-as" type="j2ee:run-asType" minOccurs="0"/>
+ <xsd:element name="security-role-ref" type="j2ee:security-role-refType" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
<xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
@@ -1013,9 +928,7 @@
</xsd:annotation>
<xsd:sequence>
- <xsd:element name="session-timeout"
- type="j2ee:xsdIntegerType"
- minOccurs="0">
+ <xsd:element name="session-timeout" type="j2ee:xsdIntegerType" minOccurs="0">
<xsd:annotation>
<xsd:documentation>
@@ -1084,12 +997,8 @@
</xsd:annotation>
<xsd:sequence>
- <xsd:element name="description"
- type="j2ee:descriptionType"
- minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="transport-guarantee"
- type="j2ee:transport-guaranteeType"/>
+ <xsd:element name="description" type="j2ee:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="transport-guarantee" type="j2ee:transport-guaranteeType"/>
</xsd:sequence>
<xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
@@ -1136,10 +1045,8 @@
<xsd:choice minOccurs="0" maxOccurs="unbounded">
<xsd:group ref="j2ee:descriptionGroup"/>
- <xsd:element name="distributable"
- type="j2ee:emptyType"/>
- <xsd:element name="context-param"
- type="j2ee:param-valueType">
+ <xsd:element name="distributable" type="j2ee:emptyType"/>
+ <xsd:element name="context-param" type="j2ee:param-valueType">
<xsd:annotation>
<xsd:documentation>
@@ -1152,42 +1059,25 @@
</xsd:annotation>
</xsd:element>
- <xsd:element name="filter"
- type="j2ee:filterType"/>
- <xsd:element name="filter-mapping"
- type="j2ee:filter-mappingType"/>
- <xsd:element name="listener"
- type="j2ee:listenerType"/>
- <xsd:element name="servlet"
- type="j2ee:servletType"/>
- <xsd:element name="servlet-mapping"
- type="j2ee:servlet-mappingType"/>
- <xsd:element name="session-config"
- type="j2ee:session-configType"/>
- <xsd:element name="mime-mapping"
- type="j2ee:mime-mappingType"/>
- <xsd:element name="welcome-file-list"
- type="j2ee:welcome-file-listType"/>
- <xsd:element name="error-page"
- type="j2ee:error-pageType"/>
- <xsd:element name="jsp-config"
- type="j2ee:jsp-configType"/>
- <xsd:element name="security-constraint"
- type="j2ee:security-constraintType"/>
- <xsd:element name="login-config"
- type="j2ee:login-configType"/>
- <xsd:element name="security-role"
- type="j2ee:security-roleType"/>
+ <xsd:element name="filter" type="j2ee:filterType"/>
+ <xsd:element name="filter-mapping" type="j2ee:filter-mappingType"/>
+ <xsd:element name="listener" type="j2ee:listenerType"/>
+ <xsd:element name="servlet" type="j2ee:servletType"/>
+ <xsd:element name="servlet-mapping" type="j2ee:servlet-mappingType"/>
+ <xsd:element name="session-config" type="j2ee:session-configType"/>
+ <xsd:element name="mime-mapping" type="j2ee:mime-mappingType"/>
+ <xsd:element name="welcome-file-list" type="j2ee:welcome-file-listType"/>
+ <xsd:element name="error-page" type="j2ee:error-pageType"/>
+ <xsd:element name="jsp-config" type="j2ee:jsp-configType"/>
+ <xsd:element name="security-constraint" type="j2ee:security-constraintType"/>
+ <xsd:element name="login-config" type="j2ee:login-configType"/>
+ <xsd:element name="security-role" type="j2ee:security-roleType"/>
<xsd:group ref="j2ee:jndiEnvironmentRefsGroup"/>
- <xsd:element name="message-destination"
- type="j2ee:message-destinationType"/>
- <xsd:element name="locale-encoding-mapping-list"
- type="j2ee:locale-encoding-mapping-listType"/>
+ <xsd:element name="message-destination" type="j2ee:message-destinationType"/>
+ <xsd:element name="locale-encoding-mapping-list" type="j2ee:locale-encoding-mapping-listType"/>
</xsd:choice>
- <xsd:attribute name="version"
- type="j2ee:web-app-versionType"
- use="required"/>
+ <xsd:attribute name="version" type="j2ee:web-app-versionType" use="required"/>
<xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
@@ -1209,8 +1099,7 @@
</xsd:annotation>
<xsd:sequence>
- <xsd:element name="web-resource-name"
- type="j2ee:string">
+ <xsd:element name="web-resource-name" type="j2ee:string">
<xsd:annotation>
<xsd:documentation>
@@ -1220,16 +1109,9 @@
</xsd:documentation>
</xsd:annotation>
</xsd:element>
- <xsd:element name="description"
- type="j2ee:descriptionType"
- minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="url-pattern"
- type="j2ee:url-patternType"
- maxOccurs="unbounded"/>
- <xsd:element name="http-method"
- type="j2ee:http-methodType"
- minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="description" type="j2ee:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="url-pattern" type="j2ee:url-patternType" maxOccurs="unbounded"/>
+ <xsd:element name="http-method" type="j2ee:http-methodType" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
<xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
@@ -1249,9 +1131,7 @@
</xsd:annotation>
<xsd:sequence>
- <xsd:element name="welcome-file"
- type="j2ee:string"
- maxOccurs="unbounded">
+ <xsd:element name="welcome-file" type="xsd:string" maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation>
@@ -1265,5 +1145,4 @@
<xsd:attribute name="id" type="xsd:ID"/>
</xsd:complexType>
-</xsd:schema>
-
+</xsd:schema>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list