geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: rev 55336 - in geronimo/trunk/modules/j2ee-schema: . src/j2ee_1_4schema
Date Fri, 22 Oct 2004 23:39:27 GMT
Author: ammulder
Date: Fri Oct 22 16:39:25 2004
New Revision: 55336

Added:
   geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/j2ee_jaxrpc_mapping_1_1.xsd
   geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/j2ee_web_services_1_1.xsd
Removed:
   geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/application-client_1_4-corrected.xsd
   geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/ejb-jar_2_1-corrected.xsd
   geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/web-app_2_4-corrected.xsd
Modified:
   geronimo/trunk/modules/j2ee-schema/maven.xml
   geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/application-client_1_4.xsd
   geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/application_1_4.xsd
   geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/connector_1_5.xsd
   geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/ejb-jar_2_1.xsd
   geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/j2ee_1_4.xsd
   geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/j2ee_web_services_client_1_1.xsd
   geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/jsp_2_0.xsd
   geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/web-app_2_4.xsd
   geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/web-jsptaglibrary_2_0.xsd
   geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/xml.xsd
Log:
Update to latest J2EE schemas from http://java.sun.com/xml/ns/j2ee/
Corrected versions are no longer necessary
Now includes more web services schemas


Modified: geronimo/trunk/modules/j2ee-schema/maven.xml
==============================================================================
--- geronimo/trunk/modules/j2ee-schema/maven.xml	(original)
+++ geronimo/trunk/modules/j2ee-schema/maven.xml	Fri Oct 22 16:39:25 2004
@@ -28,7 +28,7 @@
     <preGoal name="java:compile">
         <xmlbeans:schema2java
             sourcedir="${basedir}/src"
-            sourceschema="j2ee_1_4schema/application_1_4.xsd,j2ee_1_3schema/connector_1_0.xsd,j2ee_1_4schema/j2ee_1_4.xsd,j2ee_1_4schema/connector_1_5.xsd,j2ee_1_4schema/ejb-jar_2_1-corrected.xsd,j2ee_1_4schema/web-app_2_4-corrected.xsd,j2ee_1_4schema/application-client_1_4-corrected.xsd"
+            sourceschema="j2ee_1_4schema/application_1_4.xsd,j2ee_1_3schema/connector_1_0.xsd,j2ee_1_4schema/j2ee_1_4.xsd,j2ee_1_4schema/connector_1_5.xsd,j2ee_1_4schema/ejb-jar_2_1.xsd,j2ee_1_4schema/web-app_2_4.xsd,j2ee_1_4schema/application-client_1_4.xsd"
             xmlconfigs="${basedir}/src/conf/xmlconfig.xml"
             targetdir="${basedir}/target/xmlbeans"
             cataloglocation="${basedir}/src/catalog/resolver-catalog.xml"/>

Modified: geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/application-client_1_4.xsd
==============================================================================
--- geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/application-client_1_4.xsd	(original)
+++ geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/application-client_1_4.xsd	Fri Oct 22 16:39:25 2004
@@ -1,21 +1,21 @@
 <?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="1.4">
