geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hogst...@apache.org
Subject svn commit: r438133 [1/10] - in /geronimo/server/branches/1.1.1: etc/ modules/axis-builder/ modules/client-builder/ modules/connector-builder/ modules/j2ee-builder/ modules/j2ee-schema/ modules/j2ee-schema/src/catalog/ modules/j2ee-schema/src/conf/ mod...
Date Tue, 29 Aug 2006 17:59:04 GMT
Author: hogstrom
Date: Tue Aug 29 10:59:01 2006
New Revision: 438133

URL: http://svn.apache.org/viewvc?rev=438133&view=rev
Log:
GERONIMO-2332 Applied patches for removal of Sun XSDs

Modified:
    geronimo/server/branches/1.1.1/etc/explicit_versions.properties
    geronimo/server/branches/1.1.1/etc/project.properties
    geronimo/server/branches/1.1.1/modules/axis-builder/project.xml
    geronimo/server/branches/1.1.1/modules/client-builder/project.xml
    geronimo/server/branches/1.1.1/modules/connector-builder/project.xml
    geronimo/server/branches/1.1.1/modules/j2ee-builder/project.xml
    geronimo/server/branches/1.1.1/modules/j2ee-schema/maven.xml
    geronimo/server/branches/1.1.1/modules/j2ee-schema/project.xml
    geronimo/server/branches/1.1.1/modules/j2ee-schema/src/catalog/resolver-catalog.xml
    geronimo/server/branches/1.1.1/modules/j2ee-schema/src/conf/xmlconfig.xml
    geronimo/server/branches/1.1.1/modules/j2ee-schema/src/j2ee_1_2schema/ejb-jar_1_1.xsd
    geronimo/server/branches/1.1.1/modules/j2ee-schema/src/j2ee_1_2schema/web-app_2_2.xsd
    geronimo/server/branches/1.1.1/modules/j2ee-schema/src/j2ee_1_3schema/connector_1_0.xsd
    geronimo/server/branches/1.1.1/modules/j2ee-schema/src/j2ee_1_3schema/ejb-jar_2_0.xsd
    geronimo/server/branches/1.1.1/modules/j2ee-schema/src/j2ee_1_3schema/web-app_2_3.xsd
    geronimo/server/branches/1.1.1/modules/j2ee-schema/src/j2ee_1_4schema/application-client_1_4.xsd
    geronimo/server/branches/1.1.1/modules/j2ee-schema/src/j2ee_1_4schema/application_1_4.xsd
    geronimo/server/branches/1.1.1/modules/j2ee-schema/src/j2ee_1_4schema/connector_1_5.xsd
    geronimo/server/branches/1.1.1/modules/j2ee-schema/src/j2ee_1_4schema/ejb-jar_2_1.xsd
    geronimo/server/branches/1.1.1/modules/j2ee-schema/src/j2ee_1_4schema/j2ee_1_4.xsd
    geronimo/server/branches/1.1.1/modules/j2ee-schema/src/j2ee_1_4schema/j2ee_jaxrpc_mapping_1_1.xsd
    geronimo/server/branches/1.1.1/modules/j2ee-schema/src/j2ee_1_4schema/j2ee_web_services_1_1.xsd
    geronimo/server/branches/1.1.1/modules/j2ee-schema/src/j2ee_1_4schema/j2ee_web_services_client_1_1.xsd
    geronimo/server/branches/1.1.1/modules/j2ee-schema/src/j2ee_1_4schema/jsp_2_0.xsd
    geronimo/server/branches/1.1.1/modules/j2ee-schema/src/j2ee_1_4schema/web-app_2_4.xsd
    geronimo/server/branches/1.1.1/modules/j2ee-schema/src/j2ee_1_4schema/web-jsptaglibrary_2_0.xsd
    geronimo/server/branches/1.1.1/modules/j2ee-schema/src/j2ee_1_4schema/xml.xsd
    geronimo/server/branches/1.1.1/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_2dtd/application-client_1_2.dtd
    geronimo/server/branches/1.1.1/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_2dtd/application_1_2.dtd
    geronimo/server/branches/1.1.1/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_2dtd/ejb-jar_1_1.dtd
    geronimo/server/branches/1.1.1/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_2dtd/web-app_2_2.dtd
    geronimo/server/branches/1.1.1/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_2dtd/web-jsptaglibrary_1_1.dtd
    geronimo/server/branches/1.1.1/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_3dtd/application-client_1_3.dtd
    geronimo/server/branches/1.1.1/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_3dtd/application_1_3.dtd
    geronimo/server/branches/1.1.1/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_3dtd/connector_1_0.dtd
    geronimo/server/branches/1.1.1/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_3dtd/ejb-jar_2_0.dtd
    geronimo/server/branches/1.1.1/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_3dtd/web-app_2_3.dtd
    geronimo/server/branches/1.1.1/modules/j2ee-schema/src/resources/schemaorg_apache_xmlbeans/src/modules/j2ee-schema/src/j2ee_1_3dtd/web-jsptaglibrary_1_2.dtd
    geronimo/server/branches/1.1.1/modules/jetty-builder/project.xml
    geronimo/server/branches/1.1.1/modules/naming-builder/project.xml
    geronimo/server/branches/1.1.1/modules/security-builder/project.xml
    geronimo/server/branches/1.1.1/modules/service-builder/project.xml
    geronimo/server/branches/1.1.1/modules/test-ddbean/project.xml
    geronimo/server/branches/1.1.1/modules/tomcat-builder/project.xml
    geronimo/server/branches/1.1.1/modules/tomcat/project.xml
    geronimo/server/branches/1.1.1/modules/upgrade/project.xml
    geronimo/server/branches/1.1.1/modules/web-builder/project.xml

