geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r216115 [1/2] - in /geronimo/trunk: etc/ modules/assembly/ modules/assembly/src/plan/ modules/axis-builder/ modules/axis-builder/src/java/org/apache/geronimo/axis/builder/ modules/client-builder/ modules/client-builder/src/schema/ modules/c...
Date Wed, 13 Jul 2005 05:22:21 GMT
Author: djencks
Date: Tue Jul 12 22:22:18 2005
New Revision: 216115

URL: http://svn.apache.org/viewcvs?rev=216115&view=rev
Log:
GERONIMO-738 move to xmlbeans v2

Added:
    geronimo/trunk/plugins/maven-xmlbeans2-plugin/
    geronimo/trunk/plugins/maven-xmlbeans2-plugin/INSTRUCTIONS.txt
    geronimo/trunk/plugins/maven-xmlbeans2-plugin/LICENSE.txt
    geronimo/trunk/plugins/maven-xmlbeans2-plugin/NOTICE.txt
    geronimo/trunk/plugins/maven-xmlbeans2-plugin/maven.xml
    geronimo/trunk/plugins/maven-xmlbeans2-plugin/plugin.jelly
    geronimo/trunk/plugins/maven-xmlbeans2-plugin/project.properties
    geronimo/trunk/plugins/maven-xmlbeans2-plugin/project.xml
    geronimo/trunk/plugins/maven-xmlbeans2-plugin/src/
    geronimo/trunk/plugins/maven-xmlbeans2-plugin/src/java/
    geronimo/trunk/plugins/maven-xmlbeans2-plugin/src/java/org/
    geronimo/trunk/plugins/maven-xmlbeans2-plugin/src/java/org/apache/
    geronimo/trunk/plugins/maven-xmlbeans2-plugin/src/java/org/apache/xmlbeans/
    geronimo/trunk/plugins/maven-xmlbeans2-plugin/src/java/org/apache/xmlbeans/maven/
    geronimo/trunk/plugins/maven-xmlbeans2-plugin/src/java/org/apache/xmlbeans/maven/SchemaCompilerWrapper.java
Modified:
    geronimo/trunk/etc/project.properties
    geronimo/trunk/etc/project.xml
    geronimo/trunk/modules/assembly/maven.xml
    geronimo/trunk/modules/assembly/project.xml
    geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml
    geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml
    geronimo/trunk/modules/axis-builder/maven.xml
    geronimo/trunk/modules/axis-builder/project.xml
    geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/AxisServiceBuilder.java
    geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/SchemaInfoBuilder.java
    geronimo/trunk/modules/client-builder/maven.xml
    geronimo/trunk/modules/client-builder/project.xml
    geronimo/trunk/modules/client-builder/src/schema/geronimo-application-client.xsd
    geronimo/trunk/modules/connector-builder/maven.xml
    geronimo/trunk/modules/connector-builder/project.xml
    geronimo/trunk/modules/connector-builder/src/schema/geronimo-connector_1_5.xsd
    geronimo/trunk/modules/deploy-config/project.xml
    geronimo/trunk/modules/deploy-jsr88/project.xml
    geronimo/trunk/modules/deploy-tool/project.xml
    geronimo/trunk/modules/j2ee-builder/maven.xml
    geronimo/trunk/modules/j2ee-builder/project.xml
    geronimo/trunk/modules/j2ee-builder/src/schema/geronimo-application.xsd
    geronimo/trunk/modules/j2ee-schema/maven.xml
    geronimo/trunk/modules/j2ee-schema/project.xml
    geronimo/trunk/modules/jetty-builder/project.xml
    geronimo/trunk/modules/naming-builder/maven.xml
    geronimo/trunk/modules/naming-builder/project.xml
    geronimo/trunk/modules/security-builder/maven.xml
    geronimo/trunk/modules/security-builder/project.xml
    geronimo/trunk/modules/service-builder/maven.xml
    geronimo/trunk/modules/service-builder/project.xml
    geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanBuilder.java
    geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
    geronimo/trunk/modules/spring-builder/maven.xml
    geronimo/trunk/modules/spring-builder/project.xml
    geronimo/trunk/modules/test-ddbean/project.xml
    geronimo/trunk/modules/tomcat-builder/project.xml
    geronimo/trunk/modules/tomcat/project.xml
    geronimo/trunk/modules/web-builder/maven.xml
    geronimo/trunk/modules/web-builder/project.xml
    geronimo/trunk/modules/web-builder/src/schema/geronimo-web.xsd

Modified: geronimo/trunk/etc/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/etc/project.properties?rev=216115&r1=216114&r2=216115&view=diff
==============================================================================
--- geronimo/trunk/etc/project.properties (original)
+++ geronimo/trunk/etc/project.properties Tue Jul 12 22:22:18 2005
@@ -168,7 +168,8 @@
 xml_apis_version=1.0.b2
 xml_resolver_version=1.1
 xml_parser_apis_version=2.2.1
-xmlbeans_version=1.0-DEV
+xmlbeans_version=2.0.0
+xmlbeans_maven_plugin_version=2.0.0-beta1
 xmlpull_version=1.1.3.4d_b4_min
 xpp3_version=1.1.3.3
 xstream_version=1.0.2

Modified: geronimo/trunk/etc/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/etc/project.xml?rev=216115&r1=216114&r2=216115&view=diff
==============================================================================
--- geronimo/trunk/etc/project.xml (original)
+++ geronimo/trunk/etc/project.xml Tue Jul 12 22:22:18 2005
@@ -6,9 +6,9 @@
     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.
@@ -340,12 +340,6 @@
                 </includes>
             </resource>
             <resource>
-                <directory>${basedir}/target/xmlbeans</directory>
-                <includes>
-                    <include>schema/**/*.xsb</include>
-                </includes>
-            </resource>
-            <resource>
                 <directory>${basedir}/target/etc</directory>
                 <includes>
                     <include>META-INF/geronimo-service.xml</include>
@@ -362,7 +356,20 @@
             </excludes>
             <resources>
                 <resource>
