From 401daebfbba2ebe23595453c99ce02f97d1ddcc8 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 9 Nov 2009 11:27:57 +0000
Subject: [PATCH] Update schemas to latest draft as of 2009-11-05

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@834021 13f79535-47bb-0310-9956-ffa450edef68
---
 java/javax/servlet/resources/javaee_6.xsd         | 141 ++++++++++++----------
 java/javax/servlet/resources/web-app_3_0.xsd      |   1 +
 java/javax/servlet/resources/web-common_3_0.xsd   |   5 +-
 java/javax/servlet/resources/web-fragment_3_0.xsd |   1 +
 4 files changed, 85 insertions(+), 63 deletions(-)

diff --git a/java/javax/servlet/resources/javaee_6.xsd b/java/javax/servlet/resources/javaee_6.xsd
index f4c18c505..f59284e5c 100644
--- a/java/javax/servlet/resources/javaee_6.xsd
+++ b/java/javax/servlet/resources/javaee_6.xsd
@@ -182,12 +182,38 @@
     <xsd:annotation>
       <xsd:documentation>
 
-        This group collects elements that are common to all the
+        This group collects elements that are common to most
         JNDI resource elements.
         
       </xsd:documentation>
     </xsd:annotation>
     <xsd:sequence>
+      <xsd:group ref="javaee:resourceBaseGroup"/>
+      <xsd:element name="lookup-name"
+                   type="javaee:xsdStringType"
+                   minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation>
+
+            The JNDI name to be looked up to resolve a resource reference.
+            
+          </xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+  </xsd:group>
+
+  <xsd:group name="resourceBaseGroup">
+    <xsd:annotation>
+      <xsd:documentation>
+
+        This group collects elements that are common to all the
+        JNDI resource elements. It does not include the lookup-name
+        element, that is only applicable to some resource elements.
+        
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
       <xsd:element name="mapped-name"
                    type="javaee:xsdStringType"
                    minOccurs="0">
@@ -217,17 +243,6 @@
                    type="javaee:injection-targetType"
                    minOccurs="0"
                    maxOccurs="unbounded"/>
-      <xsd:element name="lookup-name"
-                   type="javaee:xsdStringType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The JNDI name to be looked up to resolve a resource reference.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
     </xsd:sequence>
   </xsd:group>
 
@@ -315,14 +330,14 @@
                    minOccurs="0">
         <xsd:annotation>
           <xsd:documentation>
