geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r292333 [2/4] - in /geronimo/trunk: applications/console-ear/src/plan/ applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/ applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/activem...
Date Wed, 28 Sep 2005 22:10:54 GMT
Modified: geronimo/trunk/modules/assembly/src/var/config/config.list
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/var/config/config.list?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/var/config/config.list (original)
+++ geronimo/trunk/modules/assembly/src/var/config/config.list Wed Sep 28 15:09:15 2005
@@ -7,5 +7,5 @@
 org/apache/geronimo/RuntimeDeployer
 org/apache/geronimo/JettyRuntimeDeployer
 org/apache/geronimo/TomcatRuntimeDeployer
-org/apache/geronimo/applications/Welcome
-org/apache/geronimo/Console
+org/apache/geronimo/applications/Welcome/${PlanWebServerName}
+org/apache/geronimo/Console/${PlanWebServerName}

Added: geronimo/trunk/modules/assembly/src/var/config/config.tomcat.list
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/var/config/config.tomcat.list?rev=292333&view=auto
==============================================================================
--- geronimo/trunk/modules/assembly/src/var/config/config.tomcat.list (added)
+++ geronimo/trunk/modules/assembly/src/var/config/config.tomcat.list Wed Sep 28 15:09:15 2005
@@ -0,0 +1,10 @@
+org/apache/geronimo/System
+org/apache/geronimo/RMINaming
+org/apache/geronimo/Server
+org/apache/geronimo/Security
+org/apache/geronimo/SystemDatabase
+org/apache/geronimo/SystemJMS
+org/apache/geronimo/RuntimeDeployer
+org/apache/geronimo/TomcatRuntimeDeployer
+org/apache/geronimo/applications/Welcome/Tomcat
+org/apache/geronimo/Console/Tomcat

Added: geronimo/trunk/modules/assembly/src/var/config/config.tomcat.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/var/config/config.tomcat.xml?rev=292333&view=auto
==============================================================================
--- geronimo/trunk/modules/assembly/src/var/config/config.tomcat.xml (added)
+++ geronimo/trunk/modules/assembly/src/var/config/config.tomcat.xml Wed Sep 28 15:09:15 2005
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<attributes>
+    <configuration name="org/apache/geronimo/RMINaming">
+        <gbean name="RMIRegistry">
+            <attribute name="port">${PlanNamingPort}</attribute>
+        </gbean>
+        <gbean name="NamingProperties">
+            <!-- Check whether this really works if host name is 0.0.0.0 -->
+            <attribute name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort}</attribute>
+        </gbean>
+    </configuration>
+    <configuration name="org/apache/geronimo/OfflineDeployer">
+        <gbean name="WebBuilder">
+            <attribute name="defaultNamespace">${PlanTomcatWebBuilderDefaultNamespace}</attribute>
+        </gbean>
+        <gbean name="EJBBuilder">
+            <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Tomcat,J2EEServer=geronimo,j2eeType=GBean,name=${PlanWebServerName}WebContainer</attribute>
+        </gbean>
+    </configuration>
+    <configuration name="org/apache/geronimo/RuntimeDeployer">
+        <gbean name="WebBuilder">
+            <attribute name="defaultNamespace">${PlanTomcatWebBuilderDefaultNamespace}</attribute>
+        </gbean>
+        <gbean name="EJBBuilder">
+            <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Tomcat,J2EEServer=geronimo,j2eeType=GBean,name=${PlanWebServerName}WebContainer</attribute>
+        </gbean>
+    </configuration>
+    <configuration name="org/apache/geronimo/Jetty">
+        <gbean name="JettyWebConnector">
+            <attribute name="host">${PlanServerHostname}</attribute>
+            <attribute name="port">${PlanHTTPPortSecondary}</attribute>
+            <attribute name="redirectPort">${PlanHTTPSPortSecondary}</attribute>
+        </gbean>
+        <gbean name="JettySSLConnector">
+            <attribute name="host">${PlanServerHostname}</attribute>
+            <attribute name="port">${PlanHTTPSPortSecondary}</attribute>
+        </gbean>
+    </configuration>
+    <configuration name="org/apache/geronimo/Tomcat">
+        <gbean name="TomcatWebConnector">
+            <attribute name="host">${PlanServerHostname}</attribute>
+            <attribute name="port">${PlanHTTPPortPrimary}</attribute>
+            <attribute name="redirectPort">${PlanHTTPSPortPrimary}</attribute>
+        </gbean>
+        <gbean name="TomcatAJPConnector">
+            <attribute name="host">${PlanServerHostname}</attribute>
+            <attribute name="port">${PlanAJPPortPrimary}</attribute>
+            <attribute name="redirectPort">${PlanHTTPSPortPrimary}</attribute>
+        </gbean>
+        <gbean name="TomcatWebSSLConnector">
+            <attribute name="host">${PlanServerHostname}</attribute>
+            <attribute name="port">${PlanHTTPSPortPrimary}</attribute>
+        </gbean>
+    </configuration>
+    <configuration name="org/apache/geronimo/Server">
+        <gbean name="openejb:type=NetworkService,name=EJB">
+            <attribute name="host">${PlanServerHostname}</attribute>
+            <attribute name="port">${PlanOpenEJBPort}</attribute>
+        </gbean>
+    </configuration>
+    <configuration name="org/apache/geronimo/Security">
+        <gbean name="geronimo.remoting:target=JaasLoginServiceRemotingServer">
+            <attribute name="host">${PlanServerHostname}</attribute>
+            <attribute name="port">${PlanRemoteLoginPort}</attribute>
+        </gbean>
+        <gbean name="JMXConnector">
+            <attribute name="url">service:jmx:rmi://${PlanServerHostname}/jndi/rmi:/JMXConnector</attribute>
+        </gbean>
+        <!-- Add CORBA settings PlanIIOPPort, PlanORBPort, PlanCOSNamingPort -->
+    </configuration>
+    <configuration name="org/apache/geronimo/ActiveMQServer">
+        <gbean name="ActiveMQ.tcp.default">
+            <attribute name="host">${PlanServerHostname}</attribute>
+            <attribute name="port">${PlanActiveMQPort}</attribute>
+        </gbean>
+    </configuration>
+    <configuration name="org/apache/geronimo/SystemDatabase">
+        <gbean name="DerbyNetwork">
+            <attribute name="host">${PlanServerHostname}</attribute>
+            <attribute name="port">${PlanDerbyPort}</attribute>
+        </gbean>
+    </configuration>
+    <configuration name="org/apache/geronimo/Directory">
+        <gbean name="geronimo.server:name=DirectoryService">
+            <attribute name="host">${PlanServerHostname}</attribute>
+            <attribute name="port">${PlanLdapPort}</attribute>
+        </gbean>
+    </configuration>
+</attributes>

Modified: geronimo/trunk/modules/assembly/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/var/config/config.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/var/config/config.xml (original)
+++ geronimo/trunk/modules/assembly/src/var/config/config.xml Wed Sep 28 15:09:15 2005
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <attributes>
-    <configuration name="org/apache/geronimo/RuntimeDeployer">
-        <gbean name="WebBuilder">
-            <attribute name="defaultNamespace">${PlanWebBuilderDefaultNamespace}</attribute>
-        </gbean>
-    </configuration>
     <configuration name="org/apache/geronimo/RMINaming">
         <gbean name="RMIRegistry">
             <attribute name="port">${PlanNamingPort}</attribute>
@@ -41,16 +36,12 @@
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanHTTPSPort}</attribute>
         </gbean>
-        <gbean name="JettyClientCertSSLConnector">
-            <attribute name="host">${PlanServerHostname}</attribute>
-            <attribute name="port">${PlanClientCertHTTPSPort}</attribute>
-        </gbean>
     </configuration>
     <configuration name="org/apache/geronimo/Tomcat">
         <gbean name="TomcatWebConnector">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanHTTPPort2}</attribute>
-            <attribute name="redirectPort">${PlanHTTPSPort}</attribute>
+            <attribute name="redirectPort">${PlanHTTPSPort2}</attribute>
         </gbean>
         <gbean name="TomcatAJPConnector">
             <attribute name="host">${PlanServerHostname}</attribute>

Modified: geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/SchemaInfoBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/SchemaInfoBuilder.java?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/SchemaInfoBuilder.java (original)
+++ geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/SchemaInfoBuilder.java Wed Sep 28 15:09:15 2005
@@ -56,6 +56,8 @@
 import org.apache.geronimo.xbeans.wsdl.TDefinitions;
 import org.apache.geronimo.xbeans.wsdl.TPort;
 import org.apache.geronimo.xbeans.wsdl.TService;
+import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
+import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
 import org.apache.xmlbeans.SchemaField;
 import org.apache.xmlbeans.SchemaGlobalElement;
 import org.apache.xmlbeans.SchemaParticle;
@@ -90,7 +92,7 @@
             throw new RuntimeException("Could not locate soap encoding schema");
         }
         ArrayList errors = new ArrayList();