-    <xsd:annotation>
-        <xsd:documentation>
+	    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="1.4">
+  <xsd:annotation>
+    <xsd:documentation>
       @(#)application-client_1_4.xsds	1.17 02/11/03
-        </xsd:documentation>
-    </xsd:annotation>
+    </xsd:documentation>
+  </xsd:annotation>
 
-    <xsd:annotation>
-        <xsd:documentation>
+  <xsd:annotation>
+    <xsd:documentation>
 
-      Copyright 2002 Sun Microsystems, Inc., 901 San Antonio
+      Copyright 2003 Sun Microsystems, Inc., 901 San Antonio
       Road, Palo Alto, California 94303, U.S.A. All rights
       reserved.
 
@@ -44,12 +44,12 @@
       Federal Acquisitions: Commercial Software - Government Users
       Subject to Standard License Terms and Conditions.
 
-        </xsd:documentation>
-    </xsd:annotation>
+    </xsd:documentation>
+  </xsd:annotation>
 
-    <xsd:annotation>
-        <xsd:documentation>
-            <![CDATA[
+  <xsd:annotation>
+    <xsd:documentation>
+      <![CDATA[
 
 	This is the XML Schema for the application client 1.4
 	deployment descriptor.  The deployment descriptor must
@@ -77,12 +77,12 @@
 
 	http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd
 
-        ]]>
-        </xsd:documentation>
-    </xsd:annotation>
+	]]>
+    </xsd:documentation>
+  </xsd:annotation>
 
-    <xsd:annotation>
-        <xsd:documentation>
+  <xsd:annotation>
+    <xsd:documentation>
 
       The following conventions apply to all J2EE
       deployment descriptor elements unless indicated otherwise.
@@ -96,18 +96,18 @@
 	preferred.  The exception is .war files where absolute
 	names are preferred for consistency with the Servlet API.
 
-        </xsd:documentation>
-    </xsd:annotation>
+    </xsd:documentation>
+  </xsd:annotation>
 
-    <xsd:include schemaLocation="j2ee_1_4.xsd"/>
+  <xsd:include schemaLocation="j2ee_1_4.xsd"/>
 
 
-    <!-- **************************************************** -->
+<!-- **************************************************** -->
 
 
-    <xsd:element name="application-client" type="j2ee:application-clientType">
-        <xsd:annotation>
-            <xsd:documentation>
+  <xsd:element name="application-client" type="j2ee:application-clientType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The application-client element is the root element of an
 	application client deployment descriptor.  The application
@@ -115,27 +115,27 @@
 	and external resources referenced by the application
 	client.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <xsd:unique name="env-entry-name-uniqueness">
-            <xsd:annotation>
-                <xsd:documentation>
+    <xsd:unique name="env-entry-name-uniqueness">
+      <xsd:annotation>
+	<xsd:documentation>
 
 	  The env-entry-name element contains the name of an
 	  application client's environment entry.  The name is a JNDI
 	  name relative to the java:comp/env context.  The name must
 	  be unique within an application client.
 
-                </xsd:documentation>
-            </xsd:annotation>
-            <xsd:selector xpath="j2ee:env-entry"/>
-            <xsd:field xpath="j2ee:env-entry-name"/>
-        </xsd:unique>
-
-        <xsd:unique name="ejb-ref-name-uniqueness">
-            <xsd:annotation>
-                <xsd:documentation>
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="j2ee:env-entry"/>
+      <xsd:field    xpath="j2ee:env-entry-name"/>
+    </xsd:unique>
+
+    <xsd:unique name="ejb-ref-name-uniqueness">
+      <xsd:annotation>
+	<xsd:documentation>
 
 	  The ejb-ref-name element contains the name of an EJB
 	  reference. The EJB reference is an entry in the application
@@ -145,30 +145,30 @@
 
 	  It is recommended that name is prefixed with "ejb/".
 
-                </xsd:documentation>
-            </xsd:annotation>
-            <xsd:selector xpath="j2ee:ejb-ref"/>
-            <xsd:field xpath="j2ee:ejb-ref-name"/>
-        </xsd:unique>
-
-        <xsd:unique name="res-ref-name-uniqueness">
-            <xsd:annotation>
-                <xsd:documentation>
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="j2ee:ejb-ref"/>
+      <xsd:field    xpath="j2ee:ejb-ref-name"/>
+    </xsd:unique>
+
+    <xsd:unique name="res-ref-name-uniqueness">
+      <xsd:annotation>
+	<xsd:documentation>
 
 	  The res-ref-name element specifies the name of a
 	  resource manager connection factory reference.The name
 	  is a JNDI name relative to the java:comp/env context.
 	  The name must be unique within an application client.
 
-                </xsd:documentation>
-            </xsd:annotation>
-            <xsd:selector xpath="j2ee:resource-ref"/>
-            <xsd:field xpath="j2ee:res-ref-name"/>
-        </xsd:unique>
-
-        <xsd:unique name="resource-env-ref-uniqueness">
-            <xsd:annotation>
-                <xsd:documentation>
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="j2ee:resource-ref"/>
+      <xsd:field    xpath="j2ee:res-ref-name"/>
+    </xsd:unique>
+
+    <xsd:unique name="resource-env-ref-uniqueness">
+      <xsd:annotation>
+	<xsd:documentation>
 
 	  The resource-env-ref-name element specifies the name of
 	  a resource environment reference; its value is the
@@ -177,15 +177,15 @@
 	  java:comp/env context and must be unique within an
 	  application client.
 
-                </xsd:documentation>
-            </xsd:annotation>
-            <xsd:selector xpath="j2ee:resource-env-ref"/>
-            <xsd:field xpath="j2ee:resource-env-ref-name"/>
-        </xsd:unique>
-
-        <xsd:unique name="message-destination-ref-uniqueness">
-            <xsd:annotation>
-                <xsd:documentation>
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="j2ee:resource-env-ref"/>
+      <xsd:field    xpath="j2ee:resource-env-ref-name"/>
+    </xsd:unique>
+
+    <xsd:unique name="message-destination-ref-uniqueness">
+      <xsd:annotation>
+	<xsd:documentation>
 
 	  The message-destination-ref-name element specifies the
 	  name of a message destination reference; its value is
@@ -194,40 +194,40 @@
 	  relative to the java:comp/env context and must be unique
 	  within an application client.
 
-                </xsd:documentation>
-            </xsd:annotation>
-            <xsd:selector xpath="j2ee:message-destination-ref"/>
-            <xsd:field xpath="j2ee:message-destination-ref-name"/>
-        </xsd:unique>
-    </xsd:element>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="application-clientType">
-        <xsd:sequence>
-            <xsd:group ref="j2ee:descriptionGroup"/>
-            <xsd:element name="env-entry"
-                type="j2ee:env-entryType"
-                minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="ejb-ref"
-                type="j2ee:ejb-refType"
-                minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:group ref="j2ee:service-refGroup"/>
-            <xsd:element name="resource-ref"
-                type="j2ee:resource-refType"
-                minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="resource-env-ref"
-                type="j2ee:resource-env-refType"
-                minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="message-destination-ref"
-                type="j2ee:message-destination-refType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-            <xsd:element name="callback-handler"
-                type="j2ee:fully-qualified-classType"
-                minOccurs="0">
-                <xsd:annotation>
-                    <xsd:documentation>
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="j2ee:message-destination-ref"/>
+      <xsd:field    xpath="j2ee:message-destination-ref-name"/>
+    </xsd:unique>
+  </xsd:element>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="application-clientType">
+    <xsd:sequence>
+      <xsd:group ref="j2ee:descriptionGroup"/>
+      <xsd:element name="env-entry"
+		   type="j2ee:env-entryType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="ejb-ref"
+		   type="j2ee:ejb-refType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:group ref="j2ee:service-refGroup"/>
+      <xsd:element name="resource-ref"
+		   type="j2ee:resource-refType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="resource-env-ref"
+		   type="j2ee:resource-env-refType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="message-destination-ref"
+		   type="j2ee:message-destination-refType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="callback-handler"
+		   type="j2ee:fully-qualified-classType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The callback-handler element names a class provided by
 	    the application.  The class must have a no args
@@ -237,30 +237,30 @@
 	    application client container and used by the container
 	    to collect authentication information from the user.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="message-destination"
-                type="j2ee:message-destinationType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-        </xsd:sequence>
-
-        <xsd:attribute name="version"
-            type="j2ee:dewey-versionType"
-            fixed="1.4"
-            use="required">
-            <xsd:annotation>
-                <xsd:documentation>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="message-destination"
+		   type="j2ee:message-destinationType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+    </xsd:sequence>
+
+    <xsd:attribute name="version"
+		   type="j2ee:dewey-versionType"
+		   fixed="1.4"
+		   use="required">
+      <xsd:annotation>
+	<xsd:documentation>
 
 	  The required value for the version is 1.4.
 
-                </xsd:documentation>
-            </xsd:annotation>
+	</xsd:documentation>
+      </xsd:annotation>
 
-        </xsd:attribute>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
+    </xsd:attribute>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
 
 </xsd:schema>
 

Modified: geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/application_1_4.xsd
==============================================================================
--- geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/application_1_4.xsd	(original)
+++ geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/application_1_4.xsd	Fri Oct 22 16:39:25 2004
@@ -1,21 +1,21 @@
 <?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="1.4">
-    <xsd:annotation>
-        <xsd:documentation>
+	    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="1.4">
+  <xsd:annotation>
+    <xsd:documentation>
       @(#)application_1_4.xsds	1.13 02/11/03
-        </xsd:documentation>
-    </xsd:annotation>
+    </xsd:documentation>
+  </xsd:annotation>
 
-    <xsd:annotation>
-        <xsd:documentation>
+  <xsd:annotation>
+    <xsd:documentation>
 
-      Copyright 2002 Sun Microsystems, Inc., 901 San Antonio
+      Copyright 2003 Sun Microsystems, Inc., 901 San Antonio
       Road, Palo Alto, California 94303, U.S.A. All rights
       reserved.
 
@@ -44,12 +44,12 @@
       Federal Acquisitions: Commercial Software - Government Users
       Subject to Standard License Terms and Conditions.
 
-        </xsd:documentation>
-    </xsd:annotation>
+    </xsd:documentation>
+  </xsd:annotation>
 
-    <xsd:annotation>
-        <xsd:documentation>
-            <![CDATA[
+  <xsd:annotation>
+    <xsd:documentation>
+      <![CDATA[
 
 	This is the XML Schema for the application 1.4 deployment
 	descriptor.  The deployment descriptor must be named
@@ -76,12 +76,12 @@
 
 	http://java.sun.com/xml/ns/j2ee/application_1_4.xsd
 
-        ]]>
-        </xsd:documentation>
-    </xsd:annotation>
+	]]>
+    </xsd:documentation>
+  </xsd:annotation>
 
-    <xsd:annotation>
-        <xsd:documentation>
+  <xsd:annotation>
+    <xsd:documentation>
 
       The following conventions apply to all J2EE
       deployment descriptor elements unless indicated otherwise.
@@ -95,107 +95,107 @@
 	preferred.  The exception is .war files where absolute
 	names are preferred for consistency with the Servlet API.
 
-        </xsd:documentation>
-    </xsd:annotation>
+    </xsd:documentation>
+  </xsd:annotation>
 
-    <xsd:include schemaLocation="j2ee_1_4.xsd"/>
+  <xsd:include schemaLocation="j2ee_1_4.xsd"/>
 
 
-    <!-- **************************************************** -->
+<!-- **************************************************** -->
 
 
-    <xsd:element name="application" type="j2ee:applicationType">
-        <xsd:annotation>
-            <xsd:documentation>
+  <xsd:element name="application" type="j2ee:applicationType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The application element is the root element of a J2EE
 	application deployment descriptor.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <xsd:unique name="context-root-uniqueness">
-            <xsd:annotation>
-                <xsd:documentation>
+    <xsd:unique name="context-root-uniqueness">
+      <xsd:annotation>
+	<xsd:documentation>
 
 	  The context-root element content must be unique
 	  in the ear.
 
-                </xsd:documentation>
-            </xsd:annotation>
-            <xsd:selector xpath="j2ee:module/j2ee:web"/>
-            <xsd:field xpath="j2ee:context-root"/>
-        </xsd:unique>
-
-        <xsd:unique name="security-role-uniqueness">
-            <xsd:annotation>
-                <xsd:documentation>
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="j2ee:module/j2ee:web"/>
+      <xsd:field    xpath="j2ee:context-root"/>
+    </xsd:unique>
+
+    <xsd:unique name="security-role-uniqueness">
+      <xsd:annotation>
+	<xsd:documentation>
 
 	  The security-role-name element content
 	  must be unique in the ear.
 
-                </xsd:documentation>
-            </xsd:annotation>
-            <xsd:selector xpath="j2ee:security-role"/>
-            <xsd:field xpath="j2ee:role-name"/>
-        </xsd:unique>
-
-    </xsd:element>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="applicationType">
-        <xsd:annotation>
-            <xsd:documentation>
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="j2ee:security-role"/>
+      <xsd:field    xpath="j2ee:role-name"/>
+    </xsd:unique>
+
+  </xsd:element>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="applicationType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The applicationType defines the structure of the
 	application.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <xsd:sequence>
-            <xsd:group ref="j2ee:descriptionGroup"/>
-            <xsd:element name="module"
-                type="j2ee:moduleType"
-                maxOccurs="unbounded">
-                <xsd:annotation>
-                    <xsd:documentation>
+    <xsd:sequence>
+      <xsd:group ref="j2ee:descriptionGroup"/>
+      <xsd:element name="module"
+		   type="j2ee:moduleType"
+		   maxOccurs="unbounded">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The application deployment descriptor must have one
 	    module element for each J2EE module in the
 	    application package. A module element is defined
 	    by moduleType definition.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="security-role"
-                type="j2ee:security-roleType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-        </xsd:sequence>
-        <xsd:attribute name="version"
-            type="j2ee:dewey-versionType"
-            fixed="1.4"
-            use="required">
-            <xsd:annotation>
-                <xsd:documentation>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="security-role"
+		   type="j2ee:security-roleType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="version"
+		   type="j2ee:dewey-versionType"
+		   fixed="1.4"
+		   use="required">
+      <xsd:annotation>
+	<xsd:documentation>
 
 	  The required value for the version is 1.4.
 
-                </xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="moduleType">
-        <xsd:annotation>
-            <xsd:documentation>
+	</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="moduleType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The moduleType defines a single J2EE module and contains a
 	connector, ejb, java, or web element, which indicates the
@@ -203,55 +203,55 @@
 	optional alt-dd element, which specifies an optional URI to
 	the post-assembly version of the deployment descriptor.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <xsd:sequence>
-            <xsd:choice>
-                <xsd:element name="connector"
-                    type="j2ee:pathType">
-                    <xsd:annotation>
-                        <xsd:documentation>
+    <xsd:sequence>
+      <xsd:choice>
+	<xsd:element name="connector"
+		     type="j2ee:pathType">
+	  <xsd:annotation>
+	    <xsd:documentation>
 
 	      The connector element specifies the URI of a
 	      resource adapter archive file, relative to the
 	      top level of the application package.
 
-                        </xsd:documentation>
-                    </xsd:annotation>
-                </xsd:element>
-                <xsd:element name="ejb"
-                    type="j2ee:pathType">
-                    <xsd:annotation>
-                        <xsd:documentation>
+	    </xsd:documentation>
+	  </xsd:annotation>
+	</xsd:element>
+	<xsd:element name="ejb"
+		     type="j2ee:pathType">
+	  <xsd:annotation>
+	    <xsd:documentation>
 
 	      The ejb element specifies the URI of an ejb-jar,
 	      relative to the top level of the application
 	      package.
 
-                        </xsd:documentation>
-                    </xsd:annotation>
-                </xsd:element>
-                <xsd:element name="java"
-                    type="j2ee:pathType">
-                    <xsd:annotation>
-                        <xsd:documentation>
+	    </xsd:documentation>
+	  </xsd:annotation>
+	</xsd:element>
+	<xsd:element name="java"
+		     type="j2ee:pathType">
+	  <xsd:annotation>
+	    <xsd:documentation>
 
 	      The java element specifies the URI of a java
 	      application client module, relative to the top
 	      level of the application package.
 
-                        </xsd:documentation>
-                    </xsd:annotation>
-                </xsd:element>
-                <xsd:element name="web"
-                    type="j2ee:webType"/>
-            </xsd:choice>
-            <xsd:element name="alt-dd"
-                type="j2ee:pathType"
-                minOccurs="0">
-                <xsd:annotation>
-                    <xsd:documentation>
+	    </xsd:documentation>
+	  </xsd:annotation>
+	</xsd:element>
+	<xsd:element name="web"
+		     type="j2ee:webType"/>
+      </xsd:choice>
+      <xsd:element name="alt-dd"
+		   type="j2ee:pathType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The alt-dd element specifies an optional URI to the
 	    post-assembly version of the deployment descriptor
@@ -263,52 +263,52 @@
 	    location and file name required by the respective
 	    component specification.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="webType">
-        <xsd:annotation>
-            <xsd:documentation>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="webType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The webType defines the web-uri and context-root of
 	a web application module.
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:sequence>
-            <xsd:element name="web-uri"
-                type="j2ee:pathType">
-                <xsd:annotation>
-                    <xsd:documentation>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="web-uri"
+		   type="j2ee:pathType">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The web-uri element specifies the URI of a web
 	    application file, relative to the top level of the
 	    application package.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="context-root"
-                type="j2ee:string">
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="context-root"
+		   type="j2ee:string">
 
-                <xsd:annotation>
-                    <xsd:documentation>
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The context-root element specifies the context root
 	    of a web application.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
 
 </xsd:schema>
 

Modified: geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/connector_1_5.xsd
==============================================================================
--- geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/connector_1_5.xsd	(original)
+++ geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/connector_1_5.xsd	Fri Oct 22 16:39:25 2004
@@ -1,21 +1,21 @@
 <?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="1.5">
-    <xsd:annotation>
-        <xsd:documentation>
-      @(#)connector_1_5.xsds	1.26 03/21/03
-        </xsd:documentation>
-    </xsd:annotation>
+	    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="1.5">
+  <xsd:annotation>
+    <xsd:documentation>
+      @(#)connector_1_5.xsds	1.27 06/17/03
+    </xsd:documentation>
+  </xsd:annotation>
 
-    <xsd:annotation>
-        <xsd:documentation>
+  <xsd:annotation>
+    <xsd:documentation>
 
-      Copyright 2002 Sun Microsystems, Inc., 901 San Antonio
+      Copyright 2003 Sun Microsystems, Inc., 901 San Antonio
       Road, Palo Alto, California 94303, U.S.A. All rights
       reserved.
 
@@ -44,12 +44,12 @@
       Federal Acquisitions: Commercial Software - Government Users
       Subject to Standard License Terms and Conditions.
 
-        </xsd:documentation>
-    </xsd:annotation>
+    </xsd:documentation>
+  </xsd:annotation>
 
-    <xsd:annotation>
-        <xsd:documentation>
-            <![CDATA[
+  <xsd:annotation>
+    <xsd:documentation>
+      <![CDATA[
 
 	This is the XML Schema for the Connector 1.5 deployment
 	descriptor.  The deployment descriptor must be named
@@ -76,12 +76,12 @@
 
 	http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd
 
-        ]]>
-        </xsd:documentation>
-    </xsd:annotation>
+	]]>
+    </xsd:documentation>
+  </xsd:annotation>
 
-    <xsd:annotation>
-        <xsd:documentation>
+  <xsd:annotation>
+    <xsd:documentation>
 
       The following conventions apply to all J2EE
       deployment descriptor elements unless indicated otherwise.
@@ -95,18 +95,18 @@
 	preferred.  The exception is .war files where absolute
 	names are preferred for consistency with the Servlet API.
 
-        </xsd:documentation>
-    </xsd:annotation>
+    </xsd:documentation>
+  </xsd:annotation>
 
-    <xsd:include schemaLocation="j2ee_1_4.xsd"/>
+  <xsd:include schemaLocation="j2ee_1_4.xsd"/>
 
 
-    <!-- **************************************************** -->
+<!-- **************************************************** -->
 
 
-    <xsd:element name="connector" type="j2ee:connectorType">
-        <xsd:annotation>
-            <xsd:documentation>
+  <xsd:element name="connector" type="j2ee:connectorType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The connector element is the root element of the deployment
 	descriptor for the resource adapter. This element includes
@@ -116,31 +116,31 @@
 	adapter library as specified through the element
 	resourceadapter.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-    </xsd:element>
+  </xsd:element>
 
-    <!-- **************************************************** -->
+<!-- **************************************************** -->
 
-    <xsd:complexType name="activationspecType">
-        <xsd:annotation>
-            <xsd:documentation>
+  <xsd:complexType name="activationspecType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The activationspecType specifies an activation
 	specification.  The information includes fully qualified
 	Java class name of an activation specification and a set of
 	required configuration property names.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <xsd:sequence>
-            <xsd:element name="activationspec-class"
-                type="j2ee:fully-qualified-classType">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        <![CDATA[
+    <xsd:sequence>
+      <xsd:element name="activationspec-class"
+		   type="j2ee:fully-qualified-classType">
+	<xsd:annotation>
+	  <xsd:documentation>
+	    <![CDATA[
 
 	      The element activationspec-class specifies the fully
 	      qualified Java class name of the activation
@@ -153,23 +153,23 @@
 		  <activationspec-class>com.wombat.ActivationSpecImpl
 		  </activationspec-class>
 
-                        ]]>
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="required-config-property"
-                type="j2ee:required-config-propertyType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="adminobjectType">
-        <xsd:annotation>
-            <xsd:documentation>
+	      ]]>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="required-config-property"
+		   type="j2ee:required-config-propertyType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="adminobjectType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The adminobjectType specifies information about an
 	administered object.  Administered objects are specific to a
@@ -178,15 +178,15 @@
 	an administered object, its Java class name and its
 	configuration properties.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <xsd:sequence>
-            <xsd:element name="adminobject-interface"
-                type="j2ee:fully-qualified-classType">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        <![CDATA[
+    <xsd:sequence>
+      <xsd:element name="adminobject-interface"
+		   type="j2ee:fully-qualified-classType">
+	<xsd:annotation>
+	  <xsd:documentation>
+	    <![CDATA[
 
 	      The element adminobject-interface specifies the
 	      fully qualified name of the Java type of the
@@ -196,16 +196,16 @@
 		<adminobject-interface>javax.jms.Destination
 		</adminobject-interface>
 
-                        ]]>
-                    </xsd:documentation>
-                </xsd:annotation>
-
-            </xsd:element>
-            <xsd:element name="adminobject-class"
-                type="j2ee:fully-qualified-classType">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        <![CDATA[
+	      ]]>
+	  </xsd:documentation>
+	</xsd:annotation>
+
+      </xsd:element>
+      <xsd:element name="adminobject-class"
+		   type="j2ee:fully-qualified-classType">
+	<xsd:annotation>
+	  <xsd:documentation>
+	    <![CDATA[
 
 	      The element adminobject-class specifies the fully
 	      qualified Java class name of an administered object.
@@ -214,24 +214,24 @@
 		  <adminobject-class>com.wombat.DestinationImpl
 		  </adminobject-class>
 
-                        ]]>
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-
-            <xsd:element name="config-property"
-                type="j2ee:config-propertyType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="authentication-mechanismType">
-        <xsd:annotation>
-            <xsd:documentation>
+	      ]]>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+      <xsd:element name="config-property"
+		   type="j2ee:config-propertyType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="authentication-mechanismType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The authentication-mechanismType specifies an authentication
 	mechanism supported by the resource adapter. Note that this
@@ -246,19 +246,19 @@
 	org.ietf.jgss.GSSCredential interface or the deprecated
 	javax.resource.spi.security.GenericCredential interface.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <xsd:sequence>
-            <xsd:element name="description"
-                type="j2ee:descriptionType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-            <xsd:element name="authentication-mechanism-type"
-                type="j2ee:xsdStringType">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        <![CDATA[
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="authentication-mechanism-type"
+		   type="j2ee:xsdStringType">
+	<xsd:annotation>
+	  <xsd:documentation>
+	    <![CDATA[
 
 	      The element authentication-mechanism-type specifies
 	      type of an authentication mechanism.
@@ -274,23 +274,23 @@
 	      Any additional security mechanisms are outside the
 	      scope of the Connector architecture specification.
 
-                        ]]>
-                    </xsd:documentation>
-                </xsd:annotation>
-
-            </xsd:element>
-            <xsd:element name="credential-interface"
-                type="j2ee:credential-interfaceType"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="config-property-nameType">
-        <xsd:annotation>
-            <xsd:documentation>
-                <![CDATA[
+	      ]]>
+	  </xsd:documentation>
+	</xsd:annotation>
+
+      </xsd:element>
+      <xsd:element name="credential-interface"
+		   type="j2ee:credential-interfaceType"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="config-property-nameType">
+    <xsd:annotation>
+      <xsd:documentation>
+	<![CDATA[
 
 	  The config-property-nameType contains the name of a
 	  configuration property.
@@ -318,20 +318,20 @@
 
 	  Example: <config-property-name>ServerName</config-property-name>
 
-            ]]>
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:restriction base="j2ee:xsdStringType"/>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="config-property-typeType">
-        <xsd:annotation>
-            <xsd:documentation>
-                <![CDATA[
+	  ]]>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:xsdStringType"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="config-property-typeType">
+    <xsd:annotation>
+      <xsd:documentation>
+	<![CDATA[
 
 	  The config-property-typeType contains the fully
 	  qualified Java type of a configuration property.
@@ -346,29 +346,29 @@
 	  Example:
 	  <config-property-type>java.lang.String</config-property-type>
 
-            ]]>
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:restriction base="j2ee:string">
-                <xsd:enumeration value="java.lang.Boolean"/>
-                <xsd:enumeration value="java.lang.String"/>
-                <xsd:enumeration value="java.lang.Integer"/>
-                <xsd:enumeration value="java.lang.Double"/>
-                <xsd:enumeration value="java.lang.Byte"/>
-                <xsd:enumeration value="java.lang.Short"/>
-                <xsd:enumeration value="java.lang.Long"/>
-                <xsd:enumeration value="java.lang.Float"/>
-                <xsd:enumeration value="java.lang.Character"/>
-            </xsd:restriction>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="config-propertyType">
-        <xsd:annotation>
-            <xsd:documentation>
+	  ]]>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:string">
+	<xsd:enumeration value="java.lang.Boolean"/>
+	<xsd:enumeration value="java.lang.String"/>
+	<xsd:enumeration value="java.lang.Integer"/>
+	<xsd:enumeration value="java.lang.Double"/>
+	<xsd:enumeration value="java.lang.Byte"/>
+	<xsd:enumeration value="java.lang.Short"/>
+	<xsd:enumeration value="java.lang.Long"/>
+	<xsd:enumeration value="java.lang.Float"/>
+	<xsd:enumeration value="java.lang.Character"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="config-propertyType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The config-propertyType contains a declaration of a single
 	configuration property that may be used for providing
@@ -383,23 +383,23 @@
 	Any bounds or well-defined values of properties should be
 	described in the description element.
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:sequence>
-            <xsd:element name="description"
-                type="j2ee:descriptionType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-            <xsd:element name="config-property-name"
-                type="j2ee:config-property-nameType"/>
-            <xsd:element name="config-property-type"
-                type="j2ee:config-property-typeType"/>
-            <xsd:element name="config-property-value"
-                type="j2ee:xsdStringType"
-                minOccurs="0">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        <![CDATA[
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="config-property-name"
+		   type="j2ee:config-property-nameType"/>
+      <xsd:element name="config-property-type"
+		   type="j2ee:config-property-typeType"/>
+      <xsd:element name="config-property-value"
+		   type="j2ee:xsdStringType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+	    <![CDATA[
 
 	      The element config-property-value contains the value
 	      of a configuration entry. Note, it is possible for a
@@ -409,19 +409,19 @@
 	      Example:
 	      <config-property-value>WombatServer</config-property-value>
 
-                        ]]>
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="connection-definitionType">
-        <xsd:annotation>
-            <xsd:documentation>
+	      ]]>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="connection-definitionType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The connection-definitionType defines a set of connection
 	interfaces and classes pertaining to a particular connection
@@ -429,15 +429,15 @@
 	ManagedConnectionFactory instances that may be produced out
 	of this set.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <xsd:sequence>
-            <xsd:element name="managedconnectionfactory-class"
-                type="j2ee:fully-qualified-classType">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        <![CDATA[
+    <xsd:sequence>
+      <xsd:element name="managedconnectionfactory-class"
+		   type="j2ee:fully-qualified-classType">
+	<xsd:annotation>
+	  <xsd:documentation>
+	    <![CDATA[
 
 	      The element managedconnectionfactory-class specifies
 	      the fully qualified name of the Java class that
@@ -453,19 +453,19 @@
 		  com.wombat.ManagedConnectionFactoryImpl
 	      </managedconnectionfactory-class>
 
-                        ]]>
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="config-property"
-                type="j2ee:config-propertyType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-            <xsd:element name="connectionfactory-interface"
-                type="j2ee:fully-qualified-classType">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        <![CDATA[
+	      ]]>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="config-property"
+		   type="j2ee:config-propertyType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="connectionfactory-interface"
+		   type="j2ee:fully-qualified-classType">
+	<xsd:annotation>
+	  <xsd:documentation>
+	    <![CDATA[
 
 	      The element connectionfactory-interface specifies
 	      the fully qualified name of the ConnectionFactory
@@ -480,16 +480,16 @@
 	      <connectionfactory-interface>javax.resource.cci.ConnectionFactory
 	      </connectionfactory-interface>
 
-                        ]]>
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-
-            <xsd:element name="connectionfactory-impl-class"
-                type="j2ee:fully-qualified-classType">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        <![CDATA[
+	      ]]>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+      <xsd:element name="connectionfactory-impl-class"
+		   type="j2ee:fully-qualified-classType">
+	<xsd:annotation>
+	  <xsd:documentation>
+	    <![CDATA[
 
 	      The element connectionfactory-impl-class specifies
 	      the fully qualified name of the ConnectionFactory
@@ -501,15 +501,15 @@
 	      <connectionfactory-impl-class>com.wombat.ConnectionFactoryImpl
 	      </connectionfactory-impl-class>
 
-                        ]]>
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="connection-interface"
-                type="j2ee:fully-qualified-classType">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        <![CDATA[
+	      ]]>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="connection-interface"
+		   type="j2ee:fully-qualified-classType">
+	<xsd:annotation>
+	  <xsd:documentation>
+	    <![CDATA[
 
 	      The connection-interface element specifies the fully
 	      qualified name of the Connection interface supported
@@ -520,15 +520,15 @@
 		  <connection-interface>javax.resource.cci.Connection
 		  </connection-interface>
 
-                        ]]>
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="connection-impl-class"
-                type="j2ee:fully-qualified-classType">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        <![CDATA[
+	      ]]>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="connection-impl-class"
+		   type="j2ee:fully-qualified-classType">
+	<xsd:annotation>
+	  <xsd:documentation>
+	    <![CDATA[
 
 	      The connection-impl-classType specifies the fully
 	      qualified name of the Connection class that
@@ -541,42 +541,42 @@
 		  <connection-impl-class>com.wombat.ConnectionImpl
 		  </connection-impl-class>
 
-                        ]]>
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="connectorType">
-        <xsd:annotation>
-            <xsd:documentation>
+	      ]]>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="connectorType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The connectorType defines a resource adapter.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <xsd:sequence>
-            <xsd:group ref="j2ee:descriptionGroup"/>
-            <xsd:element name="vendor-name"
-                type="j2ee:xsdStringType">
-                <xsd:annotation>
-                    <xsd:documentation>
+    <xsd:sequence>
+      <xsd:group ref="j2ee:descriptionGroup"/>
+      <xsd:element name="vendor-name"
+		   type="j2ee:xsdStringType">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The element vendor-name specifies the name of
 	    resource adapter provider vendor.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="eis-type"
-                type="j2ee:xsdStringType">
-                <xsd:annotation>
-                    <xsd:documentation>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="eis-type"
+		   type="j2ee:xsdStringType">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The element eis-type contains information about the
 	    type of the EIS. For example, the type of an EIS can
@@ -586,35 +586,35 @@
 	    This helps in identifying EIS instances that can be
 	    used with this resource adapter.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="resourceadapter-version"
-                type="j2ee:xsdStringType">
-                <xsd:annotation>
-                    <xsd:documentation>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="resourceadapter-version"
+		   type="j2ee:xsdStringType">
+	<xsd:annotation>
+	  <xsd:documentation>
 
-	    The element version specifies a string-based version
+	    The element resourceadapter-version specifies a string-based version
 	    of the resource adapter from the resource adapter
 	    provider.
 
-                    </xsd:documentation>
-                </xsd:annotation>
+	  </xsd:documentation>
+	</xsd:annotation>
 
-            </xsd:element>
-            <xsd:element name="license"
-                type="j2ee:licenseType"
-                minOccurs="0"/>
-            <xsd:element name="resourceadapter"
-                type="j2ee:resourceadapterType"/>
-
-        </xsd:sequence>
-        <xsd:attribute name="version"
-            type="j2ee:dewey-versionType"
-            fixed="1.5"
-            use="required">
-            <xsd:annotation>
-                <xsd:documentation>
+      </xsd:element>
+      <xsd:element name="license"
+		   type="j2ee:licenseType"
+		   minOccurs="0"/>
+      <xsd:element name="resourceadapter"
+		   type="j2ee:resourceadapterType"/>
+
+    </xsd:sequence>
+    <xsd:attribute name="version"
+		   type="j2ee:dewey-versionType"
+		   fixed="1.5"
+		   use="required">
+      <xsd:annotation>
+	<xsd:documentation>
 
 	  The version specifies the version of the
 	  connector architecture specification that is
@@ -623,17 +623,17 @@
 	  support deployment and runtime requirements of the
 	  corresponding connector architecture specification.
 
-                </xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="credential-interfaceType">
-        <xsd:annotation>
-            <xsd:documentation>
+	</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="credential-interfaceType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The credential-interfaceType specifies the
 	interface that the resource adapter implementation
@@ -650,61 +650,61 @@
 	org.ietf.jgss.GSSCredential
 	javax.resource.spi.security.GenericCredential
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:restriction base="j2ee:fully-qualified-classType">
-                <xsd:enumeration
-                    value="javax.resource.spi.security.PasswordCredential"/>
-                <xsd:enumeration
-                    value="org.ietf.jgss.GSSCredential"/>
-                <xsd:enumeration
-                    value="javax.resource.spi.security.GenericCredential"/>
-            </xsd:restriction>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="inbound-resourceadapterType">
-        <xsd:annotation>
-            <xsd:documentation>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:fully-qualified-classType">
+	<xsd:enumeration
+	     value="javax.resource.spi.security.PasswordCredential"/>
+	<xsd:enumeration
+	     value="org.ietf.jgss.GSSCredential"/>
+	<xsd:enumeration
+	     value="javax.resource.spi.security.GenericCredential"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="inbound-resourceadapterType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The inbound-resourceadapterType specifies information
 	about an inbound resource adapter. This contains information
 	specific to the implementation of the resource adapter
 	library as specified through the messageadapter element.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <xsd:sequence>
-            <xsd:element name="messageadapter"
-                type="j2ee:messageadapterType"
-                minOccurs="0">
-                <xsd:unique name="messagelistener-type-uniqueness">
-                    <xsd:annotation>
-                        <xsd:documentation>
+    <xsd:sequence>
+      <xsd:element name="messageadapter"
+		   type="j2ee:messageadapterType"
+		   minOccurs="0">
+	<xsd:unique name="messagelistener-type-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
 
 	      The messagelistener-type element content must be
 	      unique in the messageadapter. Several messagelisteners
 	      can not use the same messagelistener-type.
 
-                        </xsd:documentation>
-                    </xsd:annotation>
-                    <xsd:selector xpath="j2ee:messagelistener"/>
-                    <xsd:field xpath="j2ee:messagelistener-type"/>
-                </xsd:unique>
-            </xsd:element>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="licenseType">
-        <xsd:annotation>
-            <xsd:documentation>
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="j2ee:messagelistener"/>
+	  <xsd:field    xpath="j2ee:messagelistener-type"/>
+	</xsd:unique>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="licenseType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The licenseType specifies licensing requirements for the
 	resource adapter module. This type specifies whether a
@@ -713,36 +713,36 @@
 	(examples: duration of license, number of connection
 	restrictions). It is used by the license element.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <xsd:sequence>
-            <xsd:element name="description"
-                type="j2ee:descriptionType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-            <xsd:element name="license-required"
-                type="j2ee:true-falseType">
-                <xsd:annotation>
-                    <xsd:documentation>
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="license-required"
+		   type="j2ee:true-falseType">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The element license-required specifies whether a
 	    license is required to deploy and use the
 	    resource adapter. This element must be one of
 	    the following, "true" or "false".
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="messageadapterType">
-        <xsd:annotation>
-            <xsd:documentation>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="messageadapterType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The messageadapterType specifies information about the
 	messaging capabilities of the resource adapter. This
@@ -750,22 +750,22 @@
 	resource adapter library as specified through the
 	messagelistener element.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="messagelistener"
+		   type="j2ee:messagelistenerType"
+		   maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
 
-        <xsd:sequence>
-            <xsd:element name="messagelistener"
-                type="j2ee:messagelistenerType"
-                maxOccurs="unbounded"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="messagelistenerType">
-        <xsd:annotation>
-            <xsd:documentation>
+  <xsd:complexType name="messagelistenerType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The messagelistenerType specifies information about a
 	specific message listener supported by the messaging
@@ -773,15 +773,15 @@
 	of the message listener interface and an activation
 	specification.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <xsd:sequence>
-            <xsd:element name="messagelistener-type"
-                type="j2ee:fully-qualified-classType">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        <![CDATA[
+    <xsd:sequence>
+      <xsd:element name="messagelistener-type"
+		   type="j2ee:fully-qualified-classType">
+	<xsd:annotation>
+	  <xsd:documentation>
+	    <![CDATA[
 
 	      The element messagelistener-type specifies the fully
 	      qualified name of the Java type of a message
@@ -792,22 +792,22 @@
 		<messagelistener-type>javax.jms.MessageListener
 		</messagelistener-type>
 
-                        ]]>
-                    </xsd:documentation>
-                </xsd:annotation>
-
-            </xsd:element>
-            <xsd:element name="activationspec"
-                type="j2ee:activationspecType"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="outbound-resourceadapterType">
-        <xsd:annotation>
-            <xsd:documentation>
+	      ]]>
+	  </xsd:documentation>
+	</xsd:annotation>
+
+      </xsd:element>
+      <xsd:element name="activationspec"
+		   type="j2ee:activationspecType"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="outbound-resourceadapterType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The outbound-resourceadapterType specifies information about
 	an outbound resource adapter. The information includes fully
@@ -823,23 +823,23 @@
 	part of security contract. The application server ignores
 	the security part of the system contracts in this case.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <xsd:sequence>
-            <xsd:element name="connection-definition"
-                type="j2ee:connection-definitionType"
-                maxOccurs="unbounded"/>
-            <xsd:element name="transaction-support"
-                type="j2ee:transaction-supportType"/>
-            <xsd:element name="authentication-mechanism"
-                type="j2ee:authentication-mechanismType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-            <xsd:element name="reauthentication-support"
-                type="j2ee:true-falseType">
-                <xsd:annotation>
-                    <xsd:documentation>
+    <xsd:sequence>
+      <xsd:element name="connection-definition"
+		   type="j2ee:connection-definitionType"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="transaction-support"
+		   type="j2ee:transaction-supportType"/>
+      <xsd:element name="authentication-mechanism"
+		   type="j2ee:authentication-mechanismType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="reauthentication-support"
+		   type="j2ee:true-falseType">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The element reauthentication-support specifies
 	    whether the resource adapter implementation supports
@@ -849,20 +849,20 @@
 	    underlying EIS instance. This element must have
 	    either a "true" or "false" value.
 
-                    </xsd:documentation>
-                </xsd:annotation>
+	  </xsd:documentation>
+	</xsd:annotation>
+
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
 
-            </xsd:element>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="required-config-propertyType">
-        <xsd:annotation>
-            <xsd:documentation>
-                <![CDATA[
+  <xsd:complexType name="required-config-propertyType">
+    <xsd:annotation>
+      <xsd:documentation>
+	<![CDATA[
 
 	  The required-config-propertyType contains a declaration
 	  of a single configuration property used for specifying a
@@ -873,26 +873,26 @@
 
 	  <required-config-property>Destination</required-config-property>
 
-            ]]>
-            </xsd:documentation>
-        </xsd:annotation>
-
-        <xsd:sequence>
-            <xsd:element name="description"
-                type="j2ee:descriptionType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-            <xsd:element name="config-property-name"
-                type="j2ee:config-property-nameType"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="resourceadapterType">
-        <xsd:annotation>
-            <xsd:documentation>
+	  ]]>
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="config-property-name"
+		   type="j2ee:config-property-nameType"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="resourceadapterType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The resourceadapterType specifies information about the
 	resource adapter. The information includes fully qualified
@@ -902,15 +902,15 @@
 	outbound-resourceadapter and inbound-resourceadapter
 	elements, and an optional set of administered objects.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <xsd:sequence>
-            <xsd:element name="resourceadapter-class"
-                type="j2ee:fully-qualified-classType"
-                minOccurs="0">
-                <xsd:annotation>
-                    <xsd:documentation>
+    <xsd:sequence>
+      <xsd:element name="resourceadapter-class"
+		   type="j2ee:fully-qualified-classType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The element resourceadapter-class specifies the
 	    fully qualified name of a Java class that implements
@@ -920,52 +920,52 @@
 	    architecture specified contracts. The implementation
 	    of this class is required to be a JavaBean.
 
-                    </xsd:documentation>
-                </xsd:annotation>
+	  </xsd:documentation>
+	</xsd:annotation>
 
-            </xsd:element>
-            <xsd:element name="config-property"
-                type="j2ee:config-propertyType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-            <xsd:element name="outbound-resourceadapter"
-                type="j2ee:outbound-resourceadapterType"
-                minOccurs="0">
-                <xsd:unique name="connectionfactory-interface-uniqueness">
-                    <xsd:annotation>
-                        <xsd:documentation>
+      </xsd:element>
+      <xsd:element name="config-property"
+		   type="j2ee:config-propertyType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="outbound-resourceadapter"
+		   type="j2ee:outbound-resourceadapterType"
+		   minOccurs="0">
+	<xsd:unique name="connectionfactory-interface-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
 
 	      The connectionfactory-interface element content
 	      must be unique in the outbound-resourceadapter.
 	      Multiple connection-definitions can not use the
 	      same connectionfactory-type.
 
-                        </xsd:documentation>
-                    </xsd:annotation>
-                    <xsd:selector xpath="j2ee:connection-definition"/>
-                    <xsd:field xpath="j2ee:connectionfactory-interface"/>
-                </xsd:unique>
-            </xsd:element>
-            <xsd:element name="inbound-resourceadapter"
-                type="j2ee:inbound-resourceadapterType"
-                minOccurs="0"/>
-            <xsd:element name="adminobject"
-                type="j2ee:adminobjectType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-            <xsd:element name="security-permission"
-                type="j2ee:security-permissionType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="security-permissionType">
-        <xsd:annotation>
-            <xsd:documentation>
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="j2ee:connection-definition"/>
+	  <xsd:field    xpath="j2ee:connectionfactory-interface"/>
+	</xsd:unique>
+      </xsd:element>
+      <xsd:element name="inbound-resourceadapter"
+		   type="j2ee:inbound-resourceadapterType"
+		   minOccurs="0"/>
+      <xsd:element name="adminobject"
+		   type="j2ee:adminobjectType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="security-permission"
+		   type="j2ee:security-permissionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="security-permissionType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The security-permissionType specifies a security
 	permission that is required by the resource adapter code.
@@ -977,18 +977,18 @@
 	reason that resource adapter requires a given security
 	permission.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <xsd:sequence>
-            <xsd:element name="description"
-                type="j2ee:descriptionType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-            <xsd:element name="security-permission-spec"
-                type="j2ee:xsdStringType">
-                <xsd:annotation>
-                    <xsd:documentation>
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="security-permission-spec"
+		   type="j2ee:xsdStringType">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The element security-permission-spec specifies a security
 	    permission based on the Security policy file
@@ -997,18 +997,18 @@
 	    specification:
 
 	    http://java.sun.com/products/jdk/1.4/docs/guide/security/PolicyFiles.html#FileSyntax
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="transaction-supportType">
-        <xsd:annotation>
-            <xsd:documentation>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="transaction-supportType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The transaction-supportType specifies the level of
 	transaction support provided by the resource adapter. It is
@@ -1020,16 +1020,16 @@
 	    LocalTransaction
 	    XATransaction
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:restriction base="j2ee:string">
-                <xsd:enumeration value="NoTransaction"/>
-                <xsd:enumeration value="LocalTransaction"/>
-                <xsd:enumeration value="XATransaction"/>
-            </xsd:restriction>
-        </xsd:simpleContent>
-    </xsd:complexType>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:string">
+	<xsd:enumeration value="NoTransaction"/>
+	<xsd:enumeration value="LocalTransaction"/>
+	<xsd:enumeration value="XATransaction"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
 
 </xsd:schema>
 

Modified: geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/ejb-jar_2_1.xsd
==============================================================================
--- geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/ejb-jar_2_1.xsd	(original)
+++ geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/ejb-jar_2_1.xsd	Fri Oct 22 16:39:25 2004
@@ -1,21 +1,21 @@
 <?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.1">
-    <xsd:annotation>
-        <xsd:documentation>
-      @(#)ejb-jar_2_1.xsds	1.22 02/11/03
-        </xsd:documentation>
-    </xsd:annotation>
+	    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.1">
+  <xsd:annotation>
+    <xsd:documentation>
+      @(#)ejb-jar_2_1.xsds	1.23 08/01/03
+    </xsd:documentation>
+  </xsd:annotation>
 
-    <xsd:annotation>
-        <xsd:documentation>
+  <xsd:annotation>
+    <xsd:documentation>
 
-      Copyright 2002 Sun Microsystems, Inc., 901 San Antonio
+      Copyright 2003 Sun Microsystems, Inc., 901 San Antonio
       Road, Palo Alto, California 94303, U.S.A. All rights
       reserved.
 
@@ -44,12 +44,12 @@
       Federal Acquisitions: Commercial Software - Government Users
       Subject to Standard License Terms and Conditions.
 
-        </xsd:documentation>
-    </xsd:annotation>
+    </xsd:documentation>
+  </xsd:annotation>
 
-    <xsd:annotation>
-        <xsd:documentation>
-            <![CDATA[
+  <xsd:annotation>
+    <xsd:documentation>
+      <![CDATA[
 
 	This is the XML Schema for the EJB 2.1 deployment descriptor.
 	The deployment descriptor must be named "META-INF/ejb-jar.xml" in
@@ -75,12 +75,12 @@
 
 	http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd
 
-        ]]>
-        </xsd:documentation>
-    </xsd:annotation>
+	]]>
+    </xsd:documentation>
+  </xsd:annotation>
 
-    <xsd:annotation>
-        <xsd:documentation>
+  <xsd:annotation>
+    <xsd:documentation>
 
       The following conventions apply to all J2EE
       deployment descriptor elements unless indicated otherwise.
@@ -94,88 +94,88 @@
 	preferred.  The exception is .war files where absolute
 	names are preferred for consistency with the Servlet API.
 
-        </xsd:documentation>
-    </xsd:annotation>
+    </xsd:documentation>
+  </xsd:annotation>
 
-    <xsd:include schemaLocation="j2ee_1_4.xsd"/>
+  <xsd:include schemaLocation="j2ee_1_4.xsd"/>
 
 
-    <!-- **************************************************** -->
+<!-- **************************************************** -->
 
 
-    <xsd:element name="ejb-jar" type="j2ee:ejb-jarType">
-        <xsd:annotation>
-            <xsd:documentation>
+  <xsd:element name="ejb-jar" type="j2ee:ejb-jarType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	This is the root of the ejb-jar deployment descriptor.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <xsd:key name="ejb-name-key">
-            <xsd:annotation>
-                <xsd:documentation>
+    <xsd:key name="ejb-name-key">
+      <xsd:annotation>
+	<xsd:documentation>
 
 	  The ejb-name element contains the name of an enterprise
 	  bean. The name must be unique within the ejb-jar file.
 
-                </xsd:documentation>
-            </xsd:annotation>
-            <xsd:selector xpath="j2ee:enterprise-beans/*"/>
-            <xsd:field xpath="j2ee:ejb-name"/>
-        </xsd:key>
-
-        <xsd:keyref name="ejb-name-references"
-            refer="j2ee:ejb-name-key">
-            <xsd:annotation>
-                <xsd:documentation>
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="j2ee:enterprise-beans/*"/>
+      <xsd:field    xpath="j2ee:ejb-name"/>
+    </xsd:key>
+
+    <xsd:keyref name="ejb-name-references"
+		refer="j2ee:ejb-name-key">
+      <xsd:annotation>
+	<xsd:documentation>
 
 	  The keyref indicates the references from
 	  relationship-role-source must be to a specific ejb-name
 	  defined within the scope of enterprise-beans element.
 
-                </xsd:documentation>
-            </xsd:annotation>
-            <xsd:selector
-                xpath=".//j2ee:ejb-relationship-role/j2ee:relationship-role-source"/>
-            <xsd:field
-                xpath="j2ee:ejb-name"/>
-        </xsd:keyref>
-
-        <xsd:key name="role-name-key">
-            <xsd:annotation>
-                <xsd:documentation>
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector
+	   xpath=".//j2ee:ejb-relationship-role/j2ee:relationship-role-source"/>
+      <xsd:field
+	   xpath="j2ee:ejb-name"/>
+    </xsd:keyref>
+
+    <xsd:key name="role-name-key">
+      <xsd:annotation>
+	<xsd:documentation>
 
 	  A role-name-key is specified to allow the references
 	  from the security-role-refs.
 
-                </xsd:documentation>
-            </xsd:annotation>
-            <xsd:selector xpath="j2ee:assembly-descriptor/j2ee:security-role"/>
-            <xsd:field xpath="j2ee:role-name"/>
-        </xsd:key>
-
-        <xsd:keyref name="role-name-references"
-            refer="j2ee:role-name-key">
-            <xsd:annotation>
-                <xsd:documentation>
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="j2ee:assembly-descriptor/j2ee:security-role"/>
+      <xsd:field    xpath="j2ee:role-name"/>
+    </xsd:key>
+
+    <xsd:keyref name="role-name-references"
+		refer="j2ee:role-name-key">
+      <xsd:annotation>
+	<xsd:documentation>
 
 	  The keyref indicates the references from
 	  security-role-ref to a specified role-name.
 
-                </xsd:documentation>
-            </xsd:annotation>
-            <xsd:selector xpath="j2ee:enterprise-beans/*/j2ee:security-role-ref"/>
-            <xsd:field xpath="j2ee:role-link"/>
-        </xsd:keyref>
-    </xsd:element>
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="j2ee:enterprise-beans/*/j2ee:security-role-ref"/>
+      <xsd:field    xpath="j2ee:role-link"/>
+    </xsd:keyref>
+  </xsd:element>
 
 
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="activation-config-propertyType">
-        <xsd:annotation>
-            <xsd:documentation>
+<!-- **************************************************** -->
+
+  <xsd:complexType name="activation-config-propertyType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The activation-config-propertyType contains a name/value
 	configuration property pair for a message-driven bean.
@@ -183,14 +183,14 @@
 	The properties that are recognized for a particular
 	message-driven bean are determined by the messaging type.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <xsd:sequence>
-            <xsd:element name="activation-config-property-name"
-                type="j2ee:xsdStringType">
-                <xsd:annotation>
-                    <xsd:documentation>
+    <xsd:sequence>
+      <xsd:element name="activation-config-property-name"
+		   type="j2ee:xsdStringType">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The activation-config-property-name element contains
 	    the name for an activation configuration property of
@@ -200,30 +200,30 @@
 	    names are recognized: acknowledgeMode,
 	    messageSelector, destinationType, subscriptionDurability
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="activation-config-property-value"
-                type="j2ee:xsdStringType">
-                <xsd:annotation>
-                    <xsd:documentation>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="activation-config-property-value"
+		   type="j2ee:xsdStringType">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The activation-config-property-value element
 	    contains the value for an activation configuration
 	    property of a message-driven bean.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="activation-configType">
-        <xsd:annotation>
-            <xsd:documentation>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="activation-configType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The activation-configType defines information about the
 	expected configuration properties of the message-driven bean
@@ -237,26 +237,26 @@
 	The properties that are recognized for a particular
 	message-driven bean are determined by the messaging type.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="activation-config-property"
+		   type="j2ee:activation-config-propertyType"
+		   maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
 
-        <xsd:sequence>
-            <xsd:element name="description"
-                type="j2ee:descriptionType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-            <xsd:element name="activation-config-property"
-                type="j2ee:activation-config-propertyType"
-                maxOccurs="unbounded"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="assembly-descriptorType">
-        <xsd:annotation>
-            <xsd:documentation>
+<!-- **************************************************** -->
+
+  <xsd:complexType name="assembly-descriptorType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The assembly-descriptorType defines
 	application-assembly information.
@@ -274,54 +274,54 @@
 	Providing an assembly-descriptor in the deployment
 	descriptor is optional for the ejb-jar file producer.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="security-role"
+		   type="j2ee:security-roleType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="method-permission"
+		   type="j2ee:method-permissionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="container-transaction"
+		   type="j2ee:container-transactionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="message-destination"
+		   type="j2ee:message-destinationType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="exclude-list"
+		   type="j2ee:exclude-listType"
+		   minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
 
-        <xsd:sequence>
-            <xsd:element name="security-role"
-                type="j2ee:security-roleType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-            <xsd:element name="method-permission"
-                type="j2ee:method-permissionType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-            <xsd:element name="container-transaction"
-                type="j2ee:container-transactionType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-            <xsd:element name="message-destination"
-                type="j2ee:message-destinationType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-            <xsd:element name="exclude-list"
-                type="j2ee:exclude-listType"
-                minOccurs="0"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="cmp-fieldType">
-        <xsd:annotation>
-            <xsd:documentation>
+<!-- **************************************************** -->
+
+  <xsd:complexType name="cmp-fieldType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The cmp-fieldType describes a container-managed field. The
 	cmp-fieldType contains an optional description of the field,
 	and the name of the field.
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:sequence>
-            <xsd:element name="description"
-                type="j2ee:descriptionType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-            <xsd:element name="field-name"
-                type="j2ee:java-identifierType">
-                <xsd:annotation>
-                    <xsd:documentation>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="field-name"
+		   type="j2ee:java-identifierType">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The field-name element specifies the name of a
 	    container managed field.
@@ -337,18 +337,18 @@
 	    cmp-version 1.x must denote a public field of the
 	    enterprise bean class or one of its superclasses.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="cmp-versionType">
-        <xsd:annotation>
-            <xsd:documentation>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="cmp-versionType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The cmp-versionType specifies the version of an entity bean
 	with container-managed persistence. It is used by
@@ -359,42 +359,42 @@
 	    1.x
 	    2.x
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:restriction base="j2ee:string">
-                <xsd:enumeration value="1.x"/>
-                <xsd:enumeration value="2.x"/>
-            </xsd:restriction>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="cmr-field-typeType">
-        <xsd:annotation>
-            <xsd:documentation>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:string">
+	<xsd:enumeration value="1.x"/>
+	<xsd:enumeration value="2.x"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="cmr-field-typeType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The cmr-field-type element specifies the class of a
 	collection-valued logical relationship field in the entity
 	bean class. The value of an element using cmr-field-typeType
 	must be either: java.util.Collection or java.util.Set.
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:restriction base="j2ee:string">
-                <xsd:enumeration value="java.util.Collection"/>
-                <xsd:enumeration value="java.util.Set"/>
-            </xsd:restriction>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="cmr-fieldType">
-        <xsd:annotation>
-            <xsd:documentation>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:string">
+	<xsd:enumeration value="java.util.Collection"/>
+	<xsd:enumeration value="java.util.Set"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="cmr-fieldType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The cmr-fieldType describes the bean provider's view of
 	a relationship. It consists of an optional description, and
@@ -405,18 +405,18 @@
 	used only for collection-valued cmr-fields. It specifies the
 	type of the collection that is used.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <xsd:sequence>
-            <xsd:element name="description"
-                type="j2ee:descriptionType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-            <xsd:element name="cmr-field-name"
-                type="j2ee:string">
-                <xsd:annotation>
-                    <xsd:documentation>
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="cmr-field-name"
+		   type="j2ee:string">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The cmr-field-name element specifies the name of a
 	    logical relationship field in the entity bean
@@ -426,21 +426,21 @@
 	    specified by cmr-field-name in which the first
 	    letter is uppercased, prefixed by "get" or "set".
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="cmr-field-type"
-                type="j2ee:cmr-field-typeType"
-                minOccurs="0"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="container-transactionType">
-        <xsd:annotation>
-            <xsd:documentation>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="cmr-field-type"
+		   type="j2ee:cmr-field-typeType"
+		   minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="container-transactionType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The container-transactionType specifies how the container
 	must manage transaction scopes for the enterprise bean's
@@ -449,29 +449,29 @@
 	transaction attribute is to be applied to all the specified
 	methods.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="method"
+		   type="j2ee:methodType"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="trans-attribute"
+		   type="j2ee:trans-attributeType"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
 
-        <xsd:sequence>
-            <xsd:element name="description"
-                type="j2ee:descriptionType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-            <xsd:element name="method"
-                type="j2ee:methodType"
-                maxOccurs="unbounded"/>
-            <xsd:element name="trans-attribute"
-                type="j2ee:trans-attributeType"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="ejb-classType">
-        <xsd:annotation>
-            <xsd:documentation>
-                <![CDATA[
+<!-- **************************************************** -->
+
+  <xsd:complexType name="ejb-classType">
+    <xsd:annotation>
+      <xsd:documentation>
+	<![CDATA[
 
 	  The ejb-classType contains the fully-qualified name of the
 	  enterprise bean's class. It is used by ejb-class elements.
@@ -480,19 +480,19 @@
 
 	      <ejb-class>com.wombat.empl.EmployeeServiceBean</ejb-class>
 
-            ]]>
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:restriction base="j2ee:fully-qualified-classType"/>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="ejb-jarType">
-        <xsd:annotation>
-            <xsd:documentation>
+	  ]]>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:fully-qualified-classType"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="ejb-jarType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The ejb-jarType defines the root element of the EJB
 	deployment descriptor. It contains
@@ -509,49 +509,49 @@
 	    - an optional name of an ejb-client-jar file for the
 	      ejb-jar.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <xsd:sequence>
-            <xsd:group ref="j2ee:descriptionGroup"/>
-            <xsd:element name="enterprise-beans"
-                type="j2ee:enterprise-beansType"/>
-            <xsd:element name="relationships"
-                type="j2ee:relationshipsType"
-                minOccurs="0">
-                <xsd:unique name="relationship-name-uniqueness">
-                    <xsd:annotation>
-                        <xsd:documentation>
+    <xsd:sequence>
+      <xsd:group ref="j2ee:descriptionGroup"/>
+      <xsd:element name="enterprise-beans"
+		   type="j2ee:enterprise-beansType"/>
+      <xsd:element name="relationships"
+		   type="j2ee:relationshipsType"
+		   minOccurs="0">
+	<xsd:unique name="relationship-name-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
 
 	      The ejb-relation-name contains the name of a
 	      relation. The name must be unique within
 	      relationships.
 
-                        </xsd:documentation>
-                    </xsd:annotation>
-                    <xsd:selector xpath="j2ee:ejb-relation"/>
-                    <xsd:field xpath="j2ee:ejb-relation-name"/>
-                </xsd:unique>
-            </xsd:element>
-            <xsd:element name="assembly-descriptor"
-                type="j2ee:assembly-descriptorType"
-                minOccurs="0">
-                <xsd:annotation>
-                    <xsd:documentation>
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="j2ee:ejb-relation"/>
+	  <xsd:field    xpath="j2ee:ejb-relation-name"/>
+	</xsd:unique>
+      </xsd:element>
+      <xsd:element name="assembly-descriptor"
+		   type="j2ee:assembly-descriptorType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    Providing an assembly-descriptor in the deployment
 	    descriptor is optional for the ejb-jar file
 	    producer.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="ejb-client-jar"
-                type="j2ee:pathType"
-                minOccurs="0">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        <![CDATA[
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="ejb-client-jar"
+		   type="j2ee:pathType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+	    <![CDATA[
 
 	      The optional ejb-client-jar element specifies a JAR
 	      file that contains the class files necessary for a
@@ -563,17 +563,17 @@
 		  <ejb-client-jar>employee_service_client.jar
 		  </ejb-client-jar>
 
-                        ]]>
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-        </xsd:sequence>
-        <xsd:attribute name="version"
-            type="j2ee:dewey-versionType"
-            fixed="2.1"
-            use="required">
-            <xsd:annotation>
-                <xsd:documentation>
+	      ]]>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="version"
+		   type="j2ee:dewey-versionType"
+		   fixed="2.1"
+		   use="required">
+      <xsd:annotation>
+	<xsd:documentation>
 
 	  The version specifies the version of the
 	  EJB specification that the instance document must
@@ -582,18 +582,18 @@
 	  Descriptor with respect to a specific version of the EJB
 	  schema.
 
-                </xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="ejb-nameType">
-        <xsd:annotation>
-            <xsd:documentation>
-                <![CDATA[
+	</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="ejb-nameType">
+    <xsd:annotation>
+      <xsd:documentation>
+	<![CDATA[
 
 	  The ejb-nameType specifies an enterprise bean's name. It is
 	  used by ejb-name elements. This name is assigned by the
@@ -613,19 +613,19 @@
 
 	  <ejb-name>EmployeeService</ejb-name>
 
-            ]]>
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:restriction base="j2ee:xsdNMTOKENType"/>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="ejb-relationType">
-        <xsd:annotation>
-            <xsd:documentation>
+	  ]]>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:xsdNMTOKENType"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="ejb-relationType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The ejb-relationType describes a relationship between two
 	entity beans with container-managed persistence.  It is used
@@ -636,40 +636,40 @@
 	relationship, if specified, is unique within the ejb-jar
 	file.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <xsd:sequence>
-            <xsd:element name="description"
-                type="j2ee:descriptionType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-            <xsd:element name="ejb-relation-name"
-                type="j2ee:string"
-                minOccurs="0">
-                <xsd:annotation>
-                    <xsd:documentation>
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="ejb-relation-name"
+		   type="j2ee:string"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The ejb-relation-name element provides a unique name
 	    within the ejb-jar file for a relationship.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="ejb-relationship-role"
-                type="j2ee:ejb-relationship-roleType"/>
-            <xsd:element name="ejb-relationship-role"
-                type="j2ee:ejb-relationship-roleType"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="ejb-relationship-roleType">
-        <xsd:annotation>
-            <xsd:documentation>
-                <![CDATA[
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="ejb-relationship-role"
+		   type="j2ee:ejb-relationship-roleType"/>
+      <xsd:element name="ejb-relationship-role"
+		   type="j2ee:ejb-relationship-roleType"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="ejb-relationship-roleType">
+    <xsd:annotation>
+      <xsd:documentation>
+	<![CDATA[
 
 	  The ejb-relationship-roleType describes a role within a
 	  relationship. There are two roles in each relationship.
@@ -708,36 +708,36 @@
 	       </ejb-relationship-role>
 	  </ejb-relation>
 
-            ]]>
-            </xsd:documentation>
-        </xsd:annotation>
-
-        <xsd:sequence>
-            <xsd:element name="description"
-                type="j2ee:descriptionType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-            <xsd:element name="ejb-relationship-role-name"
-                type="j2ee:string"
-                minOccurs="0">
-                <xsd:annotation>
-                    <xsd:documentation>
+	  ]]>
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="ejb-relationship-role-name"
+		   type="j2ee:string"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The ejb-relationship-role-name element defines a
 	    name for a role that is unique within an
 	    ejb-relation. Different relationships can use the
 	    same name for a role.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="multiplicity"
-                type="j2ee:multiplicityType"/>
-            <xsd:element name="cascade-delete"
-                type="j2ee:emptyType"
-                minOccurs="0">
-                <xsd:annotation>
-                    <xsd:documentation>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="multiplicity"
+		   type="j2ee:multiplicityType"/>
+      <xsd:element name="cascade-delete"
+		   type="j2ee:emptyType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The cascade-delete element specifies that, within a
 	    particular relationship, the lifetime of one or more
@@ -748,37 +748,37 @@
 	    which the other ejb-relationship-role
 	    element specifies a multiplicity of One.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="relationship-role-source"
-                type="j2ee:relationship-role-sourceType"/>
-            <xsd:element name="cmr-field"
-                type="j2ee:cmr-fieldType"
-                minOccurs="0"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="enterprise-beansType">
-        <xsd:annotation>
-            <xsd:documentation>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="relationship-role-source"
+		   type="j2ee:relationship-role-sourceType"/>
+      <xsd:element name="cmr-field"
+		   type="j2ee:cmr-fieldType"
+		   minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="enterprise-beansType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The enterprise-beansType declares one or more enterprise
 	beans. Each bean can be a session, entity or message-driven
 	bean.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <xsd:choice maxOccurs="unbounded">
-            <xsd:element name="session"
-                type="j2ee:session-beanType">
-                <xsd:unique name="session-ejb-local-ref-name-uniqueness">
-                    <xsd:annotation>
-                        <xsd:documentation>
+    <xsd:choice maxOccurs="unbounded">
+      <xsd:element name="session"
+		   type="j2ee:session-beanType">
+	<xsd:unique name="session-ejb-local-ref-name-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
 
 	      The ejb-ref-name element contains the name of
 	      an EJB reference. The EJB reference is an entry in
@@ -788,15 +788,15 @@
 
 	      It is recommended that name be prefixed with "ejb/".
 
-                        </xsd:documentation>
-                    </xsd:annotation>
-                    <xsd:selector xpath="j2ee:ejb-local-ref"/>
-                    <xsd:field xpath="j2ee:ejb-ref-name"/>
-                </xsd:unique>
-
-                <xsd:unique name="session-ejb-ref-name-uniqueness">
-                    <xsd:annotation>
-                        <xsd:documentation>
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="j2ee:ejb-local-ref"/>
+	  <xsd:field    xpath="j2ee:ejb-ref-name"/>
+	</xsd:unique>
+
+	<xsd:unique name="session-ejb-ref-name-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
 
 	      The ejb-ref-name element contains the name of an EJB
 	      reference. The EJB reference is an entry in the
@@ -806,15 +806,15 @@
 
 	      It is recommended that name is prefixed with "ejb/".
 
-                        </xsd:documentation>
-                    </xsd:annotation>
-                    <xsd:selector xpath="j2ee:ejb-ref"/>
-                    <xsd:field xpath="j2ee:ejb-ref-name"/>
-                </xsd:unique>
-
-                <xsd:unique name="session-resource-env-ref-uniqueness">
-                    <xsd:annotation>
-                        <xsd:documentation>
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="j2ee:ejb-ref"/>
+	  <xsd:field    xpath="j2ee:ejb-ref-name"/>
+	</xsd:unique>
+
+	<xsd:unique name="session-resource-env-ref-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
 
 	      The resource-env-ref-name element specifies the name
 	      of a resource environment reference; its value is
@@ -823,15 +823,15 @@
 	      java:comp/env context and must be unique within an
 	      component.
 
-                        </xsd:documentation>
-                    </xsd:annotation>
-                    <xsd:selector xpath="j2ee:resource-env-ref"/>
-                    <xsd:field xpath="j2ee:resource-env-ref-name"/>
-                </xsd:unique>
-
-                <xsd:unique name="session-message-destination-ref-uniqueness">
-                    <xsd:annotation>
-                        <xsd:documentation>
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="j2ee:resource-env-ref"/>
+	  <xsd:field    xpath="j2ee:resource-env-ref-name"/>
+	</xsd:unique>
+
+	<xsd:unique name="session-message-destination-ref-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
 
 	      The message-destination-ref-name element specifies the name
 	      of a message destination reference; its value is
@@ -840,48 +840,48 @@
 	      java:comp/env context and must be unique within an
 	      component.
 
-                        </xsd:documentation>
-                    </xsd:annotation>
-                    <xsd:selector xpath="j2ee:message-destination-ref"/>
-                    <xsd:field xpath="j2ee:message-destination-ref-name"/>
-                </xsd:unique>
-
-                <xsd:unique name="session-res-ref-name-uniqueness">
-                    <xsd:annotation>
-                        <xsd:documentation>
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="j2ee:message-destination-ref"/>
+	  <xsd:field    xpath="j2ee:message-destination-ref-name"/>
+	</xsd:unique>
+
+	<xsd:unique name="session-res-ref-name-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
 
 	      The res-ref-name element specifies the name of a
 	      resource manager connection factory reference.  The name
 	      is a JNDI name relative to the java:comp/env context.
 	      The name must be unique within an component.
 
-                        </xsd:documentation>
-                    </xsd:annotation>
-                    <xsd:selector xpath="j2ee:resource-ref"/>
-                    <xsd:field xpath="j2ee:res-ref-name"/>
-                </xsd:unique>
-
-                <xsd:unique name="session-env-entry-name-uniqueness">
-                    <xsd:annotation>
-                        <xsd:documentation>
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="j2ee:resource-ref"/>
+	  <xsd:field    xpath="j2ee:res-ref-name"/>
+	</xsd:unique>
+
+	<xsd:unique name="session-env-entry-name-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
 
 	      The env-entry-name element contains the name of a
 	      component's environment entry.  The name is a JNDI
 	      name relative to the java:comp/env context.  The
 	      name must be unique within an component.
 
-                        </xsd:documentation>
-                    </xsd:annotation>
-                    <xsd:selector xpath="j2ee:env-entry"/>
-                    <xsd:field xpath="j2ee:env-entry-name"/>
-                </xsd:unique>
-            </xsd:element>
-
-            <xsd:element name="entity"
-                type="j2ee:entity-beanType">
-                <xsd:unique name="entity-ejb-local-ref-name-uniqueness">
-                    <xsd:annotation>
-                        <xsd:documentation>
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="j2ee:env-entry"/>
+	  <xsd:field    xpath="j2ee:env-entry-name"/>
+	</xsd:unique>
+      </xsd:element>
+
+      <xsd:element name="entity"
+		   type="j2ee:entity-beanType">
+	<xsd:unique name="entity-ejb-local-ref-name-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
 
 	      The ejb-ref-name element contains the name of
 	      an EJB reference. The EJB reference is an entry in
@@ -891,15 +891,15 @@
 
 	      It is recommended that name be prefixed with "ejb/".
 
-                        </xsd:documentation>
-                    </xsd:annotation>
-                    <xsd:selector xpath="j2ee:ejb-local-ref"/>
-                    <xsd:field xpath="j2ee:ejb-ref-name"/>
-                </xsd:unique>
-
-                <xsd:unique name="entity-ejb-ref-name-uniqueness">
-                    <xsd:annotation>
-                        <xsd:documentation>
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="j2ee:ejb-local-ref"/>
+	  <xsd:field    xpath="j2ee:ejb-ref-name"/>
+	</xsd:unique>
+
+	<xsd:unique name="entity-ejb-ref-name-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
 
 	      The ejb-ref-name element contains the name of an EJB
 	      reference. The EJB reference is an entry in the
@@ -909,15 +909,15 @@
 
 	      It is recommended that name is prefixed with "ejb/".
 
-                        </xsd:documentation>
-                    </xsd:annotation>
-                    <xsd:selector xpath="j2ee:ejb-ref"/>
-                    <xsd:field xpath="j2ee:ejb-ref-name"/>
-                </xsd:unique>
-
-                <xsd:unique name="entity-resource-env-ref-uniqueness">
-                    <xsd:annotation>
-                        <xsd:documentation>
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="j2ee:ejb-ref"/>
+	  <xsd:field    xpath="j2ee:ejb-ref-name"/>
+	</xsd:unique>
+
+	<xsd:unique name="entity-resource-env-ref-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
 
 	      The resource-env-ref-name element specifies the name
 	      of a resource environment reference; its value is
@@ -926,15 +926,15 @@
 	      java:comp/env context and must be unique within an
 	      component.
 
-                        </xsd:documentation>
-                    </xsd:annotation>
-                    <xsd:selector xpath="j2ee:resource-env-ref"/>
-                    <xsd:field xpath="j2ee:resource-env-ref-name"/>
-                </xsd:unique>
-
-                <xsd:unique name="entity-message-destination-ref-uniqueness">
-                    <xsd:annotation>
-                        <xsd:documentation>
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="j2ee:resource-env-ref"/>
+	  <xsd:field    xpath="j2ee:resource-env-ref-name"/>
+	</xsd:unique>
+
+	<xsd:unique name="entity-message-destination-ref-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
 
 	      The message-destination-ref-name element specifies the name
 	      of a message destination reference; its value is
@@ -943,48 +943,48 @@
 	      java:comp/env context and must be unique within an
 	      component.
 
-                        </xsd:documentation>
-                    </xsd:annotation>
-                    <xsd:selector xpath="j2ee:message-destination-ref"/>
-                    <xsd:field xpath="j2ee:message-destination-ref-name"/>
-                </xsd:unique>
-
-                <xsd:unique name="entity-res-ref-name-uniqueness">
-                    <xsd:annotation>
-                        <xsd:documentation>
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="j2ee:message-destination-ref"/>
+	  <xsd:field    xpath="j2ee:message-destination-ref-name"/>
+	</xsd:unique>
+
+	<xsd:unique name="entity-res-ref-name-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
 
 	      The res-ref-name element specifies the name of a
 	      resource manager connection factory reference.  The name
 	      is a JNDI name relative to the java:comp/env context.
 	      The name must be unique within an component.
 
-                        </xsd:documentation>
-                    </xsd:annotation>
-                    <xsd:selector xpath="j2ee:resource-ref"/>
-                    <xsd:field xpath="j2ee:res-ref-name"/>
-                </xsd:unique>
-
-                <xsd:unique name="entity-env-entry-name-uniqueness">
-                    <xsd:annotation>
-                        <xsd:documentation>
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="j2ee:resource-ref"/>
+	  <xsd:field    xpath="j2ee:res-ref-name"/>
+	</xsd:unique>
+
+	<xsd:unique name="entity-env-entry-name-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
 
 	      The env-entry-name element contains the name of a
 	      component's environment entry.  The name is a JNDI
 	      name relative to the java:comp/env context.  The
 	      name must be unique within an component.
 
-                        </xsd:documentation>
-                    </xsd:annotation>
-                    <xsd:selector xpath="j2ee:env-entry"/>
-                    <xsd:field xpath="j2ee:env-entry-name"/>
-                </xsd:unique>
-            </xsd:element>
-
-            <xsd:element name="message-driven"
-                type="j2ee:message-driven-beanType">
-                <xsd:unique name="messaged-ejb-local-ref-name-uniqueness">
-                    <xsd:annotation>
-                        <xsd:documentation>
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="j2ee:env-entry"/>
+	  <xsd:field    xpath="j2ee:env-entry-name"/>
+	</xsd:unique>
+      </xsd:element>
+
+      <xsd:element name="message-driven"
+		   type="j2ee:message-driven-beanType">
+	<xsd:unique name="messaged-ejb-local-ref-name-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
 
 	      The ejb-ref-name element contains the name of
 	      an EJB reference. The EJB reference is an entry in
@@ -994,15 +994,15 @@
 
 	      It is recommended that name be prefixed with "ejb/".
 
-                        </xsd:documentation>
-                    </xsd:annotation>
-                    <xsd:selector xpath="j2ee:ejb-local-ref"/>
-                    <xsd:field xpath="j2ee:ejb-ref-name"/>
-                </xsd:unique>
-
-                <xsd:unique name="messaged-ejb-ref-name-uniqueness">
-                    <xsd:annotation>
-                        <xsd:documentation>
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="j2ee:ejb-local-ref"/>
+	  <xsd:field    xpath="j2ee:ejb-ref-name"/>
+	</xsd:unique>
+
+	<xsd:unique name="messaged-ejb-ref-name-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
 
 	      The ejb-ref-name element contains the name of an EJB
 	      reference. The EJB reference is an entry in the
@@ -1012,15 +1012,15 @@
 
 	      It is recommended that name is prefixed with "ejb/".
 
-                        </xsd:documentation>
-                    </xsd:annotation>
-                    <xsd:selector xpath="j2ee:ejb-ref"/>
-                    <xsd:field xpath="j2ee:ejb-ref-name"/>
-                </xsd:unique>
-
-                <xsd:unique name="messaged-resource-env-ref-uniqueness">
-                    <xsd:annotation>
-                        <xsd:documentation>
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="j2ee:ejb-ref"/>
+	  <xsd:field    xpath="j2ee:ejb-ref-name"/>
+	</xsd:unique>
+
+	<xsd:unique name="messaged-resource-env-ref-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
 
 	      The resource-env-ref-name element specifies the name
 	      of a resource environment reference; its value is
@@ -1029,15 +1029,15 @@
 	      java:comp/env context and must be unique within an
 	      component.
 
-                        </xsd:documentation>
-                    </xsd:annotation>
-                    <xsd:selector xpath="j2ee:resource-env-ref"/>
-                    <xsd:field xpath="j2ee:resource-env-ref-name"/>
-                </xsd:unique>
-
-                <xsd:unique name="messaged-message-destination-ref-uniqueness">
-                    <xsd:annotation>
-                        <xsd:documentation>
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="j2ee:resource-env-ref"/>
+	  <xsd:field    xpath="j2ee:resource-env-ref-name"/>
+	</xsd:unique>
+
+	<xsd:unique name="messaged-message-destination-ref-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
 
 	      The message-destination-ref-name element specifies the name
 	      of a message destination reference; its value is
@@ -1046,52 +1046,52 @@
 	      java:comp/env context and must be unique within an
 	      component.
 
-                        </xsd:documentation>
-                    </xsd:annotation>
-                    <xsd:selector xpath="j2ee:message-destination-ref"/>
-                    <xsd:field xpath="j2ee:message-destination-ref-name"/>
-                </xsd:unique>
-
-                <xsd:unique name="messaged-res-ref-name-uniqueness">
-                    <xsd:annotation>
-                        <xsd:documentation>
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="j2ee:message-destination-ref"/>
+	  <xsd:field    xpath="j2ee:message-destination-ref-name"/>
+	</xsd:unique>
+
+	<xsd:unique name="messaged-res-ref-name-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
 
 	      The res-ref-name element specifies the name of a
 	      resource manager connection factory reference.  The name
 	      is a JNDI name relative to the java:comp/env context.
 	      The name must be unique within an component.
 
-                        </xsd:documentation>
-                    </xsd:annotation>
-                    <xsd:selector xpath="j2ee:resource-ref"/>
-                    <xsd:field xpath="j2ee:res-ref-name"/>
-                </xsd:unique>
-
-                <xsd:unique name="messaged-env-entry-name-uniqueness">
-                    <xsd:annotation>
-                        <xsd:documentation>
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="j2ee:resource-ref"/>
+	  <xsd:field    xpath="j2ee:res-ref-name"/>
+	</xsd:unique>
+
+	<xsd:unique name="messaged-env-entry-name-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
 
 	      The env-entry-name element contains the name of a
 	      component's environment entry.  The name is a JNDI
 	      name relative to the java:comp/env context.  The
 	      name must be unique within an component.
 
-                        </xsd:documentation>
-                    </xsd:annotation>
-                    <xsd:selector xpath="j2ee:env-entry"/>
-                    <xsd:field xpath="j2ee:env-entry-name"/>
-                </xsd:unique>
-            </xsd:element>
-
-        </xsd:choice>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="entity-beanType">
-        <xsd:annotation>
-            <xsd:documentation>
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="j2ee:env-entry"/>
+	  <xsd:field    xpath="j2ee:env-entry-name"/>
+	</xsd:unique>
+      </xsd:element>
+
+    </xsd:choice>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="entity-beanType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The entity-beanType declares an entity bean. The declaration
 	consists of:
@@ -1177,33 +1177,33 @@
 	the cmp-version is 1.x, and none must not be present if the
 	entity's persistence-type is Bean.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <xsd:sequence>
-            <xsd:group ref="j2ee:descriptionGroup"/>
-            <xsd:element name="ejb-name"
-                type="j2ee:ejb-nameType"/>
-            <xsd:element name="home"
-                type="j2ee:homeType"
-                minOccurs="0"/>
-            <xsd:element name="remote"
-                type="j2ee:remoteType"
-                minOccurs="0"/>
-            <xsd:element name="local-home"
-                type="j2ee:local-homeType"
-                minOccurs="0"/>
-            <xsd:element name="local"
-                type="j2ee:localType"
-                minOccurs="0"/>
-            <xsd:element name="ejb-class"
-                type="j2ee:ejb-classType"/>
-            <xsd:element name="persistence-type"
-                type="j2ee:persistence-typeType"/>
-            <xsd:element name="prim-key-class"
-                type="j2ee:fully-qualified-classType">
-                <xsd:annotation>
-                    <xsd:documentation>
+    <xsd:sequence>
+      <xsd:group ref="j2ee:descriptionGroup"/>
+      <xsd:element name="ejb-name"
+		   type="j2ee:ejb-nameType"/>
+      <xsd:element name="home"
+		   type="j2ee:homeType"
+		   minOccurs="0"/>
+      <xsd:element name="remote"
+		   type="j2ee:remoteType"
+		   minOccurs="0"/>
+      <xsd:element name="local-home"
+		   type="j2ee:local-homeType"
+		   minOccurs="0"/>
+      <xsd:element name="local"
+		   type="j2ee:localType"
+		   minOccurs="0"/>
+      <xsd:element name="ejb-class"
+		   type="j2ee:ejb-classType"/>
+      <xsd:element name="persistence-type"
+		   type="j2ee:persistence-typeType"/>
+      <xsd:element name="prim-key-class"
+		   type="j2ee:fully-qualified-classType">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The prim-key-class element contains the
 	    fully-qualified name of an
@@ -1213,13 +1213,13 @@
 	    deferred to deployment time, the prim-key-class
 	    element should specify java.lang.Object.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="reentrant"
-                type="j2ee:true-falseType">
-                <xsd:annotation>
-                    <xsd:documentation>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="reentrant"
+		   type="j2ee:true-falseType">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The reentrant element specifies whether an entity
 	    bean is reentrant or not.
@@ -1227,17 +1227,17 @@
 	    The reentrant element must be one of the two
 	    following: true or false
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="cmp-version"
-                type="j2ee:cmp-versionType"
-                minOccurs="0"/>
-            <xsd:element name="abstract-schema-name"
-                type="j2ee:java-identifierType"
-                minOccurs="0">
-                <xsd:annotation>
-                    <xsd:documentation>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="cmp-version"
+		   type="j2ee:cmp-versionType"
+		   minOccurs="0"/>
+      <xsd:element name="abstract-schema-name"
+		   type="j2ee:java-identifierType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The abstract-schema-name element specifies the name
 	    of the abstract schema type of an entity bean with
@@ -1247,18 +1247,18 @@
 	    bean whose local interface is
 	    com.acme.commerce.Order might be Order.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="cmp-field"
-                type="j2ee:cmp-fieldType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-            <xsd:element name="primkey-field"
-                type="j2ee:string"
-                minOccurs="0">
-                <xsd:annotation>
-                    <xsd:documentation>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="cmp-field"
+		   type="j2ee:cmp-fieldType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="primkey-field"
+		   type="j2ee:string"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The primkey-field element is used to specify the
 	    name of the primary key field for an entity with
@@ -1275,28 +1275,28 @@
 	    their names must correspond to the field names of
 	    the entity bean class that comprise the key.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:group ref="j2ee:jndiEnvironmentRefsGroup"/>
-            <xsd:element name="security-role-ref"
-                type="j2ee:security-role-refType"
-                minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="security-identity"
-                type="j2ee:security-identityType"
-                minOccurs="0"/>
-            <xsd:element name="query"
-                type="j2ee:queryType"
-                minOccurs="0" maxOccurs="unbounded"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="exclude-listType">
-        <xsd:annotation>
-            <xsd:documentation>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:group ref="j2ee:jndiEnvironmentRefsGroup"/>
+      <xsd:element name="security-role-ref"
+		   type="j2ee:security-role-refType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="security-identity"
+		   type="j2ee:security-identityType"
+		   minOccurs="0"/>
+      <xsd:element name="query"
+		   type="j2ee:queryType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="exclude-listType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The exclude-listType specifies one or more methods which
 	the Assembler marks to be uncallable.
@@ -1305,44 +1305,26 @@
 	in the exclude list, the Deployer should consider those
 	methods to be uncallable.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="method"
+		   type="j2ee:methodType"
+		   maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
 
-        <xsd:sequence>
-            <xsd:element name="description"
-                type="j2ee:descriptionType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-            <xsd:element name="method"
-                type="j2ee:methodType"
-                maxOccurs="unbounded"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="java-typeType">
-        <xsd:annotation>
-            <xsd:documentation>
-
-	This is a generic type that designates a Java primitive
-	type or a fully qualified name of a Java interface/type.
-
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:restriction base="j2ee:string">
-                <xsd:pattern value="[^\p{Z}]*"/>
-            </xsd:restriction>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="message-driven-beanType">
-        <xsd:annotation>
-            <xsd:documentation>
+<!-- **************************************************** -->
+
+  <xsd:complexType name="message-driven-beanType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The message-driven element declares a message-driven
 	bean. The declaration consists of:
@@ -1381,54 +1363,54 @@
 	    - an optional declaration of the bean's message
 	      destination references
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <xsd:sequence>
-            <xsd:group ref="j2ee:descriptionGroup"/>
-            <xsd:element name="ejb-name"
-                type="j2ee:ejb-nameType"/>
-            <xsd:element name="ejb-class"
-                type="j2ee:ejb-classType"/>
-            <xsd:element name="messaging-type"
-                type="j2ee:fully-qualified-classType"
-                minOccurs="0">
-                <xsd:annotation>
-                    <xsd:documentation>
+    <xsd:sequence>
+      <xsd:group ref="j2ee:descriptionGroup"/>
+      <xsd:element name="ejb-name"
+		   type="j2ee:ejb-nameType"/>
+      <xsd:element name="ejb-class"
+		   type="j2ee:ejb-classType"/>
+      <xsd:element name="messaging-type"
+		   type="j2ee:fully-qualified-classType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The messaging-type element specifies the message
 	    listener interface of the message-driven bean. If
 	    the messaging-type element is not specified, it is
 	    assumed to be javax.jms.MessageListener.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="transaction-type"
-                type="j2ee:transaction-typeType"/>
-            <xsd:element name="message-destination-type"
-                type="j2ee:message-destination-typeType"
-                minOccurs="0"/>
-            <xsd:element name="message-destination-link"
-                type="j2ee:message-destination-linkType"
-                minOccurs="0"/>
-            <xsd:element name="activation-config"
-                type="j2ee:activation-configType"
-                minOccurs="0"/>
-            <xsd:group ref="j2ee:jndiEnvironmentRefsGroup"/>
-            <xsd:element name="security-identity"
-                type="j2ee:security-identityType"
-                minOccurs="0"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="transaction-type"
+		   type="j2ee:transaction-typeType"/>
+      <xsd:element name="message-destination-type"
+		   type="j2ee:message-destination-typeType"
+		   minOccurs="0"/>
+      <xsd:element name="message-destination-link"
+		   type="j2ee:message-destination-linkType"
+		   minOccurs="0"/>
+      <xsd:element name="activation-config"
+		   type="j2ee:activation-configType"
+		   minOccurs="0"/>
+      <xsd:group ref="j2ee:jndiEnvironmentRefsGroup"/>
+      <xsd:element name="security-identity"
+		   type="j2ee:security-identityType"
+		   minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
 
-    <!-- **************************************************** -->
+<!-- **************************************************** -->
 
-    <xsd:complexType name="method-intfType">
+  <xsd:complexType name="method-intfType">
 
-        <xsd:annotation>
-            <xsd:documentation>
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The method-intf element allows a method element to
 	differentiate between the methods with the same name and
@@ -1446,73 +1428,73 @@
 	    Local
 	    ServiceEndpoint
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:restriction base="j2ee:string">
-                <xsd:enumeration value="Home"/>
-                <xsd:enumeration value="Remote"/>
-                <xsd:enumeration value="LocalHome"/>
-                <xsd:enumeration value="Local"/>
-                <xsd:enumeration value="ServiceEndpoint"/>
-            </xsd:restriction>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="method-nameType">
-        <xsd:annotation>
-            <xsd:documentation>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:string">
+	<xsd:enumeration value="Home"/>
+	<xsd:enumeration value="Remote"/>
+	<xsd:enumeration value="LocalHome"/>
+	<xsd:enumeration value="Local"/>
+	<xsd:enumeration value="ServiceEndpoint"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="method-nameType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The method-nameType contains a name of an enterprise
 	bean method or the asterisk (*) character. The asterisk is
 	used when the element denotes all the methods of an
 	enterprise bean's client view interfaces.
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:restriction base="j2ee:string"/>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="method-paramsType">
-        <xsd:annotation>
-            <xsd:documentation>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:string"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="method-paramsType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The method-paramsType defines a list of the
 	fully-qualified Java type names of the method parameters.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <xsd:sequence>
-            <xsd:element name="method-param"
-                type="j2ee:java-typeType"
-                minOccurs="0"
-                maxOccurs="unbounded">
-                <xsd:annotation>
-                    <xsd:documentation>
+    <xsd:sequence>
+      <xsd:element name="method-param"
+		   type="j2ee:java-typeType"
+		   minOccurs="0"
+		   maxOccurs="unbounded">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The method-param element contains a primitive
 	    or a fully-qualified Java type name of a method
 	    parameter.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="method-permissionType">
-        <xsd:annotation>
-            <xsd:documentation>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="method-permissionType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The method-permissionType specifies that one or more
 	security roles are allowed to invoke one or more enterprise
@@ -1527,44 +1509,44 @@
 	defined in the enterprise bean's home, component and/or web
 	service endpoint interfaces.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <xsd:sequence>
-            <xsd:element name="description"
-                type="j2ee:descriptionType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-            <xsd:choice>
-                <xsd:element name="role-name"
-                    type="j2ee:role-nameType"
-                    maxOccurs="unbounded"/>
-                <xsd:element name="unchecked"
-                    type="j2ee:emptyType">
-                    <xsd:annotation>
-                        <xsd:documentation>
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:choice>
+	<xsd:element name="role-name"
+		     type="j2ee:role-nameType"
+		     maxOccurs="unbounded"/>
+	<xsd:element name="unchecked"
+		     type="j2ee:emptyType">
+	  <xsd:annotation>
+	    <xsd:documentation>
 
 	      The unchecked element specifies that a method is
 	      not checked for authorization by the container
 	      prior to invocation of the method.
 
-                        </xsd:documentation>
-                    </xsd:annotation>
-                </xsd:element>
-            </xsd:choice>
-            <xsd:element name="method"
-                type="j2ee:methodType"
-                maxOccurs="unbounded"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="methodType">
-        <xsd:annotation>
-            <xsd:documentation>
-                <![CDATA[
+	    </xsd:documentation>
+	  </xsd:annotation>
+	</xsd:element>
+      </xsd:choice>
+      <xsd:element name="method"
+		   type="j2ee:methodType"
+		   maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="methodType">
+    <xsd:annotation>
+      <xsd:documentation>
+	<![CDATA[
 
 	  The methodType is used to denote a method of an enterprise
 	  bean's home, component, and/or web service endpoint
@@ -1735,34 +1717,34 @@
 	      <method-name>*</method-name>
 	  </method>
 
-            ]]>
-            </xsd:documentation>
-        </xsd:annotation>
-
-        <xsd:sequence>
-            <xsd:element name="description"
-                type="j2ee:descriptionType"
-                minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="ejb-name"
-                type="j2ee:ejb-nameType"/>
-            <xsd:element name="method-intf"
-                type="j2ee:method-intfType"
-                minOccurs="0">
-            </xsd:element>
-            <xsd:element name="method-name"
-                type="j2ee:method-nameType"/>
-            <xsd:element name="method-params"
-                type="j2ee:method-paramsType"
-                minOccurs="0"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="multiplicityType">
-        <xsd:annotation>
-            <xsd:documentation>
+	  ]]>
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="ejb-name"
+		   type="j2ee:ejb-nameType"/>
+      <xsd:element name="method-intf"
+		   type="j2ee:method-intfType"
+		   minOccurs="0">
+      </xsd:element>
+      <xsd:element name="method-name"
+		   type="j2ee:method-nameType"/>
+      <xsd:element name="method-params"
+		   type="j2ee:method-paramsType"
+		   minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="multiplicityType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The multiplicityType describes the multiplicity of the
 	role that participates in a relation.
@@ -1772,21 +1754,21 @@
 	    One
 	    Many
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:restriction base="j2ee:string">
-                <xsd:enumeration value="One"/>
-                <xsd:enumeration value="Many"/>
-            </xsd:restriction>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="persistence-typeType">
-        <xsd:annotation>
-            <xsd:documentation>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:string">
+	<xsd:enumeration value="One"/>
+	<xsd:enumeration value="Many"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="persistence-typeType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The persistence-typeType specifies an entity bean's persistence
 	management type.
@@ -1796,22 +1778,22 @@
 	    Bean
 	    Container
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:restriction base="j2ee:string">
-                <xsd:enumeration value="Bean"/>
-                <xsd:enumeration value="Container"/>
-            </xsd:restriction>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="query-methodType">
-        <xsd:annotation>
-            <xsd:documentation>
-                <![CDATA[
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:string">
+	<xsd:enumeration value="Bean"/>
+	<xsd:enumeration value="Container"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="query-methodType">
+    <xsd:annotation>
+      <xsd:documentation>
+	<![CDATA[
 
 	  The query-method specifies the method for a finder or select
 	  query.
@@ -1838,24 +1820,24 @@
 	      </ejb-ql>
 	  </query>
 
-            ]]>
-            </xsd:documentation>
-        </xsd:annotation>
-
-        <xsd:sequence>
-            <xsd:element name="method-name"
-                type="j2ee:method-nameType"/>
-            <xsd:element name="method-params"
-                type="j2ee:method-paramsType"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="queryType">
-        <xsd:annotation>
-            <xsd:documentation>
+	  ]]>
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="method-name"
+		   type="j2ee:method-nameType"/>
+      <xsd:element name="method-params"
+		   type="j2ee:method-paramsType"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="queryType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The queryType defines a finder or select
 	query. It contains
@@ -1878,28 +1860,28 @@
 	that returns entity objects.  The default value for the
 	result-type-mapping element is "Local".
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType" minOccurs="0"/>
+      <xsd:element name="query-method"
+		   type="j2ee:query-methodType"/>
+      <xsd:element name="result-type-mapping"
+		   type="j2ee:result-type-mappingType"
+		   minOccurs="0"/>
+      <xsd:element name="ejb-ql"
+		   type="j2ee:xsdStringType"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
 
-        <xsd:sequence>
-            <xsd:element name="description"
-                type="j2ee:descriptionType" minOccurs="0"/>
-            <xsd:element name="query-method"
-                type="j2ee:query-methodType"/>
-            <xsd:element name="result-type-mapping"
-                type="j2ee:result-type-mappingType"
-                minOccurs="0"/>
-            <xsd:element name="ejb-ql"
-                type="j2ee:xsdStringType"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="relationship-role-sourceType">
-        <xsd:annotation>
-            <xsd:documentation>
+<!-- **************************************************** -->
+
+  <xsd:complexType name="relationship-role-sourceType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The relationship-role-sourceType designates the source of a
 	role that participates in a relationship. A
@@ -1907,25 +1889,25 @@
 	relationship-role-source elements to uniquely identify an
 	entity bean.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="ejb-name"
+		   type="j2ee:ejb-nameType"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
 
-        <xsd:sequence>
-            <xsd:element name="description"
-                type="j2ee:descriptionType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-            <xsd:element name="ejb-name"
-                type="j2ee:ejb-nameType"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="relationshipsType">
-        <xsd:annotation>
-            <xsd:documentation>
+<!-- **************************************************** -->
+
+  <xsd:complexType name="relationshipsType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The relationshipsType describes the relationships in
 	which entity beans with container-managed persistence
@@ -1933,44 +1915,44 @@
 	description; and a list of ejb-relation elements, which
 	specify the container managed relationships.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <xsd:sequence>
-            <xsd:element name="description"
-                type="j2ee:descriptionType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-            <xsd:element name="ejb-relation"
-                type="j2ee:ejb-relationType"
-                maxOccurs="unbounded">
-
-                <xsd:unique name="role-name-uniqueness">
-                    <xsd:annotation>
-                        <xsd:documentation>
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="ejb-relation"
+		   type="j2ee:ejb-relationType"
+		   maxOccurs="unbounded">
+
+	<xsd:unique name="role-name-uniqueness">
+	  <xsd:annotation>
+	    <xsd:documentation>
 
 	      The ejb-relationship-role-name contains the name of a
 	      relationship role. The name must be unique within
 	      a relationship, but can be reused in different
 	      relationships.
 
-                        </xsd:documentation>
-                    </xsd:annotation>
-                    <xsd:selector
-                        xpath=".//j2ee:ejb-relationship-role-name"/>
-                    <xsd:field
-                        xpath="."/>
-                </xsd:unique>
-            </xsd:element>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="result-type-mappingType">
-        <xsd:annotation>
-            <xsd:documentation>
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector
+	       xpath=".//j2ee:ejb-relationship-role-name"/>
+	  <xsd:field
+	       xpath="."/>
+	</xsd:unique>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="result-type-mappingType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The result-type-mappingType is used in the query element to
 	specify whether an abstract schema type returned by a query
@@ -1982,21 +1964,21 @@
 	    Local
 	    Remote
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:restriction base="j2ee:string">
-                <xsd:enumeration value="Local"/>
-                <xsd:enumeration value="Remote"/>
-            </xsd:restriction>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="security-identityType">
-        <xsd:annotation>
-            <xsd:documentation>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:string">
+	<xsd:enumeration value="Local"/>
+	<xsd:enumeration value="Remote"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="security-identityType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The security-identityType specifies whether the caller's
 	security identity is to be used for the execution of the
@@ -2004,40 +1986,40 @@
 	identity is to be used. It contains an optional description
 	and a specification of the security identity to be used.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <xsd:sequence>
-            <xsd:element name="description"
-                type="j2ee:descriptionType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-            <xsd:choice>
-                <xsd:element name="use-caller-identity"
-                    type="j2ee:emptyType">
-                    <xsd:annotation>
-                        <xsd:documentation>
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:choice>
+	<xsd:element name="use-caller-identity"
+		     type="j2ee:emptyType">
+	  <xsd:annotation>
+	    <xsd:documentation>
 
 	      The use-caller-identity element specifies that
 	      the caller's security identity be used as the
 	      security identity for the execution of the
 	      enterprise bean's methods.
 
-                        </xsd:documentation>
-                    </xsd:annotation>
-                </xsd:element>
-                <xsd:element name="run-as"
-                    type="j2ee:run-asType"/>
-            </xsd:choice>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="session-beanType">
-        <xsd:annotation>
-            <xsd:documentation>
+	    </xsd:documentation>
+	  </xsd:annotation>
+	</xsd:element>
+	<xsd:element name="run-as"
+		     type="j2ee:run-asType"/>
+      </xsd:choice>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="session-beanType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The session-beanType declares an session bean. The
 	declaration consists of:
@@ -2086,30 +2068,30 @@
 	The service-endpoint element may only be specified if the
 	bean is a stateless session bean.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <xsd:sequence>
-            <xsd:group ref="j2ee:descriptionGroup"/>
-            <xsd:element name="ejb-name"
-                type="j2ee:ejb-nameType"/>
-            <xsd:element name="home"
-                type="j2ee:homeType"
-                minOccurs="0"/>
-            <xsd:element name="remote"
-                type="j2ee:remoteType"
-                minOccurs="0"/>
-            <xsd:element name="local-home"
-                type="j2ee:local-homeType"
-                minOccurs="0"/>
-            <xsd:element name="local"
-                type="j2ee:localType"
-                minOccurs="0"/>
-            <xsd:element name="service-endpoint"
-                type="j2ee:fully-qualified-classType"
-                minOccurs="0">
-                <xsd:annotation>
-                    <xsd:documentation>
+    <xsd:sequence>
+      <xsd:group ref="j2ee:descriptionGroup"/>
+      <xsd:element name="ejb-name"
+		   type="j2ee:ejb-nameType"/>
+      <xsd:element name="home"
+		   type="j2ee:homeType"
+		   minOccurs="0"/>
+      <xsd:element name="remote"
+		   type="j2ee:remoteType"
+		   minOccurs="0"/>
+      <xsd:element name="local-home"
+		   type="j2ee:local-homeType"
+		   minOccurs="0"/>
+      <xsd:element name="local"
+		   type="j2ee:localType"
+		   minOccurs="0"/>
+      <xsd:element name="service-endpoint"
+		   type="j2ee:fully-qualified-classType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The service-endpoint element contains the
 	    fully-qualified name of the enterprise bean's web
@@ -2118,32 +2100,32 @@
 	    session bean. The specified interface must be a
 	    valid JAX-RPC service endpoint interface.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="ejb-class"
-                type="j2ee:ejb-classType"/>
-            <xsd:element name="session-type"
-                type="j2ee:session-typeType"/>
-            <xsd:element name="transaction-type"
-                type="j2ee:transaction-typeType"/>
-            <xsd:group ref="j2ee:jndiEnvironmentRefsGroup"/>
-            <xsd:element name="security-role-ref"
-                type="j2ee:security-role-refType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-            <xsd:element name="security-identity"
-                type="j2ee:security-identityType"
-                minOccurs="0"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="session-typeType">
-        <xsd:annotation>
-            <xsd:documentation>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="ejb-class"
+		   type="j2ee:ejb-classType"/>
+      <xsd:element name="session-type"
+		   type="j2ee:session-typeType"/>
+      <xsd:element name="transaction-type"
+		   type="j2ee:transaction-typeType"/>
+      <xsd:group ref="j2ee:jndiEnvironmentRefsGroup"/>
+      <xsd:element name="security-role-ref"
+		   type="j2ee:security-role-refType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="security-identity"
+		   type="j2ee:security-identityType"
+		   minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="session-typeType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The session-typeType describes whether the session bean is a
 	stateful session or stateless session. It is used by
@@ -2154,21 +2136,21 @@
 	    Stateful
 	    Stateless
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:restriction base="j2ee:string">
-                <xsd:enumeration value="Stateful"/>
-                <xsd:enumeration value="Stateless"/>
-            </xsd:restriction>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="trans-attributeType">
-        <xsd:annotation>
-            <xsd:documentation>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:string">
+	<xsd:enumeration value="Stateful"/>
+	<xsd:enumeration value="Stateless"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="trans-attributeType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The trans-attributeType specifies how the container must
 	manage the transaction boundaries when delegating a method
@@ -2183,25 +2165,25 @@
 	    Mandatory
 	    Never
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:restriction base="j2ee:string">
-                <xsd:enumeration value="NotSupported"/>
-                <xsd:enumeration value="Supports"/>
-                <xsd:enumeration value="Required"/>
-                <xsd:enumeration value="RequiresNew"/>
-                <xsd:enumeration value="Mandatory"/>
-                <xsd:enumeration value="Never"/>
-            </xsd:restriction>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="transaction-typeType">
-        <xsd:annotation>
-            <xsd:documentation>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:string">
+	<xsd:enumeration value="NotSupported"/>
+	<xsd:enumeration value="Supports"/>
+	<xsd:enumeration value="Required"/>
+	<xsd:enumeration value="RequiresNew"/>
+	<xsd:enumeration value="Mandatory"/>
+	<xsd:enumeration value="Never"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="transaction-typeType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The transaction-typeType specifies an enterprise bean's
 	transaction management type.
@@ -2211,15 +2193,15 @@
 	    Bean
 	    Container
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:restriction base="j2ee:string">
-                <xsd:enumeration value="Bean"/>
-                <xsd:enumeration value="Container"/>
-            </xsd:restriction>
-        </xsd:simpleContent>
-    </xsd:complexType>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:string">
+	<xsd:enumeration value="Bean"/>
+	<xsd:enumeration value="Container"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
 
 </xsd:schema>
 

Modified: geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/j2ee_1_4.xsd
==============================================================================
--- geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/j2ee_1_4.xsd	(original)
+++ geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/j2ee_1_4.xsd	Fri Oct 22 16:39:25 2004
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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="1.4">
-    <xsd:annotation>
-        <xsd:documentation>
-      @(#)j2ee_1_4.xsds	1.40 03/04/10
-        </xsd:documentation>
-    </xsd:annotation>
+     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="1.4">
+  <xsd:annotation>
+    <xsd:documentation>
+      @(#)j2ee_1_4.xsds	1.43 03/09/16
+    </xsd:documentation>
+  </xsd:annotation>
 
-    <xsd:annotation>
-        <xsd:documentation>
+  <xsd:annotation>
+    <xsd:documentation>
 
-      Copyright 2002 Sun Microsystems, Inc., 901 San Antonio
+      Copyright 2003 Sun Microsystems, Inc., 901 San Antonio
       Road, Palo Alto, California 94303, U.S.A. All rights
       reserved.
 
@@ -44,10 +44,11 @@
       Federal Acquisitions: Commercial Software - Government Users
       Subject to Standard License Terms and Conditions.
 
-        </xsd:documentation>
-    </xsd:annotation>
-    <xsd:annotation>
-        <xsd:documentation>
+    </xsd:documentation>
+  </xsd:annotation>
+
+<xsd:annotation>
+<xsd:documentation>
 
 The following definitions that appear in the common
 shareable schema(s) of J2EE deployment descriptors should be
@@ -66,21 +67,21 @@
     jar file;
     rar file;
 
-        </xsd:documentation>
-    </xsd:annotation>
+</xsd:documentation>
+</xsd:annotation>
 
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"
-        schemaLocation="http://www.w3.org/2001/xml.xsd"/>
+  <xsd:import namespace="http://www.w3.org/XML/1998/namespace"
+	      schemaLocation="http://www.w3.org/2001/xml.xsd"/>
 
-    <xsd:include schemaLocation=
-      "http://www.ibm.com/webservices/xsd/j2ee_web_services_client_1_1.xsd"/>
+  <xsd:include schemaLocation=
+	"http://www.ibm.com/webservices/xsd/j2ee_web_services_client_1_1.xsd"/>
 
 
-    <!-- **************************************************** -->
+<!-- **************************************************** -->
 
-    <xsd:group name="descriptionGroup">
-        <xsd:annotation>
-            <xsd:documentation>
+  <xsd:group name="descriptionGroup">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	This group keeps the usage of the contained description related
 	elements consistent across J2EE deployment descriptors.
@@ -88,29 +89,29 @@
 	All elements may occur multiple times with different languages,
 	to support localization of the content.
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:sequence>
-            <xsd:element name="description"
-                type="j2ee:descriptionType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-            <xsd:element name="display-name"
-                type="j2ee:display-nameType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-            <xsd:element name="icon"
-                type="j2ee:iconType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-        </xsd:sequence>
-    </xsd:group>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="descriptionType">
-        <xsd:annotation>
-            <xsd:documentation>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="display-name"
+		   type="j2ee:display-nameType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="icon"
+		   type="j2ee:iconType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:group>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="descriptionType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The description type is used by a description element to
 	provide text describing the parent element.  The elements
@@ -125,39 +126,39 @@
 	The lang attribute defines the language that the
 	description is provided in. The default value is "en" (English).
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:extension base="j2ee:xsdStringType">
-                <xsd:attribute ref="xml:lang"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:simpleType name="dewey-versionType">
-        <xsd:annotation>
-            <xsd:documentation>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:extension base="j2ee:xsdStringType">
+	<xsd:attribute ref="xml:lang"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:simpleType name="dewey-versionType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	This type defines a dewey decimal which is used
 	to describe versions of documents.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <xsd:restriction base="xsd:decimal">
-            <xsd:whiteSpace value="collapse"/>
-        </xsd:restriction>
+    <xsd:restriction base="xsd:decimal">
+      <xsd:whiteSpace value="collapse"/>
+    </xsd:restriction>
 
-    </xsd:simpleType>
+  </xsd:simpleType>
 
-    <!-- **************************************************** -->
+<!-- **************************************************** -->
 
-    <xsd:complexType name="display-nameType">
-        <xsd:annotation>
-            <xsd:documentation>
-                <![CDATA[
+  <xsd:complexType name="display-nameType">
+    <xsd:annotation>
+      <xsd:documentation>
+	<![CDATA[
 
 	  The display-name type contains a short name that is intended
 	  to be displayed by tools. It is used by display-name
@@ -170,22 +171,22 @@
 
 	  The value of the xml:lang attribute is "en" (English) by default.
 
-            ]]>
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:extension base="j2ee:string">
-                <xsd:attribute ref="xml:lang"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="ejb-linkType">
-        <xsd:annotation>
-            <xsd:documentation>
-                <![CDATA[
+	  ]]>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:extension base="j2ee:string">
+	<xsd:attribute ref="xml:lang"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="ejb-linkType">
+    <xsd:annotation>
+      <xsd:documentation>
+	<![CDATA[
 
 	  The ejb-linkType is used by ejb-link
 	  elements in the ejb-ref or ejb-local-ref elements to specify
@@ -210,19 +211,19 @@
 
 	      <ejb-link>../products/product.jar#ProductEJB</ejb-link>
 
-            ]]>
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:restriction base="j2ee:string"/>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="ejb-local-refType">
-        <xsd:annotation>
-            <xsd:documentation>
+	  ]]>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:string"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="ejb-local-refType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The ejb-local-refType is used by ejb-local-ref elements for
 	the declaration of a reference to an enterprise bean's local
@@ -237,35 +238,35 @@
 	    - optional ejb-link information, used to specify the
 	      referenced enterprise bean
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <xsd:sequence>
-            <xsd:element name="description"
-                type="j2ee:descriptionType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-            <xsd:element name="ejb-ref-name"
-                type="j2ee:ejb-ref-nameType"/>
-            <xsd:element name="ejb-ref-type"
-                type="j2ee:ejb-ref-typeType"/>
-            <xsd:element name="local-home"
-                type="j2ee:local-homeType"/>
-            <xsd:element name="local"
-                type="j2ee:localType"/>
-            <xsd:element name="ejb-link"
-                type="j2ee:ejb-linkType"
-                minOccurs="0"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="ejb-ref-nameType">
-        <xsd:annotation>
-            <xsd:documentation>
-                <![CDATA[
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="ejb-ref-name"
+		   type="j2ee:ejb-ref-nameType"/>
+      <xsd:element name="ejb-ref-type"
+		   type="j2ee:ejb-ref-typeType"/>
+      <xsd:element name="local-home"
+		   type="j2ee:local-homeType"/>
+      <xsd:element name="local"
+		   type="j2ee:localType"/>
+      <xsd:element name="ejb-link"
+		   type="j2ee:ejb-linkType"
+		   minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="ejb-ref-nameType">
+    <xsd:annotation>
+      <xsd:documentation>
+	<![CDATA[
 
 	  The ejb-ref-name element contains the name of an EJB
 	  reference. The EJB reference is an entry in the
@@ -279,19 +280,19 @@
 
 	  <ejb-ref-name>ejb/Payroll</ejb-ref-name>
 
-            ]]>
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:restriction base="j2ee:jndi-nameType"/>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="ejb-ref-typeType">
-        <xsd:annotation>
-            <xsd:documentation>
+	  ]]>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:jndi-nameType"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="ejb-ref-typeType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The ejb-ref-typeType contains the expected type of the
 	referenced enterprise bean.
@@ -302,21 +303,21 @@
 	    Entity
 	    Session
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:restriction base="j2ee:string">
-                <xsd:enumeration value="Entity"/>
-                <xsd:enumeration value="Session"/>
-            </xsd:restriction>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="ejb-refType">
-        <xsd:annotation>
-            <xsd:documentation>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:string">
+	<xsd:enumeration value="Entity"/>
+	<xsd:enumeration value="Session"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="ejb-refType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The ejb-refType is used by ejb-ref elements for the
 	declaration of a reference to an enterprise bean's home. The
@@ -332,50 +333,50 @@
 	    - optional ejb-link information, used to specify the
 	      referenced enterprise bean
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="ejb-ref-name"
+		   type="j2ee:ejb-ref-nameType"/>
+      <xsd:element name="ejb-ref-type"
+		   type="j2ee:ejb-ref-typeType"/>
+
+      <xsd:element name="home"
+		   type="j2ee:homeType"/>
+      <xsd:element name="remote"
+		   type="j2ee:remoteType"/>
+      <xsd:element name="ejb-link"
+		   type="j2ee:ejb-linkType"
+		   minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
 
-        <xsd:sequence>
-            <xsd:element name="description"
-                type="j2ee:descriptionType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-            <xsd:element name="ejb-ref-name"
-                type="j2ee:ejb-ref-nameType"/>
-            <xsd:element name="ejb-ref-type"
-                type="j2ee:ejb-ref-typeType"/>
-
-            <xsd:element name="home"
-                type="j2ee:homeType"/>
-            <xsd:element name="remote"
-                type="j2ee:remoteType"/>
-            <xsd:element name="ejb-link"
-                type="j2ee:ejb-linkType"
-                minOccurs="0"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="emptyType">
-        <xsd:annotation>
-            <xsd:documentation>
+<!-- **************************************************** -->
+
+  <xsd:complexType name="emptyType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	This type is used to designate an empty
 	element when used.
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="env-entry-type-valuesType">
-        <xsd:annotation>
-            <xsd:documentation>
-                <![CDATA[
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="env-entry-type-valuesType">
+    <xsd:annotation>
+      <xsd:documentation>
+	<![CDATA[
 
 	  This type contains the fully-qualified Java type of the
 	  environment entry value that is expected by the
@@ -397,29 +398,29 @@
 
 	  <env-entry-type>java.lang.Boolean</env-entry-type>
 
-            ]]>
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:restriction base="j2ee:string">
-                <xsd:enumeration value="java.lang.Boolean"/>
-                <xsd:enumeration value="java.lang.Byte"/>
-                <xsd:enumeration value="java.lang.Character"/>
-                <xsd:enumeration value="java.lang.String"/>
-                <xsd:enumeration value="java.lang.Short"/>
-                <xsd:enumeration value="java.lang.Integer"/>
-                <xsd:enumeration value="java.lang.Long"/>
-                <xsd:enumeration value="java.lang.Float"/>
-                <xsd:enumeration value="java.lang.Double"/>
-            </xsd:restriction>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="env-entryType">
-        <xsd:annotation>
-            <xsd:documentation>
+	  ]]>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:string">
+	<xsd:enumeration value="java.lang.Boolean"/>
+	<xsd:enumeration value="java.lang.Byte"/>
+	<xsd:enumeration value="java.lang.Character"/>
+	<xsd:enumeration value="java.lang.String"/>
+	<xsd:enumeration value="java.lang.Short"/>
+	<xsd:enumeration value="java.lang.Integer"/>
+	<xsd:enumeration value="java.lang.Long"/>
+	<xsd:enumeration value="java.lang.Float"/>
+	<xsd:enumeration value="java.lang.Double"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="env-entryType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The env-entryType is used to declare an application's
 	environment entry. The declaration consists of an optional
@@ -429,19 +430,19 @@
 
 	It is used by env-entry elements.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <xsd:sequence>
-            <xsd:element name="description"
-                type="j2ee:descriptionType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-            <xsd:element name="env-entry-name"
-                type="j2ee:jndi-nameType">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        <![CDATA[
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="env-entry-name"
+		   type="j2ee:jndi-nameType">
+	<xsd:annotation>
+	  <xsd:documentation>
+	    <![CDATA[
 
 	      The env-entry-name element contains the name of a
 	      Deployment Component's environment entry.  The name
@@ -455,20 +456,20 @@
 
 	      <env-entry-name>minAmount</env-entry-name>
 
-                        ]]>
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-
-            <xsd:element name="env-entry-type"
-                type="j2ee:env-entry-type-valuesType"/>
-
-            <xsd:element name="env-entry-value"
-                type="j2ee:xsdStringType"
-                minOccurs="0">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        <![CDATA[
+	      ]]>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+      <xsd:element name="env-entry-type"
+		   type="j2ee:env-entry-type-valuesType"/>
+
+      <xsd:element name="env-entry-value"
+		   type="j2ee:xsdStringType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+	    <![CDATA[
 
 	      The env-entry-value designates the value of a
 	      Deployment Component's environment entry. The value
@@ -481,59 +482,63 @@
 
 	      <env-entry-value>100.00</env-entry-value>
 
-                        ]]>
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="fully-qualified-classType">
-        <xsd:annotation>
-            <xsd:documentation>
+	      ]]>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="fully-qualified-classType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The elements that use this type designate the name of a
-	Java class or interface.
+	Java class or interface.  The name is in the form of a
+	"binary name", as defined in the JLS.  This is the form
+	of name used in Class.forName().  Tools that need the
+	canonical name (the name used in source code) will need
+	to convert this binary name to the canonical name.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:string"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:restriction base="j2ee:string"/>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="generic-booleanType">
-        <xsd:annotation>
-            <xsd:documentation>
+<!-- **************************************************** -->
+
+  <xsd:complexType name="generic-booleanType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	This type defines four different values which can designate
 	boolean values. This includes values yes and no which are
 	not designated by xsd:boolean
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:restriction base="j2ee:string">
-                <xsd:enumeration value="true"/>
-                <xsd:enumeration value="false"/>
-                <xsd:enumeration value="yes"/>
-                <xsd:enumeration value="no"/>
-            </xsd:restriction>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="homeType">
-        <xsd:annotation>
-            <xsd:documentation>
-                <![CDATA[
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:string">
+	<xsd:enumeration value="true"/>
+	<xsd:enumeration value="false"/>
+	<xsd:enumeration value="yes"/>
+	<xsd:enumeration value="no"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="homeType">
+    <xsd:annotation>
+      <xsd:documentation>
+	<![CDATA[
 
 	  The homeType defines the fully-qualified name of
 	  an enterprise bean's home interface.
@@ -542,19 +547,19 @@
 
 	      <home>com.aardvark.payroll.PayrollHome</home>
 
-            ]]>
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:restriction base="j2ee:fully-qualified-classType"/>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="iconType">
-        <xsd:annotation>
-            <xsd:documentation>
+	  ]]>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:fully-qualified-classType"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="iconType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The icon type contains small-icon and large-icon elements
 	that specify the file names for small and large GIF or
@@ -565,15 +570,15 @@
 	icon file names are provided in. Its value is "en" (English)
 	by default.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <xsd:sequence>
-            <xsd:element name="small-icon" type="j2ee:pathType"
-                minOccurs="0">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        <![CDATA[
+    <xsd:sequence>
+      <xsd:element name="small-icon" type="j2ee:pathType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+	    <![CDATA[
 
 	      The small-icon element contains the name of a file
 	      containing a small (16 x 16) icon image. The file
@@ -587,15 +592,15 @@
 
 	      <small-icon>employee-service-icon16x16.jpg</small-icon>
 
-                        ]]>
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="large-icon" type="j2ee:pathType"
-                minOccurs="0">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        <![CDATA[
+	      ]]>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="large-icon" type="j2ee:pathType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+	    <![CDATA[
 
 	      The large-icon element contains the name of a file
 	      containing a large
@@ -610,126 +615,176 @@
 
 	      <large-icon>employee-service-icon32x32.jpg</large-icon>
 
-                        ]]>
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
+	      ]]>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
 
