geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke...@apache.org
Subject svn commit: r486143 [2/2] - in /geronimo/sandbox/xsds: j2ee_1_4.xsd j2ee_web_services_1_1.xsd j2ee_web_services_client_1_1.xsd jsp_2_0.xsd jsp_2_1.xsd web-app_2_3.dtd web-app_2_4.xsd web-jsptaglibrary_2_0.xsd web-jsptaglibrary_2_1.xsd
Date Tue, 12 Dec 2006 13:53:51 GMT
Modified: geronimo/sandbox/xsds/web-app_2_4.xsd
URL: http://svn.apache.org/viewvc/geronimo/sandbox/xsds/web-app_2_4.xsd?view=diff&rev=486143&r1=486142&r2=486143
==============================================================================
--- geronimo/sandbox/xsds/web-app_2_4.xsd (original)
+++ geronimo/sandbox/xsds/web-app_2_4.xsd Tue Dec 12 05:53:50 2006
@@ -1,368 +1,325 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
 
 <!--
-  --  The actual Sun XSD for this stripped down XSD can be found at
-  --  http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd
-  --  This XSD contains only the functional elements for programatic use.
-  -->
+  **  The actual Sun XSD for this stripped down XSD can be found at
+  **  http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd
+  **  This XSD contains only the functional elements for programatic use.
+-->
 
 
-<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:include schemaLocation="j2ee_1_4.xsd" />
-	<xsd:include schemaLocation="jsp_2_0.xsd" />
-	<xsd:element name="web-app" type="j2ee:web-appType">
-		<xsd:unique name="web-app-servlet-name-uniqueness">
-			<xsd:selector xpath="j2ee:servlet" />
-			<xsd:field xpath="j2ee:servlet-name" />
-		</xsd:unique>
-		<xsd:unique name="web-app-filter-name-uniqueness">
-			<xsd:selector xpath="j2ee:filter" />
-			<xsd:field xpath="j2ee:filter-name" />
-		</xsd:unique>
-		<xsd:unique name="web-app-ejb-local-ref-name-uniqueness">
-			<xsd:selector xpath="j2ee:ejb-local-ref" />
-			<xsd:field xpath="j2ee:ejb-ref-name" />
-		</xsd:unique>
-		<xsd:unique name="web-app-ejb-ref-name-uniqueness">
-			<xsd:selector xpath="j2ee:ejb-ref" />
-			<xsd:field xpath="j2ee:ejb-ref-name" />
-		</xsd:unique>
-		<xsd:unique name="web-app-resource-env-ref-uniqueness">
-			<xsd:selector xpath="j2ee:resource-env-ref" />
-			<xsd:field xpath="j2ee:resource-env-ref-name" />
-		</xsd:unique>
-		<xsd:unique name="web-app-message-destination-ref-uniqueness">
-			<xsd:selector xpath="j2ee:message-destination-ref" />
-			<xsd:field xpath="j2ee:message-destination-ref-name" />
-		</xsd:unique>
-		<xsd:unique name="web-app-res-ref-name-uniqueness">
-			<xsd:selector xpath="j2ee:resource-ref" />
-			<xsd:field xpath="j2ee:res-ref-name" />
-		</xsd:unique>
-		<xsd:unique name="web-app-env-entry-name-uniqueness">
-			<xsd:selector xpath="j2ee:env-entry" />
-			<xsd:field xpath="j2ee:env-entry-name" />
-		</xsd:unique>
-		<xsd:key name="web-app-role-name-key">
-			<xsd:selector xpath="j2ee:security-role" />
-			<xsd:field xpath="j2ee:role-name" />
-		</xsd:key>
-		<xsd:keyref name="web-app-role-name-references"
-			refer="j2ee:web-app-role-name-key">
-			<xsd:selector xpath="j2ee:servlet/j2ee:security-role-ref" />
-			<xsd:field xpath="j2ee:role-link" />
-		</xsd:keyref>
-	</xsd:element>
-	<xsd:complexType name="auth-constraintType">
-		<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:sequence>
-		<xsd:attribute name="id" type="xsd:ID" />
-	</xsd:complexType>
-	<xsd:complexType name="auth-methodType">
-		<xsd:simpleContent>
-			<xsd:restriction base="j2ee:string" />
-		</xsd:simpleContent>
-	</xsd:complexType>
-	<xsd:complexType name="dispatcherType">
-		<xsd:simpleContent>
-			<xsd:restriction base="j2ee:string">
-				<xsd:enumeration value="FORWARD" />
-				<xsd:enumeration value="INCLUDE" />
-				<xsd:enumeration value="REQUEST" />
-				<xsd:enumeration value="ERROR" />
-			</xsd:restriction>
-		</xsd:simpleContent>
-	</xsd:complexType>
-	<xsd:simpleType name="encodingType">
-		<xsd:restriction base="xsd:string">
-			<xsd:pattern value="[^s]+" />
-		</xsd:restriction>
-	</xsd:simpleType>
-	<xsd:complexType name="error-codeType">
-		<xsd:simpleContent>
-			<xsd:restriction base="j2ee:xsdPositiveIntegerType">
-				<xsd:pattern value="d{3}" />
-				<xsd:attribute name="id" type="xsd:ID" />
-			</xsd:restriction>
-		</xsd:simpleContent>
-	</xsd:complexType>
-	<xsd:complexType name="error-pageType">
-		<xsd:sequence>
-			<xsd:choice>
-				<xsd:element name="error-code"
-					type="j2ee:error-codeType" />
-				<xsd:element name="exception-type"
-					type="j2ee:fully-qualified-classType">
-				</xsd:element>
-			</xsd:choice>
-			<xsd:element name="location" type="j2ee:war-pathType">
-			</xsd:element>
-		</xsd:sequence>
-		<xsd:attribute name="id" type="xsd:ID" />
-	</xsd:complexType>
-	<xsd:complexType name="filter-mappingType">
-		<xsd:sequence>
-			<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:choice>
-			<xsd:element name="dispatcher" type="j2ee:dispatcherType"
-				minOccurs="0" maxOccurs="4" />
-		</xsd:sequence>
-		<xsd:attribute name="id" type="xsd:ID" />
-	</xsd:complexType>
-	<xsd:complexType name="filter-nameType">
-		<xsd:simpleContent>
-			<xsd:extension base="j2ee:nonEmptyStringType" />
-		</xsd:simpleContent>
-	</xsd:complexType>
-	<xsd:complexType name="filterType">
-		<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>
-			<xsd:element name="init-param" type="j2ee:param-valueType"
-				minOccurs="0" maxOccurs="unbounded">
-			</xsd:element>
-		</xsd:sequence>
-		<xsd:attribute name="id" type="xsd:ID" />
-	</xsd:complexType>
-	<xsd:complexType name="form-login-configType">
-		<xsd:sequence>
-			<xsd:element name="form-login-page"
-				type="j2ee:war-pathType">
-			</xsd:element>
-			<xsd:element name="form-error-page"
-				type="j2ee:war-pathType">
-			</xsd:element>
-		</xsd:sequence>
-		<xsd:attribute name="id" type="xsd:ID" />
-	</xsd:complexType>
-	<xsd:complexType name="http-methodType">
-		<xsd:simpleContent>
-			<xsd:restriction base="j2ee:string">
-				<xsd:enumeration value="GET" />
-				<xsd:enumeration value="POST" />
-				<xsd:enumeration value="PUT" />
-				<xsd:enumeration value="DELETE" />
-				<xsd:enumeration value="HEAD" />
-				<xsd:enumeration value="OPTIONS" />
-				<xsd:enumeration value="TRACE" />
-			</xsd:restriction>
-		</xsd:simpleContent>
-	</xsd:complexType>
-	<xsd:complexType name="locale-encoding-mapping-listType">
-		<xsd:sequence>
-			<xsd:element name="locale-encoding-mapping"
-				type="j2ee:locale-encoding-mappingType" maxOccurs="unbounded" />
-		</xsd:sequence>
-		<xsd:attribute name="id" type="xsd:ID" />
-	</xsd:complexType>
-	<xsd:complexType name="locale-encoding-mappingType">
-		<xsd:sequence>
-			<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>
-	<xsd:simpleType name="localeType">
-		<xsd:restriction base="xsd:string">
-			<xsd:pattern value="[a-z]{2}(_|-)?([p{L}-p{Nd}]{2})?" />
-		</xsd:restriction>
-	</xsd:simpleType>
-	<xsd:complexType name="login-configType">
-		<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>
-			<xsd:element name="form-login-config"
-				type="j2ee:form-login-configType" minOccurs="0" />
-		</xsd:sequence>
-		<xsd:attribute name="id" type="xsd:ID" />
-	</xsd:complexType>
-	<xsd:complexType name="mime-mappingType">
-		<xsd:sequence>
-			<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>
-	<xsd:complexType name="mime-typeType">
-		<xsd:simpleContent>
-			<xsd:restriction base="j2ee:string">
-				<xsd:pattern value="[p{L}-p{Nd}]+/[p{L}-p{Nd}.]+" />
-			</xsd:restriction>
-		</xsd:simpleContent>
-	</xsd:complexType>
-	<xsd:complexType name="nonEmptyStringType">
-		<xsd:simpleContent>
-			<xsd:restriction base="j2ee:string">
-				<xsd:minLength value="1" />
-			</xsd:restriction>
-		</xsd:simpleContent>
-	</xsd:complexType>
-	<xsd:complexType name="security-constraintType">
-		<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:sequence>
-		<xsd:attribute name="id" type="xsd:ID" />
-	</xsd:complexType>
-	<xsd:complexType name="servlet-mappingType">
-		<xsd:sequence>
-			<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>
-	<xsd:complexType name="servlet-nameType">
-		<xsd:simpleContent>
-			<xsd:extension base="j2ee:nonEmptyStringType" />
-		</xsd:simpleContent>
-	</xsd:complexType>
-	<xsd:complexType name="servletType">
-		<xsd:sequence>
-			<xsd:group ref="j2ee:descriptionGroup" />
-			<xsd:element name="servlet-name"
-				type="j2ee:servlet-nameType" />
-			<xsd:choice>
-				<xsd:element name="servlet-class"
-					type="j2ee:fully-qualified-classType">
-				</xsd:element>
-				<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>
-			<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>
-	<xsd:complexType name="session-configType">
-		<xsd:sequence>
-			<xsd:element name="session-timeout"
-				type="j2ee:xsdIntegerType" minOccurs="0">
-			</xsd:element>
-		</xsd:sequence>
-		<xsd:attribute name="id" type="xsd:ID" />
-	</xsd:complexType>
-	<xsd:complexType name="transport-guaranteeType">
-		<xsd:simpleContent>
-			<xsd:restriction base="j2ee:string">
-				<xsd:enumeration value="NONE" />
-				<xsd:enumeration value="INTEGRAL" />
-				<xsd:enumeration value="CONFIDENTIAL" />
-			</xsd:restriction>
-		</xsd:simpleContent>
-	</xsd:complexType>
-	<xsd:complexType name="user-data-constraintType">
-		<xsd:sequence>
-			<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>
-	<xsd:complexType name="war-pathType">
-		<xsd:simpleContent>
-			<xsd:restriction base="j2ee:string">
-				<xsd:pattern value="/.*" />
-			</xsd:restriction>
-		</xsd:simpleContent>
-	</xsd:complexType>
-	<xsd:simpleType name="web-app-versionType">
-		<xsd:restriction base="xsd:token">
-			<xsd:enumeration value="2.4" />
-		</xsd:restriction>
-	</xsd:simpleType>
-	<xsd:complexType name="web-appType">
-		<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>
-			<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:choice>
-		<xsd:attribute name="version" type="j2ee:web-app-versionType"
-			use="required" />
-		<xsd:attribute name="id" type="xsd:ID" />
-	</xsd:complexType>
-	<xsd:complexType name="web-resource-collectionType">
-		<xsd:sequence>
-			<xsd:element name="web-resource-name" type="j2ee:string">
-			</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:sequence>
-		<xsd:attribute name="id" type="xsd:ID" />
-	</xsd:complexType>
-	<xsd:complexType name="welcome-file-listType">
-		<xsd:sequence>
-			<xsd:element name="welcome-file" type="xsd:string"
-				maxOccurs="unbounded">
-			</xsd:element>
-		</xsd:sequence>
-		<xsd:attribute name="id" type="xsd:ID" />
-	</xsd:complexType>
+<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:include schemaLocation="j2ee_1_4.xsd" />
+    <xsd:include schemaLocation="jsp_2_0.xsd" />
+    <xsd:element name="web-app" type="j2ee:web-appType">
+        <xsd:unique name="web-app-servlet-name-uniqueness">
+            <xsd:selector xpath="j2ee:servlet" />
+            <xsd:field xpath="j2ee:servlet-name" />
+        </xsd:unique>
+        <xsd:unique name="web-app-filter-name-uniqueness">
+            <xsd:selector xpath="j2ee:filter" />
+            <xsd:field xpath="j2ee:filter-name" />
+        </xsd:unique>
+        <xsd:unique name="web-app-ejb-local-ref-name-uniqueness">
+            <xsd:selector xpath="j2ee:ejb-local-ref" />
+            <xsd:field xpath="j2ee:ejb-ref-name" />
+        </xsd:unique>
+        <xsd:unique name="web-app-ejb-ref-name-uniqueness">
+            <xsd:selector xpath="j2ee:ejb-ref" />
+            <xsd:field xpath="j2ee:ejb-ref-name" />
+        </xsd:unique>
+        <xsd:unique name="web-app-resource-env-ref-uniqueness">
+            <xsd:selector xpath="j2ee:resource-env-ref" />
+            <xsd:field xpath="j2ee:resource-env-ref-name" />
+        </xsd:unique>
+        <xsd:unique name="web-app-message-destination-ref-uniqueness">
+            <xsd:selector xpath="j2ee:message-destination-ref" />
+            <xsd:field xpath="j2ee:message-destination-ref-name" />
+        </xsd:unique>
+        <xsd:unique name="web-app-res-ref-name-uniqueness">
+            <xsd:selector xpath="j2ee:resource-ref" />
+            <xsd:field xpath="j2ee:res-ref-name" />
+        </xsd:unique>
+        <xsd:unique name="web-app-env-entry-name-uniqueness">
+            <xsd:selector xpath="j2ee:env-entry" />
+            <xsd:field xpath="j2ee:env-entry-name" />
+        </xsd:unique>
+        <xsd:key name="web-app-role-name-key">
+            <xsd:selector xpath="j2ee:security-role" />
+            <xsd:field xpath="j2ee:role-name" />
+        </xsd:key>
+        <xsd:keyref name="web-app-role-name-references" refer="j2ee:web-app-role-name-key">
+            <xsd:selector xpath="j2ee:servlet/j2ee:security-role-ref" />
+            <xsd:field xpath="j2ee:role-link" />
+        </xsd:keyref>
+    </xsd:element>
+    <xsd:complexType name="auth-constraintType">
+        <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:sequence>
+        <xsd:attribute name="id" type="xsd:ID" />
+    </xsd:complexType>
+    <xsd:complexType name="auth-methodType">
+        <xsd:simpleContent>
+            <xsd:restriction base="j2ee:string" />
+        </xsd:simpleContent>
+    </xsd:complexType>
+    <xsd:complexType name="dispatcherType">
+        <xsd:simpleContent>
+            <xsd:restriction base="j2ee:string">
+                <xsd:enumeration value="FORWARD" />
+                <xsd:enumeration value="INCLUDE" />
+                <xsd:enumeration value="REQUEST" />
+                <xsd:enumeration value="ERROR" />
+            </xsd:restriction>
+        </xsd:simpleContent>
+    </xsd:complexType>
+    <xsd:simpleType name="encodingType">
+        <xsd:restriction base="xsd:string">
+            <xsd:pattern value="[^\s]+" />
+        </xsd:restriction>
+    </xsd:simpleType>
+    <xsd:complexType name="error-codeType">
+        <xsd:simpleContent>
+            <xsd:restriction base="j2ee:xsdPositiveIntegerType">
+                <xsd:pattern value="\d{3}" />
+                <xsd:attribute name="id" type="xsd:ID" />
+            </xsd:restriction>
+        </xsd:simpleContent>
+    </xsd:complexType>
+    <xsd:complexType name="error-pageType">
+        <xsd:sequence>
+            <xsd:choice>
+                <xsd:element name="error-code" type="j2ee:error-codeType" />
+                <xsd:element name="exception-type" type="j2ee:fully-qualified-classType"></xsd:element>
+            </xsd:choice>
+            <xsd:element name="location" type="j2ee:war-pathType"></xsd:element>
+        </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:ID" />
+    </xsd:complexType>
+    <xsd:complexType name="filter-mappingType">
+        <xsd:sequence>
+            <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:choice>
+            <xsd:element name="dispatcher" type="j2ee:dispatcherType" minOccurs="0" maxOccurs="4" />
+        </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:ID" />
+    </xsd:complexType>
+    <xsd:complexType name="filter-nameType">
+        <xsd:simpleContent>
+            <xsd:extension base="j2ee:nonEmptyStringType" />
+        </xsd:simpleContent>
+    </xsd:complexType>
+    <xsd:complexType name="filterType">
+        <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>
+            <xsd:element name="init-param" type="j2ee:param-valueType" minOccurs="0" maxOccurs="unbounded"></xsd:element>
+        </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:ID" />
+    </xsd:complexType>
+    <xsd:complexType name="form-login-configType">
+        <xsd:sequence>
+            <xsd:element name="form-login-page" type="j2ee:war-pathType"></xsd:element>
+            <xsd:element name="form-error-page" type="j2ee:war-pathType"></xsd:element>
+        </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:ID" />
+    </xsd:complexType>
+    <xsd:complexType name="http-methodType">
+        <xsd:simpleContent>
+            <xsd:restriction base="j2ee:string">
+                <xsd:enumeration value="GET" />
+                <xsd:enumeration value="POST" />
+                <xsd:enumeration value="PUT" />
+                <xsd:enumeration value="DELETE" />
+                <xsd:enumeration value="HEAD" />
+                <xsd:enumeration value="OPTIONS" />
+                <xsd:enumeration value="TRACE" />
+            </xsd:restriction>
+        </xsd:simpleContent>
+    </xsd:complexType>
+    <xsd:complexType name="locale-encoding-mapping-listType">
+        <xsd:sequence>
+            <xsd:element name="locale-encoding-mapping" type="j2ee:locale-encoding-mappingType" maxOccurs="unbounded" />
+        </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:ID" />
+    </xsd:complexType>
+    <xsd:complexType name="locale-encoding-mappingType">
+        <xsd:sequence>
+            <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>
+    <xsd:simpleType name="localeType">
+        <xsd:restriction base="xsd:string">
+            <xsd:pattern value="[a-z]{2}(_|-)?([\p{L}\-\p{Nd}]{2})?" />
+        </xsd:restriction>
+    </xsd:simpleType>
+    <xsd:complexType name="login-configType">
+        <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>
+            <xsd:element name="form-login-config" type="j2ee:form-login-configType" minOccurs="0" />
+        </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:ID" />
+    </xsd:complexType>
+    <xsd:complexType name="mime-mappingType">
+        <xsd:sequence>
+            <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>
+    <xsd:complexType name="mime-typeType">
+        <xsd:simpleContent>
+            <xsd:restriction base="j2ee:string">
+                <xsd:pattern value="[\p{L}\-\p{Nd}]+/[\p{L}\-\p{Nd}\.]+" />
+            </xsd:restriction>
+        </xsd:simpleContent>
+    </xsd:complexType>
+    <xsd:complexType name="nonEmptyStringType">
+        <xsd:simpleContent>
+            <xsd:restriction base="j2ee:string">
+                <xsd:minLength value="1" />
+            </xsd:restriction>
+        </xsd:simpleContent>
+    </xsd:complexType>
+    <xsd:complexType name="security-constraintType">
+        <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:sequence>
+        <xsd:attribute name="id" type="xsd:ID" />
+    </xsd:complexType>
+    <xsd:complexType name="servlet-mappingType">
+        <xsd:sequence>
+            <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>
+    <xsd:complexType name="servlet-nameType">
+        <xsd:simpleContent>
+            <xsd:extension base="j2ee:nonEmptyStringType" />
+        </xsd:simpleContent>
+    </xsd:complexType>
+    <xsd:complexType name="servletType">
+        <xsd:sequence>
+            <xsd:group ref="j2ee:descriptionGroup" />
+            <xsd:element name="servlet-name" type="j2ee:servlet-nameType" />
+            <xsd:choice>
+                <xsd:element name="servlet-class" type="j2ee:fully-qualified-classType"></xsd:element>
+                <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>
+            <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>
+    <xsd:complexType name="session-configType">
+        <xsd:sequence>
+            <xsd:element name="session-timeout" type="j2ee:xsdIntegerType" minOccurs="0"></xsd:element>
+        </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:ID" />
+    </xsd:complexType>
+    <xsd:complexType name="transport-guaranteeType">
+        <xsd:simpleContent>
+            <xsd:restriction base="j2ee:string">
+                <xsd:enumeration value="NONE" />
+                <xsd:enumeration value="INTEGRAL" />
+                <xsd:enumeration value="CONFIDENTIAL" />
+            </xsd:restriction>
+        </xsd:simpleContent>
+    </xsd:complexType>
+    <xsd:complexType name="user-data-constraintType">
+        <xsd:sequence>
+            <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>
+    <xsd:complexType name="war-pathType">
+        <xsd:simpleContent>
+            <xsd:restriction base="j2ee:string">
+                <xsd:pattern value="/.*" />
+            </xsd:restriction>
+        </xsd:simpleContent>
+    </xsd:complexType>
+    <xsd:simpleType name="web-app-versionType">
+        <xsd:restriction base="xsd:token">
+            <xsd:enumeration value="2.4" />
+        </xsd:restriction>
+    </xsd:simpleType>
+    <xsd:complexType name="web-appType">
+        <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>
+            <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:choice>
+        <xsd:attribute name="version" type="j2ee:web-app-versionType" use="required" />
+        <xsd:attribute name="id" type="xsd:ID" />
+    </xsd:complexType>
+    <xsd:complexType name="web-resource-collectionType">
+        <xsd:sequence>
+            <xsd:element name="web-resource-name" type="j2ee:string"></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:sequence>
+        <xsd:attribute name="id" type="xsd:ID" />
+    </xsd:complexType>
+    <xsd:complexType name="welcome-file-listType">
+        <xsd:sequence>
+            <xsd:element name="welcome-file" type="xsd:string" maxOccurs="unbounded"></xsd:element>
+        </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:ID" />
+    </xsd:complexType>
 </xsd:schema>