+                    <directory>${basedir}/src</directory>
+                    <includes>
+                        <include>schema/**</include>
+                    </includes>
+                    <targetPath>META-INF</targetPath>
+                </resource>
+                <resource>
                     <directory>${basedir}/src/test-data</directory>
+                    <includes>
+                        <include>**/*</include>
+                    </includes>
+                </resource>
+                <resource>
+                    <directory>${basedir}/src/test-resources</directory>
                     <includes>
                         <include>**/*</include>
                     </includes>

Modified: geronimo/trunk/modules/assembly/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/maven.xml?rev=216115&r1=216114&r2=216115&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/maven.xml (original)
+++ geronimo/trunk/modules/assembly/maven.xml Tue Jul 12 22:22:18 2005
@@ -543,7 +543,7 @@
             </ant:java>
 
             <!-- create SystemDatabase -->
-            <attainGoal name="init-database"/>
+<!--            <attainGoal name="init-database"/>-->
 
             <j:if test="${context.getVariable('geronimo.assemble.offline') != 'true'}">
                 <deploy:stopRemoteServer

Modified: geronimo/trunk/modules/assembly/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/project.xml?rev=216115&r1=216114&r2=216115&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/project.xml (original)
+++ geronimo/trunk/modules/assembly/project.xml Tue Jul 12 22:22:18 2005
@@ -804,7 +804,7 @@
 
         <dependency>
             <groupId>xmlbeans</groupId>
-            <artifactId>xbean-apache</artifactId>
+            <artifactId>xbean</artifactId>
             <version>${xmlbeans_version}</version>
             <properties>
                 <repository>true</repository>

Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml?rev=216115&r1=216114&r2=216115&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml Tue Jul 12 22:22:18 2005
@@ -28,7 +28,7 @@
     >
 
     <dependency>
-        <uri>xmlbeans/jars/xbean-apache-${xmlbeans_version}.jar</uri>
+        <uri>xmlbeans/jars/xbean-${xmlbeans_version}.jar</uri>
     </dependency>
     <dependency>
         <uri>geronimo-spec/jars/geronimo-spec-corba-${geronimo_spec_corba_version}.jar</uri>
@@ -70,7 +70,13 @@
         <uri>openejb/jars/openejb-builder-${openejb_version}.jar</uri>
     </dependency>
     <dependency>
-        <uri>xmlbeans/jars/xbean-apache-${xmlbeans_version}.jar</uri>
+        <uri>xmlbeans/jars/xbean-${xmlbeans_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>stax/jars/stax-${stax_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>stax/jars/stax-api-${stax_api_version}.jar</uri>
     </dependency>
 
     <dependency>

Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml?rev=216115&r1=216114&r2=216115&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml Tue Jul 12 22:22:18 2005
@@ -28,9 +28,6 @@
     >
 
     <dependency>
-        <uri>xmlbeans/jars/xbean-apache-${xmlbeans_version}.jar</uri>
-    </dependency>
-    <dependency>
         <uri>geronimo/jars/geronimo-j2ee-schema-${geronimo_version}.jar</uri>
     </dependency>
     <dependency>
@@ -67,7 +64,13 @@
         <uri>openejb/jars/openejb-builder-${openejb_version}.jar</uri>
     </dependency>
     <dependency>
-        <uri>xmlbeans/jars/xbean-apache-${xmlbeans_version}.jar</uri>
+        <uri>xmlbeans/jars/xbean-${xmlbeans_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>stax/jars/stax-${stax_version}.jar</uri>
+    </dependency>
+    <dependency>
+        <uri>stax/jars/stax-api-${stax_api_version}.jar</uri>
     </dependency>
     <dependency>
         <uri>asm/jars/asm-${asm_version}.jar</uri>

Modified: geronimo/trunk/modules/axis-builder/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis-builder/maven.xml?rev=216115&r1=216114&r2=216115&view=diff
==============================================================================
--- geronimo/trunk/modules/axis-builder/maven.xml (original)
+++ geronimo/trunk/modules/axis-builder/maven.xml Tue Jul 12 22:22:18 2005
@@ -23,7 +23,7 @@
     xmlns:j="jelly:core"
     xmlns:ant="jelly:ant"
     xmlns:maven="jelly:maven"
-    xmlns:xmlbeans="geronimo:xmlbeans"
+    xmlns:xmlbeans="xmlbeans2:maven"
     >
 
     <preGoal name="java:compile">
@@ -31,8 +31,7 @@
             sourcedir="${basedir}/src"
             sourceschema="schema/wsdl.xsd"
             xmlconfigs="${basedir}/src/schema/xmlconfig.xml"
-            targetdir="${basedir}/target/xmlbeans"
-            cataloglocation="${basedir}/../j2ee-schema/src/catalog/resolver-catalog.xml"/>
+            targetdir="${basedir}/target/xmlbeans"/>
     </preGoal>
 
 </project>

Modified: geronimo/trunk/modules/axis-builder/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis-builder/project.xml?rev=216115&r1=216114&r2=216115&view=diff
==============================================================================
--- geronimo/trunk/modules/axis-builder/project.xml (original)
+++ geronimo/trunk/modules/axis-builder/project.xml Tue Jul 12 22:22:18 2005
@@ -44,26 +44,30 @@
 
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>geronimo-xmlbeans-plugin</artifactId>
-            <version>${pom.currentVersion}</version>
-            <type>plugin</type>
-        </dependency>
-
-        <!-- what is this for?? -->
-        <dependency>
-            <groupId>maven-plugins</groupId>
-            <artifactId>maven-axis-plugin</artifactId>
-            <version>0.5</version>
+            <artifactId>xmlbeans-maven-plugin</artifactId>
+            <version>${xmlbeans_maven_plugin_version}</version>
             <type>plugin</type>
         </dependency>
 
         <!-- needed for xmlbeans runtime-->
         <dependency>
             <groupId>xmlbeans</groupId>
-            <artifactId>xbean-apache</artifactId>
+            <artifactId>xbean</artifactId>
             <version>${xmlbeans_version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax</artifactId>
+            <version>${stax_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+            <version>${stax_api_version}</version>
+        </dependency>
+
         <!-- Module Dependencies -->
         <dependency>
             <groupId>geronimo-spec</groupId>
@@ -251,37 +255,17 @@
         </dependency>
 
     </dependencies>
-
     <build>
         <resources>
+            <!--n.b. this schema is NOT compiled to xmlobjects.  Do not remove!  Used by SchemaInfoBuilder -->
             <resource>
                 <directory>${basedir}/src/schema</directory>
-            </resource>
-            <resource>
-                <directory>${basedir}/target/xmlbeans</directory>
                 <includes>
-                    <include>schema/**</include>
+                    <include>soap_encoding_1_1.xsd</include>
                 </includes>
+                <targetPath>META-INF/schema</targetPath>
             </resource>
         </resources>
-        <unitTest>
-            <includes>
-                <include>**/*Test.java</include>
-            </includes>
-            <excludes>
-                <exclude>**/Abstract*.java</exclude>
-            </excludes>
-            <resources>
-                <resource>
-                    <directory>${basedir}/src/schema</directory>
-                    <includes>
-                        <include>*.xsd</include>
-                    </includes>
-                </resource>
-                <resource>
-                    <directory>${basedir}/src/test-resources</directory>
-                </resource>
-            </resources>
-        </unitTest>
     </build>
+
 </project>

Modified: geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/AxisServiceBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/AxisServiceBuilder.java?rev=216115&r1=216114&r2=216115&view=diff
==============================================================================
--- geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/AxisServiceBuilder.java (original)
+++ geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/AxisServiceBuilder.java Tue Jul 12 22:22:18 2005
@@ -62,9 +62,9 @@
 import org.apache.geronimo.xbeans.wsdl.TService;
 import org.apache.geronimo.xbeans.wsdl.TTypes;
 import org.apache.xmlbeans.XmlCursor;