-        </xsd:sequence>
+    </xsd:sequence>
 
-        <xsd:attribute ref="xml:lang"/>
-        <xsd:attribute name="id" type="xsd:ID"/>
+    <xsd:attribute ref="xml:lang"/>
+    <xsd:attribute name="id" type="xsd:ID"/>
 
-    </xsd:complexType>
+  </xsd:complexType>
 
-    <!-- **************************************************** -->
+<!-- **************************************************** -->
 
-    <xsd:complexType name="java-identifierType">
-        <xsd:annotation>
-            <xsd:documentation>
+  <xsd:complexType name="java-identifierType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The java-identifierType defines a Java identifier.
 	The users of this type should further verify that
 	the content does not contain Java reserved keywords.
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:restriction base="j2ee:string">
-                <xsd:pattern value="($|_|\p{L})(\p{L}|\p{Nd}|_|$)*"/>
-            </xsd:restriction>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="jndi-nameType">
-        <xsd:annotation>
-            <xsd:documentation>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:string">
+	<xsd:pattern value="($|_|\p{L})(\p{L}|\p{Nd}|_|$)*"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="java-typeType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	This is a generic type that designates a Java primitive
+	type or a fully qualified name of a Java interface/type,
+	or an array of such types.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:string">
+	<xsd:pattern value="[^\p{Z}]*"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="jndi-nameType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The jndi-nameType type designates a JNDI name in the
 	Deployment Component's environment and is relative to the
 	java:comp/env context.  A JNDI name must be unique within the
 	Deployment Component.
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:restriction base="j2ee:string"/>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:group name="jndiEnvironmentRefsGroup">
-        <xsd:annotation>
-            <xsd:documentation>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:string"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:group name="jndiEnvironmentRefsGroup">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	This group keeps the usage of the contained JNDI environment
 	reference elements consistent across J2EE deployment descriptors.
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:sequence>
-            <xsd:element name="env-entry"
-                type="j2ee:env-entryType"
-                minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="ejb-ref"
-                type="j2ee:ejb-refType"
-                minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="ejb-local-ref"
-                type="j2ee:ejb-local-refType"
-                minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:group ref="j2ee:service-refGroup"/>
-            <xsd:element name="resource-ref"
-                type="j2ee:resource-refType"
-                minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="resource-env-ref"
-                type="j2ee:resource-env-refType"
-                minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="message-destination-ref"
-                type="j2ee:message-destination-refType"
-                minOccurs="0" maxOccurs="unbounded"/>
-        </xsd:sequence>
-    </xsd:group>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="local-homeType">
-        <xsd:annotation>
-            <xsd:documentation>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="env-entry"
+		   type="j2ee:env-entryType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="ejb-ref"
+		   type="j2ee:ejb-refType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="ejb-local-ref"
+		   type="j2ee:ejb-local-refType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:group ref="j2ee:service-refGroup"/>
+      <xsd:element name="resource-ref"
+		   type="j2ee:resource-refType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="resource-env-ref"
+		   type="j2ee:resource-env-refType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="message-destination-ref"
+		   type="j2ee:message-destination-refType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:group>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="listenerType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The listenerType indicates the deployment properties for a web
+	application listener bean.
+
+      </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="local-homeType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The local-homeType defines the fully-qualified
 	name of an enterprise bean's local home interface.
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:restriction base="j2ee:fully-qualified-classType"/>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="localType">
-        <xsd:annotation>
-            <xsd:documentation>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:fully-qualified-classType"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="localType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The localType defines the fully-qualified name of an
 	enterprise bean's local interface.
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:restriction base="j2ee:fully-qualified-classType"/>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="message-destination-linkType">
-        <xsd:annotation>
-            <xsd:documentation>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:fully-qualified-classType"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="message-destination-linkType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The message-destination-linkType is used to link a message
 	destination reference or message-driven bean to a message