Modified: geronimo/sandbox/xsds/web-jsptaglibrary_2_0.xsd
URL: http://svn.apache.org/viewvc/geronimo/sandbox/xsds/web-jsptaglibrary_2_0.xsd?view=diff&rev=486143&r1=486142&r2=486143
==============================================================================
--- geronimo/sandbox/xsds/web-jsptaglibrary_2_0.xsd (original)
+++ geronimo/sandbox/xsds/web-jsptaglibrary_2_0.xsd Tue Dec 12 05:53:50 2006
@@ -1,233 +1,181 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-  --  The actual Sun XSD for this stripped down XSD can be found at
-  --  http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd
-  --  This XSD contains only the functional elements for programatic use.
-  -->
-
-<xsd:schema 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.0">
-	
-	<xsd:include schemaLocation="j2ee_1_4.xsd" />
-	
-	<xsd:element name="taglib" type="j2ee:tldTaglibType">
-		<xsd:unique name="tag-name-uniqueness">
-			<xsd:selector xpath="j2ee:tag|j2ee:tag-file" />
-			<xsd:field xpath="j2ee:name" />
-		</xsd:unique>
-		<xsd:unique name="function-name-uniqueness">
-			<xsd:selector xpath="j2ee:function" />
-			<xsd:field xpath="j2ee:name" />
-		</xsd:unique>
-	</xsd:element>
-	
-	<xsd:complexType name="body-contentType">
-		<xsd:simpleContent>
-			<xsd:restriction base="j2ee:string">
-				<xsd:enumeration value="tagdependent" />
-				<xsd:enumeration value="JSP" />
-				<xsd:enumeration value="empty" />
-				<xsd:enumeration value="scriptless" />
-			</xsd:restriction>
-		</xsd:simpleContent>
-	</xsd:complexType>
-	
-	<xsd:complexType name="extensibleType" abstract="true">
-		<xsd:attribute name="id" type="xsd:ID" />
-	</xsd:complexType>
-	
-	<xsd:complexType name="functionType">
-		<xsd:sequence>
-			<xsd:group ref="j2ee:descriptionGroup" />
-			<xsd:element name="name"
-				type="j2ee:tld-canonical-nameType">
-			</xsd:element>
-			<xsd:element name="function-class"
-				type="j2ee:fully-qualified-classType">
-			</xsd:element>
-			<xsd:element name="function-signature" type="j2ee:string">
-			</xsd:element>
-			<xsd:element name="example" type="j2ee:xsdStringType"
-				minOccurs="0">
-			</xsd:element>
-			<xsd:element name="function-extension"
-				type="j2ee:tld-extensionType" minOccurs="0" maxOccurs="unbounded">
-			</xsd:element>
-		</xsd:sequence>
-		<xsd:attribute name="id" type="xsd:ID" />
-	</xsd:complexType>
-	
-	<xsd:complexType name="tagFileType">
-		<xsd:sequence>
-			<xsd:group ref="j2ee:descriptionGroup" />
-			<xsd:element name="name" type="j2ee:tld-canonical-nameType" />
-			<xsd:element name="path" type="j2ee:pathType" />
-			<xsd:element name="example" type="j2ee:xsdStringType"
-				minOccurs="0">
-			</xsd:element>
-			<xsd:element name="tag-extension"
-				type="j2ee:tld-extensionType" minOccurs="0" maxOccurs="unbounded">
-			</xsd:element>
-		</xsd:sequence>
-		<xsd:attribute name="id" type="xsd:ID" />
-	</xsd:complexType>
-	
-	<xsd:complexType name="tagType">
-		<xsd:sequence>
-			<xsd:group ref="j2ee:descriptionGroup" />
-			<xsd:element name="name" type="j2ee:tld-canonical-nameType" />
-			<xsd:element name="tag-class"
-				type="j2ee:fully-qualified-classType">
-			</xsd:element>
-			<xsd:element name="tei-class"
-				type="j2ee:fully-qualified-classType" minOccurs="0">
-			</xsd:element>
-			<xsd:element name="body-content"
-				type="j2ee:body-contentType">
-			</xsd:element>
-			<xsd:element name="variable" type="j2ee:variableType"
-				minOccurs="0" maxOccurs="unbounded" />
-			<xsd:element name="attribute" type="j2ee:tld-attributeType"
-				minOccurs="0" maxOccurs="unbounded" />
-			<xsd:element name="dynamic-attributes"
-				type="j2ee:generic-booleanType" minOccurs="0" />
-			<xsd:element name="example" type="j2ee:xsdStringType"
-				minOccurs="0">
-			</xsd:element>
-			<xsd:element name="tag-extension"
-				type="j2ee:tld-extensionType" minOccurs="0" maxOccurs="unbounded">
-			</xsd:element>
-		</xsd:sequence>
-		<xsd:attribute name="id" type="xsd:ID" />
-	</xsd:complexType>
-	
-	<xsd:complexType name="tld-attributeType">
-		<xsd:sequence>
-			<xsd:element name="description" type="j2ee:descriptionType"
-				minOccurs="0" maxOccurs="unbounded" />
-			<xsd:element name="name" type="j2ee:java-identifierType" />
-			<xsd:element name="required" type="j2ee:generic-booleanType"
-				minOccurs="0">
-			</xsd:element>
-			<xsd:choice>
-				<xsd:sequence>
-					<xsd:element name="rtexprvalue"
-						type="j2ee:generic-booleanType" minOccurs="0">
-					</xsd:element>
-					<xsd:element name="type"
-						type="j2ee:fully-qualified-classType" minOccurs="0">
-					</xsd:element>
-				</xsd:sequence>
-				<xsd:element name="fragment"
-					type="j2ee:generic-booleanType" minOccurs="0">
-				</xsd:element>
-			</xsd:choice>
-		</xsd:sequence>
-		<xsd:attribute name="id" type="xsd:ID" />
-	</xsd:complexType>
-	
-	<xsd:complexType name="tld-canonical-nameType">
-		<xsd:simpleContent>
-			<xsd:restriction base="j2ee:xsdNMTOKENType" />
-		</xsd:simpleContent>
-	</xsd:complexType>
-	
-	<xsd:complexType name="tld-extensionType">
-		<xsd:sequence>
-			<xsd:element name="extension-element"
-				type="j2ee:extensibleType" maxOccurs="unbounded" />
-		</xsd:sequence>
-		<xsd:attribute name="namespace" use="required"
-			type="xsd:anyURI" />
-		<xsd:attribute name="id" type="xsd:ID" />
-	</xsd:complexType>
-	
-	<xsd:complexType name="tldTaglibType">
-		<xsd:sequence>
-			<xsd:group ref="j2ee:descriptionGroup" />
-			<xsd:element name="tlib-version"
-				type="j2ee:dewey-versionType">
-			</xsd:element>
-			<xsd:element name="short-name"
-				type="j2ee:tld-canonical-nameType">
-			</xsd:element>
-			<xsd:element name="uri" type="j2ee:xsdAnyURIType"
-				minOccurs="0">
-			</xsd:element>
-			<xsd:element name="validator" type="j2ee:validatorType"
-				minOccurs="0">
-			</xsd:element>
-			<xsd:element name="listener" type="j2ee:listenerType"
-				minOccurs="0" maxOccurs="unbounded">
-			</xsd:element>
-			<xsd:element name="tag" type="j2ee:tagType" minOccurs="0"
-				maxOccurs="unbounded" />
-			<xsd:element name="tag-file" type="j2ee:tagFileType"
-				minOccurs="0" maxOccurs="unbounded" />
-			<xsd:element name="function" type="j2ee:functionType"
-				minOccurs="0" maxOccurs="unbounded" />
-			<xsd:element name="taglib-extension"
-				type="j2ee:tld-extensionType" minOccurs="0" maxOccurs="unbounded">
-			</xsd:element>
-		</xsd:sequence>
-		<xsd:attribute name="version" type="j2ee:dewey-versionType"
-			fixed="2.0" use="required">
-		</xsd:attribute>
-		<xsd:attribute name="id" type="xsd:ID" />
-	</xsd:complexType>
-	
-	<xsd:complexType name="validatorType">
-		<xsd:sequence>
-			<xsd:element name="description" type="j2ee:descriptionType"
-				minOccurs="0" maxOccurs="unbounded" />
-			<xsd:element name="validator-class"
-				type="j2ee:fully-qualified-classType">
-			</xsd:element>
-			<xsd:element name="init-param" type="j2ee:param-valueType"
-				minOccurs="0" maxOccurs="unbounded">
-			</xsd:element>
-		</xsd:sequence>
-		<xsd:attribute name="id" type="xsd:ID" />
-	</xsd:complexType>
-	
-	<xsd:complexType name="variable-scopeType">
-		<xsd:simpleContent>
-
-			<xsd:restriction base="j2ee:string">
-				<xsd:enumeration value="NESTED" />
-				<xsd:enumeration value="AT_BEGIN" />
-				<xsd:enumeration value="AT_END" />
-			</xsd:restriction>
-		</xsd:simpleContent>
-	</xsd:complexType>
-	
-	<xsd:complexType name="variableType">
-		<xsd:sequence>
-			<xsd:element name="description" type="j2ee:descriptionType"
-				minOccurs="0" maxOccurs="unbounded" />
-			<xsd:choice>
-				<xsd:element name="name-given"
-					type="j2ee:java-identifierType">
-				</xsd:element>
-				<xsd:element name="name-from-attribute"
-					type="j2ee:java-identifierType">
-				</xsd:element>
-			</xsd:choice>
-			<xsd:element name="variable-class"
-				type="j2ee:fully-qualified-classType" minOccurs="0">
-			</xsd:element>
-
-			<xsd:element name="declare" type="j2ee:generic-booleanType"
-				minOccurs="0">
-			</xsd:element>
-			<xsd:element name="scope" type="j2ee:variable-scopeType"
-				minOccurs="0">
-			</xsd:element>
-		</xsd:sequence>
-		<xsd:attribute name="id" type="xsd:ID" />
-	</xsd:complexType>
-</xsd:schema>
\ No newline at end of file
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!--
+  **  The actual Sun XSD for this stripped down XSD can be found at
+  **  http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd
+  **  This XSD contains only the functional elements for programatic use.
+-->
+
+<xsd:schema 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.0">
+
+    <xsd:include schemaLocation="j2ee_1_4.xsd" />
+
+    <xsd:element name="taglib" type="j2ee:tldTaglibType">
+        <xsd:unique name="tag-name-uniqueness">
+            <xsd:selector xpath="j2ee:tag|j2ee:tag-file" />
+            <xsd:field xpath="j2ee:name" />
+        </xsd:unique>
+        <xsd:unique name="function-name-uniqueness">
+            <xsd:selector xpath="j2ee:function" />
+            <xsd:field xpath="j2ee:name" />
+        </xsd:unique>
+    </xsd:element>
+
+    <xsd:complexType name="body-contentType">
+        <xsd:simpleContent>
+            <xsd:restriction base="j2ee:string">
+                <xsd:enumeration value="tagdependent" />
+                <xsd:enumeration value="JSP" />
+                <xsd:enumeration value="empty" />
+                <xsd:enumeration value="scriptless" />
+            </xsd:restriction>
+        </xsd:simpleContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="extensibleType" abstract="true">
+        <xsd:attribute name="id" type="xsd:ID" />
+    </xsd:complexType>
+
+    <xsd:complexType name="functionType">
+        <xsd:sequence>
+            <xsd:group ref="j2ee:descriptionGroup" />
+            <xsd:element name="name" type="j2ee:tld-canonical-nameType"></xsd:element>
+            <xsd:element name="function-class" type="j2ee:fully-qualified-classType"></xsd:element>
+            <xsd:element name="function-signature" type="j2ee:string"></xsd:element>
+            <xsd:element name="example" type="j2ee:xsdStringType" minOccurs="0"></xsd:element>
+            <xsd:element name="function-extension" type="j2ee:tld-extensionType" minOccurs="0" maxOccurs="unbounded"></xsd:element>
+        </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:ID" />
+    </xsd:complexType>
+
+    <xsd:complexType name="tagFileType">
+        <xsd:sequence>
+            <xsd:group ref="j2ee:descriptionGroup" />
+            <xsd:element name="name" type="j2ee:tld-canonical-nameType" />
+            <xsd:element name="path" type="j2ee:pathType" />
+            <xsd:element name="example" type="j2ee:xsdStringType" minOccurs="0"></xsd:element>
+            <xsd:element name="tag-extension" type="j2ee:tld-extensionType" minOccurs="0" maxOccurs="unbounded"></xsd:element>
+        </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:ID" />
+    </xsd:complexType>
+
+    <xsd:complexType name="tagType">
+        <xsd:sequence>
+            <xsd:group ref="j2ee:descriptionGroup" />
+            <xsd:element name="name" type="j2ee:tld-canonical-nameType" />
+            <xsd:element name="tag-class" type="j2ee:fully-qualified-classType"></xsd:element>
+            <xsd:element name="tei-class" type="j2ee:fully-qualified-classType" minOccurs="0"></xsd:element>
+            <xsd:element name="body-content" type="j2ee:body-contentType"></xsd:element>
+            <xsd:element name="variable" type="j2ee:variableType" minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="attribute" type="j2ee:tld-attributeType" minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="dynamic-attributes" type="j2ee:generic-booleanType" minOccurs="0" />
+            <xsd:element name="example" type="j2ee:xsdStringType" minOccurs="0"></xsd:element>
+            <xsd:element name="tag-extension" type="j2ee:tld-extensionType" minOccurs="0" maxOccurs="unbounded"></xsd:element>
+        </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:ID" />
+    </xsd:complexType>
+
+    <xsd:complexType name="tld-attributeType">
+        <xsd:sequence>
+            <xsd:element name="description" type="j2ee:descriptionType" minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="name" type="j2ee:java-identifierType" />
+            <xsd:element name="required" type="j2ee:generic-booleanType" minOccurs="0"></xsd:element>
+            <xsd:choice>
+                <xsd:sequence>
+                    <xsd:element name="rtexprvalue" type="j2ee:generic-booleanType" minOccurs="0"></xsd:element>
+                    <xsd:element name="type" type="j2ee:fully-qualified-classType" minOccurs="0"></xsd:element>
+                </xsd:sequence>
+                <xsd:element name="fragment" type="j2ee:generic-booleanType" minOccurs="0"></xsd:element>
+            </xsd:choice>
+        </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:ID" />
+    </xsd:complexType>
+
+    <xsd:complexType name="tld-canonical-nameType">
+        <xsd:simpleContent>
+            <xsd:restriction base="j2ee:xsdNMTOKENType" />
+        </xsd:simpleContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="tld-extensionType">
+        <xsd:sequence>
+            <xsd:element name="extension-element" type="j2ee:extensibleType" maxOccurs="unbounded" />
+        </xsd:sequence>
+        <xsd:attribute name="namespace" use="required" type="xsd:anyURI" />
+        <xsd:attribute name="id" type="xsd:ID" />
+    </xsd:complexType>
+
+    <xsd:complexType name="tldTaglibType">
+        <xsd:sequence>
+            <xsd:group ref="j2ee:descriptionGroup" />
+            <xsd:element name="tlib-version" type="j2ee:dewey-versionType"></xsd:element>
+            <xsd:element name="short-name" type="j2ee:tld-canonical-nameType"></xsd:element>
+            <xsd:element name="uri" type="j2ee:xsdAnyURIType" minOccurs="0"></xsd:element>
+            <xsd:element name="validator" type="j2ee:validatorType" minOccurs="0"></xsd:element>
+            <xsd:element name="listener" type="j2ee:listenerType" minOccurs="0" maxOccurs="unbounded"></xsd:element>
+            <xsd:element name="tag" type="j2ee:tagType" minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="tag-file" type="j2ee:tagFileType" minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="function" type="j2ee:functionType" minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="taglib-extension" type="j2ee:tld-extensionType" minOccurs="0" maxOccurs="unbounded"></xsd:element>
+        </xsd:sequence>
+        <xsd:attribute name="version" type="j2ee:dewey-versionType" fixed="2.0" use="required"></xsd:attribute>
+        <xsd:attribute name="id" type="xsd:ID" />
+    </xsd:complexType>
+
+    <xsd:complexType name="validatorType">
+        <xsd:sequence>
+            <xsd:element name="description" type="j2ee:descriptionType" minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="validator-class" type="j2ee:fully-qualified-classType"></xsd:element>
+            <xsd:element name="init-param" type="j2ee:param-valueType" minOccurs="0" maxOccurs="unbounded"></xsd:element>
+        </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:ID" />
+    </xsd:complexType>
+
+    <xsd:complexType name="variable-scopeType">
+        <xsd:simpleContent>
+
+            <xsd:restriction base="j2ee:string">
+                <xsd:enumeration value="NESTED" />
+                <xsd:enumeration value="AT_BEGIN" />
+                <xsd:enumeration value="AT_END" />
+            </xsd:restriction>
+        </xsd:simpleContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="variableType">
+        <xsd:sequence>
+            <xsd:element name="description" type="j2ee:descriptionType" minOccurs="0" maxOccurs="unbounded" />
+            <xsd:choice>
+                <xsd:element name="name-given" type="j2ee:java-identifierType"></xsd:element>
+                <xsd:element name="name-from-attribute" type="j2ee:java-identifierType"></xsd:element>
+            </xsd:choice>
+            <xsd:element name="variable-class" type="j2ee:fully-qualified-classType" minOccurs="0"></xsd:element>
+
+            <xsd:element name="declare" type="j2ee:generic-booleanType" minOccurs="0"></xsd:element>
+            <xsd:element name="scope" type="j2ee:variable-scopeType" minOccurs="0"></xsd:element>
+        </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:ID" />
+    </xsd:complexType>
+</xsd:schema>