-        XmlOptions xmlOptions = SchemaConversionUtils.createXmlOptions(errors);
+        XmlOptions xmlOptions = XmlBeansUtil.createXmlOptions(errors);
         try {
             SchemaDocument parsed = SchemaDocument.Factory.parse(is, xmlOptions);
             if (errors.size() != 0) {
@@ -355,7 +357,7 @@
 
     static XmlObject parseWithNamespaces(Element element, Map namespaceMap) throws XmlException {
         ArrayList errors = new ArrayList();
-        XmlOptions xmlOptions = SchemaConversionUtils.createXmlOptions(errors);
+        XmlOptions xmlOptions = XmlBeansUtil.createXmlOptions(errors);
         SchemaDocument parsed = SchemaDocument.Factory.parse(element, xmlOptions);
         if (errors.size() != 0) {
             throw new XmlException(errors.toArray().toString());

Added: geronimo/trunk/modules/axis-builder/src/test-resources/schema/schema5.xsd
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis-builder/src/test-resources/schema/schema5.xsd?rev=292333&view=auto
==============================================================================
--- geronimo/trunk/modules/axis-builder/src/test-resources/schema/schema5.xsd (added)
+++ geronimo/trunk/modules/axis-builder/src/test-resources/schema/schema5.xsd Wed Sep 28 15:09:15 2005
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema
+    targetNamespace="http://foo.org/types"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns="http://www.w3.org/2001/XMLSchema">
+    <element name="RequestWrapper" type="xsd:anyType"/>
+    <element name="ResponseWrapper" type="xsd:anyType"/>
+    <element name="PolicyRequestWrapper" type="xsd:anyType"/>
+    <element name="PolicyResponseWrapper" type="xsd:anyType"/>
+</schema>

Modified: geronimo/trunk/modules/axis-builder/src/test/org/apache/geronimo/axis/builder/ParsingTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis-builder/src/test/org/apache/geronimo/axis/builder/ParsingTest.java?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/axis-builder/src/test/org/apache/geronimo/axis/builder/ParsingTest.java (original)
+++ geronimo/trunk/modules/axis-builder/src/test/org/apache/geronimo/axis/builder/ParsingTest.java Wed Sep 28 15:09:15 2005
@@ -34,6 +34,7 @@
 import org.apache.xmlbeans.SchemaTypeLoader;
 import org.apache.geronimo.schema.SchemaConversionUtils;
 import org.apache.geronimo.common.DeploymentException;
+import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
 
 /**
  * @version $Rev:  $ $Date:  $
@@ -64,7 +65,7 @@
     }
 
     private Map parse(File schema1) throws IOException, XmlException, DeploymentException, URISyntaxException {
-        XmlObject xmlObject = SchemaConversionUtils.parse(schema1.toURL());
+        XmlObject xmlObject = XmlBeansUtil.parse(schema1.toURL());
         Collection errors = new ArrayList();
         XmlOptions xmlOptions = new XmlOptions();
         xmlOptions.setErrorListener(errors);
@@ -97,6 +98,17 @@
         System.out.println("ELEMENT MAP");
         System.out.println(elements);
         assertEquals(1, elements.size());
+    }
+
+    public void testAnyElements() throws Exception {
+        File schema1 = new File(basedir, "src/test-resources/schema/schema5.xsd");
+        System.out.println("SCHEMA 5");
+        Map map = parse(schema1);
+        assertEquals(8, map.size());
+        Map elements = schemaInfoBuilder.getElementToTypeMap();
+        System.out.println("ELEMENT MAP");
+        System.out.println(elements);
+        assertEquals(4, elements.size());
     }
 
 }

Modified: geronimo/trunk/modules/axis/src/etc/META-INF/geronimo-service.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis/src/etc/META-INF/geronimo-service.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/axis/src/etc/META-INF/geronimo-service.xml (original)
+++ geronimo/trunk/modules/axis/src/etc/META-INF/geronimo-service.xml Wed Sep 28 15:09:15 2005
@@ -18,7 +18,7 @@
 
 
 <!--dependencies for axis-->
-<service xmlns="http://geronimo.apache.org/xml/ns/deployment">
+<service xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0">
 
     <dependency>
         <uri>axis/jars/axis-${axis_version}.jar</uri>

Modified: geronimo/trunk/modules/axis/src/plans/plan1.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis/src/plans/plan1.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/axis/src/plans/plan1.xml (original)
+++ geronimo/trunk/modules/axis/src/plans/plan1.xml Wed Sep 28 15:09:15 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration
-    xmlns="http://geronimo.apache.org/xml/ns/deployment"
+    xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
     configId="test/plan1"
     >
     <dependency>
@@ -8,7 +8,7 @@
         <artifactId>geronimo-kernel</artifactId>
         <version>DEV</version>
     </dependency>
-    
+
     <!-- Use the default deployer -->
     <gbean gbeanName="geronimo.deployer:role=Builder,type=EAR,config=org/apache/geronimo/Server" class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
         <attribute name="defaultParentId">org/apache/geronimo/Server</attribute>

Modified: geronimo/trunk/modules/client-builder/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/client-builder/maven.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/client-builder/maven.xml (original)
+++ geronimo/trunk/modules/client-builder/maven.xml Wed Sep 28 15:09:15 2005
@@ -27,7 +27,7 @@
 
     <preGoal name="java:compile">
         <xmlbeans:schema2java
-            maven.xmlbeans2.sourceschema="schema/geronimo-application-client.xsd"/>
+            maven.xmlbeans2.sourceschema="schema/geronimo-application-client-1.0.xsd"/>
         <mkdir dir="${basedir}/target/xmlbeans-classes"/>
         <mkdir dir="${basedir}/target/xmlbeans-classes/schemaorg_apache_xmlbeans"/>
         <copy todir="${basedir}/target/xmlbeans-classes/schemaorg_apache_xmlbeans">

Modified: geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java (original)
+++ geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java Wed Sep 28 15:09:15 2005
@@ -41,9 +41,11 @@
 import org.apache.geronimo.client.StaticJndiContextPlugin;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.deployment.DeploymentContext;
+import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
 import org.apache.geronimo.deployment.service.ServiceConfigBuilder;
 import org.apache.geronimo.deployment.util.DeploymentUtil;
 import org.apache.geronimo.deployment.util.NestedJarFile;
+import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
 import org.apache.geronimo.deployment.xbeans.DependencyType;
 import org.apache.geronimo.deployment.xbeans.GbeanType;
 import org.apache.geronimo.gbean.GBeanData;
@@ -80,6 +82,7 @@
 import org.apache.geronimo.xbeans.j2ee.MessageDestinationType;
 import org.apache.xmlbeans.XmlException;
 import org.apache.xmlbeans.XmlObject;
+import org.apache.xmlbeans.XmlCursor;
 
 
 /**
@@ -159,7 +162,7 @@
         //we found application-client.xml, if it won't parse it's an error.
         try {
             // parse it
-            XmlObject xmlObject = SchemaConversionUtils.parse(specDD);
+            XmlObject xmlObject = XmlBeansUtil.parse(specDD);
             ApplicationClientDocument appClientDoc = SchemaConversionUtils.convertToApplicationClientSchema(xmlObject);
             appClient = appClientDoc.getApplicationClient();
         } catch (XmlException e) {
@@ -195,34 +198,26 @@
 
     GerApplicationClientType getGeronimoAppClient(Object plan, JarFile moduleFile, boolean standAlone, String targetPath, ApplicationClientType appClient, URI earConfigId) throws DeploymentException {
         GerApplicationClientType gerAppClient = null;
+        XmlObject rawPlan = null;
         try {
             // load the geronimo-application-client.xml from either the supplied plan or from the earFile
             try {
                 if (plan instanceof XmlObject) {
-                    gerAppClient = (GerApplicationClientType) SchemaConversionUtils.getNestedObjectAsType((XmlObject) plan,
-                            "application-client",
-                            GerApplicationClientType.type);
+                    rawPlan = (XmlObject) plan;
                 } else {
-                    GerApplicationClientDocument gerAppClientDoc = null;
                     if (plan != null) {
-                        gerAppClientDoc = GerApplicationClientDocument.Factory.parse((File) plan);
+                        rawPlan = XmlBeansUtil.parse((File) plan);
                     } else {
                         URL path = DeploymentUtil.createJarURL(moduleFile, "META-INF/geronimo-application-client.xml");
-                        gerAppClientDoc = GerApplicationClientDocument.Factory.parse(path);
-                    }
-                    if (gerAppClientDoc != null) {
-                        gerAppClient = gerAppClientDoc.getApplicationClient();
+                        rawPlan = XmlBeansUtil.parse(path);
                     }
                 }
             } catch (IOException e) {
             }
 
             // if we got one extract the validate it otherwise create a default one
-            if (gerAppClient != null) {
-                gerAppClient = (GerApplicationClientType) SchemaConversionUtils.convertToGeronimoSecuritySchema(gerAppClient);
-                gerAppClient = (GerApplicationClientType) SchemaConversionUtils.convertToGeronimoNamingSchema(gerAppClient);
-                gerAppClient = (GerApplicationClientType) SchemaConversionUtils.convertToGeronimoServiceSchema(gerAppClient);
-                SchemaConversionUtils.validateDD(gerAppClient);
+            if (rawPlan != null) {
+                gerAppClient = (GerApplicationClientType) SchemaConversionUtils.fixGeronimoSchema(rawPlan, "application-client", GerApplicationClientType.type);
             } else {
                 String path;
                 if (standAlone) {

Copied: geronimo/trunk/modules/client-builder/src/schema/geronimo-application-client-1.0.xsd (from r292006, geronimo/trunk/modules/client-builder/src/schema/geronimo-application-client.xsd)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/client-builder/src/schema/geronimo-application-client-1.0.xsd?p2=geronimo/trunk/modules/client-builder/src/schema/geronimo-application-client-1.0.xsd&p1=geronimo/trunk/modules/client-builder/src/schema/geronimo-application-client.xsd&r1=292006&r2=292333&rev=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/client-builder/src/schema/geronimo-application-client.xsd (original)
+++ geronimo/trunk/modules/client-builder/src/schema/geronimo-application-client-1.0.xsd Wed Sep 28 15:09:15 2005
@@ -17,21 +17,21 @@
 -->
 <!-- @version $Rev: 46019 $ $Date: 2004-09-14 02:56:06 -0700 (Tue, 14 Sep 2004) $ -->
 <xs:schema
-    xmlns:geronimo="http://geronimo.apache.org/xml/ns/j2ee/application-client"
-    targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/application-client"
-    xmlns:naming="http://geronimo.apache.org/xml/ns/naming"
-    xmlns:connector="http://geronimo.apache.org/xml/ns/j2ee/connector"
-    xmlns:security="http://geronimo.apache.org/xml/ns/security"
-    xmlns:sys="http://geronimo.apache.org/xml/ns/deployment"
+    xmlns:geronimo="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.0"
+    targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.0"
+    xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.0"
+    xmlns:connector="http://geronimo.apache.org/xml/ns/j2ee/connector-1.0"
+    xmlns:security="http://geronimo.apache.org/xml/ns/security-1.0"
+    xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.0"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     elementFormDefault="qualified"
     attributeFormDefault="unqualified"
     version="1.0">
 
-    <xs:import namespace="http://geronimo.apache.org/xml/ns/naming" schemaLocation="geronimo-naming.xsd"/>
-    <xs:import namespace="http://geronimo.apache.org/xml/ns/security" schemaLocation="geronimo-security.xsd"/>
-    <xs:import namespace="http://geronimo.apache.org/xml/ns/j2ee/connector" schemaLocation="geronimo-connector_1_5.xsd"/>
-    <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment" schemaLocation="geronimo-config.xsd"/>
+    <xs:import namespace="http://geronimo.apache.org/xml/ns/naming-1.0" schemaLocation="geronimo-naming-1.0.xsd"/>
+    <xs:import namespace="http://geronimo.apache.org/xml/ns/security-1.0" schemaLocation="geronimo-security-1.0.xsd"/>
+    <xs:import namespace="http://geronimo.apache.org/xml/ns/j2ee/connector-1.0" schemaLocation="geronimo-connector-1.0.xsd"/>
+    <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.0" schemaLocation="geronimo-config-1.0.xsd"/>
 
     <xs:element name="application-client" type="geronimo:application-clientType"/>
 

Modified: geronimo/trunk/modules/client-builder/src/schema/xmlconfig.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/client-builder/src/schema/xmlconfig.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/client-builder/src/schema/xmlconfig.xml (original)
+++ geronimo/trunk/modules/client-builder/src/schema/xmlconfig.xml Wed Sep 28 15:09:15 2005
@@ -18,20 +18,20 @@
 <!-- @version $Rev: 46019 $ $Date: 2004-09-14 02:56:06 -0700 (Tue, 14 Sep 2004) $ -->
 <xb:config xmlns:xb="http://www.bea.com/2002/09/xbean/config">
 
-    <xb:namespace uri="http://geronimo.apache.org/xml/ns/j2ee/application-client">
+    <xb:namespace uri="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.0">
         <xb:package>org.apache.geronimo.xbeans.geronimo.client</xb:package>
         <xb:prefix>Ger</xb:prefix>
     </xb:namespace>
 
     <!--this should be unnecessary.  Probably needs xmlbeans plugin to reuse the naming classes rather than generating duplicates-->
-    <xb:namespace uri="http://geronimo.apache.org/xml/ns/naming">
-        <xb:package>org.apache.geronimo.xbeans.geronimo.naming</xb:package>
-        <xb:prefix>Ger</xb:prefix>
-    </xb:namespace>
-
-    <xb:namespace uri="http://geronimo.apache.org/xml/ns/j2ee/connector">
-        <xb:package>org.apache.geronimo.xbeans.geronimo</xb:package>
-        <xb:prefix>Ger</xb:prefix>
-    </xb:namespace>
+<!--    <xb:namespace uri="http://geronimo.apache.org/xml/ns/naming-1.0">-->
+<!--        <xb:package>org.apache.geronimo.xbeans.geronimo.naming</xb:package>-->
+<!--        <xb:prefix>Ger</xb:prefix>-->
+<!--    </xb:namespace>-->
+<!---->
+<!--    <xb:namespace uri="http://geronimo.apache.org/xml/ns/j2ee/connector-1.0">-->
+<!--        <xb:package>org.apache.geronimo.xbeans.geronimo</xb:package>-->
+<!--        <xb:prefix>Ger</xb:prefix>-->
+<!--    </xb:namespace>-->
 
 </xb:config>

Modified: geronimo/trunk/modules/client-builder/src/test-resources/plans/plan1.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/client-builder/src/test-resources/plans/plan1.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/client-builder/src/test-resources/plans/plan1.xml (original)
+++ geronimo/trunk/modules/client-builder/src/test-resources/plans/plan1.xml Wed Sep 28 15:09:15 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client"
+<application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.0"
     clientConfigId="test-client"
     configId="client"
     parentId="org/apache/geronimo/DefaultDatabase">

Modified: geronimo/trunk/modules/client-builder/src/test-resources/plans/plan2.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/client-builder/src/test-resources/plans/plan2.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/client-builder/src/test-resources/plans/plan2.xml (original)
+++ geronimo/trunk/modules/client-builder/src/test-resources/plans/plan2.xml Wed Sep 28 15:09:15 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client"
+<application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.0"
     clientConfigId="test-client"
     configId="client"
     parentId="org/apache/geronimo/DefaultDatabase">
@@ -9,7 +9,7 @@
     </resource-ref>
     <resource>
         <external-rar>tranql/rars/tranql-connector-1.0-SNAPSHOT</external-rar>
-        <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"
+        <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.0"
             configId="org/apache/geronimo/DefaultDatabase"
             parentId="org/apache/geronimo/Server">
 

Modified: geronimo/trunk/modules/connector-builder/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/maven.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/maven.xml (original)
+++ geronimo/trunk/modules/connector-builder/maven.xml Wed Sep 28 15:09:15 2005
@@ -28,7 +28,7 @@
 
     <preGoal name="java:compile">
         <xmlbeans:schema2java
-            maven.xmlbeans2.sourceschema="schema/geronimo-connector.xsd"/>
+            maven.xmlbeans2.sourceschema="schema/geronimo-connector-1.0.xsd"/>
         <mkdir dir="${basedir}/target/xmlbeans-classes"/>
         <mkdir dir="${basedir}/target/xmlbeans-classes/schemaorg_apache_xmlbeans"/>
         <copy todir="${basedir}/target/xmlbeans-classes/schemaorg_apache_xmlbeans">

Modified: geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java (original)
+++ geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java Wed Sep 28 15:09:15 2005
@@ -64,9 +64,11 @@
 import org.apache.geronimo.connector.outbound.connectionmanagerconfig.XATransactions;
 import org.apache.geronimo.deployment.service.ServiceConfigBuilder;
 import org.apache.geronimo.deployment.util.DeploymentUtil;
+import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
 import org.apache.geronimo.deployment.xbeans.DependencyType;
 import org.apache.geronimo.deployment.xbeans.GbeanType;
 import org.apache.geronimo.deployment.DeploymentContext;
+import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
 import org.apache.geronimo.gbean.DynamicGAttributeInfo;
 import org.apache.geronimo.gbean.GAttributeInfo;
 import org.apache.geronimo.gbean.GBeanData;
@@ -178,7 +180,7 @@
         //we found ra.xml, if it won't parse it's an error.
         try {
             // parse it
-            XmlObject xmlObject = SchemaConversionUtils.parse(specDD);
+            XmlObject xmlObject = XmlBeansUtil.parse(specDD);
             ConnectorDocument connectorDoc = SchemaConversionUtils.convertToConnectorSchema(xmlObject);
             connector = connectorDoc.getConnector();
         } catch (XmlException e) {
@@ -194,11 +196,15 @@
                             GerConnectorType.type);
                 } else {
                     GerConnectorDocument gerConnectorDoc = null;
+                    ArrayList errors = new ArrayList();
                     if (plan != null) {
-                        gerConnectorDoc = GerConnectorDocument.Factory.parse((File) plan);
+                        gerConnectorDoc = GerConnectorDocument.Factory.parse((File) plan, XmlBeansUtil.createXmlOptions(errors));
                     } else {
                         URL path = DeploymentUtil.createJarURL(moduleFile, "META-INF/geronimo-ra.xml");
-                        gerConnectorDoc = GerConnectorDocument.Factory.parse(path);
+                        gerConnectorDoc = GerConnectorDocument.Factory.parse(path, XmlBeansUtil.createXmlOptions(errors));
+                    }
+                    if (errors.size() > 0) {
+                        throw new DeploymentException("Could not parse connector doc: " + errors);
                     }
                     if (gerConnectorDoc != null) {
                         gerConnector = gerConnectorDoc.getConnector();
@@ -213,9 +219,13 @@
                         " (either META-INF/geronimo-ra.xml in the RAR file or a standalone deployment plan passed to the deployer).");
             }
             ConnectorPlanRectifier.rectifyPlan(gerConnector);
-            gerConnector = (GerConnectorType) SchemaConversionUtils.convertToGeronimoServiceSchema(gerConnector);
-            //for workmanager
-            gerConnector = (GerConnectorType) SchemaConversionUtils.convertToGeronimoNamingSchema(gerConnector);
+            XmlCursor cursor = gerConnector.newCursor();
+            try {
+                SchemaConversionUtils.convertToGeronimoSubSchemas(cursor);
+            } finally {
+                cursor.dispose();
+            }
+
             SchemaConversionUtils.validateDD(gerConnector);
         } catch (XmlException e) {
             throw new DeploymentException(e);

Copied: geronimo/trunk/modules/connector-builder/src/schema/geronimo-connector-1.0.xsd (from r292006, geronimo/trunk/modules/connector-builder/src/schema/geronimo-connector.xsd)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/src/schema/geronimo-connector-1.0.xsd?p2=geronimo/trunk/modules/connector-builder/src/schema/geronimo-connector-1.0.xsd&p1=geronimo/trunk/modules/connector-builder/src/schema/geronimo-connector.xsd&r1=292006&r2=292333&rev=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/schema/geronimo-connector.xsd (original)
+++ geronimo/trunk/modules/connector-builder/src/schema/geronimo-connector-1.0.xsd Wed Sep 28 15:09:15 2005
@@ -17,22 +17,22 @@
 -->
 
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema"
-    xmlns:ger="http://geronimo.apache.org/xml/ns/j2ee/connector"
-    xmlns:naming="http://geronimo.apache.org/xml/ns/naming"
-    xmlns:sys="http://geronimo.apache.org/xml/ns/deployment"
-    targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/connector"
+    xmlns:ger="http://geronimo.apache.org/xml/ns/j2ee/connector-1.0"
+    xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.0"
+    xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.0"
+    targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/connector-1.0"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     elementFormDefault="qualified"
     attributeFormDefault="unqualified">
 
-    <xs:import namespace="http://geronimo.apache.org/xml/ns/naming" schemaLocation="geronimo-naming.xsd"/>
-    <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment" schemaLocation="geronimo-config.xsd"/>
+    <xs:import namespace="http://geronimo.apache.org/xml/ns/naming-1.0" schemaLocation="geronimo-naming-1.0.xsd"/>
+    <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.0" schemaLocation="geronimo-config-1.0.xsd"/>
 
     <xs:annotation>
         <xs:documentation>
             <![CDATA[
             documents using this schema should start like:
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.0"
     version="1.5">
 
           @(#)geronimo-connector_1_5.xsds

Modified: geronimo/trunk/modules/connector-builder/src/schema/xmlconfig.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/src/schema/xmlconfig.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/schema/xmlconfig.xml (original)
+++ geronimo/trunk/modules/connector-builder/src/schema/xmlconfig.xml Wed Sep 28 15:09:15 2005
@@ -1,7 +1,7 @@
 <xb:config xmlns:xb="http://www.bea.com/2002/09/xbean/config"
     >
 
-    <xb:namespace uri="http://geronimo.apache.org/xml/ns/j2ee/connector">
+    <xb:namespace uri="http://geronimo.apache.org/xml/ns/j2ee/connector-1.0">
         <xb:package>org.apache.geronimo.xbeans.geronimo</xb:package>
         <xb:prefix>Ger</xb:prefix>
     </xb:namespace>

Modified: geronimo/trunk/modules/connector-builder/src/test-data/connector_1_0/geronimo-ra.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/src/test-data/connector_1_0/geronimo-ra.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/test-data/connector_1_0/geronimo-ra.xml (original)
+++ geronimo/trunk/modules/connector-builder/src/test-data/connector_1_0/geronimo-ra.xml Wed Sep 28 15:09:15 2005
@@ -16,7 +16,7 @@
     limitations under the License.
 -->
 
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.0"
     configId="org/apache/geronimo/j2ee/deployment/test"
     parentId="org/apache/geronimo/Server">
 

Modified: geronimo/trunk/modules/connector-builder/src/test-data/connector_1_5/geronimo-ra.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/src/test-data/connector_1_5/geronimo-ra.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/test-data/connector_1_5/geronimo-ra.xml (original)
+++ geronimo/trunk/modules/connector-builder/src/test-data/connector_1_5/geronimo-ra.xml Wed Sep 28 15:09:15 2005
@@ -16,7 +16,7 @@
     limitations under the License.
 -->
 
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.0"
     configId="org/apache/geronimo/j2ee/deployment/test"
     parentId="org/apache/geronimo/Server">
 

Modified: geronimo/trunk/modules/connector-builder/src/test-data/data/dup-admin-object-name.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/src/test-data/data/dup-admin-object-name.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/test-data/data/dup-admin-object-name.xml (original)
+++ geronimo/trunk/modules/connector-builder/src/test-data/data/dup-admin-object-name.xml Wed Sep 28 15:09:15 2005
@@ -16,7 +16,7 @@
     limitations under the License.
 -->
 
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.0"
     configId="org/apache/geronimo/j2ee/deployment/test"
     parentId="org/apache/geronimo/Server">
 

Modified: geronimo/trunk/modules/connector-builder/src/test-data/data/dup-connectionfactoryinstance-name.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/src/test-data/data/dup-connectionfactoryinstance-name.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/test-data/data/dup-connectionfactoryinstance-name.xml (original)
+++ geronimo/trunk/modules/connector-builder/src/test-data/data/dup-connectionfactoryinstance-name.xml Wed Sep 28 15:09:15 2005
@@ -16,7 +16,7 @@
     limitations under the License.
 -->
 
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.0"
     configId="org/apache/geronimo/j2ee/deployment/test"
     parentId="org/apache/geronimo/Server">
 

Modified: geronimo/trunk/modules/connector-builder/src/test-data/data/dup-resourceadapter-name.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/src/test-data/data/dup-resourceadapter-name.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/test-data/data/dup-resourceadapter-name.xml (original)
+++ geronimo/trunk/modules/connector-builder/src/test-data/data/dup-resourceadapter-name.xml Wed Sep 28 15:09:15 2005
@@ -16,7 +16,7 @@
     limitations under the License.
 -->
 
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.0"
     configId="org/apache/geronimo/j2ee/deployment/test"
     parentId="org/apache/geronimo/Server">
 

Modified: geronimo/trunk/modules/connector-builder/src/test-data/data/external-application-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/src/test-data/data/external-application-plan.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/test-data/data/external-application-plan.xml (original)
+++ geronimo/trunk/modules/connector-builder/src/test-data/data/external-application-plan.xml Wed Sep 28 15:09:15 2005
@@ -16,14 +16,14 @@
     limitations under the License.
 -->
 
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application"
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
     configId="org/apache/geronimo/j2ee/deployment/test"
     >
     <!--parentId="org/apache/geronimo/Server"-->
 
     <module>
         <connector>test-rar-10-noger.rar</connector>
-        <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"
+        <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.0"
             configId="org/apache/geronimo/j2ee/deployment/test"
             parentId="org/apache/geronimo/Server">
 
@@ -83,7 +83,7 @@
     </module>
     <module>
         <connector>test-rar-15-noger.rar</connector>
-        <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"
+        <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.0"
             configId="org/apache/geronimo/j2ee/deployment/test"
             parentId="org/apache/geronimo/Server">
 

Modified: geronimo/trunk/modules/connector-builder/src/test-data/data/old-schema-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/src/test-data/data/old-schema-plan.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/test-data/data/old-schema-plan.xml (original)
+++ geronimo/trunk/modules/connector-builder/src/test-data/data/old-schema-plan.xml Wed Sep 28 15:09:15 2005
@@ -16,7 +16,7 @@
     limitations under the License.
 -->
 
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.0"
     version="1.5"
     configId="org/apache/geronimo/j2ee/deployment/test"
     parentId="org/apache/geronimo/Server">

Modified: geronimo/trunk/modules/connector-builder/src/test-data/ear/geronimo-application.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/src/test-data/ear/geronimo-application.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/test-data/ear/geronimo-application.xml (original)
+++ geronimo/trunk/modules/connector-builder/src/test-data/ear/geronimo-application.xml Wed Sep 28 15:09:15 2005
@@ -16,7 +16,7 @@
     limitations under the License.
 -->
 
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application"
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
     configId="org/apache/geronimo/j2ee/deployment/test"
     parentId="org/apache/geronimo/Server">
 </application>

Modified: geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/PlanParsingTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/PlanParsingTest.java?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/PlanParsingTest.java (original)
+++ geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/PlanParsingTest.java Wed Sep 28 15:09:15 2005
@@ -7,6 +7,8 @@
 import org.apache.geronimo.xbeans.geronimo.GerConnectorDocument;
 import org.apache.geronimo.xbeans.geronimo.GerConnectorType;
 import org.apache.geronimo.xbeans.j2ee.ConnectorDocument;
+import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
+import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
 import org.apache.xmlbeans.XmlException;
 import org.apache.xmlbeans.XmlObject;
 
@@ -19,17 +21,17 @@
     public void testLoadGeronimoDeploymentDescriptor10() throws Exception {
         File geronimoDD = new File(basedir, "src/test-data/connector_1_0/geronimo-ra.xml");
         assertTrue(geronimoDD.exists());
-        XmlObject plan = SchemaConversionUtils.parse(geronimoDD.toURL());
+        XmlObject plan = XmlBeansUtil.parse(geronimoDD.toURL());
         GerConnectorDocument connectorDocument = (GerConnectorDocument) plan.changeType(GerConnectorDocument.type);
-        connectorDocument = (GerConnectorDocument)SchemaConversionUtils.convertToGeronimoServiceSchema(connectorDocument);
-        SchemaConversionUtils.validateDD(connectorDocument);
+        GerConnectorType connector = (GerConnectorType) SchemaConversionUtils.fixGeronimoSchema(connectorDocument, "connector", GerConnectorType.type);
+        SchemaConversionUtils.validateDD(connector);
         assertEquals(1, connectorDocument.getConnector().getResourceadapterArray().length);
     }
 
     public void testLoadJ2eeDeploymentDescriptor() throws Exception {
         File j2eeDD = new File(basedir, "src/test-data/connector_1_5/ra.xml");
         assertTrue(j2eeDD.exists());
-        XmlObject plan = SchemaConversionUtils.parse(j2eeDD.toURL());
+        XmlObject plan = XmlBeansUtil.parse(j2eeDD.toURL());
         ConnectorDocument connectorDocument = (ConnectorDocument) plan.changeType(ConnectorDocument.type);
         assertNotNull(connectorDocument.getConnector().getResourceadapter());
         SchemaConversionUtils.validateDD(connectorDocument);
@@ -38,19 +40,17 @@
     public void testLoadGeronimoDeploymentDescriptor15() throws Exception {
         File geronimoDD = new File(basedir, "src/test-data/connector_1_5/geronimo-ra.xml");
         assertTrue(geronimoDD.exists());
-        XmlObject plan = SchemaConversionUtils.parse(geronimoDD.toURL());
+        XmlObject plan = XmlBeansUtil.parse(geronimoDD.toURL());
         GerConnectorDocument connectorDocument = (GerConnectorDocument) plan.changeType(GerConnectorDocument.type);
-        connectorDocument = (GerConnectorDocument) SchemaConversionUtils.convertToGeronimoServiceSchema(connectorDocument);
-        connectorDocument = (GerConnectorDocument) SchemaConversionUtils.convertToGeronimoNamingSchema(connectorDocument);
-        assertEquals(1, connectorDocument.getConnector().getResourceadapterArray().length);
-        SchemaConversionUtils.validateDD(connectorDocument);
+        GerConnectorType connector = (GerConnectorType) SchemaConversionUtils.fixGeronimoSchema(connectorDocument, "connector", GerConnectorType.type);
+        assertEquals(1, connector.getResourceadapterArray().length);
     }
 
     public void testResourceAdapterNameUniqueness() throws Exception {
         File resourcePlan = new File(basedir, "src/test-data/data/dup-resourceadapter-name.xml");
         assertTrue(resourcePlan.exists());
 
-        XmlObject plan = SchemaConversionUtils.parse(resourcePlan.toURL());
+        XmlObject plan = XmlBeansUtil.parse(resourcePlan.toURL());
         GerConnectorDocument doc = (GerConnectorDocument) plan.changeType(GerConnectorDocument.type);
         if (doc == null) {
             doc = (GerConnectorDocument) plan;
@@ -67,7 +67,7 @@
         File resourcePlan = new File(basedir, "src/test-data/data/dup-connectionfactoryinstance-name.xml");
         assertTrue(resourcePlan.exists());
 
-        XmlObject plan = SchemaConversionUtils.parse(resourcePlan.toURL());
+        XmlObject plan = XmlBeansUtil.parse(resourcePlan.toURL());
         GerConnectorDocument doc = (GerConnectorDocument) plan.changeType(GerConnectorDocument.type);
         if (doc == null) {
             doc = (GerConnectorDocument) plan;
@@ -84,7 +84,7 @@
         File resourcePlan = new File(basedir, "src/test-data/data/dup-admin-object-name.xml");
         assertTrue(resourcePlan.exists());
 
-        XmlObject plan = SchemaConversionUtils.parse(resourcePlan.toURL());
+        XmlObject plan = XmlBeansUtil.parse(resourcePlan.toURL());
         GerConnectorDocument doc = (GerConnectorDocument) plan.changeType(GerConnectorDocument.type);
         if (doc == null) {
             doc = (GerConnectorDocument) plan;
@@ -101,17 +101,14 @@
         File resourcePlan = new File(basedir, "src/test-data/data/old-schema-plan.xml");
         assertTrue(resourcePlan.exists());
 
-        XmlObject plan = SchemaConversionUtils.parse(resourcePlan.toURL());
+        XmlObject plan = XmlBeansUtil.parse(resourcePlan.toURL());
         GerConnectorDocument doc = (GerConnectorDocument) plan.changeType(GerConnectorDocument.type);
         if (doc == null) {
             doc = (GerConnectorDocument) plan;
         }
         GerConnectorType gerConnector = doc.getConnector();
         ConnectorPlanRectifier.rectifyPlan(gerConnector);
-        gerConnector = (GerConnectorType) SchemaConversionUtils.convertToGeronimoServiceSchema(gerConnector);
-        //for workmanager
-        gerConnector = (GerConnectorType) SchemaConversionUtils.convertToGeronimoNamingSchema(gerConnector);
-            SchemaConversionUtils.validateDD(doc);
+        gerConnector = (GerConnectorType) SchemaConversionUtils.fixGeronimoSchema(gerConnector, "connector", GerConnectorType.type);
     }
 
 }

Modified: geronimo/trunk/modules/deployment/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deployment/project.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/deployment/project.xml (original)
+++ geronimo/trunk/modules/deployment/project.xml Wed Sep 28 15:09:15 2005
@@ -41,6 +41,19 @@
     <!-- ============ -->
 
     <dependencies>
+
+        <dependency>
+            <groupId>xmlbeans</groupId>
+            <artifactId>xbean</artifactId>
+            <version>${xmlbeans_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+            <version>${stax_api_version}</version>
+        </dependency>
+
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-kernel</artifactId>
@@ -107,7 +120,7 @@
                 <exclude>**/Abstract*.java</exclude>
             </excludes>
             <resources>
-<!--   
+<!--
              <resource>
                     <directory>${basedir}/src/schema</directory>
                     <includes>

Modified: geronimo/trunk/modules/j2ee-builder/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/maven.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/maven.xml (original)
+++ geronimo/trunk/modules/j2ee-builder/maven.xml Wed Sep 28 15:09:15 2005
@@ -27,7 +27,7 @@
 
     <preGoal name="java:compile">
         <xmlbeans:schema2java
-            maven.xmlbeans2.sourceschema="schema/geronimo-application.xsd"/>
+            maven.xmlbeans2.sourceschema="schema/geronimo-application-1.0.xsd"/>
         <mkdir dir="${basedir}/target/xmlbeans-classes"/>
         <mkdir dir="${basedir}/target/xmlbeans-classes/schemaorg_apache_xmlbeans"/>
         <copy todir="${basedir}/target/xmlbeans-classes/schemaorg_apache_xmlbeans">

Modified: geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java (original)
+++ geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java Wed Sep 28 15:09:15 2005
@@ -35,7 +35,7 @@
     private Collection resourceModules;
 
     public AppClientModule(boolean standAlone, URI configId, List parentId, JarFile moduleFile, String targetPath, XmlObject specDD, XmlObject vendorDD, String originalSpecDD) {
-        super(standAlone, configId, parentId, moduleFile, targetPath, specDD, vendorDD, originalSpecDD);
+        super(standAlone, configId, parentId, moduleFile, targetPath, specDD, vendorDD, originalSpecDD, null);
     }
 
     public ConfigurationModuleType getType() {

Modified: geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ConnectorModule.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ConnectorModule.java?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ConnectorModule.java (original)
+++ geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ConnectorModule.java Wed Sep 28 15:09:15 2005
@@ -31,7 +31,7 @@
  */
 public class ConnectorModule extends Module {
     public ConnectorModule(boolean standAlone, URI configId, List parentId, JarFile moduleFile, String targetPath, XmlObject specDD, XmlObject vendorDD, String originalSpecDD) {
-        super(standAlone, configId, parentId, moduleFile, targetPath, specDD, vendorDD, originalSpecDD);
+        super(standAlone, configId, parentId, moduleFile, targetPath, specDD, vendorDD, originalSpecDD, null);
     }
 
     public ConfigurationModuleType getType() {

Modified: geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java (original)
+++ geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java Wed Sep 28 15:09:15 2005
@@ -43,6 +43,7 @@
 import org.apache.geronimo.deployment.service.ServiceConfigBuilder;
 import org.apache.geronimo.deployment.util.DeploymentUtil;
 import org.apache.geronimo.deployment.util.NestedJarFile;
+import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
 import org.apache.geronimo.deployment.xbeans.DependencyType;
 import org.apache.geronimo.deployment.xbeans.GbeanType;
 import org.apache.geronimo.gbean.GBeanData;
@@ -73,8 +74,6 @@
  */
 public class EARConfigBuilder implements ConfigurationBuilder {
 
-    private static final QName APPLICATION_QNAME = new QName("http://geronimo.apache.org/xml/ns/j2ee/application", "application");
-
     private final Kernel kernel;
     private final Repository repository;
     private final ModuleBuilder ejbConfigBuilder;
@@ -167,7 +166,7 @@
             }
             //we found something called application.xml in the right place, if we can't parse it it's an error
             try {
-                XmlObject xmlObject = SchemaConversionUtils.parse(specDD);
+                XmlObject xmlObject = XmlBeansUtil.parse(specDD);
                 application = SchemaConversionUtils.convertToApplicationSchema(xmlObject).getApplication();
             } catch (XmlException e) {
                 throw new DeploymentException("Could not parse application.xml", e);
@@ -178,36 +177,25 @@
         try {
             // load the geronimo-application.xml from either the supplied plan or from the earFile
             GerApplicationDocument gerApplicationDoc = null;
+            XmlObject rawPlan = null;
             try {
                 if (planFile != null) {
-                    XmlObject xml = SchemaConversionUtils.parse(planFile.toURL());
-                    XmlCursor cursor = xml.newCursor();
-                    try {
-                        cursor.toFirstChild();
-                        QName qname = cursor.getName();
-                        if (APPLICATION_QNAME.equals(qname)) {
-                            gerApplicationDoc = (GerApplicationDocument) xml.changeType(GerApplicationDocument.type);
-                        } else {
-                            return null;
-                        }
-                    } finally {
-                        cursor.dispose();
+                    rawPlan = XmlBeansUtil.parse(planFile.toURL());
+                    gerApplication = (GerApplicationType) SchemaConversionUtils.fixGeronimoSchema(rawPlan, "application", GerApplicationType.type);
+                    if (gerApplication == null) {
+                        return null;
                     }
                 } else {
                     URL path = DeploymentUtil.createJarURL(earFile, "META-INF/geronimo-application.xml");
-                    gerApplicationDoc = GerApplicationDocument.Factory.parse(path);
+                    rawPlan = XmlBeansUtil.parse(path);
+                    gerApplication = (GerApplicationType) SchemaConversionUtils.fixGeronimoSchema(rawPlan, "application", GerApplicationType.type);
                 }
             } catch (IOException e) {
+                //TODO isn't this an error?
             }
 
             // if we got one extract the validate it otherwise create a default one
-            if (gerApplicationDoc != null) {
-                gerApplicationDoc = (GerApplicationDocument) SchemaConversionUtils.convertToGeronimoServiceSchema(gerApplicationDoc);
-                gerApplicationDoc = (GerApplicationDocument) SchemaConversionUtils.convertToGeronimoNamingSchema(gerApplicationDoc);
-                gerApplicationDoc = (GerApplicationDocument) SchemaConversionUtils.convertToGeronimoSecuritySchema(gerApplicationDoc);
-                SchemaConversionUtils.validateDD(gerApplicationDoc);
-                gerApplication = gerApplicationDoc.getApplication();
-            } else {
+            if (gerApplication == null) {
                 gerApplication = createDefaultPlan(application, earFile);
             }
         } catch (XmlException e) {

Modified: geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBModule.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBModule.java?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBModule.java (original)
+++ geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBModule.java Wed Sep 28 15:09:15 2005
@@ -31,7 +31,7 @@
  */
 public class EJBModule extends Module {
     public EJBModule(boolean standAlone, URI configId, List parentId, JarFile moduleFile, String targetPath, XmlObject specDD, XmlObject vendorDD, String originalSpecDD) {
-        super(standAlone, configId, parentId, moduleFile, targetPath, specDD, vendorDD, originalSpecDD);
+        super(standAlone, configId, parentId, moduleFile, targetPath, specDD, vendorDD, originalSpecDD, null);
     }
 
     public ConfigurationModuleType getType() {

Modified: geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/Module.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/Module.java?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/Module.java (original)
+++ geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/Module.java Wed Sep 28 15:09:15 2005
@@ -43,10 +43,11 @@
     private final XmlObject specDD;
     private final XmlObject vendorDD;
     private final String originalSpecDD;
+    private final String namespace;
 
     private URI uniqueModuleLocation;
 
-    protected Module(boolean standAlone, URI configId, List parentId, JarFile moduleFile, String targetPath, XmlObject specDD, XmlObject vendorDD, String originalSpecDD) {
+    protected Module(boolean standAlone, URI configId, List parentId, JarFile moduleFile, String targetPath, XmlObject specDD, XmlObject vendorDD, String originalSpecDD, String namespace) {
         assert targetPath != null: "targetPath is null";
 
         this.standAlone = standAlone;
@@ -57,6 +58,7 @@
         this.specDD = specDD;
         this.vendorDD = vendorDD;
         this.originalSpecDD = originalSpecDD;
+        this.namespace = namespace;
 
         if (standAlone) {
             name = configId.toString();
@@ -113,6 +115,10 @@
 
     public String getOriginalSpecDD() {
         return originalSpecDD;
+    }
+
+    public String getNamespace() {
+        return namespace;
     }
 
     public int hashCode() {

Modified: geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java (original)
+++ geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java Wed Sep 28 15:09:15 2005
@@ -37,6 +37,8 @@
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.schema.SchemaConversionUtils;
+import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
+import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
 import org.apache.xmlbeans.XmlObject;
 import org.apache.xmlbeans.XmlException;
 import org.apache.xmlbeans.XmlCursor;
@@ -97,7 +99,7 @@
         XmlObject xmlObject;
         if (plan instanceof File) {
             try {
-                xmlObject = SchemaConversionUtils.parse(((File) plan).toURL());
+                xmlObject = XmlBeansUtil.parse(((File) plan).toURL());
             } catch (IOException e) {
                 throw new DeploymentException("Could not read plan file", e);
             } catch (XmlException e) {
@@ -110,12 +112,17 @@
         }
         XmlCursor cursor = xmlObject.newCursor();
         try {
-            cursor.toFirstChild();
-            String namespace = cursor.getName().getNamespaceURI();
-            return namespace;
+            while (cursor.hasNextToken()){
+                if (cursor.isStart()) {
+                    String namespace = cursor.getName().getNamespaceURI();
+                    return namespace;
+                }
+                cursor.toNextToken();
+            }
         } finally {
             cursor.dispose();
         }
+        throw new DeploymentException("Cannot find namespace in xmlObject: " + xmlObject.xmlText());
     }
 
     private ModuleBuilder getBuilderFromNamespace(String namespace) throws DeploymentException {
@@ -136,22 +143,19 @@
     }
 
     public void installModule(JarFile earFile, EARContext earContext, Module module) throws DeploymentException {
-        XmlObject plan = module.getVendorDD();
-        String namespace = getNamespaceFromPlan(plan);
+        String namespace = module.getNamespace();
         ModuleBuilder builder = getBuilderFromNamespace(namespace);
         builder.installModule(earFile, earContext, module);
     }
 
     public void initContext(EARContext earContext, Module module, ClassLoader cl) throws DeploymentException {
-        XmlObject plan = module.getVendorDD();
-        String namespace = getNamespaceFromPlan(plan);
+        String namespace = module.getNamespace();
         ModuleBuilder builder = getBuilderFromNamespace(namespace);
         builder.initContext(earContext, module, cl);
     }
 
     public void addGBeans(EARContext earContext, Module module, ClassLoader cl) throws DeploymentException {
-        XmlObject plan = module.getVendorDD();
-        String namespace = getNamespaceFromPlan(plan);
+        String namespace = module.getNamespace();
         ModuleBuilder builder = getBuilderFromNamespace(namespace);
         builder.addGBeans(earContext, module, cl);
     }

Modified: geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/WebModule.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/WebModule.java?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/WebModule.java (original)
+++ geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/WebModule.java Wed Sep 28 15:09:15 2005
@@ -37,8 +37,8 @@
     private final String contextRoot;
     private final Map portMap;
 
-    public WebModule(boolean standAlone, URI configId, List parentId, JarFile moduleFile, String targetPath, XmlObject specDD, XmlObject vendorDD, String originalSpecDD, String contextRoot, Map portMap) {
-        super(standAlone, configId, parentId, moduleFile, targetPath, specDD, vendorDD, originalSpecDD);
+    public WebModule(boolean standAlone, URI configId, List parentId, JarFile moduleFile, String targetPath, XmlObject specDD, XmlObject vendorDD, String originalSpecDD, String contextRoot, Map portMap, String namespace) {
+        super(standAlone, configId, parentId, moduleFile, targetPath, specDD, vendorDD, originalSpecDD, namespace);
         this.contextRoot = contextRoot;
         this.portMap = portMap;
     }

Copied: geronimo/trunk/modules/j2ee-builder/src/schema/geronimo-application-1.0.xsd (from r292006, geronimo/trunk/modules/j2ee-builder/src/schema/geronimo-application.xsd)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/schema/geronimo-application-1.0.xsd?p2=geronimo/trunk/modules/j2ee-builder/src/schema/geronimo-application-1.0.xsd&p1=geronimo/trunk/modules/j2ee-builder/src/schema/geronimo-application.xsd&r1=292006&r2=292333&rev=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/src/schema/geronimo-application.xsd (original)
+++ geronimo/trunk/modules/j2ee-builder/src/schema/geronimo-application-1.0.xsd Wed Sep 28 15:09:15 2005
@@ -17,17 +17,17 @@
 -->
 
 <xs:schema
-    xmlns:geronimo="http://geronimo.apache.org/xml/ns/j2ee/application"
-    targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/application"
-    xmlns:security="http://geronimo.apache.org/xml/ns/security"
-    xmlns:sys="http://geronimo.apache.org/xml/ns/deployment"
+    xmlns:geronimo="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
+    targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
+    xmlns:security="http://geronimo.apache.org/xml/ns/security-1.0"
+    xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.0"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     elementFormDefault="qualified"
     attributeFormDefault="unqualified"
     version="1.0">
 
-    <xs:import namespace="http://geronimo.apache.org/xml/ns/security" schemaLocation="geronimo-security.xsd"/>
-    <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment" schemaLocation="geronimo-config.xsd"/>
+    <xs:import namespace="http://geronimo.apache.org/xml/ns/security-1.0" schemaLocation="geronimo-security-1.0.xsd"/>
+    <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.0" schemaLocation="geronimo-config-1.0.xsd"/>
 
     <xs:element name="application" type="geronimo:applicationType"/>
 

Modified: geronimo/trunk/modules/j2ee-builder/src/schema/xmlconfig.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/schema/xmlconfig.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/src/schema/xmlconfig.xml (original)
+++ geronimo/trunk/modules/j2ee-builder/src/schema/xmlconfig.xml Wed Sep 28 15:09:15 2005
@@ -1,6 +1,6 @@
 <xb:config xmlns:xb="http://www.bea.com/2002/09/xbean/config">
 
-    <xb:namespace uri="http://geronimo.apache.org/xml/ns/j2ee/application">
+    <xb:namespace uri="http://geronimo.apache.org/xml/ns/j2ee/application-1.0">
         <xb:package>org.apache.geronimo.xbeans.geronimo.j2ee</xb:package>
         <xb:prefix>Ger</xb:prefix>
     </xb:namespace>

Modified: geronimo/trunk/modules/j2ee-builder/src/test-ear/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/test-ear/META-INF/geronimo-application.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/src/test-ear/META-INF/geronimo-application.xml (original)
+++ geronimo/trunk/modules/j2ee-builder/src/test-ear/META-INF/geronimo-application.xml Wed Sep 28 15:09:15 2005
@@ -16,7 +16,7 @@
     limitations under the License.
 -->
 
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application"
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
     configId="org/apache/geronimo/j2ee/deployment/test"
     parentId="org/apache/geronimo/Server">
 

Modified: geronimo/trunk/modules/j2ee-builder/src/test-ear/test-ejb-jar/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/test-ear/test-ejb-jar/META-INF/openejb-jar.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/src/test-ear/test-ejb-jar/META-INF/openejb-jar.xml (original)
+++ geronimo/trunk/modules/j2ee-builder/src/test-ear/test-ejb-jar/META-INF/openejb-jar.xml Wed Sep 28 15:09:15 2005
@@ -16,7 +16,7 @@
     limitations under the License.
 -->
 <openejb-jar
-    xmlns="http://www.openejb.org/xml/ns/openejb-jar"
+    xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.0"
     configId="org/openejb/itests"
     parentId="org/apache/geronimo/Server">
 

Modified: geronimo/trunk/modules/j2ee-builder/src/test-ear/test-war/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/test-ear/test-war/WEB-INF/geronimo-web.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/src/test-ear/test-war/WEB-INF/geronimo-web.xml (original)
+++ geronimo/trunk/modules/j2ee-builder/src/test-ear/test-war/WEB-INF/geronimo-web.xml Wed Sep 28 15:09:15 2005
@@ -6,17 +6,17 @@
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-  
-<jetty:web-app xmlns:jetty="http://geronimo.apache.org/xml/ns/web/jetty">
+
+<jetty:web-app xmlns:jetty="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0">
     <jetty:context-priority-classloader>false</jetty:context-priority-classloader>
     <!--
         <jetty:security>

Modified: geronimo/trunk/modules/j2ee-builder/src/test-ear13/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/test-ear13/META-INF/geronimo-application.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/src/test-ear13/META-INF/geronimo-application.xml (original)
+++ geronimo/trunk/modules/j2ee-builder/src/test-ear13/META-INF/geronimo-application.xml Wed Sep 28 15:09:15 2005
@@ -16,7 +16,7 @@
     limitations under the License.
 -->
 
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application"
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
     configId="org/apache/geronimo/j2ee/deployment/test"
     parentId="org/apache/geronimo/Server">
 

Modified: geronimo/trunk/modules/j2ee-builder/src/test-ear13/test-ejb-jar/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/test-ear13/test-ejb-jar/META-INF/openejb-jar.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/src/test-ear13/test-ejb-jar/META-INF/openejb-jar.xml (original)
+++ geronimo/trunk/modules/j2ee-builder/src/test-ear13/test-ejb-jar/META-INF/openejb-jar.xml Wed Sep 28 15:09:15 2005
@@ -17,7 +17,7 @@
 -->
 
 <openejb-jar
-    xmlns="http://www.openejb.org/xml/ns/openejb-jar"
+    xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.0"
     configId="org/openejb/itests"
     parentId="org/apache/geronimo/Server">
 

Modified: geronimo/trunk/modules/j2ee-builder/src/test-ear13/test-war/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/test-ear13/test-war/WEB-INF/geronimo-web.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/src/test-ear13/test-war/WEB-INF/geronimo-web.xml (original)
+++ geronimo/trunk/modules/j2ee-builder/src/test-ear13/test-war/WEB-INF/geronimo-web.xml Wed Sep 28 15:09:15 2005
@@ -6,17 +6,17 @@
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-  
-<jetty:web-app xmlns:jetty="http://geronimo.apache.org/xml/ns/web/jetty">
+
+<jetty:web-app xmlns:jetty="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0">
     <jetty:context-priority-classloader>false</jetty:context-priority-classloader>
     <!--
         <jetty:security>

Modified: geronimo/trunk/modules/j2ee-builder/src/test-plan/test-bad-car.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/test-plan/test-bad-car.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/src/test-plan/test-bad-car.xml (original)
+++ geronimo/trunk/modules/j2ee-builder/src/test-plan/test-bad-car.xml Wed Sep 28 15:09:15 2005
@@ -16,7 +16,7 @@
     limitations under the License.
 -->
 
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application"
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
     configId="org/apache/geronimo/j2ee/deployment/test"
     parentId="org/apache/geronimo/Server">
 

Modified: geronimo/trunk/modules/j2ee-builder/src/test-plan/test-bad-ejb-jar.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/test-plan/test-bad-ejb-jar.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/src/test-plan/test-bad-ejb-jar.xml (original)
+++ geronimo/trunk/modules/j2ee-builder/src/test-plan/test-bad-ejb-jar.xml Wed Sep 28 15:09:15 2005
@@ -16,7 +16,7 @@
     limitations under the License.
 -->
 
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application"
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
     configId="org/apache/geronimo/j2ee/deployment/test"
     parentId="org/apache/geronimo/Server">
 

Modified: geronimo/trunk/modules/j2ee-builder/src/test-plan/test-bad-rar.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/test-plan/test-bad-rar.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/src/test-plan/test-bad-rar.xml (original)
+++ geronimo/trunk/modules/j2ee-builder/src/test-plan/test-bad-rar.xml Wed Sep 28 15:09:15 2005
@@ -16,7 +16,7 @@
     limitations under the License.
 -->
 
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application"
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
     configId="org/apache/geronimo/j2ee/deployment/test"
     parentId="org/apache/geronimo/Server">
 

Modified: geronimo/trunk/modules/j2ee-builder/src/test-plan/test-bad-war.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/test-plan/test-bad-war.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/src/test-plan/test-bad-war.xml (original)
+++ geronimo/trunk/modules/j2ee-builder/src/test-plan/test-bad-war.xml Wed Sep 28 15:09:15 2005
@@ -16,7 +16,7 @@
     limitations under the License.
 -->
 
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application"
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
     configId="org/apache/geronimo/j2ee/deployment/test"
     parentId="org/apache/geronimo/Server">
 

Modified: geronimo/trunk/modules/j2ee-builder/src/test-unpacked-ear/META-INF/geronimo-application-alt-dd.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/test-unpacked-ear/META-INF/geronimo-application-alt-dd.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/src/test-unpacked-ear/META-INF/geronimo-application-alt-dd.xml (original)
+++ geronimo/trunk/modules/j2ee-builder/src/test-unpacked-ear/META-INF/geronimo-application-alt-dd.xml Wed Sep 28 15:09:15 2005
@@ -16,7 +16,7 @@
     limitations under the License.
 -->
 
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application"
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
     configId="org/apache/geronimo/j2ee/deployment/test"
     parentId="org/apache/geronimo/Server">
 

Modified: geronimo/trunk/modules/j2ee-builder/src/test-unpacked-ear/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/test-unpacked-ear/META-INF/geronimo-application.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/src/test-unpacked-ear/META-INF/geronimo-application.xml (original)
+++ geronimo/trunk/modules/j2ee-builder/src/test-unpacked-ear/META-INF/geronimo-application.xml Wed Sep 28 15:09:15 2005
@@ -16,7 +16,7 @@
     limitations under the License.
 -->
 
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application"
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
     configId="org/apache/geronimo/j2ee/deployment/test"
     parentId="org/apache/geronimo/Server">
 

Modified: geronimo/trunk/modules/j2ee-builder/src/test-unpacked-ear/alt-ger-ejb-jar.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/test-unpacked-ear/alt-ger-ejb-jar.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/src/test-unpacked-ear/alt-ger-ejb-jar.xml (original)
+++ geronimo/trunk/modules/j2ee-builder/src/test-unpacked-ear/alt-ger-ejb-jar.xml Wed Sep 28 15:09:15 2005
@@ -16,7 +16,7 @@
     limitations under the License.
 -->
 <openejb-jar
-    xmlns="http://www.openejb.org/xml/ns/openejb-jar"
+    xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.0"
     configId="org/openejb/itests"
     parentId="org/apache/geronimo/Server">
 

Modified: geronimo/trunk/modules/j2ee-builder/src/test-unpacked-ear/alt-ger-war.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/test-unpacked-ear/alt-ger-war.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/src/test-unpacked-ear/alt-ger-war.xml (original)
+++ geronimo/trunk/modules/j2ee-builder/src/test-unpacked-ear/alt-ger-war.xml Wed Sep 28 15:09:15 2005
@@ -16,7 +16,7 @@
     limitations under the License.
 -->
 
-<jetty:web-app xmlns:jetty="http://geronimo.apache.org/xml/ns/web/jetty">
+<jetty:web-app xmlns:jetty="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0">
     <jetty:context-priority-classloader>false</jetty:context-priority-classloader>
     <!--
         <jetty:security>

Modified: geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java (original)
+++ geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java Wed Sep 28 15:09:15 2005
@@ -58,6 +58,7 @@
 public class EARConfigBuilderTest extends TestCase {
     private static final File basedir = new File(System.getProperty("basedir", System.getProperty("user.dir")));
 
+    private static String WEB_NAMESPACE="foo";
     private static JarFile earFile;
     private static MockEJBConfigBuilder ejbConfigBuilder = new MockEJBConfigBuilder();
     private static MockWARConfigBuilder webConfigBuilder = new MockWARConfigBuilder();
@@ -92,7 +93,7 @@
                 earFile = DeploymentUtil.createJarFile(new File(basedir, "target/test-ear14/test-ear.ear"));
                 ejbConfigBuilder.ejbModule = new EJBModule(false, null, null, null, "test-ejb-jar.jar", null, null, null);
                 webConfigBuilder.contextRoot = contextRoot;
-                webConfigBuilder.webModule = new WebModule(false, null, null, null, "test-war.war", null, null, null, contextRoot, portMap);
+                webConfigBuilder.webModule = new WebModule(false, null, null, null, "test-war.war", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
                 connectorConfigBuilder.connectorModule = new ConnectorModule(false, null, null, null, "test-rar.rar", null, null, null);
             }
 
@@ -108,7 +109,7 @@
                 earFile = DeploymentUtil.createJarFile(new File(basedir, "target/test-ear14/test-naked-ear.ear"));
                 ejbConfigBuilder.ejbModule = new EJBModule(false, null, null, null, "test-ejb-jar.jar", null, null, null);
                 webConfigBuilder.contextRoot = contextRoot;
-                webConfigBuilder.webModule = new WebModule(false, null, null, null, "test-war.war", null, null, null, contextRoot, portMap);
+                webConfigBuilder.webModule = new WebModule(false, null, null, null, "test-war.war", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
                 connectorConfigBuilder.connectorModule = new ConnectorModule(false, null, null, null, "test-rar.rar", null, null, null);
             }
 
@@ -124,7 +125,7 @@
                 earFile = DeploymentUtil.createJarFile(new File(basedir, "target/test-ear13/test-ear.ear"));
                 ejbConfigBuilder.ejbModule = new EJBModule(false, null, null, null, "test-ejb-jar.jar", null, null, null);
                 webConfigBuilder.contextRoot = contextRoot;
-                webConfigBuilder.webModule = new WebModule(false, null, null, null, "test-war.war", null, null, null, contextRoot, portMap);
+                webConfigBuilder.webModule = new WebModule(false, null, null, null, "test-war.war", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
                 connectorConfigBuilder.connectorModule = new ConnectorModule(false, null, null, null, "test-rar.rar", null, null, null);
             }
 
@@ -140,7 +141,7 @@
                 earFile = DeploymentUtil.createJarFile(new File(basedir, "target/test-ear13/test-naked-ear.ear"));
                 ejbConfigBuilder.ejbModule = new EJBModule(false, null, null, null, "test-ejb-jar.jar", null, null, null);
                 webConfigBuilder.contextRoot = contextRoot;
-                webConfigBuilder.webModule = new WebModule(false, null, null, null, "test-war.war", null, null, null, contextRoot, portMap);
+                webConfigBuilder.webModule = new WebModule(false, null, null, null, "test-war.war", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
                 connectorConfigBuilder.connectorModule = new ConnectorModule(false, null, null, null, "test-rar.rar", null, null, null);
             }
 
@@ -156,7 +157,7 @@
                 earFile = DeploymentUtil.createJarFile(new File(basedir, "target/test-unpacked-ear/full/"));
                 ejbConfigBuilder.ejbModule = new EJBModule(false, null, null, null, "test-ejb-jar.jar/", null, null, null);
                 webConfigBuilder.contextRoot = contextRoot;
-                webConfigBuilder.webModule = new WebModule(false, null, null, null, "test-war.war/", null, null, null, contextRoot, portMap);
+                webConfigBuilder.webModule = new WebModule(false, null, null, null, "test-war.war/", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
                 connectorConfigBuilder.connectorModule = new ConnectorModule(false, null, null, null, "test-rar.rar", null, null, null);
             }
 
@@ -172,7 +173,7 @@
                 earFile = DeploymentUtil.createJarFile(new File(basedir, "target/test-unpacked-ear/naked/"));
                 ejbConfigBuilder.ejbModule = new EJBModule(false, null, null, null, "test-ejb-jar.jar/", null, null, null);
                 webConfigBuilder.contextRoot = contextRoot;
-                webConfigBuilder.webModule = new WebModule(false, null, null, null, "test-war.war", null, null, null, contextRoot, portMap);
+                webConfigBuilder.webModule = new WebModule(false, null, null, null, "test-war.war", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
                 connectorConfigBuilder.connectorModule = new ConnectorModule(false, null, null, null, "test-rar.rar", null, null, null);
             }
 
@@ -188,7 +189,7 @@
                 earFile = DeploymentUtil.createJarFile(new File(basedir, "target/test-unpacked-ear/alt-dd/"));
                 ejbConfigBuilder.ejbModule = new EJBModule(false, null, null, null, "test-ejb-jar.jar/", null, null, null);
                 webConfigBuilder.contextRoot = contextRoot;
-                webConfigBuilder.webModule = new WebModule(false, null, null, null, "test-war.war/", null, null, null, contextRoot, portMap);
+                webConfigBuilder.webModule = new WebModule(false, null, null, null, "test-war.war/", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
                 connectorConfigBuilder.connectorModule = new ConnectorModule(false, null, null, null, "test-rar.rar", null, null, null);
             }
 
@@ -204,7 +205,7 @@
                 earFile = DeploymentUtil.createJarFile(new File(basedir, "target/test-unpacked-ear/alt-dd.ear"));
                 ejbConfigBuilder.ejbModule = new EJBModule(false, null, null, null, "test-ejb-jar.jar/", null, null, null);
                 webConfigBuilder.contextRoot = contextRoot;
-                webConfigBuilder.webModule = new WebModule(false, null, null, null, "test-war.war/", null, null, null, contextRoot, portMap);
+                webConfigBuilder.webModule = new WebModule(false, null, null, null, "test-war.war/", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
                 connectorConfigBuilder.connectorModule = new ConnectorModule(false, null, null, null, "test-rar.rar", null, null, null);
             }
 



Mime
View raw message