@@ -751,19 +806,19 @@
 	message destination.  This allows multiple message
 	destinations with the same name to be uniquely identified.
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:restriction base="j2ee:string"/>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="message-destination-refType">
-        <xsd:annotation>
-            <xsd:documentation>
-                <![CDATA[
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:string"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="message-destination-refType">
+    <xsd:annotation>
+      <xsd:documentation>
+	<![CDATA[
 
 	  The message-destination-ref element contains a declaration
 	  of Deployment Component's reference to a message destination
@@ -791,18 +846,18 @@
 		  </message-destination-link>
 	  </message-destination-ref>
 
-            ]]>
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:sequence>
-            <xsd:element name="description"
-                type="j2ee:descriptionType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-            <xsd:element name="message-destination-ref-name"
-                type="j2ee:jndi-nameType">
-                <xsd:annotation>
-                    <xsd:documentation>
+	  ]]>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="message-destination-ref-name"
+		   type="j2ee:jndi-nameType">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The message-destination-ref-name element specifies
 	    the name of a message destination reference; its
@@ -812,27 +867,27 @@
 	    unique within an ejb-jar (for enterprise beans) or a
 	    Deployment File (for others).
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="message-destination-type"
-                type="j2ee:message-destination-typeType"/>
-            <xsd:element name="message-destination-usage"
-                type="j2ee:message-destination-usageType"/>
-            <xsd:element name="message-destination-link"
-                type="j2ee:message-destination-linkType"
-                minOccurs="0"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="message-destination-typeType">
-        <xsd:annotation>
-            <xsd:documentation>
-                <![CDATA[
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="message-destination-type"
+		   type="j2ee:message-destination-typeType"/>
+      <xsd:element name="message-destination-usage"
+		   type="j2ee:message-destination-usageType"/>
+      <xsd:element name="message-destination-link"
+		   type="j2ee:message-destination-linkType"
+		   minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="message-destination-typeType">
+    <xsd:annotation>
+      <xsd:documentation>
+	<![CDATA[
 
 	  The message-destination-typeType specifies the type of
 	  the destination. The type is specified by the Java interface
@@ -843,19 +898,19 @@
 	    <message-destination-type>javax.jms.Queue
 	    </message-destination-type>
 
-            ]]>
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:restriction base="j2ee:fully-qualified-classType"/>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="message-destination-usageType">
-        <xsd:annotation>
-            <xsd:documentation>
+	  ]]>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:fully-qualified-classType"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="message-destination-usageType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The message-destination-usageType specifies the use of the
 	message destination indicated by the reference.  The value