Modified: geronimo/sandbox/xsds/web-jsptaglibrary_2_1.xsd
URL: http://svn.apache.org/viewvc/geronimo/sandbox/xsds/web-jsptaglibrary_2_1.xsd?view=diff&rev=486143&r1=486142&r2=486143
==============================================================================
--- geronimo/sandbox/xsds/web-jsptaglibrary_2_1.xsd (original)
+++ geronimo/sandbox/xsds/web-jsptaglibrary_2_1.xsd Tue Dec 12 05:53:50 2006
@@ -1,417 +1,229 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-  **
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!--
   ** This XSD contains only the programatic elements required for an implementation.
   ** For the XSD from Sun that includes documentation and other copyrighted information
   ** please refer to http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd for a fully documented and latest
   **  XSD.
 -->
 
-<xsd:schema
-  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="2.1">
-
-  <xsd:include schemaLocation="javaee_5.xsd" />
-
-  <xsd:element
-    name="taglib"
-    type="javaee:tldTaglibType">
-    <xsd:unique name="tag-name-uniqueness">
-      <xsd:selector xpath="javaee:tag|javaee:tag-file" />
-      <xsd:field xpath="javaee:name" />
-    </xsd:unique>
-
-    <xsd:unique name="function-name-uniqueness">
-      <xsd:selector xpath="javaee:function" />
-      <xsd:field xpath="javaee:name" />
-    </xsd:unique>
-  </xsd:element>
-
-  <xsd:complexType name="body-contentType">
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-        <xsd:enumeration value="tagdependent" />
-        <xsd:enumeration value="JSP" />
-        <xsd:enumeration value="empty" />
-        <xsd:enumeration value="scriptless" />
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-  <xsd:complexType
-    name="extensibleType"
-    abstract="true">
-    <xsd:attribute
-      name="id"
-      type="xsd:ID" />
-  </xsd:complexType>
-
-  <xsd:complexType name="functionType">
-    <xsd:sequence>
-      <xsd:group ref="javaee:descriptionGroup" />
-      <xsd:element
-        name="name"
-        type="javaee:tld-canonical-nameType">
-      </xsd:element>
-      <xsd:element
-        name="function-class"
-        type="javaee:fully-qualified-classType">
-      </xsd:element>
-      <xsd:element
-        name="function-signature"
-        type="javaee:string">
-      </xsd:element>
-      <xsd:element
-        name="example"
-        type="javaee:xsdStringType"
-        minOccurs="0">
-      </xsd:element>
-      <xsd:element
-        name="function-extension"
-        type="javaee:tld-extensionType"
-        minOccurs="0"
-        maxOccurs="unbounded">
-      </xsd:element>
-
-    </xsd:sequence>
-    <xsd:attribute
-      name="id"
-      type="xsd:ID" />
-  </xsd:complexType>
-
-  <xsd:complexType name="tagFileType">
-    <xsd:sequence>
-      <xsd:group ref="javaee:descriptionGroup" />
-      <xsd:element
-        name="name"
-        type="javaee:tld-canonical-nameType" />
-      <xsd:element
-        name="path"
-        type="javaee:pathType" />
-      <xsd:element
-        name="example"
-        type="javaee:xsdStringType"
-        minOccurs="0">
-      </xsd:element>
-      <xsd:element
-        name="tag-extension"
-        type="javaee:tld-extensionType"
-        minOccurs="0"
-        maxOccurs="unbounded">
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute
-      name="id"
-      type="xsd:ID" />
-  </xsd:complexType>
-
-  <xsd:complexType name="tagType">
-    <xsd:sequence>
-      <xsd:group ref="javaee:descriptionGroup" />
-      <xsd:element
-        name="name"
-        type="javaee:tld-canonical-nameType" />
-      <xsd:element
-        name="tag-class"
-        type="javaee:fully-qualified-classType">
-      </xsd:element>
-      <xsd:element
-        name="tei-class"
-        type="javaee:fully-qualified-classType"
-        minOccurs="0">
-      </xsd:element>
-      <xsd:element
-        name="body-content"
-        type="javaee:body-contentType">
-      </xsd:element>
-      <xsd:element
-        name="variable"
-        type="javaee:variableType"
-        minOccurs="0"
-        maxOccurs="unbounded" />
-      <xsd:element
-        name="attribute"
-        type="javaee:tld-attributeType"
-        minOccurs="0"
-        maxOccurs="unbounded" />
-      <xsd:element
-        name="dynamic-attributes"
-        type="javaee:generic-booleanType"
-        minOccurs="0" />
-      <xsd:element
-        name="example"
-        type="javaee:xsdStringType"
-        minOccurs="0">
-        <xsd:element
-          name="tag-extension"
-          type="javaee:tld-extensionType"
-          minOccurs="0"
-          maxOccurs="unbounded">
-        </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute
-      name="id"
-      type="xsd:ID" />
-  </xsd:complexType>
-
-  <xsd:complexType name="tld-attributeType">
-    <xsd:sequence>
-      <xsd:element
-        name="description"
-        type="javaee:descriptionType"
-        minOccurs="0"
-        maxOccurs="unbounded" />
-
-      <xsd:element
-        name="name"
-        type="javaee:java-identifierType" />
-      <xsd:element
-        name="required"
-        type="javaee:generic-booleanType"
-        minOccurs="0">
-      </xsd:element>
-      <xsd:choice>
+<xsd:schema 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="2.1">
+
+    <xsd:include schemaLocation="javaee_5.xsd" />
+
+    <xsd:element name="taglib" type="javaee:tldTaglibType">
+        <xsd:unique name="tag-name-uniqueness">
+            <xsd:selector xpath="javaee:tag|javaee:tag-file" />
+            <xsd:field xpath="javaee:name" />
+        </xsd:unique>
+
+        <xsd:unique name="function-name-uniqueness">
+            <xsd:selector xpath="javaee:function" />
+            <xsd:field xpath="javaee:name" />
+        </xsd:unique>
+    </xsd:element>
+
+    <xsd:complexType name="body-contentType">
+        <xsd:simpleContent>
+            <xsd:restriction base="javaee:string">
+                <xsd:enumeration value="tagdependent" />
+                <xsd:enumeration value="JSP" />
+                <xsd:enumeration value="empty" />
+                <xsd:enumeration value="scriptless" />
+            </xsd:restriction>
+        </xsd:simpleContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="extensibleType" abstract="true">
+        <xsd:attribute name="id" type="xsd:ID" />
+    </xsd:complexType>
 