-import org.w3.x2001.xmlSchema.ImportDocument;
-import org.w3.x2001.xmlSchema.IncludeDocument;
-import org.w3.x2001.xmlSchema.SchemaDocument;
+import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument;
+import org.apache.xmlbeans.impl.xb.xsdschema.ImportDocument;
+import org.apache.xmlbeans.impl.xb.xsdschema.IncludeDocument;
 
 /**
  * @version $Rev$ $Date$

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=216115&r1=216114&r2=216115&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 Tue Jul 12 22:22:18 2005
@@ -20,7 +20,6 @@
 import java.io.InputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -37,8 +36,8 @@
 import javax.wsdl.Types;
 import javax.wsdl.WSDLException;
 import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
 import javax.wsdl.extensions.ExtensionRegistry;
+import javax.wsdl.extensions.UnknownExtensibilityElement;
 import javax.wsdl.extensions.schema.Schema;
 import javax.wsdl.extensions.soap.SOAPAddress;
 import javax.wsdl.factory.WSDLFactory;
@@ -46,15 +45,17 @@
 import javax.wsdl.xml.WSDLReader;
 import javax.xml.namespace.QName;
 
+import com.ibm.wsdl.extensions.PopulatedExtensionRegistry;
+import com.ibm.wsdl.extensions.schema.SchemaConstants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.axis.server.AxisWebServiceContainer;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.schema.SchemaConversionUtils;
 import org.apache.geronimo.xbeans.wsdl.DefinitionsDocument;
+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.xbeans.wsdl.TDefinitions;
-import org.apache.geronimo.axis.server.AxisWebServiceContainer;
 import org.apache.xmlbeans.SchemaField;
 import org.apache.xmlbeans.SchemaGlobalElement;
 import org.apache.xmlbeans.SchemaParticle;
@@ -66,13 +67,11 @@
 import org.apache.xmlbeans.XmlException;
 import org.apache.xmlbeans.XmlObject;
 import org.apache.xmlbeans.XmlOptions;
-import org.w3.x2001.xmlSchema.SchemaDocument;
+import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument;
 import org.w3c.dom.Element;
 import org.xml.sax.EntityResolver;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
-import com.ibm.wsdl.extensions.PopulatedExtensionRegistry;
-import com.ibm.wsdl.extensions.schema.SchemaConstants;
 
 /**
  * @version $Rev:  $ $Date:  $
@@ -86,15 +85,18 @@
     private static final QName LOCATION_QNAME = new QName("", "location");
 
     static {
-        URL url = WSDescriptorParser.class.getClassLoader().getResource("soap_encoding_1_1.xsd");
-        if (url == null) {
+        InputStream is = WSDescriptorParser.class.getClassLoader().getResourceAsStream("META-INF/schema/soap_encoding_1_1.xsd");
+        if (is == null) {
             throw new RuntimeException("Could not locate soap encoding schema");
         }
         Collection errors = new ArrayList();
         XmlOptions xmlOptions = new XmlOptions();
         xmlOptions.setErrorListener(errors);
         try {
-            XmlObject xmlObject = SchemaConversionUtils.parse(url);
+            XmlObject xmlObject = SchemaConversionUtils.parse(is);
+            if (!(xmlObject instanceof SchemaDocument)) {
+                xmlObject = xmlObject.changeType(SchemaDocument.type);
+            }
             basicTypeSystem = XmlBeans.compileXsd(new XmlObject[]{xmlObject}, XmlBeans.getBuiltinTypeSystem(), xmlOptions);
             if (errors.size() > 0) {
                 throw new RuntimeException("Could not compile schema type system: errors: " + errors);

Modified: geronimo/trunk/modules/client-builder/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/client-builder/maven.xml?rev=216115&r1=216114&r2=216115&view=diff
==============================================================================
--- geronimo/trunk/modules/client-builder/maven.xml (original)
+++ geronimo/trunk/modules/client-builder/maven.xml Tue Jul 12 22:22:18 2005
@@ -6,16 +6,16 @@
     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.
 -->
-  
+
 
 <!-- $Rev: 46019 $ $Date: 2004-09-14 02:56:06 -0700 (Tue, 14 Sep 2004) $ -->
 
@@ -23,7 +23,7 @@
     xmlns:j="jelly:core"
     xmlns:ant="jelly:ant"
     xmlns:maven="jelly:maven"
-    xmlns:xmlbeans="geronimo:xmlbeans">
+    xmlns:xmlbeans="xmlbeans2:maven">
 
     <preGoal name="java:compile">
         <xmlbeans:schema2java

Modified: geronimo/trunk/modules/client-builder/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/client-builder/project.xml?rev=216115&r1=216114&r2=216115&view=diff
==============================================================================
--- geronimo/trunk/modules/client-builder/project.xml (original)
+++ geronimo/trunk/modules/client-builder/project.xml Tue Jul 12 22:22:18 2005
@@ -43,18 +43,30 @@
     <dependencies>
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>geronimo-xmlbeans-plugin</artifactId>
-            <version>${pom.currentVersion}</version>
+            <artifactId>xmlbeans-maven-plugin</artifactId>
+            <version>${xmlbeans_maven_plugin_version}</version>
             <type>plugin</type>
         </dependency>
 
         <!-- needed for xmlbeans runtime-->
         <dependency>
             <groupId>xmlbeans</groupId>
-            <artifactId>xbean-apache</artifactId>
+            <artifactId>xbean</artifactId>
             <version>${xmlbeans_version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax</artifactId>
+            <version>${stax_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+            <version>${stax_api_version}</version>
+        </dependency>
+
         <!-- Module Dependencies -->
         <dependency>
             <groupId>geronimo</groupId>
@@ -203,36 +215,4 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <resources>
-            <resource>
-                <directory>${basedir}/src/etc</directory>
-            </resource>
-            <resource>
-                <directory>${basedir}/target/xmlbeans</directory>
-                <includes>
-                     <include>schema/**</include>
-                 </includes>
-             </resource>
-        </resources>
-        <unitTest>
-            <includes>
-                <include>**/*Test.java</include>
-            </includes>
-            <excludes>
-                <exclude>**/Abstract*.java</exclude>
-            </excludes>
-            <resources>
-                <resource>
-                    <directory>${basedir}/src/schema</directory>
-                    <includes>
-                        <include>*.xsd</include>
-                    </includes>
-                </resource>
-                <resource>
-                    <directory>${basedir}/src/test-resources</directory>
-                </resource>
-            </resources>
-        </unitTest>
-    </build>
 </project>

Modified: 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.xsd?rev=216115&r1=216114&r2=216115&view=diff
==============================================================================
--- geronimo/trunk/modules/client-builder/src/schema/geronimo-application-client.xsd (original)
+++ geronimo/trunk/modules/client-builder/src/schema/geronimo-application-client.xsd Tue Jul 12 22:22:18 2005
@@ -28,10 +28,10 @@
     attributeFormDefault="unqualified"
     version="1.0">
 
-    <xs:import namespace="http://geronimo.apache.org/xml/ns/naming" schemaLocation="../../../naming-builder/src/schema/geronimo-naming.xsd"/>
-    <xs:import namespace="http://geronimo.apache.org/xml/ns/security" schemaLocation="../../../security-builder/src/schema/geronimo-security.xsd"/>
-    <xs:import namespace="http://geronimo.apache.org/xml/ns/j2ee/connector" schemaLocation="../../../connector-builder/src/schema/geronimo-connector_1_5.xsd"/>
-    <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment" schemaLocation="../../../service-builder/src/schema/geronimo-config.xsd"/>
+    <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:element name="application-client" type="geronimo:application-clientType"/>
 

Modified: geronimo/trunk/modules/connector-builder/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/maven.xml?rev=216115&r1=216114&r2=216115&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/maven.xml (original)
+++ geronimo/trunk/modules/connector-builder/maven.xml Tue Jul 12 22:22:18 2005
@@ -6,16 +6,16 @@
     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.
 -->
-  
+
 
 <!-- $Rev$ $Date$ -->
 
@@ -23,15 +23,15 @@
     xmlns:j="jelly:core"
     xmlns:ant="jelly:ant"
     xmlns:maven="jelly:maven"
-    xmlns:xmlbeans="geronimo:xmlbeans">
+    xmlns:xmlbeans="xmlbeans2:maven"
+    >
 
     <preGoal name="java:compile">
         <xmlbeans:schema2java
             sourcedir="${basedir}/src"
             sourceschema="schema/geronimo-connector_1_5.xsd"
             xmlconfigs="${basedir}/src/schema/xmlconfig.xml"