@@ -870,23 +925,23 @@
 	    Produces
 	    ConsumesProduces
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:restriction base="j2ee:string">
-                <xsd:enumeration value="Consumes"/>
-                <xsd:enumeration value="Produces"/>
-                <xsd:enumeration value="ConsumesProduces"/>
-            </xsd:restriction>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="message-destinationType">
-        <xsd:annotation>
-            <xsd:documentation>
-                <![CDATA[
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:string">
+	<xsd:enumeration value="Consumes"/>
+	<xsd:enumeration value="Produces"/>
+	<xsd:enumeration value="ConsumesProduces"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="message-destinationType">
+    <xsd:annotation>
+      <xsd:documentation>
+	<![CDATA[
 
 	  The message-destinationType specifies a message
 	  destination. The logical destination described by this
@@ -908,77 +963,77 @@
 		  </message-destination-name>
 	  </message-destination>
 
-            ]]>
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:sequence>
-            <xsd:group ref="j2ee:descriptionGroup"/>
-            <xsd:element name="message-destination-name"
-                type="j2ee:string">
-                <xsd:annotation>
-                    <xsd:documentation>
+	  ]]>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:group ref="j2ee:descriptionGroup"/>
+      <xsd:element name="message-destination-name"
+		   type="j2ee:string">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The message-destination-name element specifies a
 	    name for a message destination.  This name must be
 	    unique among the names of message destinations
 	    within the Deployment File.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="param-valueType">
-        <xsd:annotation>
-            <xsd:documentation>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="param-valueType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	This type is a general type that can be used to declare
 	parameter/value lists.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <xsd:sequence>
-            <xsd:element name="description"
-                type="j2ee:descriptionType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-            <xsd:element name="param-name"
-                type="j2ee:string">
-                <xsd:annotation>
-                    <xsd:documentation>
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="param-name"
+		   type="j2ee:string">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The param-name element contains the name of a
 	    parameter.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-
-            <xsd:element name="param-value"
-                type="j2ee:xsdStringType">
-                <xsd:annotation>
-                    <xsd:documentation>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+      <xsd:element name="param-value"
+		   type="j2ee:xsdStringType">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The param-value element contains the value of a
 	    parameter.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="pathType">
-        <xsd:annotation>
-            <xsd:documentation>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="pathType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The elements that use this type designate either a relative
 	path or an absolute path starting with a "/".
@@ -992,19 +1047,19 @@
 	are preferred.  The exception is .war files where absolute
 	names are preferred for consistency with the Servlet API.
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:restriction base="j2ee:string"/>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="remoteType">
-        <xsd:annotation>
-            <xsd:documentation>
-                <![CDATA[
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:string"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="remoteType">
+    <xsd:annotation>
+      <xsd:documentation>
+	<![CDATA[
 
 	  The remote element contains the fully-qualified name
 	  of the enterprise bean's remote interface.
@@ -1013,19 +1068,19 @@
 
 	      <remote>com.wombat.empl.EmployeeService</remote>
 
-            ]]>
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:restriction base="j2ee:fully-qualified-classType"/>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="res-authType">
-        <xsd:annotation>
-            <xsd:documentation>
+	  ]]>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:fully-qualified-classType"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="res-authType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The res-authType specifies whether the Deployment Component
 	code signs on programmatically to the resource manager, or
@@ -1039,21 +1094,21 @@
 	    Application
 	    Container
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:restriction base="j2ee:string">
-                <xsd:enumeration value="Application"/>
-                <xsd:enumeration value="Container"/>
-            </xsd:restriction>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="res-sharing-scopeType">
-        <xsd:annotation>
-            <xsd:documentation>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:string">
+	<xsd:enumeration value="Application"/>
+	<xsd:enumeration value="Container"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="res-sharing-scopeType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The res-sharing-scope type specifies whether connections
 	obtained through the given resource manager connection
@@ -1065,22 +1120,22 @@
 
 	The default value is Shareable.
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:restriction base="j2ee:string">
-                <xsd:enumeration value="Shareable"/>
-                <xsd:enumeration value="Unshareable"/>
-            </xsd:restriction>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="resource-env-refType">
-        <xsd:annotation>
-            <xsd:documentation>
-                <![CDATA[
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:string">
+	<xsd:enumeration value="Shareable"/>
+	<xsd:enumeration value="Unshareable"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="resource-env-refType">
+    <xsd:annotation>
+      <xsd:documentation>
+	<![CDATA[
 
 	  The resource-env-refType is used to define
 	  resource-env-type elements.  It contains a declaration of a
@@ -1100,19 +1155,19 @@
 	      </resource-env-ref-type>
 	  </resource-env-ref>
 
-            ]]>
-            </xsd:documentation>
-        </xsd:annotation>
-
-        <xsd:sequence>
-            <xsd:element name="description"
-                type="j2ee:descriptionType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-            <xsd:element name="resource-env-ref-name"
-                type="j2ee:jndi-nameType">
-                <xsd:annotation>
-                    <xsd:documentation>
+	  ]]>
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="resource-env-ref-name"
+		   type="j2ee:jndi-nameType">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The resource-env-ref-name element specifies the name
 	    of a resource environment reference; its value is
@@ -1121,34 +1176,34 @@
 	    name relative to the java:comp/env context and must
 	    be unique within a Deployment Component.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-
-            <xsd:element name="resource-env-ref-type"
-                type="j2ee:fully-qualified-classType">
-                <xsd:annotation>
-                    <xsd:documentation>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+      <xsd:element name="resource-env-ref-type"
+		   type="j2ee:fully-qualified-classType">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The resource-env-ref-type element specifies the type
 	    of a resource environment reference.  It is the
 	    fully qualified name of a Java language class or
 	    interface.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="resource-refType">
-        <xsd:annotation>
-            <xsd:documentation>
-                <![CDATA[
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="resource-refType">
+    <xsd:annotation>
+      <xsd:documentation>
+	<![CDATA[
 
 	  The resource-refType contains a declaration of a
 	  Deployment Component's reference to an external resource. It
@@ -1169,19 +1224,19 @@
 	      <res-sharing-scope>Shareable</res-sharing-scope>
 	  </resource-ref>
 
-            ]]>
-            </xsd:documentation>
-        </xsd:annotation>
-
-        <xsd:sequence>
-            <xsd:element name="description"
-                type="j2ee:descriptionType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-            <xsd:element name="res-ref-name"
-                type="j2ee:jndi-nameType">
-                <xsd:annotation>
-                    <xsd:documentation>
+	  ]]>
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="res-ref-name"
+		   type="j2ee:jndi-nameType">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The res-ref-name element specifies the name of a
 	    resource manager connection factory reference.
@@ -1189,81 +1244,81 @@
 	    java:comp/env context.
 	    The name must be unique within a Deployment File.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-
-            <xsd:element name="res-type"
-                type="j2ee:fully-qualified-classType">
-                <xsd:annotation>
-                    <xsd:documentation>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+      <xsd:element name="res-type"
+		   type="j2ee:fully-qualified-classType">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The res-type element specifies the type of the data
 	    source. The type is specified by the fully qualified
 	    Java language class or interface
 	    expected to be implemented by the data source.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-
-            <xsd:element name="res-auth"
-                type="j2ee:res-authType"/>
-
-            <xsd:element name="res-sharing-scope"
-                type="j2ee:res-sharing-scopeType"
-                minOccurs="0"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="role-nameType">
-        <xsd:annotation>
-            <xsd:documentation>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+      <xsd:element name="res-auth"
+		   type="j2ee:res-authType"/>
+
+      <xsd:element name="res-sharing-scope"
+		   type="j2ee:res-sharing-scopeType"
+		   minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="role-nameType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The role-nameType designates the name of a security role.
 
 	The name must conform to the lexical rules for a token.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:string"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
 
-        <xsd:simpleContent>
-            <xsd:restriction base="j2ee:string"/>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="run-asType">
-        <xsd:annotation>
-            <xsd:documentation>
+  <xsd:complexType name="run-asType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The run-asType specifies the run-as identity to be
 	used for the execution of a component. It contains an
 	optional description, and the name of a security role.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="role-name"
+		   type="j2ee:role-nameType"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
 
-        <xsd:sequence>
-            <xsd:element name="description"
-                type="j2ee:descriptionType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-            <xsd:element name="role-name"
-                type="j2ee:role-nameType"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="security-role-refType">
-        <xsd:annotation>
-            <xsd:documentation>
+<!-- **************************************************** -->
+
+  <xsd:complexType name="security-role-refType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The security-role-refType contains the declaration of a
 	security role reference in a component's or a
@@ -1273,52 +1328,52 @@
 	security role is not specified, the Deployer must choose an
 	appropriate security role.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <xsd:sequence>
-            <xsd:element name="description"
-                type="j2ee:descriptionType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-            <xsd:element name="role-name"
-                type="j2ee:role-nameType">
-                <xsd:annotation>
-                    <xsd:documentation>
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="role-name"
+		   type="j2ee:role-nameType">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The value of the role-name element must be the String used
 	    as the parameter to the
 	    EJBContext.isCallerInRole(String roleName) method or the
 	    HttpServletRequest.isUserInRole(String role) method.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-
-            <xsd:element name="role-link"
-                type="j2ee:role-nameType"
-                minOccurs="0">
-                <xsd:annotation>
-                    <xsd:documentation>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+      <xsd:element name="role-link"
+		   type="j2ee:role-nameType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The role-link element is a reference to a defined
 	    security role. The role-link element must contain
 	    the name of one of the security roles defined in the
 	    security-role elements.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="security-roleType">
-        <xsd:annotation>
-            <xsd:documentation>
-                <![CDATA[
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="security-roleType">
+    <xsd:annotation>
+      <xsd:documentation>
+	<![CDATA[
 
 	  The security-roleType contains the definition of a security
 	  role. The definition consists of an optional description of the
@@ -1334,26 +1389,26 @@
 	      <role-name>employee</role-name>
 	      </security-role>
 
-            ]]>
-            </xsd:documentation>
-        </xsd:annotation>
-
-        <xsd:sequence>
-            <xsd:element name="description"
-                type="j2ee:descriptionType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-            <xsd:element name="role-name"
-                type="j2ee:role-nameType"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="string">
-        <xsd:annotation>
-            <xsd:documentation>
+	  ]]>
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="role-name"
+		   type="j2ee:role-nameType"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="string">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	This is a special string datatype that is defined by J2EE as
 	a base type for defining collapsed strings. When schemas
@@ -1361,20 +1416,20 @@
 	collapsing the existing whitespace, this base type may be
 	used.
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:token">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="true-falseType">
-        <xsd:annotation>
-            <xsd:documentation>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:extension base="xsd:token">
+	<xsd:attribute name="id" type="xsd:ID"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="true-falseType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	This simple type designates a boolean with only two
 	permissible values
@@ -1382,20 +1437,20 @@
 	- true
 	- false
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:restriction base="j2ee:xsdBooleanType">
-                <xsd:pattern value="(true|false)"/>
-            </xsd:restriction>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="url-patternType">
-        <xsd:annotation>
-            <xsd:documentation>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:xsdBooleanType">
+	<xsd:pattern value="(true|false)"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="url-patternType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The url-patternType contains the url pattern of the mapping.
 	It must follow the rules specified in Section 11.2 of the
@@ -1405,148 +1460,148 @@
 	the developer with a descriptive error message.
 	The container must preserve all characters including whitespaces.
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string"/>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="xsdAnyURIType">
-        <xsd:annotation>
-            <xsd:documentation>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:extension base="xsd:string"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="xsdAnyURIType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	This type adds an "id" attribute to xsd:anyURI.
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:anyURI">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="xsdBooleanType">
-        <xsd:annotation>
-            <xsd:documentation>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:extension base="xsd:anyURI">
+	<xsd:attribute name="id" type="xsd:ID"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="xsdBooleanType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	This type adds an "id" attribute to xsd:boolean.
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:boolean">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="xsdIntegerType">
-        <xsd:annotation>
-            <xsd:documentation>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:extension base="xsd:boolean">
+	<xsd:attribute name="id" type="xsd:ID"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="xsdIntegerType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	This type adds an "id" attribute to xsd:integer.
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:integer">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="xsdNMTOKENType">
-        <xsd:annotation>
-            <xsd:documentation>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:extension base="xsd:integer">
+	<xsd:attribute name="id" type="xsd:ID"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="xsdNMTOKENType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	This type adds an "id" attribute to xsd:NMTOKEN.
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:NMTOKEN">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="xsdNonNegativeIntegerType">
-        <xsd:annotation>
-            <xsd:documentation>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:extension base="xsd:NMTOKEN">
+	<xsd:attribute name="id" type="xsd:ID"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="xsdNonNegativeIntegerType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	This type adds an "id" attribute to xsd:nonNegativeInteger.
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:nonNegativeInteger">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="xsdPositiveIntegerType">
-        <xsd:annotation>
-            <xsd:documentation>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:extension base="xsd:nonNegativeInteger">
+	<xsd:attribute name="id" type="xsd:ID"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="xsdPositiveIntegerType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	This type adds an "id" attribute to xsd:positiveInteger.
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:positiveInteger">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="xsdQNameType">
-        <xsd:annotation>
-            <xsd:documentation>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:extension base="xsd:positiveInteger">
+	<xsd:attribute name="id" type="xsd:ID"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="xsdQNameType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	This type adds an "id" attribute to xsd:QName.
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:QName">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="xsdStringType">
-        <xsd:annotation>
-            <xsd:documentation>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:extension base="xsd:QName">
+	<xsd:attribute name="id" type="xsd:ID"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="xsdStringType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	This type adds an "id" attribute to xsd:string.
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:extension base="xsd:string">
+	<xsd:attribute name="id" type="xsd:ID"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
 
 </xsd:schema>
 

Added: geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/j2ee_jaxrpc_mapping_1_1.xsd
==============================================================================
--- (empty file)
+++ geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/j2ee_jaxrpc_mapping_1_1.xsd	Fri Oct 22 16:39:25 2004
@@ -0,0 +1,885 @@
+<?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="1.1">
+  <xsd:annotation>
+    <xsd:documentation>
+      @(#)j2ee_jaxrpc_mapping_1_1.xsds	1.12 08/25/03
+
+      Based on j2ee_jaxrpc_mapping_1_0.dtd, Last updated: 09/19/2002 10:26
+    </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.
+
+      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.
+
+      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.
+
+      Third-party software, including font technology, is
+      copyrighted and licensed from Sun suppliers.
+
+      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.
+
+      Federal Acquisitions: Commercial Software - Government Users
+      Subject to Standard License Terms and Conditions.
+
+    </xsd:documentation>
+  </xsd:annotation>
+  <xsd:annotation>
+    <xsd:documentation>
+
+      (C) Copyright International Business Machines Corporation 2002
+
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:annotation>
+    <xsd:documentation>
+      <![CDATA[
+
+	The element describes the Java mapping to a known WSDL document.
+
+	It contains the mapping between package names and XML namespaces,
+	WSDL root types and Java artifacts, and the set of mappings for
+	services.
+
+	All java-wsdl-mapping deployment descriptors must indicate the
+	schema by using the J2EE namespace:
+
+	http://java.sun.com/xml/ns/j2ee
+
+	and by indicating the version of the schema by using the
+	version element as shown below:
+
+	    <java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee"
+	      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	      xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+		http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"
+	      version="1.1">
+	      ...
+	    </java-wsdl-mapping>
+
+	The instance documents may indicate the published version of
+	the schema using the xsi:schemaLocation attribute for J2EE
+	namespace with the following location:
+
+	http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd
+
+	]]>
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:annotation>
+    <xsd:documentation>
+
+      The following conventions apply to all J2EE
+      deployment descriptor elements unless indicated otherwise.
+
+      - In elements that specify a pathname to a file within the
+	same JAR file, relative filenames (i.e., those not
+	starting with "/") are considered relative to the root of
+	the JAR file's namespace.  Absolute filenames (i.e., those
+	starting with "/") also specify names in the root of the
+	JAR file's namespace.  In general, relative names are
+	preferred.  The exception is .war files where absolute
+	names are preferred for consistency with the Servlet API.
+
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:include schemaLocation="j2ee_1_4.xsd"/>
+
+
+<!-- **************************************************** -->
+
+
+  <xsd:element name="java-wsdl-mapping" type="j2ee:java-wsdl-mappingType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	This is the root of the java-wsdl-mapping deployment descriptor.
+
+      </xsd:documentation>
+    </xsd:annotation>
+  </xsd:element>
+
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="constructor-parameter-orderType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The constructor-parameter-order element defines the order
+	that complexType element values are applied to a Java
+	exception constructor. Element names are specified for each
+	parameter of the constructor, including element names of
+	inherited types if necessary.
+
+	Used in: exception-mapping
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="element-name"
+		   type="j2ee:string"
+		   minOccurs="1" maxOccurs="unbounded">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The element-name element defines the name of a complexType
+	    element name attribute value.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="exception-mappingType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The exception-mapping element defines the mapping between the
+	service specific exception types and wsdl faults and
+	SOAP headerfaults.
+
+	This element should be interpreted with respect to the
+	mapping between a method and an operation which provides the
+	mapping context.
+
+	Used in: service-endpoint-method-mapping
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="exception-type"
+		   type="j2ee:fully-qualified-classType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The exception-type element defines Java type of the exception.
+	    It may be a service specific exception.
+
+	    It must be a fully qualified class name.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="wsdl-message"
+		   type="j2ee:wsdl-messageType"/>
+      <xsd:element name="wsdl-message-part-name"
+		   type="j2ee:wsdl-message-part-nameType"
+		   minOccurs="0" maxOccurs="1">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+            The wsdl-message-part-name element is required only
+            when the message referenced by the wsdl-message element
+            has more than one part.
+
+            This only occurs when multiple headerfaults use the
+            same message.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="constructor-parameter-order"
+		   type="j2ee:constructor-parameter-orderType"
+		   minOccurs="0" maxOccurs="1"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="java-wsdl-mappingType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The element describes the Java mapping to a known WSDL document.
+
+	It contains the mapping between package names and XML namespaces,
+	WSDL root types and Java artifacts, and the set of mappings for
+	services.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="package-mapping"
+		   type="j2ee:package-mappingType"
+		   minOccurs="1" maxOccurs="unbounded"/>
+      <xsd:element name="java-xml-type-mapping"
+		   type="j2ee:java-xml-type-mappingType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="exception-mapping"
+		   type="j2ee:exception-mappingType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:sequence minOccurs="0" maxOccurs="unbounded">
+        <xsd:element name="service-interface-mapping"
+		     type="j2ee:service-interface-mappingType"
+		     minOccurs="0" maxOccurs="1"/>
+        <xsd:element name="service-endpoint-interface-mapping"
+		     type="j2ee:service-endpoint-interface-mappingType"
+		     minOccurs="1" maxOccurs="unbounded"/>
+      </xsd:sequence>
+    </xsd:sequence>
+
+    <xsd:attribute name="version"
+		   type="j2ee:dewey-versionType"
+		   fixed="1.1"
+		   use="required">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The required value for the version is 1.1.
+
+	</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="java-xml-type-mappingType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The java-xml-type-mapping element contains a java-type that is the
+	fully qualified name of the Java class, primitive type, or array 
+	type, QName of the XML root type or anonymous type, the WSDL type
+	scope the QName applies to and the set of variable mappings for
+	each public variable within the Java class.
+
+	Used in: java-wsdl-mapping
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="java-type"
+		   type="j2ee:java-typeType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The java-type element is the fully qualified class name of
+	    a Java class, primitive, or array type.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <choice>
+        <xsd:element name="root-type-qname"
+		   type="j2ee:xsdQNameType">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The root-type-qname identifies the WSDL QName of an XML type.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="anonymous-type-qname"
+		   type="j2ee:string">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The anonymous-type-qname identifies the WSDL QName of an 
+	      anonymous XML type.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+        </xsd:element>
+      </choice>
+      <xsd:element name="qname-scope"
+		   type="j2ee:qname-scopeType"/>
+      <xsd:element name="variable-mapping"
+		   type="j2ee:variable-mappingType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="method-param-parts-mappingType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The method-param-parts-mapping element defines the mapping between a
+	Java method parameters and a wsdl-message.
+
+	Used in: service-endpoint-method-mapping
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="param-position"
+		   type="j2ee:xsdNonNegativeIntegerType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The param-position element defines the position of a
+	    parameter within a Java method.  It must be an integer
+	    starting from 0.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="param-type"
+		   type="j2ee:java-typeType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The param-type element defines the fully qualified 
+	    class name of a Java class, primitive, or array type. 
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="wsdl-message-mapping"
+		   type="j2ee:wsdl-message-mappingType"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="package-mappingType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The package-mapping indicates the mapping between java-package-name
+	and XML namespace in the WSDL document.
+
+	Used in: java-wsdl-mapping
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="package-type"
+		   type="j2ee:fully-qualified-classType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The package-type indicates the Java package name. It must be a fully
+	    qualified package name, even though the XML schema type is 
+	    fully-qualified-classType.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="namespaceURI"
+		   type="j2ee:xsdAnyURIType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The namespaceURI element indicates a URI.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="parameter-modeType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The parameter-mode element defines the mode of the parameter.
+	It can have only three values, IN, OUT, INOUT.
+
+	Used in: java-xml-type-mapping
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:string">
+	<xsd:enumeration value="IN"/>
+	<xsd:enumeration value="OUT"/>
+	<xsd:enumeration value="INOUT"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="port-mappingType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The port-mapping defines the mapping of the WSDL port name attribute
+	to the Java name used to generate the Generated Service Interface
+	method get{java-name}.
+
+	Used in: service-interface-mapping
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="port-name"
+		   type="j2ee:string">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The port-mapping defines the mapping of the WSDL port name
+	    attribute to the Java name used to generate the Generated
+	    Service Interface method get{java-name}.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="java-port-name"
+		   type="j2ee:string">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The java-port-name element is the string to use as the port
+	    name in Java.  It is used in generating the Generated
+	    Service Interface method get{java-port-name}.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="qname-scopeType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The qname-scope elements scopes the reference of a QName to the WSDL
+	element type it applies to. The value of qname-scope may be
+	simpleType, complexType, or element.
+
+	Used in: java-xml-type-mapping
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:string">
+	<xsd:enumeration value="simpleType"/>
+	<xsd:enumeration value="complexType"/>
+	<xsd:enumeration value="element"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="service-endpoint-interface-mappingType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The service-endpoint-interface-mapping defines a tuple
+	to specify Service Endpoint Interfaces to
+	WSDL port types and WSDL bindings.
+
+	An interface may be mapped to a port-type and binding multiple
+	times. This happens rarely.
+
+	Used in: java-wsdl-mapping
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="service-endpoint-interface"
+		   type="j2ee:fully-qualified-classType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The service-endpoint-interface element defines the Java
+	    type for the endpoint interface. The name must be a fully
+	    qualified class name.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="wsdl-port-type"
+		   type="j2ee:xsdQNameType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The wsdl-port-type element defines the wsdl port type
+	    by a QNAME which uniquely identifies  the port type.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="wsdl-binding"
+		   type="j2ee:xsdQNameType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The wsdl-binding element defines the wsdl binding
+	    by a QNAME which uniquely identifies  the binding.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="service-endpoint-method-mapping"
+		   type="j2ee:service-endpoint-method-mappingType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="service-endpoint-method-mappingType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The service-endpoint-method-mapping element defines the mapping of
+	Java methods to operations (which are not uniquely qualified by
+	qnames).
+
+	The wsdl-operation should be interpreted with respect to the
+	portType and binding in which this definition is embedded within.
+	See the definitions for service-endpoint-interface-mapping and
+	service-interface-mapping to acquire the proper context.  The
+	wrapped-element indicator should only be specified when a WSDL
+	message wraps an element type.  The wsdl-return-value-mapping is
+	not specified for one-way operations.
+
+	Used in: service-endpoint-interface-mapping
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="java-method-name"
+		   type="j2ee:string">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The java-method-name element defines the name of a Java method
+	    within an interface.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="wsdl-operation"
+		   type="j2ee:string">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The wsdl-operation element defines an operation within a WSDL
+	    document.  It must be interpreted with respect to a port type.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="wrapped-element"
+		   type="j2ee:emptyType"
+		   minOccurs="0"
+		   maxOccurs="1">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The wrapped-element element is defined when a WSDL message
+	    with a single part is used to wrap an element type and the
+	    element's name matches the operation name.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="method-param-parts-mapping"
+		   type="j2ee:method-param-parts-mappingType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="wsdl-return-value-mapping"
+		   type="j2ee:wsdl-return-value-mappingType"
+		   minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="service-interface-mappingType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The service-interface-mapping element defines how a Java type for
+	the service interface maps to a WSDL service.
+
+	Used in: java-wsdl-mapping
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="service-interface"
+		   type="j2ee:fully-qualified-classType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The service-interface element defines the Java type for the service.
+	    For static services, it is javax.xml.rpc.Service interface. For
+	    generated service, it would be the generated interface name.
+
+	    The name must be a fully qualified class name.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="wsdl-service-name"
+		   type="j2ee:xsdQNameType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The wsdl-service-name element defines the wsdl service name
+	    by a QNAME which uniquely identifies  the service.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="port-mapping"
+		   type="j2ee:port-mappingType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="variable-mappingType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The variable-mapping element defines the correlation between a
+	Java class data member or JavaBeans property to an XML element
+	or attribute name of an XML root type. If the data-member 
+	element is present, the Java variable name is a public data
+	member.  If data-member	is not present, the Java variable name
+	is a JavaBeans property.
+
+	Used in: java-xml-type-mapping
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="java-variable-name"
+		   type="j2ee:string">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The java-variable-name defines the name of a public data member or
+	    JavaBeans property within a Java class.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="data-member"
+		   type="j2ee:emptyType"
+		   minOccurs="0" maxOccurs="1">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The data-member element is a boolean indicator that a Java
+	    variable is a public data member and not a JavaBeans property.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:choice>
+        <xsd:element name="xml-attribute-name"
+		     type="j2ee:string">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The xml-attribute-name element defines name attribute value
+	      of a WSDL attribute element within a root type.  The value 
+	      of an xml-attribute-name element must match the value of 
+	      the ref attribute if mapping an attribute reference.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="xml-element-name"
+		     type="j2ee:string">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The xml-element-name element defines name attribute value of 
+	      a WSDL element within a root type.  The value of an 
+	      xml-element-name element must match the value of the ref 
+	      attribute if mapping an element reference.  
+
+	  </xsd:documentation>
+	</xsd:annotation>
+        </xsd:element>
+        <xsd:element name="xml-wildcard"
+		     type="j2ee:emptyType">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The xml-wildcard element associates the variable-mapping with
+	      an xsd:any element within a root type.  
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+        </xsd:element>
+      </xsd:choice>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="wsdl-message-mappingType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The wsdl-message-mapping element defines the mapping to a
+	specific message and its part. Together they define uniquely
+	the mapping for a specific parameter. Parts within a message
+	context are uniquely identified with their names.
+
+	The parameter-mode is defined by the mapping to indicate
+	whether the mapping will be IN, OUT, or INOUT..  The presence
+	of the soap-header element indicates that the parameter is
+	mapped to a soap header only.  When absent, it means that the
+	wsdl-message is mapped to a Java parameter. The soap headers
+	are interpreted in the order they are provided in the mapping.
+
+	Used in: method-param-parts-mapping
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="wsdl-message"
+		   type="j2ee:wsdl-messageType"/>
+      <xsd:element name="wsdl-message-part-name"
+		   type="j2ee:wsdl-message-part-nameType"/>
+      <xsd:element name="parameter-mode"
+		   type="j2ee:parameter-modeType"/>
+      <xsd:element name="soap-header"
+		   type="j2ee:emptyType"
+		   minOccurs="0" maxOccurs="1">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The soap-header element is a boolean element indicating that
+	    a parameter is mapped to a SOAP header.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="wsdl-message-part-nameType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	Interpretation of the wsdl-message-part-name element depends on
+	whether or not wrapped-element has been defined in the
+	service-endpoint-method-mapping.  If wrapped-element is not
+	specified, wsdl-message-part-name defines a WSDL message part. It
+	should always be interpreted with respect to a wsdl-message
+	element. If wrapped-element is specified, wsdl-message-part-name
+	refers to an element name of the element type.
+
+	Used in: wsdl-message-mapping, wsdl-return-value-mapping
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:string"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="wsdl-messageType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The wsdl-message element defines a WSDL message by a QNAME.
+
+	Used in: wsdl-message-mapping, wsdl-return-value-mapping,
+	exception-mapping
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:xsdQNameType"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="wsdl-return-value-mappingType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The wsdl-return-value-mapping  element defines the mapping for the
+	method's return value. It defines the mapping to a specific message
+	and its part.  Together they define uniquely the mapping for a
+	specific parameter. Parts within a message context are uniquely
+	identified with their names. The wsdl-message-part-name is not
+	specified if there is no return value or OUT parameters.
+
+	Used in: service-endpoint-method-mapping
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="method-return-value"
+		   type="j2ee:fully-qualified-classType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The method-return-value  element defines a fully qualified
+	    class name or void type for the method's return value
+	    type.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="wsdl-message"
+		   type="j2ee:wsdl-messageType"/>
+      <xsd:element name="wsdl-message-part-name"
+		   type="j2ee:wsdl-message-part-nameType"
+		   minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+</xsd:schema>
+