+    <xsd:complexType name="functionType">
         <xsd:sequence>
-          <xsd:sequence minOccurs="0">
-            <xsd:element
-              name="rtexprvalue"
-              type="javaee:generic-booleanType">
-            </xsd:element>
+            <xsd:group ref="javaee:descriptionGroup" />
+            <xsd:element name="name" type="javaee:tld-canonical-nameType"></xsd:element>
+            <xsd:element name="function-class" type="javaee:fully-qualified-classType"></xsd:element>
+            <xsd:element name="function-signature" type="javaee:string"></xsd:element>
+            <xsd:element name="example" type="javaee:xsdStringType" minOccurs="0"></xsd:element>
+            <xsd:element name="function-extension" type="javaee:tld-extensionType" minOccurs="0" maxOccurs="unbounded"></xsd:element>
+
+        </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:ID" />
+    </xsd:complexType>
+
+    <xsd:complexType name="tagFileType">
+        <xsd:sequence>
+            <xsd:group ref="javaee:descriptionGroup" />
+            <xsd:element name="name" type="javaee:tld-canonical-nameType" />
+            <xsd:element name="path" type="javaee:pathType" />
+            <xsd:element name="example" type="javaee:xsdStringType" minOccurs="0"></xsd:element>
+            <xsd:element name="tag-extension" type="javaee:tld-extensionType" minOccurs="0" maxOccurs="unbounded"></xsd:element>
+        </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:ID" />
+    </xsd:complexType>
+
+    <xsd:complexType name="tagType">
+        <xsd:sequence>
+            <xsd:group ref="javaee:descriptionGroup" />
+            <xsd:element name="name" type="javaee:tld-canonical-nameType" />
+            <xsd:element name="tag-class" type="javaee:fully-qualified-classType"></xsd:element>
+            <xsd:element name="tei-class" type="javaee:fully-qualified-classType" minOccurs="0"></xsd:element>
+            <xsd:element name="body-content" type="javaee:body-contentType"></xsd:element>
+            <xsd:element name="variable" type="javaee:variableType" minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="attribute" type="javaee:tld-attributeType" minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="dynamic-attributes" type="javaee:generic-booleanType" minOccurs="0" />
+            <xsd:element name="example" type="javaee:xsdStringType" minOccurs="0" />
+            <xsd:element name="tag-extension" type="javaee:tld-extensionType" minOccurs="0" maxOccurs="unbounded" />
+        </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:ID" />
+    </xsd:complexType>
+
+    <xsd:complexType name="tld-attributeType">
+        <xsd:sequence>
+            <xsd:element name="description" type="javaee:descriptionType" minOccurs="0" maxOccurs="unbounded" />
+
+            <xsd:element name="name" type="javaee:java-identifierType" />
+            <xsd:element name="required" type="javaee:generic-booleanType" minOccurs="0"></xsd:element>
+            <xsd:choice>
+
+                <xsd:sequence>
+                    <xsd:sequence minOccurs="0">
+                        <xsd:element name="rtexprvalue" type="javaee:generic-booleanType"></xsd:element>
+
+                        <xsd:element name="type" type="javaee:fully-qualified-classType" minOccurs="0"></xsd:element>
+                    </xsd:sequence>
+
+                    <xsd:choice>
+                        <xsd:element name="deferred-value" type="javaee:tld-deferred-valueType" minOccurs="0"></xsd:element>
+                        <xsd:element name="deferred-method" type="javaee:tld-deferred-methodType" minOccurs="0"></xsd:element>
+                    </xsd:choice>
+                </xsd:sequence>
+
+                <xsd:element name="fragment" type="javaee:generic-booleanType" minOccurs="0"></xsd:element>
+
+            </xsd:choice>
+
+        </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:ID" />
+    </xsd:complexType>
+
+    <xsd:complexType name="tld-canonical-nameType">
+        <xsd:simpleContent>
+            <xsd:restriction base="javaee:xsdNMTOKENType" />
+        </xsd:simpleContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="tld-deferred-methodType">
+        <xsd:sequence>
+            <xsd:element name="method-signature" type="javaee:string" minOccurs="0"></xsd:element>
+        </xsd:sequence>
+
+        <xsd:attribute name="id" type="xsd:ID" />
+
+    </xsd:complexType>
+
+    <xsd:complexType name="tld-deferred-valueType">
+
+        <xsd:sequence>
+            <xsd:element name="type" type="javaee:fully-qualified-classType" minOccurs="0"></xsd:element>
+
+        </xsd:sequence>
+
+        <xsd:attribute name="id" type="xsd:ID" />
+    </xsd:complexType>
+
+    <xsd:complexType name="tld-extensionType">
+        <xsd:sequence>
+            <xsd:element name="extension-element" type="javaee:extensibleType" maxOccurs="unbounded" />
+        </xsd:sequence>
+
+        <xsd:attribute name="namespace" use="required" type="xsd:anyURI" />
+        <xsd:attribute name="id" type="xsd:ID" />
+
+    </xsd:complexType>
+
+    <xsd:complexType name="tldTaglibType">
+        <xsd:sequence>
+            <xsd:group ref="javaee:descriptionGroup" />
+            <xsd:element name="tlib-version" type="javaee:dewey-versionType"></xsd:element>
+
+            <xsd:element name="short-name" type="javaee:tld-canonical-nameType">
 