-            targetdir="${basedir}/target/xmlbeans"
-            cataloglocation="${basedir}/../j2ee-schema/src/catalog/resolver-catalog.xml"/>
+            targetdir="${basedir}/target/xmlbeans"/>
     </preGoal>
 
     <preGoal name="test:compile">

Modified: geronimo/trunk/modules/connector-builder/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/project.xml?rev=216115&r1=216114&r2=216115&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/project.xml (original)
+++ geronimo/trunk/modules/connector-builder/project.xml Tue Jul 12 22:22:18 2005
@@ -43,18 +43,29 @@
     <dependencies>
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>geronimo-xmlbeans-plugin</artifactId>
-            <version>${pom.currentVersion}</version>
+            <artifactId>xmlbeans-maven-plugin</artifactId>
+            <version>${xmlbeans_maven_plugin_version}</version>
             <type>plugin</type>
         </dependency>
 
         <!-- needed for xmlbeans runtime-->
         <dependency>
             <groupId>xmlbeans</groupId>
-            <artifactId>xbean-apache</artifactId>
+            <artifactId>xbean</artifactId>
             <version>${xmlbeans_version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax</artifactId>
+            <version>${stax_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+            <version>${stax_api_version}</version>
+        </dependency>
 
         <!-- real stuff -->
         <dependency>

Modified: geronimo/trunk/modules/connector-builder/src/schema/geronimo-connector_1_5.xsd
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/src/schema/geronimo-connector_1_5.xsd?rev=216115&r1=216114&r2=216115&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/schema/geronimo-connector_1_5.xsd (original)
+++ geronimo/trunk/modules/connector-builder/src/schema/geronimo-connector_1_5.xsd Tue Jul 12 22:22:18 2005
@@ -26,8 +26,8 @@
     attributeFormDefault="unqualified"
     version="1.5">
 
-    <xs:import namespace="http://geronimo.apache.org/xml/ns/naming" schemaLocation="../../../naming-builder/src/schema/geronimo-naming.xsd"/>
-    <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment" schemaLocation="../../../service-builder/src/schema/geronimo-config.xsd"/>
+    <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:annotation>
         <xs:documentation>

Modified: geronimo/trunk/modules/deploy-config/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-config/project.xml?rev=216115&r1=216114&r2=216115&view=diff
==============================================================================
--- geronimo/trunk/modules/deploy-config/project.xml (original)
+++ geronimo/trunk/modules/deploy-config/project.xml Tue Jul 12 22:22:18 2005
@@ -45,8 +45,20 @@
     <dependencies>
         <dependency>
             <groupId>xmlbeans</groupId>
-            <artifactId>xbean-apache</artifactId>
+            <artifactId>xbean</artifactId>
             <version>${xmlbeans_version}</version>
+        </dependency>
+
+       <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax</artifactId>
+            <version>${stax_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+            <version>${stax_api_version}</version>
         </dependency>
 
         <dependency>

Modified: geronimo/trunk/modules/deploy-jsr88/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-jsr88/project.xml?rev=216115&r1=216114&r2=216115&view=diff
==============================================================================
--- geronimo/trunk/modules/deploy-jsr88/project.xml (original)
+++ geronimo/trunk/modules/deploy-jsr88/project.xml Tue Jul 12 22:22:18 2005
@@ -48,8 +48,20 @@
     <dependencies>
         <dependency>
             <groupId>xmlbeans</groupId>
-            <artifactId>xbean-apache</artifactId>
+            <artifactId>xbean</artifactId>
             <version>${xmlbeans_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax</artifactId>
+            <version>${stax_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+            <version>${stax_api_version}</version>
         </dependency>
 
         <dependency>

Modified: geronimo/trunk/modules/deploy-tool/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/project.xml?rev=216115&r1=216114&r2=216115&view=diff
==============================================================================
--- geronimo/trunk/modules/deploy-tool/project.xml (original)
+++ geronimo/trunk/modules/deploy-tool/project.xml Tue Jul 12 22:22:18 2005
@@ -43,10 +43,22 @@
     <dependencies>
         <dependency>
             <groupId>xmlbeans</groupId>
-            <artifactId>xbean-apache</artifactId>
+            <artifactId>xbean</artifactId>
             <version>${xmlbeans_version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax</artifactId>
+            <version>${stax_version}</version>
+        </dependency>
+    
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+            <version>${stax_api_version}</version>
+        </dependency>
+    
         <dependency>
             <groupId>mx4j</groupId>
             <artifactId>mx4j</artifactId>

Modified: geronimo/trunk/modules/j2ee-builder/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/maven.xml?rev=216115&r1=216114&r2=216115&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/maven.xml (original)
+++ geronimo/trunk/modules/j2ee-builder/maven.xml Tue Jul 12 22:22:18 2005
@@ -6,16 +6,16 @@
     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.
 -->
-  
+
 
 <!-- $Rev$ $Date$ -->
 
@@ -23,15 +23,15 @@
     xmlns:j="jelly:core"
     xmlns:ant="jelly:ant"
     xmlns:maven="jelly:maven"
-    xmlns:xmlbeans="geronimo:xmlbeans">
+    xmlns:xmlbeans="xmlbeans2:maven">
 
     <preGoal name="java:compile">
         <xmlbeans:schema2java
             sourcedir="${basedir}/src"
             sourceschema="schema/geronimo-application.xsd"
             xmlconfigs="${basedir}/src/schema/xmlconfig.xml"
-            targetdir="${basedir}/target/xmlbeans"
-            cataloglocation="${basedir}/../j2ee-schema/src/catalog/resolver-catalog.xml"/>
+            targetdir="${basedir}/target/xmlbeans"/>
+<!--            cataloglocation="${basedir}/../j2ee-schema/src/catalog/resolver-catalog.xml"/>-->
     </preGoal>
 
     <preGoal name="test:compile">
@@ -45,13 +45,13 @@
         <j:set var="ear.target.base.dir" value="${basedir}/target/test-ear13"/>
 
         <attainGoal name="setupEar"/>
-        
+
         <attainGoal name="setupUnpackedEar"/>
     </preGoal>
 
     <goal name="setupEar">
         <ant:mkdir dir="${ear.target.base.dir}/test-ejb-jar/META-INF"/>
-        
+
         <ant:mkdir dir="${ear.target.base.dir}/test-ejb-jar/META-INF"/>
         <copy todir="${ear.target.base.dir}/test-ejb-jar/META-INF">
             <fileset dir="${ear.src.base.dir}/test-ejb-jar/META-INF"/>
@@ -152,7 +152,7 @@
             <fileset dir="${basedir}/target/test-unpacked-ear/${ear.unpacked.relative}"/>
         </ant:jar>
     </goal>
-    
+
     <goal name="setupBaseUnpackedEar">
         <ant:mkdir dir="${basedir}/target/test-unpacked-ear/${ear.unpacked.relative}/META-INF"/>
         <ant:mkdir dir="${basedir}/target/test-unpacked-ear/${ear.unpacked.relative}/test-ejb-jar"/>

Modified: geronimo/trunk/modules/j2ee-builder/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/project.xml?rev=216115&r1=216114&r2=216115&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/project.xml (original)
+++ geronimo/trunk/modules/j2ee-builder/project.xml Tue Jul 12 22:22:18 2005
@@ -43,19 +43,31 @@
     <dependencies>
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>geronimo-xmlbeans-plugin</artifactId>
-            <version>${pom.currentVersion}</version>
+            <artifactId>xmlbeans-maven-plugin</artifactId>
+            <version>${xmlbeans_maven_plugin_version}</version>
             <type>plugin</type>
         </dependency>
 
         <!-- needed for xmlbeans runtime-->
         <dependency>
             <groupId>xmlbeans</groupId>
-            <artifactId>xbean-apache</artifactId>
+            <artifactId>xbean</artifactId>
             <version>${xmlbeans_version}</version>
         </dependency>
 
         <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax</artifactId>
+            <version>${stax_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+            <version>${stax_api_version}</version>
+        </dependency>
+
+        <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-common</artifactId>
             <version>${pom.currentVersion}</version>
@@ -155,6 +167,7 @@
     <!-- =================== -->
 
     <build>
+<!--
         <unitTest>
             <includes>
                 <include>**/*Test.java</include>
@@ -163,5 +176,6 @@
                 <exclude>**/Abstract*.java</exclude>
             </excludes>
         </unitTest>
+-->
     </build>
 </project>

Modified: 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.xsd?rev=216115&r1=216114&r2=216115&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/src/schema/geronimo-application.xsd (original)
+++ geronimo/trunk/modules/j2ee-builder/src/schema/geronimo-application.xsd Tue Jul 12 22:22:18 2005
@@ -26,8 +26,8 @@
     attributeFormDefault="unqualified"
     version="1.0">
 
-    <xs:import namespace="http://geronimo.apache.org/xml/ns/security" schemaLocation="../../../security-builder/src/schema/geronimo-security.xsd"/>
-    <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment" schemaLocation="../../../service-builder/src/schema/geronimo-config.xsd"/>
+    <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:element name="application" type="geronimo:applicationType"/>
 

Modified: geronimo/trunk/modules/j2ee-schema/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-schema/maven.xml?rev=216115&r1=216114&r2=216115&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-schema/maven.xml (original)
+++ geronimo/trunk/modules/j2ee-schema/maven.xml Tue Jul 12 22:22:18 2005
@@ -23,7 +23,7 @@
     xmlns:j="jelly:core"
     xmlns:ant="jelly:ant"
     xmlns:maven="jelly:maven"
-    xmlns:xmlbeans="geronimo:xmlbeans">
+    xmlns:xmlbeans="xmlbeans2:maven">
 
     <preGoal name="java:compile">
         <xmlbeans:schema2java

Modified: geronimo/trunk/modules/j2ee-schema/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-schema/project.xml?rev=216115&r1=216114&r2=216115&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-schema/project.xml (original)
+++ geronimo/trunk/modules/j2ee-schema/project.xml Tue Jul 12 22:22:18 2005
@@ -43,16 +43,28 @@
     <dependencies>
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>geronimo-xmlbeans-plugin</artifactId>
-            <version>${pom.currentVersion}</version>
+            <artifactId>xmlbeans-maven-plugin</artifactId>
+            <version>${xmlbeans_maven_plugin_version}</version>
             <type>plugin</type>
         </dependency>
-
+ 
         <!-- needed for xmlbeans runtime-->
         <dependency>
             <groupId>xmlbeans</groupId>
-            <artifactId>xbean-apache</artifactId>
+            <artifactId>xbean</artifactId>
             <version>${xmlbeans_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax</artifactId>
+            <version>${stax_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+            <version>${stax_api_version}</version>
         </dependency>
 
     </dependencies>

Modified: geronimo/trunk/modules/jetty-builder/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty-builder/project.xml?rev=216115&r1=216114&r2=216115&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty-builder/project.xml (original)
+++ geronimo/trunk/modules/jetty-builder/project.xml Tue Jul 12 22:22:18 2005
@@ -41,21 +41,27 @@
     <!-- ============ -->
 
     <dependencies>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-xmlbeans-plugin</artifactId>
-            <version>${pom.currentVersion}</version>
-            <type>plugin</type>
-        </dependency>
 
         <!-- needed for xmlbeans runtime-->
         <dependency>
             <groupId>xmlbeans</groupId>
-            <artifactId>xbean-apache</artifactId>
+            <artifactId>xbean</artifactId>
             <version>${xmlbeans_version}</version>
         </dependency>
 
         <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax</artifactId>
+            <version>${stax_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>
             <version>${pom.currentVersion}</version>
@@ -324,41 +330,4 @@
 
     </dependencies>
 
-
-    <!-- =================== -->
-    <!-- Build Specification -->
-    <!-- =================== -->
-
-    <build>
-        <resources>
-            <resource>
-                <directory>${basedir}/src/etc</directory>
-            </resource>
-            <resource>
-                <directory>${basedir}/target/xmlbeans</directory>
-                <includes>
-                     <include>schema/**</include>
-                 </includes>
-             </resource>
-        </resources>
-        <unitTest>
-            <includes>
-                <include>**/*Test.java</include>
-            </includes>
-            <excludes>
-                <exclude>**/Abstract*.java</exclude>
-            </excludes>
-            <resources>
-                <resource>
-                    <directory>${basedir}/src/schema</directory>
-                    <includes>
-                        <include>*.xsd</include>
-                    </includes>
-                </resource>
-                <resource>
-                    <directory>${basedir}/src/test-resources</directory>
-                </resource>
-            </resources>
-        </unitTest>
-    </build>
 </project>

Modified: geronimo/trunk/modules/naming-builder/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/naming-builder/maven.xml?rev=216115&r1=216114&r2=216115&view=diff
==============================================================================
--- geronimo/trunk/modules/naming-builder/maven.xml (original)
+++ geronimo/trunk/modules/naming-builder/maven.xml Tue Jul 12 22:22:18 2005
@@ -6,29 +6,28 @@
     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.
 -->
-  
+
 
 <!-- $Rev$ $Date$ -->
 
 <project default="default"
-    xmlns:xmlbeans="geronimo:xmlbeans">
+    xmlns:xmlbeans="xmlbeans2:maven">
 
     <preGoal name="java:compile">
         <xmlbeans:schema2java
             sourcedir="${basedir}/src"
             sourceschema="schema/geronimo-naming.xsd"
             xmlconfigs="${basedir}/src/schema/xmlconfig.xml"
-            targetdir="${basedir}/target/xmlbeans"
-            cataloglocation="${basedir}/../j2ee-schema/src/catalog/resolver-catalog.xml"/>
+            targetdir="${basedir}/target/xmlbeans"/>
     </preGoal>
 
 </project>

Modified: geronimo/trunk/modules/naming-builder/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/naming-builder/project.xml?rev=216115&r1=216114&r2=216115&view=diff
==============================================================================
--- geronimo/trunk/modules/naming-builder/project.xml (original)
+++ geronimo/trunk/modules/naming-builder/project.xml Tue Jul 12 22:22:18 2005
@@ -44,10 +44,22 @@
         <!-- needed for xmlbeans runtime-->
         <dependency>
             <groupId>xmlbeans</groupId>
-            <artifactId>xbean-apache</artifactId>
+            <artifactId>xbean</artifactId>
             <version>${xmlbeans_version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax</artifactId>
+            <version>${stax_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+            <version>${stax_api_version}</version>
+        </dependency>
+
         <!-- Module Dependencies -->
 
            <dependency>
@@ -113,7 +125,7 @@
             <artifactId>geronimo-naming</artifactId>
             <version>${pom.currentVersion}</version>
         </dependency>
-            
+
         <dependency>
             <groupId>geronimo-spec</groupId>
             <artifactId>geronimo-spec-jta</artifactId>
@@ -128,21 +140,4 @@
 
     </dependencies>
 
-    <build>
-        <resources>
-        </resources>
-        <unitTest>
-            <includes>
-                <include>**/*Test.java</include>
-            </includes>
-            <resources>
-                <resource>
-                    <directory>${basedir}/src/test-data</directory>
-                    <includes>
-                        <include>*.properties</include>
-                    </includes>
-                </resource>
-            </resources>
-        </unitTest>
-    </build>
 </project>

Modified: geronimo/trunk/modules/security-builder/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security-builder/maven.xml?rev=216115&r1=216114&r2=216115&view=diff
==============================================================================
--- geronimo/trunk/modules/security-builder/maven.xml (original)
+++ geronimo/trunk/modules/security-builder/maven.xml Tue Jul 12 22:22:18 2005
@@ -23,7 +23,7 @@
     xmlns:j="jelly:core"
     xmlns:ant="jelly:ant"
     xmlns:maven="jelly:maven"
-    xmlns:xmlbeans="geronimo:xmlbeans">
+    xmlns:xmlbeans="xmlbeans2:maven">
 
     <preGoal name="xdoc:jelly-transform">
         <attainGoal name="html2xdoc"/>
@@ -34,8 +34,7 @@
             sourcedir="${basedir}/src"
             sourceschema="schema/geronimo-security.xsd,schema/geronimo-login-config.xsd"
             xmlconfigs="${basedir}/src/schema/xmlconfig.xml"
-            targetdir="${basedir}/target/xmlbeans"
-            cataloglocation="${basedir}/../j2ee-schema/src/catalog/resolver-catalog.xml"/>
+            targetdir="${basedir}/target/xmlbeans"/>
     </preGoal>
 
     <!-- Set up the test files -->

Modified: geronimo/trunk/modules/security-builder/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security-builder/project.xml?rev=216115&r1=216114&r2=216115&view=diff
==============================================================================
--- geronimo/trunk/modules/security-builder/project.xml (original)
+++ geronimo/trunk/modules/security-builder/project.xml Tue Jul 12 22:22:18 2005
@@ -43,19 +43,31 @@
     <dependencies>
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>geronimo-xmlbeans-plugin</artifactId>
-            <version>${pom.currentVersion}</version>
+            <artifactId>xmlbeans-maven-plugin</artifactId>
+            <version>${xmlbeans_maven_plugin_version}</version>
             <type>plugin</type>
         </dependency>
 
         <!-- needed for xmlbeans runtime-->
         <dependency>
             <groupId>xmlbeans</groupId>
-            <artifactId>xbean-apache</artifactId>
+            <artifactId>xbean</artifactId>
             <version>${xmlbeans_version}</version>
         </dependency>
 
         <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax</artifactId>
+            <version>${stax_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+            <version>${stax_api_version}</version>
+        </dependency>
+
+        <dependency>
              <groupId>geronimo</groupId>
              <artifactId>geronimo-security</artifactId>
              <version>${pom.currentVersion}</version>
@@ -115,19 +127,4 @@
 
     </dependencies>
 
-
-    <!-- =================== -->
-    <!-- Build Specification -->
-    <!-- =================== -->
-
-    <build>
-        <unitTest>
-            <includes>
-                <include>**/*Test.java</include>
-            </includes>
-            <excludes>
-                <exclude>**/Abstract*.java</exclude>
-            </excludes>
-        </unitTest>
-    </build>
 </project>

Modified: geronimo/trunk/modules/service-builder/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/maven.xml?rev=216115&r1=216114&r2=216115&view=diff
==============================================================================
--- geronimo/trunk/modules/service-builder/maven.xml (original)
+++ geronimo/trunk/modules/service-builder/maven.xml Tue Jul 12 22:22:18 2005
@@ -20,7 +20,7 @@
 <!-- $Rev: 46019 $ $Date: 2004-09-14 05:56:06 -0400 (Tue, 14 Sep 2004) $ -->
 
 <project default="default"
-    xmlns:xmlbeans="geronimo:xmlbeans">
+    xmlns:xmlbeans="xmlbeans2:maven">
 
     <preGoal name="java:compile">
         <xmlbeans:schema2java

Modified: geronimo/trunk/modules/service-builder/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/project.xml?rev=216115&r1=216114&r2=216115&view=diff
==============================================================================
--- geronimo/trunk/modules/service-builder/project.xml (original)
+++ geronimo/trunk/modules/service-builder/project.xml Tue Jul 12 22:22:18 2005
@@ -43,18 +43,30 @@
     <dependencies>
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>geronimo-xmlbeans-plugin</artifactId>
-            <version>${pom.currentVersion}</version>
+            <artifactId>xmlbeans-maven-plugin</artifactId>
+            <version>${xmlbeans_maven_plugin_version}</version>
             <type>plugin</type>
         </dependency>
 
         <!-- needed for xmlbeans runtime-->
         <dependency>
             <groupId>xmlbeans</groupId>
-            <artifactId>xbean-apache</artifactId>
+            <artifactId>xbean</artifactId>
             <version>${xmlbeans_version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax</artifactId>
+            <version>${stax_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>

Modified: geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanBuilder.java?rev=216115&r1=216114&r2=216115&view=diff
==============================================================================
--- geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanBuilder.java (original)
+++ geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanBuilder.java Tue Jul 12 22:22:18 2005
@@ -92,13 +92,12 @@
         }
     }
 
-    public void setXmlAttribute(String name, XmlCursor xmlCursor) throws DeploymentException {
-        String namespace = xmlCursor.getName().getNamespaceURI();
+    public void setXmlAttribute(String name, XmlObject xmlObject) throws DeploymentException {
+        String namespace = xmlObject.getDomNode().getNamespaceURI();
         XmlAttributeBuilder builder = (XmlAttributeBuilder) xmlAttributeBuilderMap.get(namespace);
         if (builder == null) {
             throw new DeploymentException("No attribute builder deployed for namespace: " + namespace);
         }
-        XmlObject xmlObject = xmlCursor.getObject();
         GAttributeInfo attribute = gbean.getGBeanInfo().getAttribute(name);
         if (attribute == null) {
             throw new DeploymentException("Unknown attribute " + name + " on " + gbean.getName());

Modified: geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java?rev=216115&r1=216114&r2=216115&view=diff
==============================================================================
--- geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java (original)
+++ geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java Tue Jul 12 22:22:18 2005
@@ -64,6 +64,8 @@
 import org.apache.xmlbeans.XmlException;
 import org.apache.xmlbeans.XmlOptions;
 import org.apache.xmlbeans.XmlObject;
+import org.apache.xmlbeans.XmlObject;
+import org.apache.xmlbeans.QNameSet;
 
 /**
  * @version $Rev$ $Date$
@@ -301,13 +303,13 @@
             for (int i = 0; i < xmlAttributeArray.length; i++) {
                 XmlAttributeType xmlAttributeType = xmlAttributeArray[i];
                 String name = xmlAttributeType.getName().trim();
-                XmlCursor xmlCursor = xmlAttributeType.newCursor();
-                try {
-                    xmlCursor.toFirstChild();
-                    builder.setXmlAttribute(name, xmlCursor);
-                } finally {
-                    xmlCursor.dispose();
+//                XmlObject[] anys = xmlAttributeType.selectChildren(XmlAttributeType.type.qnameSetForWildcardElements());
+                String uri = "http://geronimo.apache.org/xml/ns/deployment";
+                XmlObject[] anys = xmlAttributeType.selectChildren(QNameSet.forWildcardNamespaceString("##other", uri));
+                if (anys.length != 1) {
+                    throw new DeploymentException("Unexpected count of xs:any elements in xml-attribute " + anys.length + " qnameset: " + XmlAttributeType.type.qnameSetForWildcardElements());
                 }
+                builder.setXmlAttribute(name, anys[0]);
             }
         }
 

Modified: geronimo/trunk/modules/spring-builder/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/spring-builder/maven.xml?rev=216115&r1=216114&r2=216115&view=diff
==============================================================================
--- geronimo/trunk/modules/spring-builder/maven.xml (original)
+++ geronimo/trunk/modules/spring-builder/maven.xml Tue Jul 12 22:22:18 2005
@@ -23,7 +23,7 @@
     xmlns:j="jelly:core"
     xmlns:ant="jelly:ant"
     xmlns:maven="jelly:maven"
-    xmlns:xmlbeans="geronimo:xmlbeans">
+    xmlns:xmlbeans="xmlbeans2:maven">
 
 <!--
     <preGoal name="java:compile">

Modified: geronimo/trunk/modules/spring-builder/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/spring-builder/project.xml?rev=216115&r1=216114&r2=216115&view=diff
==============================================================================
--- geronimo/trunk/modules/spring-builder/project.xml (original)
+++ geronimo/trunk/modules/spring-builder/project.xml Tue Jul 12 22:22:18 2005
@@ -51,10 +51,22 @@
         <!-- needed for xmlbeans runtime-->
         <dependency>
             <groupId>xmlbeans</groupId>
-            <artifactId>xbean-apache</artifactId>
+            <artifactId>xbean</artifactId>
             <version>${xmlbeans_version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax</artifactId>
+            <version>${stax_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>

Modified: geronimo/trunk/modules/test-ddbean/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/test-ddbean/project.xml?rev=216115&r1=216114&r2=216115&view=diff
==============================================================================
--- geronimo/trunk/modules/test-ddbean/project.xml (original)
+++ geronimo/trunk/modules/test-ddbean/project.xml Tue Jul 12 22:22:18 2005
@@ -43,9 +43,22 @@
     <dependencies>
         <dependency>
             <groupId>xmlbeans</groupId>
-            <artifactId>xbean-apache</artifactId>
+            <artifactId>xbean</artifactId>
             <version>${xmlbeans_version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax</artifactId>
+            <version>${stax_version}</version>
+        </dependency>
+    
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+            <version>${stax_api_version}</version>
+        </dependency>
+    
         <dependency>
             <groupId>geronimo-spec</groupId>
             <artifactId>geronimo-spec-j2ee-deployment</artifactId>

Modified: geronimo/trunk/modules/tomcat-builder/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat-builder/project.xml?rev=216115&r1=216114&r2=216115&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat-builder/project.xml (original)
+++ geronimo/trunk/modules/tomcat-builder/project.xml Tue Jul 12 22:22:18 2005
@@ -51,8 +51,20 @@
         <!-- needed for xmlbeans runtime-->
         <dependency>
             <groupId>xmlbeans</groupId>
-            <artifactId>xbean-apache</artifactId>
+            <artifactId>xbean</artifactId>
             <version>${xmlbeans_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax</artifactId>
+            <version>${stax_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+            <version>${stax_api_version}</version>
         </dependency>
 
         <dependency>

Modified: geronimo/trunk/modules/tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/project.xml?rev=216115&r1=216114&r2=216115&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/project.xml (original)
+++ geronimo/trunk/modules/tomcat/project.xml Tue Jul 12 22:22:18 2005
@@ -266,9 +266,22 @@
         </dependency>
         <dependency>
             <groupId>xmlbeans</groupId>
-            <artifactId>xbean-apache</artifactId>
+            <artifactId>xbean</artifactId>
             <version>${xmlbeans_version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax</artifactId>
+            <version>${stax_version}</version>
+        </dependency>
+    
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+            <version>${stax_api_version}</version>
+        </dependency>
+    
         <dependency>
             <groupId>commons-beanutils</groupId>
             <artifactId>commons-beanutils</artifactId>

Modified: geronimo/trunk/modules/web-builder/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/web-builder/maven.xml?rev=216115&r1=216114&r2=216115&view=diff
==============================================================================
--- geronimo/trunk/modules/web-builder/maven.xml (original)
+++ geronimo/trunk/modules/web-builder/maven.xml Tue Jul 12 22:22:18 2005
@@ -6,16 +6,16 @@
     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.
 -->
-  
+
 
 <!-- $Rev: 56771 $ $Date: 2004-11-06 12:58:54 -0700 (Sat, 06 Nov 2004) $ -->
 
@@ -23,8 +23,8 @@
     xmlns:j="jelly:core"
     xmlns:ant="jelly:ant"
     xmlns:maven="jelly:maven"
-    xmlns:xmlbeans="geronimo:xmlbeans">
-
+    xmlns:xmlbeans="xmlbeans2:maven"
+    >
     <preGoal name="java:compile">
         <xmlbeans:schema2java
             sourcedir="${basedir}/src"

Modified: geronimo/trunk/modules/web-builder/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/web-builder/project.xml?rev=216115&r1=216114&r2=216115&view=diff
==============================================================================
--- geronimo/trunk/modules/web-builder/project.xml (original)
+++ geronimo/trunk/modules/web-builder/project.xml Tue Jul 12 22:22:18 2005
@@ -41,21 +41,33 @@
     <!-- ============ -->
 
     <dependencies>
-        <dependency>
+       <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>geronimo-xmlbeans-plugin</artifactId>
-            <version>${pom.currentVersion}</version>
+            <artifactId>xmlbeans-maven-plugin</artifactId>
+            <version>${xmlbeans_maven_plugin_version}</version>
             <type>plugin</type>
         </dependency>
 
         <!-- needed for xmlbeans runtime-->
         <dependency>
             <groupId>xmlbeans</groupId>
-            <artifactId>xbean-apache</artifactId>
+            <artifactId>xbean</artifactId>
             <version>${xmlbeans_version}</version>
         </dependency>
 
         <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax</artifactId>
+            <version>${stax_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+            <version>${stax_api_version}</version>
+        </dependency>
+
+        <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-deploy-config</artifactId>
             <version>${pom.currentVersion}</version>
@@ -115,247 +127,6 @@
             <version>${geronimo_version}</version>
         </dependency>
 
-<!--
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-axis</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-kernel</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-deployment</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-naming</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-
-       <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-tomcat</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-
-       <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-j2ee</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-security</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-transaction</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-connector</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-common</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-system</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-service-builder</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-webservices</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-
-        todo put WSDescriptorParser somewhere else and remove this dependency
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-axis-builder</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-jta</artifactId>
-            <version>${geronimo_spec_jta_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee-jacc</artifactId>
-            <version>${geronimo_spec_j2ee_jacc_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-j2ee-connector</artifactId>
-            <version>${geronimo_spec_j2ee_connector_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>mx4j</groupId>
-            <artifactId>mx4j</artifactId>
-            <version>${mx4j_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-servlet</artifactId>
-            <version>${geronimo_spec_servlet_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-jsp</artifactId>
-            <version>${geronimo_spec_jsp_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-jaxrpc</artifactId>
-            <version>${geronimo_spec_jaxrpc_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>geronimo-spec</groupId>
-            <artifactId>geronimo-spec-saaj</artifactId>
-            <version>${geronimo_spec_saaj_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>axis</groupId>
-            <artifactId>axis</artifactId>
-            <version>${axis_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-discovery</groupId>
-            <artifactId>commons-discovery</artifactId>
-            <version>${commons_discovery_version}</version>
-            <url>http://jakarta.apache.org/commons/discovery/</url>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>${commons_logging_version}</version>
-            <url>http://jakarta.apache.org/commons/logging/</url>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-modeler</groupId>
-            <artifactId>commons-modeler</artifactId>
-            <version>${commons_modeler_version}</version>
-            <url>http://jakarta.apache.org/commons/modeler</url>
-            <properties>
-                <repository>true</repository>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-el</groupId>
-            <artifactId>commons-el</artifactId>
-            <version>${commons_el_version}</version>
-            <url>http://jakarta.apache.org/commons/el/</url>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>${commons_io_version}</version>
-            <url>http://jakarta.apache.org/commons/io/</url>
-        </dependency>
-
-        <dependency>
-            <groupId>ant</groupId>
-            <artifactId>ant</artifactId>
-            <version>${ant_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-            <version>${xerces_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>cglib</groupId>
-            <artifactId>cglib-nodep</artifactId>
-            <version>${cglib_version}</version>
-            <url>http://cglib.sf.net/</url>
-        </dependency>
-
-        <dependency>
-            <groupId>concurrent</groupId>
-            <artifactId>concurrent</artifactId>
-            <version>${concurrent_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>regexp</groupId>
-            <artifactId>regexp</artifactId>
-            <version>${regexp_version}</version>
-            <url>http://jakarta.apache.org/regexp</url>
-        </dependency>
-
-        <dependency>
-            <groupId>tranql</groupId>
-            <artifactId>tranql</artifactId>
-            <version>${tranql_version}</version>
-            <url>http://tranql.codehaus.org</url>
-        </dependency>
-
-        <dependency>
-            <groupId>wsdl4j</groupId>
-            <artifactId>wsdl4j</artifactId>
-            <version>${wsdl4j_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-            <version>${xerces_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xmlParserAPIs</artifactId>
-            <version>${xml_parser_apis_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>xml-apis</groupId>
-            <artifactId>xml-apis</artifactId>
-            <version>${xml_apis_version}</version>
-        </dependency>
--->
     </dependencies>
 
 
@@ -364,17 +135,6 @@
     <!-- =================== -->
 
     <build>
-        <resources>
-            <resource>
-                <directory>${basedir}/src/etc</directory>
-            </resource>
-            <resource>
-                <directory>${basedir}/target/xmlbeans</directory>
-                <includes>
-                     <include>schema/**</include>
-                 </includes>
-             </resource>
-        </resources>
         <unitTest>
             <includes>
                 <include>**/*Test.java</include>

Modified: geronimo/trunk/modules/web-builder/src/schema/geronimo-web.xsd
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/web-builder/src/schema/geronimo-web.xsd?rev=216115&r1=216114&r2=216115&view=diff
==============================================================================
--- geronimo/trunk/modules/web-builder/src/schema/geronimo-web.xsd (original)
+++ geronimo/trunk/modules/web-builder/src/schema/geronimo-web.xsd Tue Jul 12 22:22:18 2005
@@ -27,9 +27,9 @@
     attributeFormDefault="unqualified"
     version="1.0">
 
-    <xs:import namespace="http://geronimo.apache.org/xml/ns/naming" schemaLocation="../../../naming-builder/src/schema/geronimo-naming.xsd"/>
-    <xs:import namespace="http://geronimo.apache.org/xml/ns/security" schemaLocation="../../../security-builder/src/schema/geronimo-security.xsd"/>
-    <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment" schemaLocation="../../../service-builder/src/schema/geronimo-config.xsd"/>
+    <xs:import namespace="http://geronimo.apache.org/xml/ns/naming" schemaLocation="schema/geronimo-naming.xsd"/>
+    <xs:import namespace="http://geronimo.apache.org/xml/ns/security" schemaLocation="schema/geronimo-security.xsd"/>
+    <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment" schemaLocation="schema/geronimo-config.xsd"/>
 
     <xs:element name="web-app" type="web:web-appType"/>
 

Added: geronimo/trunk/plugins/maven-xmlbeans2-plugin/INSTRUCTIONS.txt
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/maven-xmlbeans2-plugin/INSTRUCTIONS.txt?rev=216115&view=auto
==============================================================================
--- geronimo/trunk/plugins/maven-xmlbeans2-plugin/INSTRUCTIONS.txt (added)
+++ geronimo/trunk/plugins/maven-xmlbeans2-plugin/INSTRUCTIONS.txt Tue Jul 12 22:22:18 2005
@@ -0,0 +1,68 @@
+Some brief instructions for using the maven xmlbeans2 plugin
+
+1. Include something like this in your maven.xml:
+namespace declaration:
+
+    xmlns:xmlbeans="xmlbeans:maven"
+
+    <preGoal name="java:compile">
+        <xmlbeans:schema2java
+            sourcedir="${basedir}/src"
+            sourceschema="j2ee_1_4schema/application_1_4.xsd,j2ee_1_4schema/j2ee_jaxrpc_mapping_1_1.xsd,j2ee_1_3schema/connector_1_0.xsd"
+            xmlconfigs="${basedir}/src/conf/xmlconfig.xml"
+            targetdir="${basedir}/target/xmlbeans"
+            cataloglocation="${basedir}/src/catalog/resolver-catalog.xml"/>
+    </preGoal>
+
+where 
+
+sourcedir is a base directory for the list in sourceschema
+sourceschema is a comma-delimited list of all the schemas you want to compile
+xmlconfigs points to your xmlconfig.xml file
+targetdir is where you want generated java source to appear
+cataloglocation is the location of an entity resolver catalog to use for resolving namespace to schema locations.
+
+The generated binary files, both .xsd and the TypeHolder class, will end up in the target/classes directory.
+
+In addition, you can add precompiled schemas to the "schema classpath" by including them as
+dependencies in project.xml with a properties tag like this:
+
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-naming-builder</artifactId>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                <xmlbeans>true</xmlbeans>
+            </properties>
+        </dependency>
+
+You will probably also want to add a dependency on the plugin to your project.xml file and the other dependencies if you use xmlbeans in unit tests:
+
+        <dependency>
+            <groupId>xmlbeans</groupId>
+            <artifactId>xmlbeans-maven-plugin</artifactId>
+            <version>2.0-beta1</version>
+            <type>plugin</type>
+        </dependency>
+
+        <!-- needed for xmlbeans runtime-->
+        <dependency>
+            <groupId>xmlbeans</groupId>
+            <artifactId>xbean</artifactId>
+            <version>${xmlbeans_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax</artifactId>
+            <version>${stax_version}</version>
+        </dependency>
+    
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+            <version>${stax_api_version}</version>
+        </dependency>
+    
+
+

Added: geronimo/trunk/plugins/maven-xmlbeans2-plugin/LICENSE.txt
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/maven-xmlbeans2-plugin/LICENSE.txt?rev=216115&view=auto
==============================================================================
--- geronimo/trunk/plugins/maven-xmlbeans2-plugin/LICENSE.txt (added)
+++ geronimo/trunk/plugins/maven-xmlbeans2-plugin/LICENSE.txt Tue Jul 12 22:22:18 2005
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
+



Mime
View raw message