Added: geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/j2ee_web_services_1_1.xsd
==============================================================================
--- (empty file)
+++ geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/j2ee_web_services_1_1.xsd	Fri Oct 22 16:39:25 2004
@@ -0,0 +1,489 @@
+<?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="1.1">
+  <xsd:annotation>
+    <xsd:documentation>
+      @(#)j2ee_web_services_1_1.xsds	1.11 02/11/03
+    </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.
+
+      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.
+
+      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.
+
+      Third-party software, including font technology, is
+      copyrighted and licensed from Sun suppliers.
+
+      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.
+
+      Federal Acquisitions: Commercial Software - Government Users
+      Subject to Standard License Terms and Conditions.
+
+    </xsd:documentation>
+  </xsd:annotation>
+  <xsd:annotation>
+    <xsd:documentation>
+
+      (C) Copyright International Business Machines Corporation 2002
+
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:annotation>
+    <xsd:documentation>
+      <![CDATA[
+
+	The webservices element is the root element for the web services
+	deployment descriptor.  It specifies the set of web service
+	descriptions that are to be deployed into the J2EE Application
+	Server and the dependencies they have on container resources and
+	services.  The deployment descriptor must be named
+	"META-INF/webservices.xml" in the web services' jar file.
+
+	Used in: webservices.xml
+
+	All webservices deployment descriptors must indicate the
+	webservices schema by using the J2EE namespace:
+
+	http://java.sun.com/xml/ns/j2ee
+
+	and by indicating the version of the schema by using the version
+	element as shown below:
+
+	    <webservices xmlns="http://java.sun.com/xml/ns/j2ee"
+	      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	      xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+		http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
+	      version="1.1">
+	      ...
+	    </webservices>
+
+	The instance documents may indicate the published version of the
+	schema using the xsi:schemaLocation attribute for the J2EE
+	namespace with the following location:
+
+	http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd
+
+	]]>
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:annotation>
+    <xsd:documentation>
+
+      The following conventions apply to all J2EE
+      deployment descriptor elements unless indicated otherwise.
+
+      - In elements that specify a pathname to a file within the
+	same JAR file, relative filenames (i.e., those not
+	starting with "/") are considered relative to the root of
+	the JAR file's namespace.  Absolute filenames (i.e., those
+	starting with "/") also specify names in the root of the
+	JAR file's namespace.  In general, relative names are
+	preferred.  The exception is .war files where absolute
+	names are preferred for consistency with the Servlet API.
+
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:include schemaLocation="j2ee_1_4.xsd"/>
+
+
+<!-- **************************************************** -->
+
+
+  <xsd:element name="webservices" type="j2ee:webservicesType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The webservices element is the root element for the web services
+	deployment descriptor.  It specifies the set of web service
+	descriptions that are to be deployed into the J2EE Application Server
+	and the dependencies they have on container resources and services.
+
+	Used in: webservices.xml
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:key name="webservice-description-name-key">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The webservice-description-name identifies the collection of
+	  port-components associated with a WSDL file and JAX-RPC mapping. The
+	  name must be unique within the deployment descriptor.
+
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="j2ee:webservice-description"/>
+      <xsd:field xpath="j2ee:webservice-description-name"/>
+    </xsd:key>
+  </xsd:element>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="port-componentType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The port-component element associates a WSDL port with a web service
+	interface and implementation.  It defines the name of the port as a
+	component, optional description, optional display name, optional iconic
+	representations, WSDL port QName, Service Endpoint Interface, Service
+	Implementation Bean.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType"
+		   minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="display-name"
+		   type="j2ee:display-nameType"
+		   minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="icon"
+		   type="j2ee:iconType"
+		   minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="port-component-name"
+		   type="j2ee:string">
+	<xsd:annotation>
+	  <xsd:documentation>
+	    <![CDATA[
+
+	      The port-component-name element specifies a port component's
+	      name.  This name is assigned by the module producer to name
+	      the service implementation bean in the module's deployment
+	      descriptor. The name must be unique among the port component
+	      names defined in the same module.
+
+	      Used in: port-component
+
+	      Example:
+		      <port-component-name>EmployeeService
+		      </port-component-name>
+
+	      ]]>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="wsdl-port"
+		   type="j2ee:xsdQNameType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    Defines the name space and local name part of the WSDL port QName.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="service-endpoint-interface"
+		   type="j2ee:fully-qualified-classType">
+	<xsd:annotation>
+	  <xsd:documentation>
+	    <![CDATA[
+
+	      The service-endpoint-interface element contains the
+	      fully-qualified name of the port component's Service Endpoint
+	      Interface.
+
+	      Used in: port-component
+
+	      Example:
+		      <remote>com.wombat.empl.EmployeeService</remote>
+
+	      ]]>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="service-impl-bean"
+		   type="j2ee:service-impl-beanType"/>
+
+      <xsd:element name="handler"
+		   type="j2ee:port-component_handlerType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="port-component_handlerType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	Declares the handler for a port-component. Handlers can access the
+	init-param name/value pairs using the HandlerInfo interface.
+
+	Used in: port-component
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:group ref="j2ee:descriptionGroup"/>
+      <xsd:element name="handler-name"
+		   type="j2ee:string">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    Defines the name of the handler. The name must be unique within the
+	    module.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="handler-class"
+		   type="j2ee:fully-qualified-classType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    Defines a fully qualified class name for the handler implementation.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="init-param"
+		   type="j2ee:param-valueType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+
+      <xsd:element name="soap-header"
+		   type="j2ee:xsdQNameType"
+		   minOccurs="0" maxOccurs="unbounded">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    Defines the QName of a SOAP header that will be processed by the
+	    handler.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="soap-role"
+		   type="j2ee:string"
+		   minOccurs="0" maxOccurs="unbounded">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The soap-role element contains a SOAP actor definition that the
+	    Handler will play as a role.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="service-impl-beanType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The service-impl-bean element defines the web service implementation.
+	A service implementation can be an EJB bean class or JAX-RPC web
+	component.  Existing EJB implementations are exposed as a web service
+	using an ejb-link.
+
+	Used in: port-component
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:choice>
+      <xsd:element name="ejb-link"
+		   type="j2ee:ejb-linkType"/>
+      <xsd:element name="servlet-link"
+		   type="j2ee:servlet-linkType"/>
+    </xsd:choice>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="servlet-linkType">
+    <xsd:annotation>
+      <xsd:documentation>
+	<![CDATA[
+
+	  The servlet-link element is used in the service-impl-bean element
+	  to specify that a Service Implementation Bean is defined as a
+	  JAX-RPC Service Endpoint.
+
+	  The value of the servlet-link element must be the servlet-name of
+	  a JAX-RPC Service Endpoint in the same WAR file.
+
+	  Used in: service-impl-bean
+
+	  Example:
+		  <servlet-link>StockQuoteService</servlet-link>
+
+	  ]]>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:string"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="webservice-descriptionType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The webservice-description element defines a WSDL document file
+	and the set of Port components associated with the WSDL ports
+	defined in the WSDL document.  There may be multiple
+	webservice-descriptions defined within a module.
+
+	All WSDL file ports must have a corresponding port-component element
+	defined.
+
+	Used in: webservices
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType"
+		   minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="display-name"
+		   type="j2ee:display-nameType"
+		   minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="icon"
+		   type="j2ee:iconType"
+		   minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="webservice-description-name"
+		   type="j2ee:string">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The webservice-description-name identifies the collection of
+	    port-components associated with a WSDL file and JAX-RPC
+	    mapping. The name must be unique within the deployment descriptor.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="wsdl-file"
+		   type="j2ee:pathType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The wsdl-file element contains the name of a WSDL file in the
+	    module.  The file name is a relative path within the module.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="jaxrpc-mapping-file"
+		   type="j2ee:pathType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The jaxrpc-mapping-file element contains the name of a file that
+	    describes the JAX-RPC mapping between the Java interaces used by
+	    the application and the WSDL description in the wsdl-file.  The
+	    file name is a relative path within the module.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="port-component"
+		   type="j2ee:port-componentType"
+		   minOccurs="1" maxOccurs="unbounded">
+	<xsd:key name="port-component_handler-name-key">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      Defines the name of the handler. The name must be unique
+	      within the module.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="j2ee:handler"/>
+	  <xsd:field xpath="j2ee:handler-name"/>
+	</xsd:key>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="webservicesType">
+    <xsd:sequence>
+      <xsd:group ref="j2ee:descriptionGroup"/>
+      <xsd:element name="webservice-description"
+		   type="j2ee:webservice-descriptionType"
+		   minOccurs="1" maxOccurs="unbounded">
+	<xsd:key name="port-component-name-key">
+	  <xsd:annotation>
+	    <xsd:documentation>
+	      <![CDATA[
+
+		The port-component-name element specifies a port
+		component's name.  This name is assigned by the module
+		producer to name the service implementation bean in the
+		module's deployment descriptor. The name must be unique
+		among the port component names defined in the same module.
+
+		Used in: port-component
+
+		Example:
+			<port-component-name>EmployeeService
+			</port-component-name>
+
+		]]>
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="j2ee:port-component"/>
+	  <xsd:field xpath="j2ee:port-component-name"/>
+	</xsd:key>
+      </xsd:element>
+    </xsd:sequence>
+
+    <xsd:attribute name="version"
+		   type="j2ee:dewey-versionType"
+		   fixed="1.1"
+		   use="required">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The required value for the version is 1.1.
+
+	</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+</xsd:schema>
+

Modified: geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/j2ee_web_services_client_1_1.xsd
==============================================================================
--- geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/j2ee_web_services_client_1_1.xsd	(original)
+++ geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/j2ee_web_services_client_1_1.xsd	Fri Oct 22 16:39:25 2004
@@ -1,341 +1,343 @@
 <?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="1.1">