-<![CDATA[[
+            <![CDATA[[
             A JDBC URL. If the <code>url</code> property is specified
             along with other standard <code>DataSource</code> properties
             such as <code>serverName</code>, <code>databaseName</code>
             and <code>portNumber</code>, the more specific properties will
             take precedence and <code>url</code> will be ignored.
             
-]]>
+            ]]>
           </xsd:documentation>
         </xsd:annotation>
       </xsd:element>
@@ -355,7 +370,7 @@
         <xsd:annotation>
           <xsd:documentation>
 
-            JDBC DataSource Propertry.  This may be a vendor-specific
+            JDBC DataSource property.  This may be a vendor-specific
             property or a less commonly used DataSource property.
             
           </xsd:documentation>
@@ -511,7 +526,7 @@
   <xsd:complexType name="display-nameType">
     <xsd:annotation>
       <xsd:documentation>
-<![CDATA[[
+        <![CDATA[[
         The display-name type contains a short name that is intended
         to be displayed by tools. It is used by display-name
         elements.  The display name need not be unique.
@@ -525,7 +540,7 @@
         
         The value of the xml:lang attribute is "en" (English) by default. 
         
-]]>
+        ]]>
       </xsd:documentation>
     </xsd:annotation>
     <xsd:simpleContent>
@@ -541,7 +556,7 @@
   <xsd:complexType name="ejb-linkType">
     <xsd:annotation>
       <xsd:documentation>
-<![CDATA[[
+        <![CDATA[[
         The ejb-linkType is used by ejb-link
         elements in the ejb-ref or ejb-local-ref elements to specify
         that an EJB reference is linked to enterprise bean.
@@ -565,7 +580,7 @@
         
         <ejb-link>../products/product.jar#ProductEJB</ejb-link>
         
-]]>
+        ]]>
       </xsd:documentation>
     </xsd:annotation>
     <xsd:simpleContent>
@@ -633,7 +648,7 @@
   <xsd:complexType name="ejb-ref-nameType">
     <xsd:annotation>
       <xsd:documentation>
-<![CDATA[[
+        <![CDATA[[
         The ejb-ref-name element contains the name of an EJB
         reference. The EJB reference is an entry in the
         Deployment Component's environment and is relative to the
@@ -646,7 +661,7 @@
         
         <ejb-ref-name>ejb/Payroll</ejb-ref-name>
         
-]]>
+        ]]>
       </xsd:documentation>
     </xsd:annotation>
     <xsd:simpleContent>
@@ -789,7 +804,7 @@
                    type="javaee:jndi-nameType">
         <xsd:annotation>
           <xsd:documentation>
-<![CDATA[[
+            <![CDATA[[
             The env-entry-name element contains the name of a
             Deployment Component's environment entry.  The name
             is a JNDI name relative to the java:comp/env
@@ -802,7 +817,7 @@
             
             <env-entry-name>minAmount</env-entry-name>
             
-]]>
+            ]]>
           </xsd:documentation>
         </xsd:annotation>
       </xsd:element>
@@ -811,7 +826,7 @@
                    minOccurs="0">
         <xsd:annotation>
           <xsd:documentation>
-<![CDATA[[
+            <![CDATA[[
             The env-entry-type element contains the Java language
             type of the environment entry.  If an injection target
             is specified for the environment entry, the type may
@@ -823,7 +838,7 @@
             
             <env-entry-type>java.lang.Integer</env-entry-type>
             
-]]>
+            ]]>
           </xsd:documentation>
         </xsd:annotation>
       </xsd:element>
@@ -832,7 +847,7 @@
                    minOccurs="0">
         <xsd:annotation>
           <xsd:documentation>
-<![CDATA[[
+            <![CDATA[[
             The env-entry-value designates the value of a
             Deployment Component's environment entry. The value
             must be a String that is valid for the
@@ -844,7 +859,7 @@
             
             <env-entry-value>100.00</env-entry-value>
             
-]]>
+            ]]>
           </xsd:documentation>
         </xsd:annotation>
       </xsd:element>
@@ -860,7 +875,7 @@
   <xsd:complexType name="env-entry-type-valuesType">
     <xsd:annotation>
       <xsd:documentation>
-<![CDATA[[
+        <![CDATA[[
         This type contains the fully-qualified Java type of the
         environment entry value that is expected by the
         application's code.
@@ -885,7 +900,7 @@
         <env-entry-type>java.lang.Class</env-entry-type>
         <env-entry-type>com.example.Color</env-entry-type>
         
-]]>
+        ]]>
       </xsd:documentation>
     </xsd:annotation>
     <xsd:simpleContent>
@@ -961,7 +976,7 @@
                    minOccurs="0">
         <xsd:annotation>
           <xsd:documentation>
-<![CDATA[[
+            <![CDATA[[
             The small-icon element contains the name of a file
             containing a small (16 x 16) icon image. The file
             name is a relative path within the Deployment
@@ -974,7 +989,7 @@
             
             <small-icon>employee-service-icon16x16.jpg</small-icon>
             
-]]>
+            ]]>
           </xsd:documentation>
         </xsd:annotation>
       </xsd:element>
@@ -983,7 +998,7 @@
                    minOccurs="0">
         <xsd:annotation>
           <xsd:documentation>
-<![CDATA[[
+            <![CDATA[[
             The large-icon element contains the name of a file
             containing a large
             (32 x 32) icon image. The file name is a relative 
@@ -997,7 +1012,7 @@
             
             <large-icon>employee-service-icon32x32.jpg</large-icon>
             
-]]>
+            ]]>
           </xsd:documentation>
         </xsd:annotation>
       </xsd:element>
@@ -1046,14 +1061,16 @@
     <xsd:annotation>
       <xsd:documentation>
 
-        public enum isolation-level-type { TRANSACTION_NONE,
-        TRANSACTION_READ_UNCOMMITTED, TRANSACTION_READ_COMMITTED,
-        TRANSACTION_REPEATABLE_READ, TRANSACTION_SERIALIZABLE };
+        	The following transaction isolation levels are allowed
+        	(see documentation for the java.sql.Connection interface):
+        TRANSACTION_READ_UNCOMMITTED
+        TRANSACTION_READ_COMMITTED
+        TRANSACTION_REPEATABLE_READ
+        TRANSACTION_SERIALIZABLE
         
       </xsd:documentation>
     </xsd:annotation>
     <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="TRANSACTION_NONE"/>
       <xsd:enumeration value="TRANSACTION_READ_UNCOMMITTED"/>
       <xsd:enumeration value="TRANSACTION_READ_COMMITTED"/>
       <xsd:enumeration value="TRANSACTION_REPEATABLE_READ"/>
@@ -1107,7 +1124,7 @@
   <xsd:complexType name="jdbc-urlType">
     <xsd:annotation>
       <xsd:documentation>
-<![CDATA[[
+        <![CDATA[[
         The jdbc-urlType contains the url pattern of the mapping.
         It must follow the rules specified in Section 9.3 of the
         JDBC Specification where the format is:
@@ -1118,7 +1135,7 @@
         
         <url>jdbc:mysql://localhost:3307/testdb</url>
         
-]]>
+        ]]>
       </xsd:documentation>
     </xsd:annotation>
     <xsd:simpleContent>
@@ -1153,7 +1170,7 @@
   <xsd:complexType name="homeType">
     <xsd:annotation>
       <xsd:documentation>
-<![CDATA[[
+        <![CDATA[[
         The homeType defines the fully-qualified name of
         an enterprise bean's home interface. 
         
@@ -1161,7 +1178,7 @@
         
         <home>com.aardvark.payroll.PayrollHome</home>
         
-]]>
+        ]]>
       </xsd:documentation>
     </xsd:annotation>
     <xsd:simpleContent>
@@ -1340,7 +1357,7 @@
   <xsd:complexType name="persistence-context-refType">
     <xsd:annotation>
       <xsd:documentation>
-<![CDATA[[
+        <![CDATA[[
         The persistence-context-ref element contains a declaration
         of Deployment Component's reference to a persistence context
         associated within a Deployment Component's
@@ -1371,7 +1388,7 @@
         <persistence-context-type>Extended</persistence-context-type>
         </persistence-context-ref>
         
-]]>
+        ]]>
       </xsd:documentation>
     </xsd:annotation>
     <xsd:sequence>
@@ -1436,7 +1453,7 @@
           </xsd:documentation>
         </xsd:annotation>
       </xsd:element>
-      <xsd:group ref="javaee:resourceGroup"/>
+      <xsd:group ref="javaee:resourceBaseGroup"/>
     </xsd:sequence>
     <xsd:attribute name="id"
                    type="xsd:ID"/>
@@ -1496,7 +1513,7 @@
   <xsd:complexType name="persistence-unit-refType">
     <xsd:annotation>
       <xsd:documentation>
-<![CDATA[[
+        <![CDATA[[
         The persistence-unit-ref element contains a declaration
         of Deployment Component's reference to a persistence unit
         associated within a Deployment Component's
@@ -1522,7 +1539,7 @@
         </persistence-unit-name>
         </persistence-unit-ref>
         
-]]>
+        ]]>
       </xsd:documentation>
     </xsd:annotation>
     <xsd:sequence>
@@ -1566,7 +1583,7 @@
           </xsd:documentation>
         </xsd:annotation>
       </xsd:element>
-      <xsd:group ref="javaee:resourceGroup"/>
+      <xsd:group ref="javaee:resourceBaseGroup"/>
     </xsd:sequence>
     <xsd:attribute name="id"
                    type="xsd:ID"/>
@@ -1578,7 +1595,7 @@
   <xsd:complexType name="remoteType">
     <xsd:annotation>
       <xsd:documentation>
-<![CDATA[[
+        <![CDATA[[
         The remote element contains the fully-qualified name
         of the enterprise bean's remote interface.
         
@@ -1586,7 +1603,7 @@
         
         <remote>com.wombat.empl.EmployeeService</remote>
         
-]]>
+        ]]>
       </xsd:documentation>
     </xsd:annotation>
     <xsd:simpleContent>
@@ -1600,7 +1617,7 @@
   <xsd:complexType name="resource-env-refType">
     <xsd:annotation>
       <xsd:documentation>
-<![CDATA[[
+        <![CDATA[[
         The resource-env-refType is used to define
         resource-env-ref elements.  It contains a declaration of a
         Deployment Component's reference to an administered object
@@ -1628,7 +1645,7 @@
         </resource-env-ref-type>
         </resource-env-ref>
         
-]]>
+        ]]>
       </xsd:documentation>
     </xsd:annotation>
     <xsd:sequence>
@@ -1677,7 +1694,7 @@
   <xsd:complexType name="resource-refType">
     <xsd:annotation>
       <xsd:documentation>
-<![CDATA[[
+        <![CDATA[[
         The resource-refType contains a declaration of a
         Deployment Component's reference to an external resource. It
         consists of an optional description, the resource manager
@@ -1706,7 +1723,7 @@
         <res-sharing-scope>Shareable</res-sharing-scope>
         </resource-ref>
         
-]]>
+        ]]>
       </xsd:documentation>
     </xsd:annotation>
     <xsd:sequence>
@@ -1859,7 +1876,7 @@
   <xsd:complexType name="security-roleType">
     <xsd:annotation>
       <xsd:documentation>
-<![CDATA[[
+        <![CDATA[[
         The security-roleType contains the definition of a security
         role. The definition consists of an optional description of
         the security role, and the security role name.
@@ -1874,7 +1891,7 @@
         <role-name>employee</role-name>
         </security-role>
         
-]]>
+        ]]>
       </xsd:documentation>
     </xsd:annotation>
     <xsd:sequence>
@@ -2168,7 +2185,7 @@
   <xsd:complexType name="message-destinationType">
     <xsd:annotation>
       <xsd:documentation>
-<![CDATA[[
+        <![CDATA[[
         The message-destinationType specifies a message
         destination. The logical destination described by this
         element is mapped to a physical destination by the Deployer.
@@ -2191,7 +2208,7 @@
         </message-destination-name>
         </message-destination>
         
-]]>
+        ]]>
       </xsd:documentation>
     </xsd:annotation>
     <xsd:sequence>
@@ -2257,7 +2274,7 @@
   <xsd:complexType name="message-destination-refType">
     <xsd:annotation>
       <xsd:documentation>
-<![CDATA[[
+        <![CDATA[[
         The message-destination-ref element contains a declaration
         of Deployment Component's reference to a message destination
         associated with a resource in Deployment Component's
@@ -2292,7 +2309,7 @@
         </message-destination-link>
         </message-destination-ref>
         
-]]>
+        ]]>
       </xsd:documentation>
     </xsd:annotation>
     <xsd:sequence>
@@ -2365,7 +2382,7 @@
   <xsd:complexType name="message-destination-typeType">
     <xsd:annotation>
       <xsd:documentation>
-<![CDATA[[
+        <![CDATA[[
         The message-destination-typeType specifies the type of
         the destination. The type is specified by the Java interface
         expected to be implemented by the destination.
@@ -2375,7 +2392,7 @@
         <message-destination-type>javax.jms.Queue
         </message-destination-type>
         
-]]>
+        ]]>
       </xsd:documentation>
     </xsd:annotation>
     <xsd:simpleContent>
@@ -2418,3 +2435,5 @@
   </xsd:complexType>
 
 </xsd:schema>
+
+
diff --git a/java/javax/servlet/resources/web-app_3_0.xsd b/java/javax/servlet/resources/web-app_3_0.xsd
index cdad777d6..305d6f86d 100644
--- a/java/javax/servlet/resources/web-app_3_0.xsd
+++ b/java/javax/servlet/resources/web-app_3_0.xsd
@@ -286,3 +286,4 @@
 
 </xsd:schema>
 
+
diff --git a/java/javax/servlet/resources/web-common_3_0.xsd b/java/javax/servlet/resources/web-common_3_0.xsd
index 3ca6dbc63..aa91587e5 100644
--- a/java/javax/servlet/resources/web-common_3_0.xsd
+++ b/java/javax/servlet/resources/web-common_3_0.xsd
@@ -121,8 +121,6 @@
   <xsd:group name="web-commonType">
     <xsd:choice>
       <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="name"
-                   type="javaee:java-identifierType"/>
       <xsd:element name="distributable"
                    type="javaee:emptyType"/>
       <xsd:element name="context-param"
@@ -227,6 +225,8 @@
   <xsd:complexType name="web-fragmentType">
     <xsd:choice minOccurs="0"
                 maxOccurs="unbounded">
+      <xsd:element name="name"
+                   type="javaee:java-identifierType"/>
       <xsd:group ref="javaee:web-commonType"/>
       <xsd:element name="ordering"
                    type="javaee:orderingType"/>
@@ -1589,3 +1589,4 @@
 
 </xsd:schema>
 
+
diff --git a/java/javax/servlet/resources/web-fragment_3_0.xsd b/java/javax/servlet/resources/web-fragment_3_0.xsd
index 40b087434..3ec906b3c 100644
--- a/java/javax/servlet/resources/web-fragment_3_0.xsd
+++ b/java/javax/servlet/resources/web-fragment_3_0.xsd
@@ -286,3 +286,4 @@
 
 </xsd:schema>
 
+
-- 
2.11.0