Modified: geronimo/server/branches/1.1.1/etc/explicit_versions.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1.1/etc/explicit_versions.properties?rev=438133&r1=438132&r2=438133&view=diff
==============================================================================
--- geronimo/server/branches/1.1.1/etc/explicit_versions.properties (original)
+++ geronimo/server/branches/1.1.1/etc/explicit_versions.properties Tue Aug 29 10:59:01 2006
@@ -13,6 +13,8 @@
 tranql/connector//rar=1.2
 tranql///=1.1
 
+org.apache.geronimo.schema/geronimo-schema-j2ee1.4//jar=1.0-SNAPSHOT
+
 org.apache.geronimo.specs///=1.0.1
 
 org.apache.geronimo.specs/geronimo-activation_1.0.2_spec//jar=1.1

Modified: geronimo/server/branches/1.1.1/etc/project.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1.1/etc/project.properties?rev=438133&r1=438132&r2=438133&view=diff
==============================================================================
--- geronimo/server/branches/1.1.1/etc/project.properties (original)
+++ geronimo/server/branches/1.1.1/etc/project.properties Tue Aug 29 10:59:01 2006
@@ -100,6 +100,8 @@
 geronimo_deployment_plugin_version=1.1.1-3
 geronimo_dependency_plugin_version=1.1.1-3
 
+geronimo_schema_j2ee1_4_version=1.0-SNAPSHOT
+
 geronimo_spec_activation_version=1.1
 
 # use old version of corba specs. the idl compiler for new specs is

Modified: geronimo/server/branches/1.1.1/modules/axis-builder/project.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1.1/modules/axis-builder/project.xml?rev=438133&r1=438132&r2=438133&view=diff
==============================================================================
--- geronimo/server/branches/1.1.1/modules/axis-builder/project.xml (original)
+++ geronimo/server/branches/1.1.1/modules/axis-builder/project.xml Tue Aug 29 10:59:01 2006
@@ -146,6 +146,11 @@
                 <xmlbeans>true</xmlbeans>
             </properties>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.schema</groupId>
+            <artifactId>geronimo-schema-j2ee1.4</artifactId>
+            <version>${geronimo_schema_j2ee1_4_version}</version>
+        </dependency>
 
         <dependency>
             <groupId>geronimo</groupId>

Modified: geronimo/server/branches/1.1.1/modules/client-builder/project.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1.1/modules/client-builder/project.xml?rev=438133&r1=438132&r2=438133&view=diff
==============================================================================
--- geronimo/server/branches/1.1.1/modules/client-builder/project.xml (original)
+++ geronimo/server/branches/1.1.1/modules/client-builder/project.xml Tue Aug 29 10:59:01 2006
@@ -124,6 +124,11 @@
                 <xmlbeans>true</xmlbeans>
             </properties>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.schema</groupId>
+            <artifactId>geronimo-schema-j2ee1.4</artifactId>
+            <version>${geronimo_schema_j2ee1_4_version}</version>
+        </dependency>
 
         <dependency>
             <groupId>geronimo</groupId>

Modified: geronimo/server/branches/1.1.1/modules/connector-builder/project.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1.1/modules/connector-builder/project.xml?rev=438133&r1=438132&r2=438133&view=diff
==============================================================================
--- geronimo/server/branches/1.1.1/modules/connector-builder/project.xml (original)
+++ geronimo/server/branches/1.1.1/modules/connector-builder/project.xml Tue Aug 29 10:59:01 2006
@@ -180,6 +180,11 @@
                 <xmlbeans>true</xmlbeans>
             </properties>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.schema</groupId>
+            <artifactId>geronimo-schema-j2ee1.4</artifactId>
+            <version>${geronimo_schema_j2ee1_4_version}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>

Modified: geronimo/server/branches/1.1.1/modules/j2ee-builder/project.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1.1/modules/j2ee-builder/project.xml?rev=438133&r1=438132&r2=438133&view=diff
==============================================================================
--- geronimo/server/branches/1.1.1/modules/j2ee-builder/project.xml (original)
+++ geronimo/server/branches/1.1.1/modules/j2ee-builder/project.xml Tue Aug 29 10:59:01 2006
@@ -26,7 +26,7 @@
     <!-- Module Identification -->
     <!-- ===================== -->
 
-    <name>Geronimo :: J2EE</name>
+    <name>Geronimo :: J2EE :: Builder</name>
     <id>geronimo-j2ee-builder</id>
     <shortDescription>J2EE Deployment Services</shortDescription>
     <description>Geronimo Deployment J2EE Services</description>