-    <xsd:annotation>
-        <xsd:documentation>
-@(#)j2ee_web_services_client_1_1.xsds	1.8 09/30/02
-        </xsd:documentation>
-    </xsd:annotation>
+	    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="1.1">
+  <xsd:annotation>
+    <xsd:documentation>
+      @(#)j2ee_web_services_client_1_1.xsds	1.10 02/11/03
+    </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.
+
+      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.
+
+      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.
+
+      Third-party software, including font technology, is
+      copyrighted and licensed from Sun suppliers.
+
+      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.
+
+      Federal Acquisitions: Commercial Software - Government Users
+      Subject to Standard License Terms and Conditions.
+
+    </xsd:documentation>
+  </xsd:annotation>
+  <xsd:annotation>
+    <xsd:documentation>
+
+      (C) Copyright International Business Machines Corporation 2002
 
-    <xsd:annotation>
-        <xsd:documentation>
+    </xsd:documentation>
+  </xsd:annotation>
 
-Copyright 2002 Sun Microsystems, Inc., 901 San Antonio
-Road, Palo Alto, California 94303, U.S.A. All rights
-reserved.
-
-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.
-
-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.
-
-Third-party software, including font technology, is
-copyrighted and licensed from Sun suppliers.
-
-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.
 
-Federal Acquisitions: Commercial Software - Government Users
-Subject to Standard License Terms and Conditions.
+<!-- **************************************************** -->
 
-        </xsd:documentation>
+  <xsd:complexType name="port-component-refType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The port-component-ref element declares a client dependency
+	on the container for resolving a Service Endpoint Interface
+	to a WSDL port. It optionally associates the Service Endpoint
+	Interface with a particular port-component. This is only used
+	by the container for a Service.getPort(Class) method call.
+
+      </xsd:documentation>
     </xsd:annotation>
 
+    <xsd:sequence>
+      <xsd:element name="service-endpoint-interface"
+		   type="j2ee:fully-qualified-classType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The service-endpoint-interface element defines a fully qualified
+	    Java class that represents the Service Endpoint Interface of a
+	    WSDL port.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+      <xsd:element name="port-component-link"
+		   type="j2ee:string"
+		   minOccurs="0" maxOccurs="1">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The port-component-link element links a port-component-ref
+	    to a specific port-component required to be made available
+	    by a service reference.
+
+	    The value of a port-component-link must be the
+	    port-component-name of a port-component in the same module
+	    or another module in the same application unit. The syntax
+	    for specification follows the syntax defined for ejb-link
+	    in the EJB 2.0 specification.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:group name="service-refGroup">
+    <xsd:sequence>
+      <xsd:element name="service-ref"
+		   type="j2ee:service-refType"
+		   minOccurs="0" maxOccurs="unbounded">
+	<xsd:key name="service-ref_handler-name-key">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      Defines the name of the handler. The name must be unique
+	      within the module.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	  <xsd:selector xpath="j2ee:handler"/>
+	  <xsd:field xpath="j2ee:handler-name"/>
+	</xsd:key>
+      </xsd:element>
+    </xsd:sequence>
+  </xsd:group>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="service-refType">
     <xsd:annotation>
-        <xsd:documentation>
+      <xsd:documentation>
 
-(C) Copyright International Business Machines Corporation 2002
+	The service-ref element declares a reference to a Web
+	service. It contains optional description, display name and
+	icons, a declaration of the required Service interface,
+	an optional WSDL document location, an optional set
+	of JAX-RPC mappings, an optional QName for the service element,
+	an optional set of Service Endpoint Interfaces to be resolved
+	by the container to a WSDL port, and an optional set of handlers.
 
-        </xsd:documentation>
+      </xsd:documentation>
     </xsd:annotation>
 
+    <xsd:sequence>
+      <xsd:group ref="j2ee:descriptionGroup"/>
+      <xsd:element name="service-ref-name"
+		   type="j2ee:jndi-nameType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The service-ref-name element declares logical name that the
+	    components in the module use to look up the Web service. It
+	    is recommended that all service reference names start with
+	    "service/".
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+      <xsd:element name="service-interface"
+		   type="j2ee:fully-qualified-classType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The service-interface element declares the fully qualified class
+	    name of the JAX-RPC Service interface the client depends on.
+	    In most cases the value will be javax.xml.rpc.Service.  A JAX-RPC
+	    generated Service Interface class may also be specified.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+      <xsd:element name="wsdl-file"
+		   type="j2ee:xsdAnyURIType"
+		   minOccurs="0" maxOccurs="1">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The wsdl-file element contains the URI location of a WSDL
+	    file. The location is relative to the root of the module.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+      <xsd:element name="jaxrpc-mapping-file"
+		   type="j2ee:pathType"
+		   minOccurs="0" maxOccurs="1">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The jaxrpc-mapping-file element contains the name of a file that
+	    describes the JAX-RPC mapping between the Java interaces used by
+	    the application and the WSDL description in the wsdl-file.  The
+	    file name is a relative path within the module file.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+      <xsd:element name="service-qname"
+		   type="j2ee:xsdQNameType"
+		   minOccurs="0" maxOccurs="1">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The service-qname element declares the specific WSDL service
+	    element that is being refered to.  It is not specified if no
+	    wsdl-file is declared.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+      <xsd:element name="port-component-ref"
+		   type="j2ee:port-component-refType"
+		   minOccurs="0" maxOccurs="unbounded">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The port-component-ref element declares a client dependency
+	    on the container for resolving a Service Endpoint Interface
+	    to a WSDL port. It optionally associates the Service Endpoint
+	    Interface with a particular port-component. This is only used
+	    by the container for a Service.getPort(Class) method call.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+      <xsd:element name="handler"
+		   type="j2ee:service-ref_handlerType"
+		   minOccurs="0" maxOccurs="unbounded">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    Declares the handler for a port-component. Handlers can
+	    access the init-param name/value pairs using the
+	    HandlerInfo interface. If port-name is not specified, the
+	    handler is assumed to be associated with all ports of the
+	    service.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="service-ref_handlerType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	Declares the handler for a port-component. Handlers can access the
+	init-param name/value pairs using the HandlerInfo interface. If
+	port-name is not specified, the handler is assumed to be associated
+	with all ports of the service.
 
-    <!-- **************************************************** -->
+	Used in: service-ref
 
-    <xsd:complexType name="port-component-refType">
-        <xsd:annotation>
-            <xsd:documentation>
-
-    The port-component-ref element declares a client dependency
-    on the container for resolving a Service Endpoint Interface
-    to a WSDL port. It optionally associates the Service Endpoint
-    Interface with a particular port-component. This is only used
-    by the container for a Service.getPort(Class) method call.
-
-            </xsd:documentation>
-        </xsd:annotation>
-
-        <xsd:sequence>
-            <xsd:element name="service-endpoint-interface"
-                type="j2ee:fully-qualified-classType">
-                <xsd:annotation>
-                    <xsd:documentation>
-
-        The service-endpoint-interface element defines a fully qualified
-        Java class that represents the Service Endpoint Interface of a
-        WSDL port.
-
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-
-            <xsd:element name="port-component-link"
-                type="j2ee:string"
-                minOccurs="0" maxOccurs="1">
-                <xsd:annotation>
-                    <xsd:documentation>
-
-        The port-component-link element links a port-component-ref to a
-        specific port-component required to be made available by a service
-        reference.
-
-        The value of a port-component-link must be the port-component-name
-        of a port-component in the same module or another module in the same
-        application unit. The syntax for specification follows the syntax
-        defined for ejb-link in the EJB 2.0 specification.
-
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:group name="service-refGroup">
-        <xsd:sequence>
-            <xsd:element name="service-ref"
-                type="j2ee:service-refType"
-                minOccurs="0" maxOccurs="unbounded">
-                <xsd:key name="service-ref_handler-name-key">
-                    <xsd:annotation>
-                        <xsd:documentation>
-
-            Defines the name of the handler. The name must be unique within the
-            module.
-
-                        </xsd:documentation>
-                    </xsd:annotation>
-                    <xsd:selector xpath="j2ee:handler"/>
-                    <xsd:field xpath="j2ee:handler-name"/>
-                </xsd:key>
-            </xsd:element>
-        </xsd:sequence>
-    </xsd:group>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="service-refType">
-        <xsd:annotation>
-            <xsd:documentation>
-
-    The service-ref element declares a reference to a Web
-    service. It contains optional description, display name and
-    icons, a declaration of the required Service interface,
-    an optional WSDL document location, an optional set
-    of JAX-RPC mappings, an optional QName for the service element,
-    an optional set of Service Endpoint Interfaces to be resolved
-    by the container to a WSDL port, and an optional set of handlers.
-
-            </xsd:documentation>
-        </xsd:annotation>
-
-        <xsd:sequence>
-            <xsd:group ref="j2ee:descriptionGroup"/>
-            <xsd:element name="service-ref-name"
-                type="j2ee:string">
-                <xsd:annotation>
-                    <xsd:documentation>
-
-        The service-ref-name element declares logical name that the
-        components in the module use to look up the Web service. It
-        is recommended that all service reference names start with
-        "service/".
-
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-
-            <xsd:element name="service-interface"
-                type="j2ee:fully-qualified-classType">
-                <xsd:annotation>
-                    <xsd:documentation>
-
-        The service-interface element declares the fully qualified class
-        name of the JAX-RPC Service interface the client depends on.
-        In most cases the value will be javax.xml.rpc.Service.  A JAX-RPC
-        generated Service Interface class may also be specified.
-
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-
-            <xsd:element name="wsdl-file"
-                type="j2ee:xsdAnyURIType"
-                minOccurs="0" maxOccurs="1">
-                <xsd:annotation>
-                    <xsd:documentation>
-
-        The wsdl-file element contains the URI location of a WSDL file. The
-        location is relative to the root of the module.
-
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-
-            <xsd:element name="jaxrpc-mapping-file"
-                type="j2ee:pathType"
-                minOccurs="0" maxOccurs="1">
-                <xsd:annotation>
-                    <xsd:documentation>
-
-        The jaxrpc-mapping-file element contains the name of a file that
-        describes the JAX-RPC mapping between the Java interaces used by
-        the application and the WSDL description in the wsdl-file.  The
-        file name is a relative path within the module file.
-
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-
-            <xsd:element name="service-qname"
-                type="j2ee:xsdQNameType"
-                minOccurs="0" maxOccurs="1">
-                <xsd:annotation>
-                    <xsd:documentation>
-
-        The service-qname element declares the specific WSDL service
-        element that is being refered to.  It is not specified if no
-        wsdl-file is declared.
-
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-
-            <xsd:element name="port-component-ref"
-                type="j2ee:port-component-refType"
-                minOccurs="0" maxOccurs="unbounded">
-                <xsd:annotation>
-                    <xsd:documentation>
-
-        The port-component-ref element declares a client dependency
-        on the container for resolving a Service Endpoint Interface
-        to a WSDL port. It optionally associates the Service Endpoint
-        Interface with a particular port-component. This is only used
-        by the container for a Service.getPort(Class) method call.
-
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-
-            <xsd:element name="handler"
-                type="j2ee:service-ref_handlerType"
-                minOccurs="0" maxOccurs="unbounded">
-                <xsd:annotation>
-                    <xsd:documentation>
-
-        Declares the handler for a port-component. Handlers can access the
-        init-param name/value pairs using the HandlerInfo interface. If
-        port-name is not specified, the handler is assumed to be associated
-        with all ports of the service.
-
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="service-ref_handlerType">
-        <xsd:annotation>
-            <xsd:documentation>
-
-    Declares the handler for a port-component. Handlers can access the
-    init-param name/value pairs using the HandlerInfo interface. If
-    port-name is not specified, the handler is assumed to be associated
-    with all ports of the service.
-
-    Used in: service-ref
-
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:sequence>
-            <xsd:group ref="j2ee:descriptionGroup"/>
-            <xsd:element name="handler-name"
-                type="j2ee:string">
-                <xsd:annotation>
-                    <xsd:documentation>
-
-        Defines the name of the handler. The name must be unique within the
-        module.
-
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="handler-class"
-                type="j2ee:fully-qualified-classType">
-                <xsd:annotation>
-                    <xsd:documentation>
-
-        Defines a fully qualified class name for the handler implementation.
-
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="init-param"
-                type="j2ee:param-valueType"
-                minOccurs="0" maxOccurs="unbounded"/>
-
-            <xsd:element name="soap-header"
-                type="j2ee:xsdQNameType"
-                minOccurs="0" maxOccurs="unbounded">
-                <xsd:annotation>
-                    <xsd:documentation>
-
-        Defines the QName of a SOAP header that will be processed by the
-        handler.
-
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-
-            <xsd:element name="soap-role"
-                type="j2ee:string"
-                minOccurs="0" maxOccurs="unbounded">
-                <xsd:annotation>
-                    <xsd:documentation>
-
-        The soap-role element contains a SOAP actor definition that the
-        Handler will play as a role.
-
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-
-            <xsd:element name="port-name"
-                type="j2ee:string"
-                minOccurs="0" maxOccurs="unbounded">
-                <xsd:annotation>
-                    <xsd:documentation>
-
-        The port-name element defines the WSDL port-name that a handler
-        should be associated with.
-
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:group ref="j2ee:descriptionGroup"/>
+      <xsd:element name="handler-name"
+		   type="j2ee:string">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    Defines the name of the handler. The name must be unique
+	    within the module.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="handler-class"
+		   type="j2ee:fully-qualified-classType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    Defines a fully qualified class name for the handler
+	    implementation.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="init-param"
+		   type="j2ee:param-valueType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+
+      <xsd:element name="soap-header"
+		   type="j2ee:xsdQNameType"
+		   minOccurs="0" maxOccurs="unbounded">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    Defines the QName of a SOAP header that will be processed
+	    by the handler.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+      <xsd:element name="soap-role"
+		   type="j2ee:string"
+		   minOccurs="0" maxOccurs="unbounded">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The soap-role element contains a SOAP actor definition that
+	    the Handler will play as a role.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+      <xsd:element name="port-name"
+		   type="j2ee:string"
+		   minOccurs="0" maxOccurs="unbounded">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The port-name element defines the WSDL port-name that a
+	    handler should be associated with.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
 
 </xsd:schema>
 

Modified: geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/jsp_2_0.xsd
==============================================================================
--- geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/jsp_2_0.xsd	(original)
+++ geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/jsp_2_0.xsd	Fri Oct 22 16:39:25 2004
@@ -1,21 +1,21 @@
 <?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.0">
-    <xsd:annotation>
-        <xsd:documentation>
+	    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:annotation>
+    <xsd:documentation>
       @(#)jsp_2_0.xsds	1.17 03/18/03
-        </xsd:documentation>
-    </xsd:annotation>
+    </xsd:documentation>
+  </xsd:annotation>
 
-    <xsd:annotation>
-        <xsd:documentation>
+  <xsd:annotation>
+    <xsd:documentation>
 
-      Copyright 2002 Sun Microsystems, Inc., 901 San Antonio
+      Copyright 2003 Sun Microsystems, Inc., 901 San Antonio
       Road, Palo Alto, California 94303, U.S.A. All rights
       reserved.
 
@@ -44,11 +44,11 @@
       Federal Acquisitions: Commercial Software - Government Users
       Subject to Standard License Terms and Conditions.
 
-        </xsd:documentation>
-    </xsd:annotation>
+    </xsd:documentation>
+  </xsd:annotation>
 
-    <xsd:annotation>
-        <xsd:documentation>
+  <xsd:annotation>
+    <xsd:documentation>
 
       This is the XML Schema for the JSP 2.0 deployment descriptor
       types.  The JSP 2.0 schema contains all the special
@@ -58,11 +58,11 @@
       The contents of this schema is used by the web-app_2_4.xsd
       file to define JSP specific content.
 
-        </xsd:documentation>
-    </xsd:annotation>
+    </xsd:documentation>
+  </xsd:annotation>
 
-    <xsd:annotation>
-        <xsd:documentation>
+  <xsd:annotation>
+    <xsd:documentation>
 
       The following conventions apply to all J2EE
       deployment descriptor elements unless indicated otherwise.
@@ -76,60 +76,60 @@
 	preferred.  The exception is .war files where absolute
 	names are preferred for consistency with the Servlet API.
 
-        </xsd:documentation>
-    </xsd:annotation>
+    </xsd:documentation>
+  </xsd:annotation>
 
-    <xsd:include schemaLocation="j2ee_1_4.xsd"/>
+  <xsd:include schemaLocation="j2ee_1_4.xsd"/>
 
 
-    <!-- **************************************************** -->
+<!-- **************************************************** -->
 
-    <xsd:complexType name="jsp-configType">
-        <xsd:annotation>
-            <xsd:documentation>
+  <xsd:complexType name="jsp-configType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The jsp-configType is used to provide global configuration
 	information for the JSP files in a web application. It has
 	two subelements, taglib and jsp-property-group.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="taglib"
+		   type="j2ee:taglibType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="jsp-property-group"
+		   type="j2ee:jsp-property-groupType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
 
-        <xsd:sequence>
-            <xsd:element name="taglib"
-                type="j2ee:taglibType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-            <xsd:element name="jsp-property-group"
-                type="j2ee:jsp-property-groupType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="jsp-fileType">
-        <xsd:annotation>
-            <xsd:documentation>
+<!-- **************************************************** -->
+
+  <xsd:complexType name="jsp-fileType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The jsp-file element contains the full path to a JSP file
 	within the web application beginning with a `/'.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:pathType"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
 
-        <xsd:simpleContent>
-            <xsd:restriction base="j2ee:pathType"/>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="jsp-property-groupType">
-        <xsd:annotation>
-            <xsd:documentation>
+  <xsd:complexType name="jsp-property-groupType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The jsp-property-groupType is used to group a number of
 	files so they can be given global property information.
@@ -142,19 +142,19 @@
 	    - Indicate that a resource is a JSP document (XML)
 	    - Prelude and Coda automatic includes.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <xsd:sequence>
-            <xsd:group ref="j2ee:descriptionGroup"/>
-            <xsd:element name="url-pattern"
-                type="j2ee:url-patternType"
-                maxOccurs="unbounded"/>
-            <xsd:element name="el-ignored"
-                type="j2ee:true-falseType"
-                minOccurs="0">
-                <xsd:annotation>
-                    <xsd:documentation>
+    <xsd:sequence>
+      <xsd:group ref="j2ee:descriptionGroup"/>
+      <xsd:element name="url-pattern"
+		   type="j2ee:url-patternType"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="el-ignored"
+		   type="j2ee:true-falseType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    Can be used to easily set the isELIgnored
 	    property of a group of JSP pages.  By default, the
@@ -162,14 +162,14 @@
 	    a Servlet 2.4 or greater web.xml, and disabled
 	    otherwise.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="page-encoding"
-                type="j2ee:string"
-                minOccurs="0">
-                <xsd:annotation>
-                    <xsd:documentation>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="page-encoding"
+		   type="j2ee:string"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The valid values of page-encoding are those of the
 	    pageEncoding page directive.  It is a
@@ -183,27 +183,27 @@
 	    It is legal to name the same encoding through
 	    mulitple mechanisms.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="scripting-invalid"
-                type="j2ee:true-falseType"
-                minOccurs="0">
-                <xsd:annotation>
-                    <xsd:documentation>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="scripting-invalid"
+		   type="j2ee:true-falseType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    Can be used to easily disable scripting in a
 	    group of JSP pages.  By default, scripting is
 	    enabled.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="is-xml"
-                type="j2ee:true-falseType"
-                minOccurs="0">
-                <xsd:annotation>
-                    <xsd:documentation>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="is-xml"
+		   type="j2ee:true-falseType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    If true, denotes that the group of resources
 	    that match the URL pattern are JSP documents,
@@ -212,15 +212,15 @@
 	    be JSP documents, unless there is another
 	    property group that indicates otherwise.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="include-prelude"
-                type="j2ee:pathType"
-                minOccurs="0"
-                maxOccurs="unbounded">
-                <xsd:annotation>
-                    <xsd:documentation>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="include-prelude"
+		   type="j2ee:pathType"
+		   minOccurs="0"
+		   maxOccurs="unbounded">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The include-prelude element is a context-relative
 	    path that must correspond to an element in the
@@ -229,15 +229,15 @@
 	    in an include directive) at the beginning of each
 	    JSP page in this jsp-property-group.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="include-coda"
-                type="j2ee:pathType"
-                minOccurs="0"
-                maxOccurs="unbounded">
-                <xsd:annotation>
-                    <xsd:documentation>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="include-coda"
+		   type="j2ee:pathType"
+		   minOccurs="0"
+		   maxOccurs="unbounded">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The include-coda element is a context-relative
 	    path that must correspond to an element in the
@@ -246,18 +246,18 @@
 	    in an include directive) at the end of each
 	    JSP page in this jsp-property-group.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="taglibType">
-        <xsd:annotation>
-            <xsd:documentation>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="taglibType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The taglibType defines the syntax for declaring in
 	the deployment descriptor that a tag library is
@@ -265,14 +265,14 @@
 	to override implicit map entries from TLD files and
 	from the container.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <xsd:sequence>
-            <xsd:element name="taglib-uri"
-                type="j2ee:string">
-                <xsd:annotation>
-                    <xsd:documentation>
+    <xsd:sequence>
+      <xsd:element name="taglib-uri"
+		   type="j2ee:string">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    A taglib-uri element describes a URI identifying a
 	    tag library used in the web application.  The body
@@ -281,27 +281,27 @@
 	    There should be no entries in web.xml with the
 	    same taglib-uri value.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-
-            <xsd:element name="taglib-location"
-                type="j2ee:pathType">
-                <xsd:annotation>
-                    <xsd:documentation>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+      <xsd:element name="taglib-location"
+		   type="j2ee:pathType">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    the taglib-location element contains the location
 	    (as a resource relative to the root of the web
 	    application) where to find the Tag Library
 	    Description file for the tag library.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
 
 </xsd:schema>
 

Modified: geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/web-app_2_4.xsd
==============================================================================
--- geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/web-app_2_4.xsd	(original)
+++ geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/web-app_2_4.xsd	Fri Oct 22 16:39:25 2004
@@ -1,21 +1,21 @@
 <?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:annotation>
-        <xsd:documentation>
-      @(#)web-app_2_4.xsds	1.57 03/04/07
-        </xsd:documentation>
-    </xsd:annotation>
+	    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.60 03/08/26
+    </xsd:documentation>
+  </xsd:annotation>
 
-    <xsd:annotation>
-        <xsd:documentation>
+  <xsd:annotation>
+    <xsd:documentation>
 
-      Copyright 2002 Sun Microsystems, Inc., 901 San Antonio
+      Copyright 2003 Sun Microsystems, Inc., 901 San Antonio
       Road, Palo Alto, California 94303, U.S.A. All rights
       reserved.
 
@@ -44,12 +44,12 @@
       Federal Acquisitions: Commercial Software - Government Users
       Subject to Standard License Terms and Conditions.
 
-        </xsd:documentation>
-    </xsd:annotation>
+    </xsd:documentation>
+  </xsd:annotation>
 
-    <xsd:annotation>
-        <xsd:documentation>
-            <![CDATA[
+  <xsd:annotation>
+    <xsd:documentation>
+      <![CDATA[
 
 	This is the XML Schema for the Servlet 2.4 deployment descriptor.
 	The deployment descriptor must be named "WEB-INF/web.xml" in the
@@ -75,12 +75,12 @@
 
 	http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd
 
-        ]]>
-        </xsd:documentation>
-    </xsd:annotation>
+	]]>
+    </xsd:documentation>
+  </xsd:annotation>
 
-    <xsd:annotation>
-        <xsd:documentation>
+  <xsd:annotation>
+    <xsd:documentation>
 
       The following conventions apply to all J2EE
       deployment descriptor elements unless indicated otherwise.
@@ -94,19 +94,19 @@
 	preferred.  The exception is .war files where absolute
 	names are preferred for consistency with the Servlet API.
 
-        </xsd:documentation>
-    </xsd:annotation>
+    </xsd:documentation>
+  </xsd:annotation>
 
-    <xsd:include schemaLocation="j2ee_1_4.xsd"/>
-    <xsd:include schemaLocation="jsp_2_0.xsd"/>
+  <xsd:include schemaLocation="j2ee_1_4.xsd"/>
+  <xsd:include schemaLocation="jsp_2_0.xsd"/>
 
 
-    <!-- **************************************************** -->
+<!-- **************************************************** -->
 
 
-    <xsd:element name="web-app" type="j2ee:web-appType">
-        <xsd:annotation>
-            <xsd:documentation>
+  <xsd:element name="web-app" type="j2ee:web-appType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The web-app element is the root of the deployment
 	descriptor for a web application.  Note that the sub-elements
@@ -123,38 +123,38 @@
 	treats that case exactly in the same way when there is only
 	one distributable.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <xsd:unique name="servlet-name-uniqueness">
-            <xsd:annotation>
-                <xsd:documentation>
+    <xsd:unique name="web-app-servlet-name-uniqueness">
+      <xsd:annotation>
+	<xsd:documentation>
 
 	  The servlet element contains the name of a servlet.
 	  The name must be unique within the web application.
 
-                </xsd:documentation>
-            </xsd:annotation>
-            <xsd:selector xpath="j2ee:servlet"/>
-            <xsd:field xpath="j2ee:servlet-name"/>
-        </xsd:unique>
-
-        <xsd:unique name="filter-name-uniqueness">
-            <xsd:annotation>
-                <xsd:documentation>
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="j2ee:servlet"/>
+      <xsd:field    xpath="j2ee:servlet-name"/>
+    </xsd:unique>
+
+    <xsd:unique name="web-app-filter-name-uniqueness">
+      <xsd:annotation>
+	<xsd:documentation>
 
 	  The filter element contains the name of a filter.
 	  The name must be unique within the web application.
 
-                </xsd:documentation>
-            </xsd:annotation>
-            <xsd:selector xpath="j2ee:filter"/>
-            <xsd:field xpath="j2ee:filter-name"/>
-        </xsd:unique>
-
-        <xsd:unique name="ejb-local-ref-name-uniqueness">
-            <xsd:annotation>
-                <xsd:documentation>
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="j2ee:filter"/>
+      <xsd:field    xpath="j2ee:filter-name"/>
+    </xsd:unique>
+
+    <xsd:unique name="web-app-ejb-local-ref-name-uniqueness">
+      <xsd:annotation>
+	<xsd:documentation>
 
 	  The ejb-local-ref-name element contains the name of an EJB
 	  reference. The EJB reference is an entry in the web
@@ -164,15 +164,15 @@
 
 	  It is recommended that name is prefixed with "ejb/".
 
-                </xsd:documentation>
-            </xsd:annotation>
-            <xsd:selector xpath="j2ee:ejb-local-ref"/>
-            <xsd:field xpath="j2ee:ejb-ref-name"/>
-        </xsd:unique>
-
-        <xsd:unique name="ejb-ref-name-uniqueness">
-            <xsd:annotation>
-                <xsd:documentation>
+	</xsd:documentation>
+      </xsd:annotation>
+      <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:annotation>
+	<xsd:documentation>
 
 	  The ejb-ref-name element contains the name of an EJB
 	  reference. The EJB reference is an entry in the web
@@ -182,15 +182,15 @@
 
 	  It is recommended that name is prefixed with "ejb/".
 
-                </xsd:documentation>
-            </xsd:annotation>
-            <xsd:selector xpath="j2ee:ejb-ref"/>
-            <xsd:field xpath="j2ee:ejb-ref-name"/>
-        </xsd:unique>
-
-        <xsd:unique name="resource-env-ref-uniqueness">
-            <xsd:annotation>
-                <xsd:documentation>
+	</xsd:documentation>
+      </xsd:annotation>
+      <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:annotation>
+	<xsd:documentation>
 
 	  The resource-env-ref-name element specifies the name of
 	  a resource environment reference; its value is the
@@ -198,15 +198,15 @@
 	  The name is a JNDI name relative to the java:comp/env
 	  context and must be unique within a web application.
 
-                </xsd:documentation>
-            </xsd:annotation>
-            <xsd:selector xpath="j2ee:resource-env-ref"/>
-            <xsd:field xpath="j2ee:resource-env-ref-name"/>
-        </xsd:unique>
-
-        <xsd:unique name="message-destination-ref-uniqueness">
-            <xsd:annotation>
-                <xsd:documentation>
+	</xsd:documentation>
+      </xsd:annotation>
+      <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:annotation>
+	<xsd:documentation>
 
 	  The message-destination-ref-name element specifies the name of
 	  a message destination reference; its value is the
@@ -214,77 +214,77 @@
 	  The name is a JNDI name relative to the java:comp/env
 	  context and must be unique within a web application.
 
-                </xsd:documentation>
-            </xsd:annotation>
-            <xsd:selector xpath="j2ee:message-destination-ref"/>
-            <xsd:field xpath="j2ee:message-destination-ref-name"/>
-        </xsd:unique>
-
-        <xsd:unique name="res-ref-name-uniqueness">
-            <xsd:annotation>
-                <xsd:documentation>
+	</xsd:documentation>
+      </xsd:annotation>
+      <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:annotation>
+	<xsd:documentation>
 
 	  The res-ref-name element specifies the name of a
 	  resource manager connection factory reference.  The name
 	  is a JNDI name relative to the java:comp/env context.
 	  The name must be unique within a web application.
 
-                </xsd:documentation>
-            </xsd:annotation>
-            <xsd:selector xpath="j2ee:resource-ref"/>
-            <xsd:field xpath="j2ee:res-ref-name"/>
-        </xsd:unique>
-
-        <xsd:unique name="env-entry-name-uniqueness">
-            <xsd:annotation>
-                <xsd:documentation>
+	</xsd:documentation>
+      </xsd:annotation>
+      <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:annotation>
+	<xsd:documentation>
 
 	  The env-entry-name element contains the name of a web
 	  application's environment entry.  The name is a JNDI
 	  name relative to the java:comp/env context.  The name
 	  must be unique within a web application.
 
-                </xsd:documentation>
-            </xsd:annotation>
+	</xsd:documentation>
+      </xsd:annotation>
 
-            <xsd:selector xpath="j2ee:env-entry"/>
-            <xsd:field xpath="j2ee:env-entry-name"/>
-        </xsd:unique>
-
-        <xsd:key name="role-name-key">
-            <xsd:annotation>
-                <xsd:documentation>
+      <xsd:selector xpath="j2ee:env-entry"/>
+      <xsd:field    xpath="j2ee:env-entry-name"/>
+    </xsd:unique>
+
+    <xsd:key name="web-app-role-name-key">
+      <xsd:annotation>
+	<xsd:documentation>
 
 	  A role-name-key is specified to allow the references
 	  from the security-role-refs.
 
-                </xsd:documentation>
-            </xsd:annotation>
-            <xsd:selector xpath="j2ee:security-role"/>
-            <xsd:field xpath="j2ee:role-name"/>
-        </xsd:key>
-
-        <xsd:keyref name="role-name-references"
-            refer="j2ee:role-name-key">
-            <xsd:annotation>
-                <xsd:documentation>
+	</xsd:documentation>
+      </xsd:annotation>
+      <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:annotation>
+	<xsd:documentation>
 
 	  The keyref indicates the references from
 	  security-role-ref to a specified role-name.
 
-                </xsd:documentation>
-            </xsd:annotation>
-            <xsd:selector xpath="j2ee:servlet/j2ee:security-role-ref"/>
-            <xsd:field xpath="j2ee:role-link"/>
-        </xsd:keyref>
-    </xsd:element>
+	</xsd:documentation>
+      </xsd:annotation>
+      <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:annotation>
-            <xsd:documentation>
+<!-- **************************************************** -->
+
+  <xsd:complexType name="auth-constraintType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The auth-constraintType indicates the user roles that
 	should be permitted access to this resource
@@ -299,25 +299,25 @@
 	containing security-constraint.  The container matches
 	role names case sensitively when determining access.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </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:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
 
-        <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:annotation>
-            <xsd:documentation>
+<!-- **************************************************** -->
+
+  <xsd:complexType name="auth-methodType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The auth-methodType is used to configure the authentication
 	mechanism for the web application. As a prerequisite to
@@ -329,19 +329,19 @@
 
 	Used in: login-config
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:string"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
 
-        <xsd:simpleContent>
-            <xsd:restriction base="j2ee:string"/>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="dispatcherType">
-        <xsd:annotation>
-            <xsd:documentation>
+<!-- **************************************************** -->
+
+  <xsd:complexType name="dispatcherType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The dispatcher has four legal values: FORWARD, REQUEST, INCLUDE,
 	and ERROR. A value of FORWARD means the Filter will be applied
@@ -354,61 +354,61 @@
 	filter-mapping indicates a default of applying filters only under
 	ordinary client calls to the path or servlet.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <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: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:annotation>
-            <xsd:documentation>
+<!-- **************************************************** -->
+
+  <xsd:simpleType name="encodingType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The encodingType defines IANA character sets.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:restriction base="xsd:string">
+      <xsd:pattern value="[^\s]+"/>
+    </xsd:restriction>
+  </xsd:simpleType>
 
-        <xsd:restriction base="xsd:string">
-            <xsd:pattern value="[^\s]+"/>
-        </xsd:restriction>
-    </xsd:simpleType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="error-codeType">
-        <xsd:annotation>
-            <xsd:documentation>
+<!-- **************************************************** -->
+
+  <xsd:complexType name="error-codeType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The error-code contains an HTTP error code, ex: 404
 
 	Used in: error-page
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <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: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:annotation>
-            <xsd:documentation>
+  <xsd:complexType name="error-pageType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The error-pageType contains a mapping between an error code
 	or exception type to the path of a resource in the web
@@ -416,49 +416,49 @@
 
 	Used in: web-app
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <xsd:sequence>
-            <xsd:choice>
-                <xsd:element name="error-code"
-                    type="j2ee:error-codeType"/>
-
-                <xsd:element name="exception-type"
-                    type="j2ee:fully-qualified-classType">
-                    <xsd:annotation>
-                        <xsd:documentation>
+    <xsd:sequence>
+      <xsd:choice>
+	<xsd:element name="error-code"
+		     type="j2ee:error-codeType"/>
+
+	<xsd:element name="exception-type"
+		     type="j2ee:fully-qualified-classType">
+	  <xsd:annotation>
+	    <xsd:documentation>
 
 	      The exception-type contains a fully qualified class
 	      name of a Java exception type.
 
-                        </xsd:documentation>
-                    </xsd:annotation>
-                </xsd:element>
-            </xsd:choice>
-
-            <xsd:element name="location"
-                type="j2ee:war-pathType">
-                <xsd:annotation>
-                    <xsd:documentation>
+	    </xsd:documentation>
+	  </xsd:annotation>
+	</xsd:element>
+      </xsd:choice>
+
+      <xsd:element name="location"
+		   type="j2ee:war-pathType">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The location element contains the location of the
 	    resource in the web application relative to the root of
 	    the web application. The value of the location must have
 	    a leading `/'.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="filter-mappingType">
-        <xsd:annotation>
-            <xsd:documentation>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="filter-mappingType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	Declaration of the filter mappings in this web
 	application is done by using filter-mappingType.
@@ -476,30 +476,30 @@
 	sub-elements of one of the filter declarations in the
 	deployment descriptor.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <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: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:annotation>
-            <xsd:documentation>
+  <xsd:complexType name="filter-nameType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The logical name of the filter is declare
 	by using filter-nameType. This name is used to map the
@@ -508,19 +508,19 @@
 
 	Used in: filter, filter-mapping
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:simpleContent>
+      <xsd:extension base="j2ee:nonEmptyStringType"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
 
-        <xsd:simpleContent>
-            <xsd:extension base="j2ee:nonEmptyStringType"/>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="filterType">
-        <xsd:annotation>
-            <xsd:documentation>
+  <xsd:complexType name="filterType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The filterType is used to declare a filter in the web
 	application. The filter is mapped to either a servlet or a
@@ -531,45 +531,45 @@
 
 	Used in: web-app
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <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:annotation>
-                    <xsd:documentation>
+    <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:annotation>
+	  <xsd:documentation>
 
 	    The fully qualified classname of the filter.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-
-            <xsd:element name="init-param"
-                type="j2ee:param-valueType"
-                minOccurs="0" maxOccurs="unbounded">
-                <xsd:annotation>
-                    <xsd:documentation>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+      <xsd:element name="init-param"
+		   type="j2ee:param-valueType"
+		   minOccurs="0" maxOccurs="unbounded">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The init-param element contains a name/value pair as
 	    an initialization param of a servlet filter
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="form-login-configType">
-        <xsd:annotation>
-            <xsd:documentation>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="form-login-configType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The form-login-configType specifies the login and error
 	pages that should be used in form based login. If form based
@@ -577,29 +577,29 @@
 
 	Used in: login-config
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <xsd:sequence>
+    <xsd:sequence>
 
-            <xsd:element name="form-login-page"
-                type="j2ee:war-pathType">
-                <xsd:annotation>
-                    <xsd:documentation>
+      <xsd:element name="form-login-page"
+		   type="j2ee:war-pathType">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The form-login-page element defines the location in the web
 	    app where the page that can be used for login can be
 	    found.  The path begins with a leading / and is interpreted
 	    relative to the root of the WAR.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-
-            <xsd:element name="form-error-page"
-                type="j2ee:war-pathType">
-                <xsd:annotation>
-                    <xsd:documentation>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+      <xsd:element name="form-error-page"
+		   type="j2ee:war-pathType">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The form-error-page element defines the location in
 	    the web app where the error page that is displayed
@@ -607,138 +607,105 @@
 	    The path begins with a leading / and is interpreted
 	    relative to the root of the WAR.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
 
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
 
-    <!-- **************************************************** -->
+<!-- **************************************************** -->
 
-    <xsd:complexType name="http-methodType">
-        <xsd:annotation>
+  <xsd:complexType name="http-methodType">
+    <xsd:annotation>
 
-            <xsd:documentation>
+      <xsd:documentation>
 
 	The http-method contains an HTTP method recognized by the
 	web-app, for example GET, POST, ...
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <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: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="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>
+  <xsd:complexType name="locale-encoding-mapping-listType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The locale-encoding-mapping-list contains one or more
 	locale-encoding-mapping(s).
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <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:annotation>
-            <xsd:documentation>
+    <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:annotation>
+      <xsd:documentation>
 
 	The locale-encoding-mapping contains locale name and
 	encoding name. The locale name must be either "Language-code",
 	such as "ja", defined by ISO-639 or "Language-code_Country-code",
 	such as "ja_JP".  "Country code" is defined by ISO-3166.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <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:annotation>
-            <xsd:documentation>
+    <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:annotation>
+      <xsd:documentation>
 
 	The localeType defines valid locale defined by ISO-639-1
 	and ISO-3166.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:restriction base="xsd:string">
+      <xsd:pattern value="[a-z]{2}(_|-)?([\p{L}\-\p{Nd}]{2})?"/>
+    </xsd:restriction>
+  </xsd:simpleType>
 
-        <xsd: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:annotation>
-            <xsd:documentation>
+<!-- **************************************************** -->
+
+  <xsd:complexType name="login-configType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The login-configType is used to configure the authentication
 	method that should be used, the realm name that should be
@@ -747,68 +714,68 @@
 
 	Used in: web-app
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </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:annotation>
-                    <xsd:documentation>
+    <xsd:sequence>
+      <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>
 
 	    The realm name element specifies the realm name to
 	    use in HTTP Basic authorization.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </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:annotation>
-            <xsd:documentation>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </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:annotation>
+      <xsd:documentation>
 
 	The mime-mappingType defines a mapping between an extension
 	and a mime type.
 
 	Used in: web-app
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <xsd:sequence>
-            <xsd:annotation>
-                <xsd:documentation>
+    <xsd:sequence>
+      <xsd:annotation>
+	<xsd:documentation>
 
 	  The extension element contains a string describing an
 	  extension. example: "txt"
 
-                </xsd:documentation>
-            </xsd:annotation>
+	</xsd:documentation>
+      </xsd:annotation>
+
+      <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: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:annotation>
-            <xsd:documentation>
+<!-- **************************************************** -->
+
+  <xsd:complexType name="mime-typeType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The mime-typeType is used to indicate a defined mime type.
 
@@ -817,37 +784,37 @@
 
 	Used in: mime-mapping
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <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: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:annotation>
-            <xsd:documentation>
+<!-- **************************************************** -->
+
+  <xsd:complexType name="nonEmptyStringType">
+    <xsd:annotation>
+      <xsd:documentation>
 	This type defines a string which contains at least one
 	character.
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:restriction base="j2ee:string">
-                <xsd:minLength value="1"/>
-            </xsd:restriction>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="security-constraintType">
-        <xsd:annotation>
-            <xsd:documentation>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:string">
+	<xsd:minLength value="1"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="security-constraintType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The security-constraintType is used to associate
 	security constraints with one or more web resource
@@ -855,73 +822,73 @@
 
 	Used in: web-app
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </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:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
 
-        <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:annotation>
-            <xsd:documentation>
+<!-- **************************************************** -->
+
+  <xsd:complexType name="servlet-mappingType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The servlet-mappingType defines a mapping between a
 	servlet and a url pattern.
 
 	Used in: web-app
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <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: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:annotation>
-            <xsd:documentation>
+<!-- **************************************************** -->
+
+  <xsd:complexType name="servlet-nameType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The servlet-name element contains the canonical name of the
 	servlet. Each servlet name is unique within the web
 	application.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:simpleContent>
+      <xsd:extension base="j2ee:nonEmptyStringType"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
 
-        <xsd:simpleContent>
-            <xsd:extension base="j2ee:nonEmptyStringType"/>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="servletType">
-        <xsd:annotation>
-            <xsd:documentation>
+<!-- **************************************************** -->
+
+  <xsd:complexType name="servletType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The servletType is used to declare a servlet.
 	It contains the declarative data of a
@@ -931,39 +898,39 @@
 
 	Used in: web-app
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <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:annotation>
-                        <xsd:documentation>
+    <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:annotation>
+	    <xsd:documentation>
 
 	      The servlet-class element contains the fully
 	      qualified class name of the servlet.
 
-                        </xsd:documentation>
-                    </xsd:annotation>
-                </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:annotation>
-                    <xsd:documentation>
+	    </xsd:documentation>
+	  </xsd:annotation>
+	</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:annotation>
+	  <xsd:documentation>
 
 	    The load-on-startup element indicates that this
 	    servlet should be loaded (instantiated and have
@@ -982,39 +949,39 @@
 	    container may choose the order of loading of
 	    servlets with the same load-on-start-up value.
 
-                    </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:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="session-configType">
-        <xsd:annotation>
-            <xsd:documentation>
+	  </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:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="session-configType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The session-configType defines the session parameters
 	for this web application.
 
 	Used in: web-app
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <xsd:sequence>
-            <xsd:element name="session-timeout"
-                type="j2ee:xsdIntegerType"
-                minOccurs="0">
-                <xsd:annotation>
-                    <xsd:documentation>
+    <xsd:sequence>
+      <xsd:element name="session-timeout"
+		   type="j2ee:xsdIntegerType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The session-timeout element defines the default
 	    session timeout interval for all sessions created
@@ -1025,18 +992,18 @@
 	    out. If this element is not specified, the container
 	    must set its default timeout period.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="transport-guaranteeType">
-        <xsd:annotation>
-            <xsd:documentation>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="transport-guaranteeType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The transport-guaranteeType specifies that the communication
 	between client and server should be NONE, INTEGRAL, or
@@ -1053,23 +1020,23 @@
 
 	Used in: user-data-constraint
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <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: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:annotation>
-            <xsd:documentation>
+<!-- **************************************************** -->
+
+  <xsd:complexType name="user-data-constraintType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The user-data-constraintType is used to indicate how
 	data communicated between the client and container should be
@@ -1077,122 +1044,122 @@
 
 	Used in: security-constraint
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </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:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
 
-        <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:annotation>
-            <xsd:documentation>
+<!-- **************************************************** -->
+
+  <xsd:complexType name="war-pathType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The elements that use this type designate a path starting
 	with a "/" and interpreted relative to the root of a WAR
 	file.
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:restriction base="j2ee:string">
-                <xsd:pattern value="/.*"/>
-            </xsd:restriction>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:simpleType name="web-app-versionType">
-        <xsd:annotation>
-            <xsd:documentation>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:string">
+	<xsd:pattern value="/.*"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:simpleType name="web-app-versionType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	This type contains the recognized versions of
 	web-application supported. It is used to designate the
 	version of the web application.
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <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:documentation>
+    </xsd:annotation>
+    <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:annotation>
-                    <xsd:documentation>
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The context-param element contains the declaration
 	    of a web application's servlet context
 	    initialization parameters.
 
-                    </xsd:documentation>
-                </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: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:annotation>
-            <xsd:documentation>
+	  </xsd:documentation>
+	</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: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:annotation>
+      <xsd:documentation>
 
 	The web-resource-collectionType is used to identify a subset
 	of the resources and HTTP methods on those resources within
@@ -1202,65 +1169,65 @@
 
 	Used in: security-constraint
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <xsd:sequence>
-            <xsd:element name="web-resource-name"
-                type="j2ee:string">
-                <xsd:annotation>
-                    <xsd:documentation>
+    <xsd:sequence>
+      <xsd:element name="web-resource-name"
+		   type="j2ee:string">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The web-resource-name contains the name of this web
 	    resource collection.
 
-                    </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:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="welcome-file-listType">
-        <xsd:annotation>
-            <xsd:documentation>
+	  </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:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="welcome-file-listType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The welcome-file-list contains an ordered list of welcome
 	files elements.
 
 	Used in: web-app
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <xsd:sequence>
-            <xsd:element name="welcome-file"
-                type="j2ee:string"
-                maxOccurs="unbounded">
-                <xsd:annotation>
-                    <xsd:documentation>
+    <xsd:sequence>
+      <xsd:element name="welcome-file"
+		   type="xsd:string"
+		   maxOccurs="unbounded">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The welcome-file element contains file name to use
 	    as a default welcome file, such as index.html
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
 
 </xsd:schema>
 

Modified: geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/web-jsptaglibrary_2_0.xsd
==============================================================================
--- geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/web-jsptaglibrary_2_0.xsd	(original)
+++ geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/web-jsptaglibrary_2_0.xsd	Fri Oct 22 16:39:25 2004
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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"
-    xmlns:xml="http://www.w3.org/XML/1998/namespace"
-    elementFormDefault="qualified"
-    attributeFormDefault="unqualified"
-    version="2.0">
+     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:annotation>
+    <xsd:documentation>
+      @(#)web-jsptaglibrary_2_0.xsds	1.38 10/08/03
+    </xsd:documentation>
+  </xsd:annotation>
 
-    <xsd:annotation>
-        <xsd:documentation>
-      @(#)web-jsptaglibrary_2_0.xsds	1.33 03/18/03
-        </xsd:documentation>
-    </xsd:annotation>
-    <xsd:annotation>
-        <xsd:documentation>
+  <xsd:annotation>
+    <xsd:documentation>
 
-      Copyright 2002 Sun Microsystems, Inc., 901 San Antonio
+      Copyright 2003 Sun Microsystems, Inc., 901 San Antonio
       Road, Palo Alto, California 94303, U.S.A. All rights
       reserved.
 
@@ -45,12 +45,12 @@
       Federal Acquisitions: Commercial Software - Government Users
       Subject to Standard License Terms and Conditions.
 
-        </xsd:documentation>
-    </xsd:annotation>
+    </xsd:documentation>
+  </xsd:annotation>
 
-    <xsd:annotation>
-        <xsd:documentation>
-            <![CDATA[
+  <xsd:annotation>
+    <xsd:documentation>
+      <![CDATA[
 
 	This is the XML Schema for the JSP Taglibrary
 	descriptor.  All Taglibrary descriptors must
@@ -75,64 +75,67 @@
 
 	http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd
 
-        ]]>
-        </xsd:documentation>
-    </xsd:annotation>
+	]]>
+    </xsd:documentation>
+  </xsd:annotation>
 
-    <xsd:include schemaLocation="j2ee_1_4.xsd"/>
+  <xsd:include schemaLocation="j2ee_1_4.xsd"/>
 
 
-    <!-- **************************************************** -->
+<!-- **************************************************** -->
 
 
-    <xsd:element name="taglib" type="j2ee:taglibType">
-        <xsd:annotation>
-            <xsd:documentation>
+  <xsd:element name="taglib" type="j2ee:tldTaglibType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The taglib tag is the document root.
 	The definition of taglib is provided
-	by the taglibType.
+	by the tldTaglibType.
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:unique name="tag-name-uniqueness">
-            <xsd:annotation>
-                <xsd:documentation>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:unique name="tag-name-uniqueness">
+      <xsd:annotation>
+	<xsd:documentation>
 
 	  The taglib element contains, among other things, tag and
 	  tag-file elements.
 	  The name subelements of these elements must each be unique.
 
-                </xsd:documentation>
-            </xsd:annotation>
-            <xsd:selector xpath="j2ee:tag|j2ee:tag-file"/>
-            <xsd:field xpath="j2ee:name"/>
-        </xsd:unique>
-
-        <xsd:unique name="function-name-uniqueness">
-            <xsd:annotation>
-                <xsd:documentation>
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="j2ee:tag|j2ee:tag-file"/>
+      <xsd:field    xpath="j2ee:name"/>
+    </xsd:unique>
+
+    <xsd:unique name="function-name-uniqueness">
+      <xsd:annotation>
+	<xsd:documentation>
 
 	  The taglib element contains function elements.
 	  The name subelements of these elements must each be unique.
 
-                </xsd:documentation>
-            </xsd:annotation>
-            <xsd:selector xpath="j2ee:function"/>
-            <xsd:field xpath="j2ee:name"/>
-        </xsd:unique>
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="j2ee:function"/>
+      <xsd:field    xpath="j2ee:name"/>
+    </xsd:unique>
 
-    </xsd:element>
+  </xsd:element>
 
 
-    <!-- **************************************************** -->
+<!-- **************************************************** -->
 
-    <xsd:complexType name="body-contentType">
-        <xsd:annotation>
-            <xsd:documentation>
+  <xsd:complexType name="body-contentType">
+    <xsd:annotation>
+      <xsd:documentation>
 
-	Provides a hint as to the content of the body of this tag.
-	Primarily intended for use by page composition tools.
+        Specifies the type of body that is valid for a tag.
+	This value is used by the JSP container to validate
+	that a tag invocation has the correct body syntax and
+	by page composition tools to assist the page author
+	in providing a valid tag body.
 
 	There are currently four values specified:
 
@@ -150,24 +153,24 @@
 			Expressions, and JSP action elements.  No
 			scripting elements are allowed.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <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: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:annotation>
-            <xsd:documentation>
+<!-- **************************************************** -->
+
+  <xsd:complexType name="extensibleType" abstract="true">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The extensibleType is an abstract base type that is used to
 	define the type of extension-elements. Instance documents
@@ -175,16 +178,16 @@
 	using xsi:type attribute to define the actual type of
 	extension-elements.
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="functionType">
-        <xsd:annotation>
-            <xsd:documentation>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="functionType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The function element is used to provide information on each
 	function in the tag library that is to be exposed to the EL.
@@ -216,38 +219,38 @@
 			    information about this function, for tool
 			    consumption
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <xsd:sequence>
-            <xsd:group ref="j2ee:descriptionGroup"/>
-            <xsd:element name="name"
-                type="j2ee:tld-canonical-nameType">
-                <xsd:annotation>
-                    <xsd:documentation>
+    <xsd:sequence>
+      <xsd:group ref="j2ee:descriptionGroup"/>
+      <xsd:element name="name"
+		   type="j2ee:tld-canonical-nameType">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    A unique name for this function.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="function-class"
-                type="j2ee:fully-qualified-classType">
-                <xsd:annotation>
-                    <xsd:documentation>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="function-class"
+		   type="j2ee:fully-qualified-classType">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    Provides the fully-qualified class name of the Java
 	    class containing the static method that implements
 	    the function.
 
-                    </xsd:documentation>
-                </xsd:annotation>
+	  </xsd:documentation>
+	</xsd:annotation>
 
-            </xsd:element>
-            <xsd:element name="function-signature"
-                type="j2ee:string">
-                <xsd:annotation>
-                    <xsd:documentation>
+      </xsd:element>
+      <xsd:element name="function-signature"
+		   type="j2ee:string">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    Provides the signature, of the static Java method that is
 	    to be used to implement the function.  The syntax of the
@@ -267,88 +270,60 @@
 
 		Where:
 
- 		    * Type is a basic type or a fully qualified Java class name
-		      (including package name), as per the 'Type' production
-		      in the Java Language Specification, Second Edition,
+ 		    * Type is a basic type or a fully qualified
+		      Java class name (including package name),
+		      as per the 'Type' production in the Java
+		      Language Specification, Second Edition,
 		      Chapter 18.
 
-                    * Identifier is a Java identifier, as per the 'Identifier'
-		      production in the Java Language Specification, Second
+                    * Identifier is a Java identifier, as per
+		      the 'Identifier' production in the Java
+		      Language Specification, Second
 		      Edition, Chapter 18.
 
 	    Example:
 
 	    java.lang.String nickName( java.lang.String, int )
 
-                    </xsd:documentation>
-                </xsd:annotation>
+	  </xsd:documentation>
+	</xsd:annotation>
 
-            </xsd:element>
-            <xsd:element name="example"
-                type="j2ee:xsdStringType"
-                minOccurs="0">
-                <xsd:annotation>
-                    <xsd:documentation>
+      </xsd:element>
+      <xsd:element name="example"
+		   type="j2ee:xsdStringType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The example element contains an informal description
 	    of an example of the use of this function.
 
-                    </xsd:documentation>
-                </xsd:annotation>
+	  </xsd:documentation>
+	</xsd:annotation>
 
-            </xsd:element>
-            <xsd:element name="function-extension"
-                type="j2ee:tld-extensionType"
-                minOccurs="0"
-                maxOccurs="unbounded">
-                <xsd:annotation>
-                    <xsd:documentation>
+      </xsd:element>
+      <xsd:element name="function-extension"
+		   type="j2ee:tld-extensionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    Function extensions are for tool use only and must not affect
 	    the behavior of a container.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="listenerType">
-        <xsd:annotation>
-            <xsd:documentation>
-
-	Defines an event listener object to be instantiated and
-	registered automatically.
-
-            </xsd:documentation>
-        </xsd:annotation>
-
-        <xsd:sequence>
-            <xsd:element name="listener-class"
-                type="j2ee:fully-qualified-classType">
-                <xsd:annotation>
-                    <xsd:documentation>
-
-	    The listener-class element declares a class in the
-	    application that must be registered as a web
-	    application listener bean.  See the Servlet
-	    specification for details.
-
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="tagFileType">
-        <xsd:annotation>
-            <xsd:documentation>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="tagFileType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	Defines an action in this tag library that is implemented
 	as a .tag file.
@@ -380,50 +355,50 @@
 			  information about this tag, for tool
 			  consumption
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <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:annotation>
-                    <xsd:documentation>
+    <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:annotation>
+	  <xsd:documentation>
 
 	    The example element contains an informal description
 	    of an example of the use of a tag.
 
-                    </xsd:documentation>
-                </xsd:annotation>
+	  </xsd:documentation>
+	</xsd:annotation>
 
-            </xsd:element>
-            <xsd:element name="tag-extension"
-                type="j2ee:tld-extensionType"
-                minOccurs="0"
-                maxOccurs="unbounded">
-                <xsd:annotation>
-                    <xsd:documentation>
+      </xsd:element>
+      <xsd:element name="tag-extension"
+		   type="j2ee:tld-extensionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    Tag extensions are for tool use only and must not affect
 	    the behavior of a container.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="tagType">
-        <xsd:annotation>
-            <xsd:documentation>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="tagType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The tag defines a unique tag in this tag library.  It has one
 	attribute, id.
@@ -466,31 +441,31 @@
 			  information about this tag, for tool
 			  consumption
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <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:annotation>
-                    <xsd:documentation>
+    <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:annotation>
+	  <xsd:documentation>
 
 	    Defines the subclass of javax.serlvet.jsp.tagext.JspTag
 	    that implements the request time semantics for
 	    this tag. (required)
 
-                    </xsd:documentation>
-                </xsd:annotation>
+	  </xsd:documentation>
+	</xsd:annotation>
 
-            </xsd:element>
-            <xsd:element name="tei-class"
-                type="j2ee:fully-qualified-classType"
-                minOccurs="0">
-                <xsd:annotation>
-                    <xsd:documentation>
+      </xsd:element>
+      <xsd:element name="tei-class"
+		   type="j2ee:fully-qualified-classType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    Defines the subclass of javax.servlet.jsp.tagext.TagExtraInfo
 	    for this tag. (optional)
@@ -498,204 +473,68 @@
 	    If this is not given, the class is not consulted at
 	    translation time.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="body-content"
-                type="j2ee:body-contentType"
-                minOccurs="0">
-                <xsd:annotation>
-                    <xsd:documentation>
-
-	    The default (if not defined) is JSP
-
-                    </xsd:documentation>
-                </xsd:annotation>
-            </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:annotation>
-                    <xsd:documentation>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="body-content"
+		   type="j2ee:body-contentType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    Specifies the format for the body of this tag.
+	    The default in JSP 1.2 was "JSP" but because this
+	    is an invalid setting for simple tag handlers, there
+	    is no longer a default in JSP 2.0.  A reasonable
+	    default for simple tag handlers is "scriptless" if
+	    the tag can have a body.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </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:annotation>
+	  <xsd:documentation>
 
 	    The example element contains an informal description
 	    of an example of the use of a tag.
 
-                    </xsd:documentation>
-                </xsd:annotation>
+	  </xsd:documentation>
+	</xsd:annotation>
 
-            </xsd:element>
-            <xsd:element name="tag-extension"
-                type="j2ee:tld-extensionType"
-                minOccurs="0"
-                maxOccurs="unbounded">
-                <xsd:annotation>
-                    <xsd:documentation>
+      </xsd:element>
+      <xsd:element name="tag-extension"
+		   type="j2ee:tld-extensionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    Tag extensions are for tool use only and must not affect
 	    the behavior of a container.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="taglibType">
-        <xsd:annotation>
-            <xsd:documentation>
-
-	The taglib tag is the document root, it defines:
-
-	description     a simple string describing the "use" of this taglib,
-			should be user discernable
-
-	display-name    the display-name element contains a
-			short name that is intended to be displayed
-			by tools
-
-	icon            optional icon that can be used by tools
-
-	tlib-version    the version of the tag library implementation
-
-	short-name      a simple default short name that could be
-			used by a JSP authoring tool to create
-			names with a mnemonic value; for example,
-			the it may be used as the prefered prefix
-			value in taglib directives
-
-	uri             a uri uniquely identifying this taglib
-
-	validator       optional TagLibraryValidator information
-
-	listener        optional event listener specification
-
-	tag             tags in this tag library
-
-	tag-file        tag files in this tag library
-
-	function        zero or more EL functions defined in this
-			tag library
-
-	taglib-extension zero or more extensions that provide extra
-			information about this taglib, for tool
-			consumption
-
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:sequence>
-            <xsd:group ref="j2ee:descriptionGroup"/>
-            <xsd:element name="tlib-version"
-                type="j2ee:dewey-versionType">
-                <xsd:annotation>
-                    <xsd:documentation>
-
-	    Describes this version (number) of the taglibrary.
-	    It is described as a dewey decimal.
-
-                    </xsd:documentation>
-                </xsd:annotation>
-
-            </xsd:element>
-
-            <xsd:element name="short-name"
-                type="j2ee:tld-canonical-nameType">
-                <xsd:annotation>
-                    <xsd:documentation>
-
-	    Defines a simple default name that could be used by
-	    a JSP authoring tool to create names with a
-	    mnemonicvalue; for example, it may be used as the
-	    preferred prefix value in taglib directives.  Do
-	    not use white space, and do not start with digits
-	    or underscore.
-
-                    </xsd:documentation>
-                </xsd:annotation>
-
-            </xsd:element>
-            <xsd:element name="uri"
-                type="j2ee:xsdAnyURIType"
-                minOccurs="0">
-                <xsd:annotation>
-                    <xsd:documentation>
-
-	    Defines a public URI that uniquely identifies this
-	    version of the taglibrary.  Leave it empty if it
-	    does not apply.
-
-                    </xsd:documentation>
-                </xsd:annotation>
-
-            </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:annotation>
-                    <xsd:documentation>
-
-	    Taglib extensions are for tool use only and must not affect
-	    the behavior of a container.
-
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-        </xsd:sequence>
-        <xsd:attribute name="version"
-            type="j2ee:dewey-versionType"
-            fixed="2.0"
-            use="required">
-            <xsd:annotation>
-                <xsd:documentation>
-
-	  Describes the JSP version (number) this taglibrary
-	  requires in order to function (dewey decimal)
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
 
-                </xsd:documentation>
-            </xsd:annotation>
+<!-- **************************************************** -->
 
-        </xsd:attribute>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="tld-attributeType">
-        <xsd:annotation>
-            <xsd:documentation>
+  <xsd:complexType name="tld-attributeType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The attribute element defines an attribute for the nesting
 	tag.  The attributre element may have several subelements
@@ -714,19 +553,19 @@
 
 	fragment        whether this attribute is a fragment
 
-            </xsd:documentation>
-        </xsd:annotation>
-        <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:annotation>
-                    <xsd:documentation>
+      </xsd:documentation>
+    </xsd:annotation>
+    <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:annotation>
+	  <xsd:documentation>
 
 	    Defines if the nesting attribute is required or
 	    optional.
@@ -734,17 +573,17 @@
 	    If not present then the default is "false", i.e
 	    the attribute is optional.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-
-            <xsd:choice>
-                <xsd:sequence>
-                    <xsd:element name="rtexprvalue"
-                        type="j2ee:generic-booleanType"
-                        minOccurs="0">
-                        <xsd:annotation>
-                            <xsd:documentation>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+      <xsd:choice>
+	<xsd:sequence>
+	  <xsd:element name="rtexprvalue"
+		       type="j2ee:generic-booleanType"
+		       minOccurs="0">
+	    <xsd:annotation>
+	      <xsd:documentation>
 
 		Defines if the nesting attribute can have scriptlet
 		expressions as a value, i.e the value of the
@@ -755,29 +594,29 @@
 		If not present then the default is "false", i.e the
 		attribute has a static value
 
-                            </xsd:documentation>
-                        </xsd:annotation>
+	      </xsd:documentation>
+	    </xsd:annotation>
 
-                    </xsd:element>
-                    <xsd:element name="type"
-                        type="j2ee:fully-qualified-classType"
-                        minOccurs="0">
-                        <xsd:annotation>
-                            <xsd:documentation>
+	  </xsd:element>
+	  <xsd:element name="type"
+		       type="j2ee:fully-qualified-classType"
+		       minOccurs="0">
+	    <xsd:annotation>
+	      <xsd:documentation>
 
 		Defines the Java type of the attributes value.  For
 		static values (those determined at translation time)
 		the type is always java.lang.String.
 
-                            </xsd:documentation>
-                        </xsd:annotation>
-                    </xsd:element>
-                </xsd:sequence>
-                <xsd:element name="fragment"
-                    type="j2ee:generic-booleanType"
-                    minOccurs="0">
-                    <xsd:annotation>
-                        <xsd:documentation>
+	      </xsd:documentation>
+	    </xsd:annotation>
+	  </xsd:element>
+	</xsd:sequence>
+	<xsd:element name="fragment"
+		     type="j2ee:generic-booleanType"
+		     minOccurs="0">
+	  <xsd:annotation>
+	    <xsd:documentation>
 
 	      "true" if this attribute is of type
 	      javax.jsp.tagext.JspFragment, representing dynamic
@@ -785,39 +624,39 @@
 	      as needed by the tag handler.  If omitted or "false",
 	      the default is still type="java.lang.String"
 
-                        </xsd:documentation>
-                    </xsd:annotation>
-                </xsd:element>
-            </xsd:choice>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
+	    </xsd:documentation>
+	  </xsd:annotation>
+	</xsd:element>
+      </xsd:choice>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
 
-    <!-- **************************************************** -->
+<!-- **************************************************** -->
 
-    <xsd:complexType name="tld-canonical-nameType">
+  <xsd:complexType name="tld-canonical-nameType">
 
-        <xsd:annotation>
-            <xsd:documentation>
+    <xsd:annotation>
+      <xsd:documentation>
 
 	Defines the canonical name of a tag or attribute being
 	defined.
 
 	The name must conform to the lexical rules for an NMTOKEN.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:xsdNMTOKENType"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
 
-        <xsd:simpleContent>
-            <xsd:restriction base="j2ee:xsdNMTOKENType"/>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="tld-extensionType">
-        <xsd:annotation>
-            <xsd:documentation>
+<!-- **************************************************** -->
+
+  <xsd:complexType name="tld-extensionType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The tld-extensionType is used to indicate
 	extensions to a specific TLD element.
@@ -832,97 +671,237 @@
 	a concrete type must be specified by the TLD using
 	xsi:type attribute for each extension-element.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <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:annotation>
+      <xsd:documentation>
+
+	The taglib tag is the document root, it defines:
+
+	description     a simple string describing the "use" of this
+			taglib, should be user discernable
+
+	display-name    the display-name element contains a
+			short name that is intended to be displayed
+			by tools
+
+	icon            optional icon that can be used by tools
+
+	tlib-version    the version of the tag library implementation
+
+	short-name      a simple default short name that could be
+			used by a JSP authoring tool to create
+			names with a mnemonic value; for example,
+			the it may be used as the prefered prefix
+			value in taglib directives
+
+	uri             a uri uniquely identifying this taglib
+
+	validator       optional TagLibraryValidator information
+
+	listener        optional event listener specification
+
+	tag             tags in this tag library
+
+	tag-file        tag files in this tag library
+
+	function        zero or more EL functions defined in this
+			tag library
+
+	taglib-extension zero or more extensions that provide extra
+			information about this taglib, for tool
+			consumption
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:group ref="j2ee:descriptionGroup"/>
+      <xsd:element name="tlib-version"
+		   type="j2ee:dewey-versionType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    Describes this version (number) of the taglibrary.
+	    It is described as a dewey decimal.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+
+      </xsd:element>
+
+      <xsd:element name="short-name"
+		   type="j2ee:tld-canonical-nameType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    Defines a simple default name that could be used by
+	    a JSP authoring tool to create names with a
+	    mnemonicvalue; for example, it may be used as the
+	    preferred prefix value in taglib directives.  Do
+	    not use white space, and do not start with digits
+	    or underscore.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+
+      </xsd:element>
+      <xsd:element name="uri"
+		   type="j2ee:xsdAnyURIType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    Defines a public URI that uniquely identifies this
+	    version of the taglibrary.  Leave it empty if it
+	    does not apply.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+
+      </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:annotation>
+	  <xsd:documentation>
+
+	    Taglib extensions are for tool use only and must not affect
+	    the behavior of a container.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="version"
+		   type="j2ee:dewey-versionType"
+		   fixed="2.0"
+		   use="required">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  Describes the JSP version (number) this taglibrary
+	  requires in order to function (dewey decimal)
 
-        <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="validatorType">
-        <xsd:annotation>
-            <xsd:documentation>
+	</xsd:documentation>
+      </xsd:annotation>
+
+    </xsd:attribute>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="validatorType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	A validator that can be used to validate
 	the conformance of a JSP page to using this tag library is
 	defined by a validatorType.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <xsd:sequence>
-            <xsd:element name="description"
-                type="j2ee:descriptionType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-            <xsd:element name="validator-class"
-                type="j2ee:fully-qualified-classType">
-                <xsd:annotation>
-                    <xsd:documentation>
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="validator-class"
+		   type="j2ee:fully-qualified-classType">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    Defines the TagLibraryValidator class that can be used
 	    to validate the conformance of a JSP page to using this
 	    tag library.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="init-param"
-                type="j2ee:param-valueType"
-                minOccurs="0" maxOccurs="unbounded">
-                <xsd:annotation>
-                    <xsd:documentation>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="init-param"
+		   type="j2ee:param-valueType"
+		   minOccurs="0" maxOccurs="unbounded">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The init-param element contains a name/value pair as an
 	    initialization param.
 
-                    </xsd:documentation>
-                </xsd:annotation>
+	  </xsd:documentation>
+	</xsd:annotation>
 
-            </xsd:element>
+      </xsd:element>
 
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
 
-    <!-- **************************************************** -->
+<!-- **************************************************** -->
 
-    <xsd:complexType name="variable-scopeType">
-        <xsd:annotation>
-            <xsd:documentation>
+  <xsd:complexType name="variable-scopeType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	This type defines scope of the scripting variable.  See
 	TagExtraInfo for details.  The allowed values are,
 	"NESTED", "AT_BEGIN" and "AT_END".
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <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: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:annotation>
-            <xsd:documentation>
+<!-- **************************************************** -->
+
+  <xsd:complexType name="variableType">
+    <xsd:annotation>
+      <xsd:documentation>
 
 	The variableType provides information on the scripting
 	variables defined by using this tag.  It is a (translation
@@ -952,80 +931,80 @@
 	scope                    The scope of the scripting varaible
 				 defined.  NESTED is default.
 
-            </xsd:documentation>
-        </xsd:annotation>
+      </xsd:documentation>
+    </xsd:annotation>
 
-        <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:annotation>
-                        <xsd:documentation>
+    <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:annotation>
+	    <xsd:documentation>
 
 	      The name for the scripting variable.
 
-                        </xsd:documentation>
-                    </xsd:annotation>
-                </xsd:element>
-
-                <xsd:element name="name-from-attribute"
-                    type="j2ee:java-identifierType">
-                    <xsd:annotation>
-                        <xsd:documentation>
+	    </xsd:documentation>
+	  </xsd:annotation>
+	</xsd:element>
+
+	<xsd:element name="name-from-attribute"
+		     type="j2ee:java-identifierType">
+	  <xsd:annotation>
+	    <xsd:documentation>
 
 	      The name of an attribute whose
 	      (translation-time) value will give the name of
 	      the variable.
 
-                        </xsd:documentation>
-                    </xsd:annotation>
-                </xsd:element>
-            </xsd:choice>
-            <xsd:element name="variable-class"
-                type="j2ee:fully-qualified-classType"
-                minOccurs="0">
-                <xsd:annotation>
-                    <xsd:documentation>
+	    </xsd:documentation>
+	  </xsd:annotation>
+	</xsd:element>
+      </xsd:choice>
+      <xsd:element name="variable-class"
+		   type="j2ee:fully-qualified-classType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The optional name of the class for the scripting
 	    variable.  The default is java.lang.String.
 
-                    </xsd:documentation>
-                </xsd:annotation>
+	  </xsd:documentation>
+	</xsd:annotation>
 
-            </xsd:element>
+      </xsd:element>
 
-            <xsd:element name="declare"
-                type="j2ee:generic-booleanType"
-                minOccurs="0">
+      <xsd:element name="declare"
+		   type="j2ee:generic-booleanType"
+		   minOccurs="0">
 
-                <xsd:annotation>
-                    <xsd:documentation>
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    Whether the scripting variable is to be defined
 	    or not.  See TagExtraInfo for details.  This
 	    element is optional and "true" is the default.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="scope"
-                type="j2ee:variable-scopeType"
-                minOccurs="0">
-                <xsd:annotation>
-                    <xsd:documentation>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="scope"
+		   type="j2ee:variable-scopeType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
 
 	    The element is optional and "NESTED" is the default.
 
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
 
 </xsd:schema>
 

Modified: geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/xml.xsd
==============================================================================
--- geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/xml.xsd	(original)
+++ geronimo/trunk/modules/j2ee-schema/src/j2ee_1_4schema/xml.xsd	Fri Oct 22 16:39:25 2004
@@ -2,80 +2,134 @@
 <!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "XMLSchema.dtd" >
 <xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="en">
 
-    <xs:annotation>
-        <xs:documentation>
+ <xs:annotation>
+  <xs:documentation>
    See http://www.w3.org/XML/1998/namespace.html and
    http://www.w3.org/TR/REC-xml for information about this namespace.
-        </xs:documentation>
-    </xs:annotation>
 
-    <xs:annotation>
-        <xs:documentation>This schema defines attributes and an attribute group
+    This schema document describes the XML namespace, in a form
+    suitable for import by other schema documents.  
+
+    Note that local names in this namespace are intended to be defined
+    only by the World Wide Web Consortium or its subgroups.  The
+    following names are currently defined in this namespace and should
+    not be used with conflicting semantics by any Working Group,
+    specification, or document instance:
+
+    base (as an attribute name): denotes an attribute whose value
+         provides a URI to be used as the base for interpreting any
+         relative URIs in the scope of the element on which it
+         appears; its value is inherited.  This name is reserved
+         by virtue of its definition in the XML Base specification.
+
+    id   (as an attribute name): denotes an attribute whose value
+         should be interpreted as if declared to be of type ID.
+         The xml:id specification is not yet a W3C Recommendation,
+         but this attribute is included here to facilitate experimentation
+         with the mechanisms it proposes.  Note that it is _not_ included
+         in the specialAttrs attribute group.
+
+    lang (as an attribute name): denotes an attribute whose value
+         is a language code for the natural language of the content of
+         any element; its value is inherited.  This name is reserved
+         by virtue of its definition in the XML specification.
+  
+    space (as an attribute name): denotes an attribute whose
+         value is a keyword indicating what whitespace processing
+         discipline is intended for the content of the element; its
+         value is inherited.  This name is reserved by virtue of its
+         definition in the XML specification.
+
+    Father (in any context at all): denotes Jon Bosak, the chair of 
+         the original XML Working Group.  This name is reserved by 
+         the following decision of the W3C XML Plenary and 
+         XML Coordination groups:
+
+             In appreciation for his vision, leadership and dedication
+             the W3C XML Plenary on this 10th day of February, 2000
+             reserves for Jon Bosak in perpetuity the XML name
+             xml:Father
+  </xs:documentation>
+ </xs:annotation>
+
+ <xs:annotation>
+  <xs:documentation>This schema defines attributes and an attribute group
         suitable for use by
         schemas wishing to allow xml:base, xml:lang or xml:space attributes
         on elements they define.
 
         To enable this, such a schema must import this schema
         for the XML namespace, e.g. as follows:
-            &lt;schema . . .>
+        &lt;schema . . .>
          . . .
-            &lt;import namespace="http://www.w3.org/XML/1998/namespace"
+         &lt;import namespace="http://www.w3.org/XML/1998/namespace"
                     schemaLocation="http://www.w3.org/2001/03/xml.xsd"/>
 
         Subsequently, qualified reference to any of the attributes
         or the group defined below will have the desired effect, e.g.
 
-            &lt;type . . .>
+        &lt;type . . .>
          . . .
-            &lt;attributeGroup ref="xml:specialAttrs"/>
-
+         &lt;attributeGroup ref="xml:specialAttrs"/>
+ 
          will define a type which will schema-validate an instance
          element with any of those attributes</xs:documentation>
-    </xs:annotation>
+ </xs:annotation>
 
-    <xs:annotation>
-        <xs:documentation>In keeping with the XML Schema WG's standard versioning
+ <xs:annotation>
+  <xs:documentation>In keeping with the XML Schema WG's standard versioning
    policy, this schema document will persist at
-   http://www.w3.org/2001/03/xml.xsd.
+   http://www.w3.org/2004/10/xml.xsd.
    At the date of issue it can also be found at
    http://www.w3.org/2001/xml.xsd.
    The schema document at that URI may however change in the future,
    in order to remain compatible with the latest version of XML Schema
-   itself.  In other words, if the XML Schema namespace changes, the version
-   of this document at
+   itself, or with the XML namespace itself.  In other words, if the XML
+   Schema or XML namespaces change, the version of this document at
    http://www.w3.org/2001/xml.xsd will change
    accordingly; the version at
-   http://www.w3.org/2001/03/xml.xsd will not change.
-        </xs:documentation>
-    </xs:annotation>
-
-    <xs:attribute name="lang" type="xs:language">
-        <xs:annotation>
-            <xs:documentation>In due course, we should install the relevant ISO 2- and 3-letter
-         codes as the enumerated possible values . . .</xs:documentation>
-        </xs:annotation>
-    </xs:attribute>
-
-    <xs:attribute name="space" default="preserve">
-        <xs:simpleType>
-            <xs:restriction base="xs:NCName">
-                <xs:enumeration value="default"/>
-                <xs:enumeration value="preserve"/>
-            </xs:restriction>
-        </xs:simpleType>
-    </xs:attribute>
-
-    <xs:attribute name="base" type="xs:anyURI">
-        <xs:annotation>
-            <xs:documentation>See http://www.w3.org/TR/xmlbase/ for
+   http://www.w3.org/2004/10/xml.xsd will not change.
+  </xs:documentation>
+ </xs:annotation>
+
+ <xs:attribute name="lang" type="xs:language">
+  <xs:annotation>
+   <xs:documentation>Attempting to install the relevant ISO 2- and 3-letter
+         codes as the enumerated possible values is probably never
+         going to be a realistic possibility.  See
+         RFC 3066 at http://www.ietf.org/rfc/rfc3066.txt and the IANA registry
+         at http://www.iana.org/assignments/lang-tag-apps.htm for
+         further information.</xs:documentation>
+  </xs:annotation>
+ </xs:attribute>
+
+ <xs:attribute name="space">
+  <xs:simpleType>
+   <xs:restriction base="xs:NCName">
+    <xs:enumeration value="default"/>
+    <xs:enumeration value="preserve"/>
+   </xs:restriction>
+  </xs:simpleType>
+ </xs:attribute>
+
+ <xs:attribute name="base" type="xs:anyURI">
+  <xs:annotation>
+   <xs:documentation>See http://www.w3.org/TR/xmlbase/ for
+                     information about this attribute.</xs:documentation>
+  </xs:annotation>
+ </xs:attribute>
+ 
+ <xs:attribute name="id" type="xs:ID">
+  <xs:annotation>
+   <xs:documentation>See http://www.w3.org/TR/xml-id/ for
                      information about this attribute.</xs:documentation>
-        </xs:annotation>
-    </xs:attribute>
+  </xs:annotation>
+ </xs:attribute>
 
-    <xs:attributeGroup name="specialAttrs">
-        <xs:attribute ref="xml:base"/>
-        <xs:attribute ref="xml:lang"/>
-        <xs:attribute ref="xml:space"/>
-    </xs:attributeGroup>
+ <xs:attributeGroup name="specialAttrs">
+  <xs:attribute ref="xml:base"/>
+  <xs:attribute ref="xml:lang"/>
+  <xs:attribute ref="xml:space"/>
+ </xs:attributeGroup>
 
 </xs:schema>

Mime
View raw message