-            <xsd:element
-              name="type"
-              type="javaee:fully-qualified-classType"
-              minOccurs="0">
             </xsd:element>
-          </xsd:sequence>
 
-          <xsd:choice>
-            <xsd:element
-              name="deferred-value"
-              type="javaee:tld-deferred-valueType"
-              minOccurs="0">
+            <xsd:element name="uri" type="javaee:xsdAnyURIType" minOccurs="0">
+
             </xsd:element>
-            <xsd:element
-              name="deferred-method"
-              type="javaee:tld-deferred-methodType"
-              minOccurs="0">
+            <xsd:element name="validator" type="javaee:validatorType" minOccurs="0">
+
             </xsd:element>
-          </xsd:choice>
+            <xsd:element name="listener" type="javaee:listenerType" minOccurs="0" maxOccurs="unbounded"></xsd:element>
+            <xsd:element name="tag" type="javaee:tagType" minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="tag-file" type="javaee:tagFileType" minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="function" type="javaee:functionType" minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="taglib-extension" type="javaee:tld-extensionType" minOccurs="0" maxOccurs="unbounded"></xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="version" type="javaee:dewey-versionType" fixed="2.1" use="required"></xsd:attribute>
+        <xsd:attribute name="id" type="xsd:ID" />
+    </xsd:complexType>
+
+    <xsd:complexType name="validatorType">
+        <xsd:sequence>
+            <xsd:element name="description" type="javaee:descriptionType" minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="validator-class" type="javaee:fully-qualified-classType"></xsd:element>
+            <xsd:element name="init-param" type="javaee:param-valueType" minOccurs="0" maxOccurs="unbounded"></xsd:element>
+
+        </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:ID" />
+    </xsd:complexType>
+
+    <xsd:complexType name="variable-scopeType">
+        <xsd:simpleContent>
 