@@ -117,6 +117,11 @@
             <groupId>geronimo</groupId>
             <artifactId>geronimo-j2ee-schema</artifactId>
             <version>${pom.currentVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.schema</groupId>
+            <artifactId>geronimo-schema-j2ee1.4</artifactId>
+            <version>${geronimo_schema_j2ee1_4_version}</version>
         </dependency>
 
         <dependency>

Modified: geronimo/server/branches/1.1.1/modules/j2ee-schema/maven.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1.1/modules/j2ee-schema/maven.xml?rev=438133&r1=438132&r2=438133&view=diff
==============================================================================
--- geronimo/server/branches/1.1.1/modules/j2ee-schema/maven.xml (original)
+++ geronimo/server/branches/1.1.1/modules/j2ee-schema/maven.xml Tue Aug 29 10:59:01 2006
@@ -25,20 +25,11 @@
     xmlns:maven="jelly:maven"
     xmlns:xmlbeans="xmlbeans2:maven">
 
-    <preGoal name="java:compile">
-        <xmlbeans:schema2java
-            maven.xmlbeans2.sourcedir="${basedir}/src"
-            maven.xmlbeans2.sourceschema="j2ee_1_4schema/application_1_4.xsd,j2ee_1_4schema/j2ee_jaxrpc_mapping_1_1.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,j2ee_1_4schema/j2ee_web_services_1_1.xsd"
-            maven.xmlbeans2.xmlconfigs="${basedir}/src/conf/xmlconfig.xml"
-            maven.xmlbeans2.targetdir="${basedir}/target/xmlbeans"
-            maven.xmlbeans2.cataloglocation="${basedir}/src/catalog/resolver-catalog.xml"/>
-        <mkdir dir="${basedir}/target/xmlbeans-classes"/>
-        <mkdir dir="${basedir}/target/xmlbeans-classes/schemaorg_apache_xmlbeans"/>
-        <copy todir="${basedir}/target/xmlbeans-classes/schemaorg_apache_xmlbeans">
-            <ant:fileset dir="${basedir}/target/classes/schemaorg_apache_xmlbeans"/>
-        </copy>
-    </preGoal>
-
+    <!-- Construct dependency lists for inclusion in generated jar. -->
+    <postGoal name="java:compile">
+        <attainGoal name="geronimo:dependency"/>
+    </postGoal>
+ 
     <postGoal name="xdoc:register-reports">
         <attainGoal name="maven-javadoc-plugin:deregister"/>
     </postGoal>

Modified: geronimo/server/branches/1.1.1/modules/j2ee-schema/project.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1.1/modules/j2ee-schema/project.xml?rev=438133&r1=438132&r2=438133&view=diff
==============================================================================
--- geronimo/server/branches/1.1.1/modules/j2ee-schema/project.xml (original)
+++ geronimo/server/branches/1.1.1/modules/j2ee-schema/project.xml Tue Aug 29 10:59:01 2006
@@ -42,10 +42,19 @@
 
     <dependencies>
         <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xmlbeans-maven-plugin</artifactId>
-            <version>${xmlbeans_maven_plugin_version}</version>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-dependency-plugin</artifactId>
+            <version>${geronimo_dependency_plugin_version}</version>
             <type>plugin</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.schema</groupId>
+            <artifactId>geronimo-schema-j2ee1.4</artifactId>
+            <version>${geronimo_schema_j2ee1_4_version}</version>
+            <properties>
+                <geronimo.dependency>true</geronimo.dependency>
+            </properties>
         </dependency>
 
         <!-- needed for xmlbeans runtime-->

Modified: geronimo/server/branches/1.1.1/modules/j2ee-schema/src/catalog/resolver-catalog.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1.1/modules/j2ee-schema/src/catalog/resolver-catalog.xml?rev=438133&r1=438132&r2=438133&view=diff
==============================================================================
--- geronimo/server/branches/1.1.1/modules/j2ee-schema/src/catalog/resolver-catalog.xml (original)
+++ geronimo/server/branches/1.1.1/modules/j2ee-schema/src/catalog/resolver-catalog.xml Tue Aug 29 10:59:01 2006
@@ -1,12 +0,0 @@
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-
-    <public publicId="http://java.sun.com/xml/ns/j2ee"
-        uri="../j2ee_1_4schema/j2ee_1_4.xsd"/>
-
-    <public publicId="http://www.w3.org/XML/1998/namespace"
-        uri="../j2ee_1_4schema/xml.xsd"/>
-
-    <system systemId="http://www.ibm.com/webservices/xsd/j2ee_web_services_client_1_1.xsd"
-        uri="../j2ee_1_4schema/j2ee_web_services_client_1_1.xsd"/>
-
-</catalog>
\ No newline at end of file

Modified: geronimo/server/branches/1.1.1/modules/j2ee-schema/src/conf/xmlconfig.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1.1/modules/j2ee-schema/src/conf/xmlconfig.xml?rev=438133&r1=438132&r2=438133&view=diff
==============================================================================
--- geronimo/server/branches/1.1.1/modules/j2ee-schema/src/conf/xmlconfig.xml (original)
+++ geronimo/server/branches/1.1.1/modules/j2ee-schema/src/conf/xmlconfig.xml Tue Aug 29 10:59:01 2006
@@ -1,13 +0,0 @@
-<xb:config xmlns:xb="http://www.bea.com/2002/09/xbean/config"
-    >
-
-    <xb:namespace uri="http://java.sun.com/xml/ns/j2ee">
-        <xb:package>org.apache.geronimo.xbeans.j2ee</xb:package>
-    </xb:namespace>
-
-    <!--xb:namespace uri="##local">
-        <xb:package>org.apache.geronimo.xbeans.j2ee.connector_1_0</xb:package>
-        <xb:suffix>10</xb:suffix>
-    </xb:namespace-->
-
-</xb:config>
\ No newline at end of file

Modified: geronimo/server/branches/1.1.1/modules/j2ee-schema/src/j2ee_1_2schema/ejb-jar_1_1.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1.1/modules/j2ee-schema/src/j2ee_1_2schema/ejb-jar_1_1.xsd?rev=438133&r1=438132&r2=438133&view=diff
==============================================================================
--- geronimo/server/branches/1.1.1/modules/j2ee-schema/src/j2ee_1_2schema/ejb-jar_1_1.xsd (original)
+++ geronimo/server/branches/1.1.1/modules/j2ee-schema/src/j2ee_1_2schema/ejb-jar_1_1.xsd Tue Aug 29 10:59:01 2006
@@ -1,374 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--W3C Schema generated by XMLSPY v2004 rel. 2 U (http://www.xmlspy.com)-->
-<xsd:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-    <xsd:complexType name="assembly-descriptorType">
-        <xsd:sequence>
-            <xsd:element name="security-role" type="security-roleType" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="method-permission" type="method-permissionType" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="container-transaction" type="container-transactionType" minOccurs="0" maxOccurs="unbounded"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-    <xsd:complexType name="cmp-fieldType">
-        <xsd:sequence>
-            <xsd:element name="description" type="descriptionType" minOccurs="0"/>
-            <xsd:element name="field-name" type="field-nameType"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-    <xsd:complexType name="container-transactionType">
-        <xsd:sequence>
-            <xsd:element name="description" type="descriptionType" minOccurs="0"/>
-            <xsd:element name="method" type="methodType" maxOccurs="unbounded"/>
-            <xsd:element name="trans-attribute" type="trans-attributeType"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-    <xsd:complexType name="descriptionType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="display-nameType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="ejb-classType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="ejb-client-jarType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:element name="ejb-jar">
-        <xsd:complexType>
-            <xsd:sequence>
-                <xsd:element name="description" type="descriptionType" minOccurs="0"/>
-                <xsd:element name="display-name" type="display-nameType" minOccurs="0"/>
-                <xsd:element name="small-icon" type="small-iconType" minOccurs="0"/>
-                <xsd:element name="large-icon" type="large-iconType" minOccurs="0"/>
-                <xsd:element name="enterprise-beans" type="enterprise-beansType"/>
-                <xsd:element name="assembly-descriptor" type="assembly-descriptorType" minOccurs="0"/>
-                <xsd:element name="ejb-client-jar" type="ejb-client-jarType" minOccurs="0"/>
-            </xsd:sequence>
-            <xsd:attribute name="id" type="xsd:ID"/>
-        </xsd:complexType>
-    </xsd:element>
-    <xsd:complexType name="ejb-linkType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="ejb-nameType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="ejb-refType">
-        <xsd:sequence>
-            <xsd:element name="description" type="descriptionType" minOccurs="0"/>
-            <xsd:element name="ejb-ref-name" type="ejb-ref-nameType"/>
-            <xsd:element name="ejb-ref-type" type="ejb-ref-typeType"/>
-            <xsd:element name="home" type="homeType"/>
-            <xsd:element name="remote" type="remoteType"/>
-            <xsd:element name="ejb-link" type="ejb-linkType" minOccurs="0"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-    <xsd:complexType name="ejb-ref-nameType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="ejb-ref-typeType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="enterprise-beansType">
-        <xsd:choice maxOccurs="unbounded">
-            <xsd:element name="session" type="sessionType"/>
-            <xsd:element name="entity" type="entityType"/>
-        </xsd:choice>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-    <xsd:complexType name="entityType">
-        <xsd:sequence>
-            <xsd:element name="description" type="descriptionType" minOccurs="0"/>
-            <xsd:element name="display-name" type="display-nameType" minOccurs="0"/>
-            <xsd:element name="small-icon" type="small-iconType" minOccurs="0"/>
-            <xsd:element name="large-icon" type="large-iconType" minOccurs="0"/>
-            <xsd:element name="ejb-name" type="ejb-nameType"/>
-            <xsd:element name="home" type="homeType"/>
-            <xsd:element name="remote" type="remoteType"/>
-            <xsd:element name="ejb-class" type="ejb-classType"/>
-            <xsd:element name="persistence-type" type="persistence-typeType"/>
-            <xsd:element name="prim-key-class" type="prim-key-classType"/>
-            <xsd:element name="reentrant" type="reentrantType"/>
-            <xsd:element name="cmp-field" type="cmp-fieldType" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="primkey-field" type="primkey-fieldType" minOccurs="0"/>
-            <xsd:element name="env-entry" type="env-entryType" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="ejb-ref" type="ejb-refType" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="security-role-ref" type="security-role-refType" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="resource-ref" type="resource-refType" minOccurs="0" maxOccurs="unbounded"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-    <xsd:complexType name="env-entryType">
-        <xsd:sequence>
-            <xsd:element name="description" type="descriptionType" minOccurs="0"/>
-            <xsd:element name="env-entry-name" type="env-entry-nameType"/>
-            <xsd:element name="env-entry-type" type="env-entry-typeType"/>
-            <xsd:element name="env-entry-value" type="env-entry-valueType" minOccurs="0"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-    <xsd:complexType name="env-entry-nameType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="env-entry-typeType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="env-entry-valueType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="field-nameType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="homeType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="large-iconType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="methodType">
-        <xsd:sequence>
-            <xsd:element name="description" type="descriptionType" minOccurs="0"/>
-            <xsd:element name="ejb-name" type="ejb-nameType"/>
-            <xsd:element name="method-intf" type="method-intfType" minOccurs="0"/>
-            <xsd:element name="method-name" type="method-nameType"/>
-            <xsd:element name="method-params" type="method-paramsType" minOccurs="0"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-    <xsd:complexType name="method-intfType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="method-nameType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="method-paramType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="method-paramsType">
-        <xsd:sequence>
-            <xsd:element name="method-param" type="method-paramType" minOccurs="0" maxOccurs="unbounded"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-    <xsd:complexType name="method-permissionType">
-        <xsd:sequence>
-            <xsd:element name="description" type="descriptionType" minOccurs="0"/>
-            <xsd:element name="role-name" type="role-nameType" maxOccurs="unbounded"/>
-            <xsd:element name="method" type="methodType" maxOccurs="unbounded"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-    <xsd:complexType name="persistence-typeType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="prim-key-classType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="primkey-fieldType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="reentrantType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="remoteType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="res-authType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="res-ref-nameType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="res-typeType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="resource-refType">
-        <xsd:sequence>
-            <xsd:element name="description" type="descriptionType" minOccurs="0"/>
-            <xsd:element name="res-ref-name" type="res-ref-nameType"/>
-            <xsd:element name="res-type" type="res-typeType"/>
-            <xsd:element name="res-auth" type="res-authType"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-    <xsd:complexType name="role-linkType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="role-nameType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="security-roleType">
-        <xsd:sequence>
-            <xsd:element name="description" type="descriptionType" minOccurs="0"/>
-            <xsd:element name="role-name" type="role-nameType"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-    <xsd:complexType name="security-role-refType">
-        <xsd:sequence>
-            <xsd:element name="description" type="descriptionType" minOccurs="0"/>
-            <xsd:element name="role-name" type="role-nameType"/>
-            <xsd:element name="role-link" type="role-linkType" minOccurs="0"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-    <xsd:complexType name="sessionType">
-        <xsd:sequence>
-            <xsd:element name="description" type="descriptionType" minOccurs="0"/>
-            <xsd:element name="display-name" type="display-nameType" minOccurs="0"/>
-            <xsd:element name="small-icon" type="small-iconType" minOccurs="0"/>
-            <xsd:element name="large-icon" type="large-iconType" minOccurs="0"/>
-            <xsd:element name="ejb-name" type="ejb-nameType"/>
-            <xsd:element name="home" type="homeType"/>
-            <xsd:element name="remote" type="remoteType"/>
-            <xsd:element name="ejb-class" type="ejb-classType"/>
-            <xsd:element name="session-type" type="session-typeType"/>
-            <xsd:element name="transaction-type" type="transaction-typeType"/>
-            <xsd:element name="env-entry" type="env-entryType" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="ejb-ref" type="ejb-refType" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="security-role-ref" type="security-role-refType" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="resource-ref" type="resource-refType" minOccurs="0" maxOccurs="unbounded"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-    <xsd:complexType name="session-typeType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="small-iconType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="trans-attributeType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="transaction-typeType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-</xsd:schema>

Modified: geronimo/server/branches/1.1.1/modules/j2ee-schema/src/j2ee_1_2schema/web-app_2_2.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1.1/modules/j2ee-schema/src/j2ee_1_2schema/web-app_2_2.xsd?rev=438133&r1=438132&r2=438133&view=diff
==============================================================================
--- geronimo/server/branches/1.1.1/modules/j2ee-schema/src/j2ee_1_2schema/web-app_2_2.xsd (original)
+++ geronimo/server/branches/1.1.1/modules/j2ee-schema/src/j2ee_1_2schema/web-app_2_2.xsd Tue Aug 29 10:59:01 2006
@@ -1,484 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--W3C Schema generated by XMLSPY v2004 rel. 2 U (http://www.xmlspy.com)-->
-<xsd:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-    <xsd:complexType name="auth-constraintType">
-        <xsd:sequence>
-            <xsd:element name="description" type="descriptionType" minOccurs="0"/>
-            <xsd:element name="role-name" type="role-nameType" minOccurs="0" maxOccurs="unbounded"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-    <xsd:complexType name="auth-methodType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="context-paramType">
-        <xsd:sequence>
-            <xsd:element name="param-name" type="param-nameType"/>
-            <xsd:element name="param-value" type="param-valueType"/>
-            <xsd:element name="description" type="descriptionType" minOccurs="0"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-    <xsd:complexType name="descriptionType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="display-nameType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="distributableType">
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-    <xsd:complexType name="ejb-linkType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="ejb-refType">
-        <xsd:sequence>
-            <xsd:element name="description" type="descriptionType" minOccurs="0"/>
-            <xsd:element name="ejb-ref-name" type="ejb-ref-nameType"/>
-            <xsd:element name="ejb-ref-type" type="ejb-ref-typeType"/>
-            <xsd:element name="home" type="homeType"/>
-            <xsd:element name="remote" type="remoteType"/>
-            <xsd:element name="ejb-link" type="ejb-linkType" minOccurs="0"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-    <xsd:complexType name="ejb-ref-nameType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="ejb-ref-typeType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="env-entryType">
-        <xsd:sequence>
-            <xsd:element name="description" type="descriptionType" minOccurs="0"/>
-            <xsd:element name="env-entry-name" type="env-entry-nameType"/>
-            <xsd:element name="env-entry-value" type="env-entry-valueType" minOccurs="0"/>
-            <xsd:element name="env-entry-type" type="env-entry-typeType"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-    <xsd:complexType name="env-entry-nameType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="env-entry-typeType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="env-entry-valueType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="error-codeType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="error-pageType">
-        <xsd:sequence>
-            <xsd:choice>
-                <xsd:element name="error-code" type="error-codeType"/>
-                <xsd:element name="exception-type" type="exception-typeType"/>
-            </xsd:choice>
-            <xsd:element name="location" type="locationType"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-    <xsd:complexType name="exception-typeType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="extensionType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="form-error-pageType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="form-login-configType">
-        <xsd:sequence>
-            <xsd:element name="form-login-page" type="form-login-pageType"/>
-            <xsd:element name="form-error-page" type="form-error-pageType"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-    <xsd:complexType name="form-login-pageType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="homeType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="http-methodType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="iconType">
-        <xsd:sequence>
-            <xsd:element name="small-icon" type="small-iconType" minOccurs="0"/>
-            <xsd:element name="large-icon" type="large-iconType" minOccurs="0"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-    <xsd:complexType name="init-paramType">
-        <xsd:sequence>
-            <xsd:element name="param-name" type="param-nameType"/>
-            <xsd:element name="param-value" type="param-valueType"/>
-            <xsd:element name="description" type="descriptionType" minOccurs="0"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-    <xsd:complexType name="jsp-fileType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="large-iconType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="load-on-startupType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="locationType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="login-configType">
-        <xsd:sequence>
-            <xsd:element name="auth-method" type="auth-methodType" minOccurs="0"/>
-            <xsd:element name="realm-name" type="realm-nameType" minOccurs="0"/>
-            <xsd:element name="form-login-config" type="form-login-configType" minOccurs="0"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-    <xsd:complexType name="mime-mappingType">
-        <xsd:sequence>
-            <xsd:element name="extension" type="extensionType"/>
-            <xsd:element name="mime-type" type="mime-typeType"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-    <xsd:complexType name="mime-typeType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="param-nameType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="param-valueType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="realm-nameType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="remoteType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="res-authType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="res-ref-nameType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="res-typeType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="resource-refType">
-        <xsd:sequence>
-            <xsd:element name="description" type="descriptionType" minOccurs="0"/>
-            <xsd:element name="res-ref-name" type="res-ref-nameType"/>
-            <xsd:element name="res-type" type="res-typeType"/>
-            <xsd:element name="res-auth" type="res-authType"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-    <xsd:complexType name="role-linkType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="role-nameType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="security-constraintType">
-        <xsd:sequence>
-            <xsd:element name="web-resource-collection" type="web-resource-collectionType" maxOccurs="unbounded"/>
-            <xsd:element name="auth-constraint" type="auth-constraintType" minOccurs="0"/>
-            <xsd:element name="user-data-constraint" type="user-data-constraintType" minOccurs="0"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-    <xsd:complexType name="security-roleType">
-        <xsd:sequence>
-            <xsd:element name="description" type="descriptionType" minOccurs="0"/>
-            <xsd:element name="role-name" type="role-nameType"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-    <xsd:complexType name="security-role-refType">
-        <xsd:sequence>
-            <xsd:element name="description" type="descriptionType" minOccurs="0"/>
-            <xsd:element name="role-name" type="role-nameType"/>
-            <xsd:element name="role-link" type="role-linkType"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-    <xsd:complexType name="servletType">
-        <xsd:sequence>
-            <xsd:element name="icon" type="iconType" minOccurs="0"/>
-            <xsd:element name="servlet-name" type="servlet-nameType"/>
-            <xsd:element name="display-name" type="display-nameType" minOccurs="0"/>
-            <xsd:element name="description" type="descriptionType" minOccurs="0"/>
-            <xsd:choice>
-                <xsd:element name="servlet-class" type="servlet-classType"/>
-                <xsd:element name="jsp-file" type="jsp-fileType"/>
-            </xsd:choice>
-            <xsd:element name="init-param" type="init-paramType" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="load-on-startup" type="load-on-startupType" minOccurs="0"/>
-            <xsd:element name="security-role-ref" type="security-role-refType" minOccurs="0" maxOccurs="unbounded"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-    <xsd:complexType name="servlet-classType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="servlet-mappingType">
-        <xsd:sequence>
-            <xsd:element name="servlet-name" type="servlet-nameType"/>
-            <xsd:element name="url-pattern" type="url-patternType"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-    <xsd:complexType name="servlet-nameType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="session-configType">
-        <xsd:sequence>
-            <xsd:element name="session-timeout" type="session-timeoutType" minOccurs="0"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-    <xsd:complexType name="session-timeoutType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="small-iconType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="taglibType">
-        <xsd:sequence>
-            <xsd:element name="taglib-uri" type="taglib-uriType"/>
-            <xsd:element name="taglib-location" type="taglib-locationType"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-    <xsd:complexType name="taglib-locationType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="taglib-uriType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="transport-guaranteeType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="url-patternType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="user-data-constraintType">
-        <xsd:sequence>
-            <xsd:element name="description" type="descriptionType" minOccurs="0"/>
-            <xsd:element name="transport-guarantee" type="transport-guaranteeType"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-    <xsd:element name="web-app">
-        <xsd:complexType>
-            <xsd:sequence>
-                <xsd:element name="icon" type="iconType" minOccurs="0"/>
-                <xsd:element name="display-name" type="display-nameType" minOccurs="0"/>
-                <xsd:element name="description" type="descriptionType" minOccurs="0"/>
-                <xsd:element name="distributable" type="distributableType" minOccurs="0"/>
-                <xsd:element name="context-param" type="context-paramType" minOccurs="0" maxOccurs="unbounded"/>
-                <xsd:element name="servlet" type="servletType" minOccurs="0" maxOccurs="unbounded"/>
-                <xsd:element name="servlet-mapping" type="servlet-mappingType" minOccurs="0" maxOccurs="unbounded"/>
-                <xsd:element name="session-config" type="session-configType" minOccurs="0"/>
-                <xsd:element name="mime-mapping" type="mime-mappingType" minOccurs="0" maxOccurs="unbounded"/>
-                <xsd:element name="welcome-file-list" type="welcome-file-listType" minOccurs="0"/>
-                <xsd:element name="error-page" type="error-pageType" minOccurs="0" maxOccurs="unbounded"/>
-                <xsd:element name="taglib" type="taglibType" minOccurs="0" maxOccurs="unbounded"/>
-                <xsd:element name="resource-ref" type="resource-refType" minOccurs="0" maxOccurs="unbounded"/>
-                <xsd:element name="security-constraint" type="security-constraintType" minOccurs="0" maxOccurs="unbounded"/>
-                <xsd:element name="login-config" type="login-configType" minOccurs="0"/>
-                <xsd:element name="security-role" type="security-roleType" minOccurs="0" maxOccurs="unbounded"/>
-                <xsd:element name="env-entry" type="env-entryType" minOccurs="0" maxOccurs="unbounded"/>
-                <xsd:element name="ejb-ref" type="ejb-refType" minOccurs="0" maxOccurs="unbounded"/>
-            </xsd:sequence>
-            <xsd:attribute name="id" type="xsd:ID"/>
-        </xsd:complexType>
-    </xsd:element>
-    <xsd:complexType name="web-resource-collectionType">
-        <xsd:sequence>
-            <xsd:element name="web-resource-name" type="web-resource-nameType"/>
-            <xsd:element name="description" type="descriptionType" minOccurs="0"/>
-            <xsd:element name="url-pattern" type="url-patternType" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="http-method" type="http-methodType" minOccurs="0" maxOccurs="unbounded"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-    <xsd:complexType name="web-resource-nameType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="welcome-fileType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-    <xsd:complexType name="welcome-file-listType">
-        <xsd:sequence>
-            <xsd:element name="welcome-file" type="welcome-fileType" maxOccurs="unbounded"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-</xsd:schema>

Modified: geronimo/server/branches/1.1.1/modules/j2ee-schema/src/j2ee_1_3schema/connector_1_0.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1.1/modules/j2ee-schema/src/j2ee_1_3schema/connector_1_0.xsd?rev=438133&r1=438132&r2=438133&view=diff
==============================================================================
--- geronimo/server/branches/1.1.1/modules/j2ee-schema/src/j2ee_1_3schema/connector_1_0.xsd (original)
+++ geronimo/server/branches/1.1.1/modules/j2ee-schema/src/j2ee_1_3schema/connector_1_0.xsd Tue Aug 29 10:59:01 2006
@@ -1,225 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!--W3C Schema generated by XMLSPY v2004 rel. 3 U (http://www.xmlspy.com)-->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-    <xs:complexType name="authentication-mechanismType">
-        <xs:sequence>
-            <xs:element name="description" type="descriptionType" minOccurs="0"/>
-            <xs:element name="authentication-mechanism-type" type="authentication-mechanism-typeType"/>
-            <xs:element name="credential-interface" type="credential-interfaceType"/>
-        </xs:sequence>
-        <xs:attribute name="id" type="xs:ID"/>
-    </xs:complexType>
-    <xs:complexType name="authentication-mechanism-typeType">
-        <xs:simpleContent>
-            <xs:extension base="xs:string">
-                <xs:attribute name="id" type="xs:ID"/>
-            </xs:extension>
-        </xs:simpleContent>
-    </xs:complexType>
-    <xs:complexType name="config-propertyType">
-        <xs:sequence>
-            <xs:element name="description" type="descriptionType" minOccurs="0"/>
-            <xs:element name="config-property-name" type="config-property-nameType"/>
-            <xs:element name="config-property-type" type="config-property-typeType"/>
-            <xs:element name="config-property-value" type="config-property-valueType" minOccurs="0"/>
-        </xs:sequence>
-        <xs:attribute name="id" type="xs:ID"/>
-    </xs:complexType>
-    <xs:complexType name="config-property-nameType">
-        <xs:simpleContent>
-            <xs:extension base="xs:string">
-                <xs:attribute name="id" type="xs:ID"/>
-            </xs:extension>
-        </xs:simpleContent>
-    </xs:complexType>
-    <xs:complexType name="config-property-typeType">
-        <xs:simpleContent>
-            <xs:extension base="xs:string">
-                <xs:attribute name="id" type="xs:ID"/>
-            </xs:extension>
-        </xs:simpleContent>
-    </xs:complexType>
-    <xs:complexType name="config-property-valueType">
-        <xs:simpleContent>
-            <xs:extension base="xs:string">
-                <xs:attribute name="id" type="xs:ID"/>
-            </xs:extension>
-        </xs:simpleContent>
-    </xs:complexType>
-    <xs:complexType name="connection-impl-classType">
-        <xs:simpleContent>
-            <xs:extension base="xs:string">
-                <xs:attribute name="id" type="xs:ID"/>
-            </xs:extension>
-        </xs:simpleContent>
-    </xs:complexType>
-    <xs:complexType name="connection-interfaceType">
-        <xs:simpleContent>
-            <xs:extension base="xs:string">
-                <xs:attribute name="id" type="xs:ID"/>
-            </xs:extension>
-        </xs:simpleContent>
-    </xs:complexType>
-    <xs:complexType name="connectionfactory-impl-classType">
-        <xs:simpleContent>
-            <xs:extension base="xs:string">
-                <xs:attribute name="id" type="xs:ID"/>
-            </xs:extension>
-        </xs:simpleContent>
-    </xs:complexType>
-    <xs:complexType name="connectionfactory-interfaceType">
-        <xs:simpleContent>
-            <xs:extension base="xs:string">
-                <xs:attribute name="id" type="xs:ID"/>
-            </xs:extension>
-        </xs:simpleContent>
-    </xs:complexType>
-    <xs:element name="connector" type="connectorType"/>
-    <xs:complexType name="connectorType">
-        <xs:sequence>
-            <xs:element name="display-name" type="display-nameType" minOccurs="0"/>
-            <xs:element name="description" type="descriptionType" minOccurs="0"/>
-            <xs:element name="icon" type="iconType" minOccurs="0"/>
-            <xs:element name="vendor-name" type="vendor-nameType"/>
-            <xs:element name="spec-version" type="spec-versionType"/>
-            <xs:element name="eis-type" type="eis-typeType"/>
-            <xs:element name="version" type="versionType"/>
-            <xs:element name="license" type="licenseType" minOccurs="0"/>
-            <xs:element name="resourceadapter" type="resourceadapterType"/>
-        </xs:sequence>
-        <xs:attribute name="id" type="xs:ID"/>
-    </xs:complexType>
-    <xs:complexType name="credential-interfaceType">
-        <xs:simpleContent>
-            <xs:extension base="xs:string">
-                <xs:attribute name="id" type="xs:ID"/>
-            </xs:extension>
-        </xs:simpleContent>
-    </xs:complexType>
-    <xs:complexType name="descriptionType">
-        <xs:simpleContent>
-            <xs:extension base="xs:string">
-                <xs:attribute name="id" type="xs:ID"/>
-            </xs:extension>
-        </xs:simpleContent>
-    </xs:complexType>
-    <xs:complexType name="display-nameType">
-        <xs:simpleContent>
-            <xs:extension base="xs:string">
-                <xs:attribute name="id" type="xs:ID"/>
-            </xs:extension>
-        </xs:simpleContent>
-    </xs:complexType>
-    <xs:complexType name="eis-typeType">
-        <xs:simpleContent>
-            <xs:extension base="xs:string">
-                <xs:attribute name="id" type="xs:ID"/>
-            </xs:extension>
-        </xs:simpleContent>
-    </xs:complexType>
-    <xs:complexType name="iconType">
-        <xs:sequence>
-            <xs:element name="small-icon" type="small-iconType" minOccurs="0"/>
-            <xs:element name="large-icon" type="large-iconType" minOccurs="0"/>
-        </xs:sequence>
-        <xs:attribute name="id" type="xs:ID"/>
-    </xs:complexType>
-    <xs:complexType name="large-iconType">
-        <xs:simpleContent>
-            <xs:extension base="xs:string">
-                <xs:attribute name="id" type="xs:ID"/>
-            </xs:extension>
-        </xs:simpleContent>
-    </xs:complexType>
-    <xs:complexType name="licenseType">
-        <xs:sequence>
-            <xs:element name="description" type="descriptionType" minOccurs="0"/>
-            <xs:element name="license-required" type="license-requiredType"/>
-        </xs:sequence>
-        <xs:attribute name="id" type="xs:ID"/>
-    </xs:complexType>
-    <xs:complexType name="license-requiredType">
-        <xs:simpleContent>
-            <xs:extension base="xs:string">
-                <xs:attribute name="id" type="xs:ID"/>
-            </xs:extension>
-        </xs:simpleContent>
-    </xs:complexType>
-    <xs:complexType name="managedconnectionfactory-classType">
-        <xs:simpleContent>
-            <xs:extension base="xs:string">
-                <xs:attribute name="id" type="xs:ID"/>
-            </xs:extension>
-        </xs:simpleContent>
-    </xs:complexType>
-    <xs:complexType name="reauthentication-supportType">
-        <xs:simpleContent>
-            <xs:extension base="xs:string">
-                <xs:attribute name="id" type="xs:ID"/>
-            </xs:extension>
-        </xs:simpleContent>
-    </xs:complexType>
-    <xs:complexType name="resourceadapterType">
-        <xs:sequence>
-            <xs:element name="managedconnectionfactory-class" type="managedconnectionfactory-classType"/>
-            <xs:element name="connectionfactory-interface" type="connectionfactory-interfaceType"/>
-            <xs:element name="connectionfactory-impl-class" type="connectionfactory-impl-classType"/>
-            <xs:element name="connection-interface" type="connection-interfaceType"/>
-            <xs:element name="connection-impl-class" type="connection-impl-classType"/>
-            <xs:element name="transaction-support" type="transaction-supportType"/>
-            <xs:element name="config-property" type="config-propertyType" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element name="authentication-mechanism" type="authentication-mechanismType" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element name="reauthentication-support" type="reauthentication-supportType"/>
-            <xs:element name="security-permission" type="security-permissionType" minOccurs="0" maxOccurs="unbounded"/>
-        </xs:sequence>
-        <xs:attribute name="id" type="xs:ID"/>
-    </xs:complexType>
-    <xs:complexType name="security-permissionType">
-        <xs:sequence>
-            <xs:element name="description" type="descriptionType" minOccurs="0"/>
-            <xs:element name="security-permission-spec" type="security-permission-specType"/>
-        </xs:sequence>
-        <xs:attribute name="id" type="xs:ID"/>
-    </xs:complexType>
-    <xs:complexType name="security-permission-specType">
-        <xs:simpleContent>
-            <xs:extension base="xs:string">
-                <xs:attribute name="id" type="xs:ID"/>
-            </xs:extension>
-        </xs:simpleContent>
-    </xs:complexType>
-    <xs:complexType name="small-iconType">
-        <xs:simpleContent>
-            <xs:extension base="xs:string">
-                <xs:attribute name="id" type="xs:ID"/>
-            </xs:extension>
-        </xs:simpleContent>
-    </xs:complexType>
-    <xs:complexType name="spec-versionType">
-        <xs:simpleContent>
-            <xs:extension base="xs:string">
-                <xs:attribute name="id" type="xs:ID"/>
-            </xs:extension>
-        </xs:simpleContent>
-    </xs:complexType>
-    <xs:complexType name="transaction-supportType">
-        <xs:simpleContent>
-            <xs:extension base="xs:string">
-                <xs:attribute name="id" type="xs:ID"/>
-            </xs:extension>
-        </xs:simpleContent>
-    </xs:complexType>
-    <xs:complexType name="vendor-nameType">
-        <xs:simpleContent>
-            <xs:extension base="xs:string">
-                <xs:attribute name="id" type="xs:ID"/>
-            </xs:extension>
-        </xs:simpleContent>
-    </xs:complexType>
-    <xs:complexType name="versionType">
-        <xs:simpleContent>
-            <xs:extension base="xs:string">
-                <xs:attribute name="id" type="xs:ID"/>
-            </xs:extension>
-        </xs:simpleContent>
-    </xs:complexType>
-</xs:schema>
\ No newline at end of file



Mime
View raw message