-        <xsd:element
-          name="fragment"
-          type="javaee:generic-booleanType"
-          minOccurs="0">
-        </xsd:element>
-
-      </xsd:choice>
-
-    </xsd:sequence>
-    <xsd:attribute
-      name="id"
-      type="xsd:ID" />
-  </xsd:complexType>
-
-  <xsd:complexType name="tld-canonical-nameType">
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:xsdNMTOKENType" />
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-  <xsd:complexType name="tld-deferred-methodType">
-    <xsd:sequence>
-      <xsd:element
-        name="method-signature"
-        type="javaee:string"
-        minOccurs="0">
-      </xsd:element>
-    </xsd:sequence>
-
-    <xsd:attribute
-      name="id"
-      type="xsd:ID" />
-
-  </xsd:complexType>
-
-  <xsd:complexType name="tld-deferred-valueType">
-
-    <xsd:sequence>
-      <xsd:element
-        name="type"
-        type="javaee:fully-qualified-classType"
-        minOccurs="0">
-      </xsd:element>
-
-    </xsd:sequence>
-
-    <xsd:attribute
-      name="id"
-      type="xsd:ID" />
-  </xsd:complexType>
-
-  <xsd:complexType name="tld-extensionType">
-    <xsd:sequence>
-      <xsd:element
-        name="extension-element"
-        type="javaee:extensibleType"
-        maxOccurs="unbounded" />
-    </xsd:sequence>
-
-    <xsd:attribute
-      name="namespace"
-      use="required"
-      type="xsd:anyURI" />
-    <xsd:attribute
-      name="id"
-      type="xsd:ID" />
-
-  </xsd:complexType>
-
-  <xsd:complexType name="tldTaglibType">
-    <xsd:sequence>
-      <xsd:group ref="javaee:descriptionGroup" />
-      <xsd:element
-        name="tlib-version"
-        type="javaee:dewey-versionType">
-      </xsd:element>
-
-      <xsd:element
-        name="short-name"
-        type="javaee:tld-canonical-nameType">
-
-      </xsd:element>
-
-      <xsd:element
-        name="uri"
-        type="javaee:xsdAnyURIType"
-        minOccurs="0">
-
-      </xsd:element>
-      <xsd:element
-        name="validator"
-        type="javaee:validatorType"
-        minOccurs="0">
-
-      </xsd:element>
-      <xsd:element
-        name="listener"
-        type="javaee:listenerType"
-        minOccurs="0"
-        maxOccurs="unbounded">
-      </xsd:element>
-      <xsd:element
-        name="tag"
-        type="javaee:tagType"
-        minOccurs="0"
-        maxOccurs="unbounded" />
-      <xsd:element
-        name="tag-file"
-        type="javaee:tagFileType"
-        minOccurs="0"
-        maxOccurs="unbounded" />
-      <xsd:element
-        name="function"
-        type="javaee:functionType"
-        minOccurs="0"
-        maxOccurs="unbounded" />
-      <xsd:element
-        name="taglib-extension"
-        type="javaee:tld-extensionType"
-        minOccurs="0"
-        maxOccurs="unbounded">
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute
-      name="version"
-      type="javaee:dewey-versionType"
-      fixed="2.1"
-      use="required">
-    </xsd:attribute>
-    <xsd:attribute
-      name="id"
-      type="xsd:ID" />
-  </xsd:complexType>
-
-  <xsd:complexType name="validatorType">
-    <xsd:sequence>
-      <xsd:element
-        name="description"
-        type="javaee:descriptionType"
-        minOccurs="0"
-        maxOccurs="unbounded" />
-      <xsd:element
-        name="validator-class"
-        type="javaee:fully-qualified-classType">
-      </xsd:element>
-      <xsd:element
-        name="init-param"
-        type="javaee:param-valueType"
-        minOccurs="0"
-        maxOccurs="unbounded">
-      </xsd:element>
-
-    </xsd:sequence>
-    <xsd:attribute
-      name="id"
-      type="xsd:ID" />
-  </xsd:complexType>
-
-  <xsd:complexType name="variable-scopeType">
-    <xsd:simpleContent>
-
-      <xsd:restriction base="javaee:string">
-        <xsd:enumeration value="NESTED" />
-        <xsd:enumeration value="AT_BEGIN" />
-        <xsd:enumeration value="AT_END" />
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-  <xsd:complexType name="variableType">
-    <xsd:sequence>
-      <xsd:element
-        name="description"
-        type="javaee:descriptionType"
-        minOccurs="0"
-        maxOccurs="unbounded" />
-
-      <xsd:choice>
-        <xsd:element
-          name="name-given"
-          type="javaee:java-identifierType">
-        </xsd:element>
-
-        <xsd:element
-          name="name-from-attribute"
-          type="javaee:java-identifierType">
-        </xsd:element>
-      </xsd:choice>
-      <xsd:element
-        name="variable-class"
-        type="javaee:fully-qualified-classType"
-        minOccurs="0">
-      </xsd:element>
-
-      <xsd:element
-        name="declare"
-        type="javaee:generic-booleanType"
-        minOccurs="0">
-      </xsd:element>
-      <xsd:element
-        name="scope"
-        type="javaee:variable-scopeType"
-        minOccurs="0">
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute
-      name="id"
-      type="xsd:ID" />
-  </xsd:complexType>
+            <xsd:restriction base="javaee:string">
+                <xsd:enumeration value="NESTED" />
+                <xsd:enumeration value="AT_BEGIN" />
+                <xsd:enumeration value="AT_END" />
+            </xsd:restriction>
+        </xsd:simpleContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="variableType">
+        <xsd:sequence>
+            <xsd:element name="description" type="javaee:descriptionType" minOccurs="0" maxOccurs="unbounded" />
+
+            <xsd:choice>
+                <xsd:element name="name-given" type="javaee:java-identifierType"></xsd:element>
+
+                <xsd:element name="name-from-attribute" type="javaee:java-identifierType"></xsd:element>
+            </xsd:choice>
+            <xsd:element name="variable-class" type="javaee:fully-qualified-classType" minOccurs="0"></xsd:element>
+
+            <xsd:element name="declare" type="javaee:generic-booleanType" minOccurs="0"></xsd:element>
+            <xsd:element name="scope" type="javaee:variable-scopeType" minOccurs="0"></xsd:element>
+        </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:ID" />
+    </xsd:complexType>
 </xsd:schema>



Mime
View raw message