geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r219994 - in /geronimo/trunk: etc/ modules/assembly/ modules/assembly/src/plan/ modules/axis-builder/ modules/client-builder/ modules/connector-builder/ modules/deploy-config/ modules/deploy-jsr88/ modules/deploy-tool/ modules/j2ee-builder/...
Date Thu, 21 Jul 2005 04:17:39 GMT
Author: djencks
Date: Wed Jul 20 21:17:36 2005
New Revision: 219994

URL: http://svn.apache.org/viewcvs?rev=219994&view=rev
Log:
GERONIMO-784 and refactor xmlbeans2 plugin for move to xmlbeans

Modified:
    geronimo/trunk/etc/project.properties
    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/assembly/src/plan/tomcat-runtime-deployer-config.xml
    geronimo/trunk/modules/axis-builder/maven.xml
    geronimo/trunk/modules/axis-builder/project.xml
    geronimo/trunk/modules/client-builder/maven.xml
    geronimo/trunk/modules/client-builder/project.xml
    geronimo/trunk/modules/connector-builder/maven.xml
    geronimo/trunk/modules/connector-builder/project.xml
    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-schema/maven.xml
    geronimo/trunk/modules/j2ee-schema/project.properties
    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/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/webservices/project.xml
    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/java/org/apache/xmlbeans/maven/SchemaCompilerWrapper.java

Modified: geronimo/trunk/etc/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/etc/project.properties?rev=219994&r1=219993&r2=219994&view=diff
==============================================================================
--- geronimo/trunk/etc/project.properties (original)
+++ geronimo/trunk/etc/project.properties Wed Jul 20 21:17:36 2005
@@ -68,6 +68,11 @@
 maven.javadoc.links=http://java.sun.com/j2se/1.4.1/docs/api/
 maven.javadoc.source=1.4
 
+#####################################################
+# Where xmlbeans2 will copy source schemas
+#####################################################
+maven.xmlbeans2.baseSchemaLocation=META-INF
+maven.xmlbeans2.sourcedir=${basedir}/src
 
 #####################################################
 # Dependency Version

Modified: geronimo/trunk/modules/assembly/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/project.xml?rev=219994&r1=219993&r2=219994&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/project.xml (original)
+++ geronimo/trunk/modules/assembly/project.xml Wed Jul 20 21:17:36 2005
@@ -1106,15 +1106,6 @@
 
         <dependency>
             <groupId>stax</groupId>
-            <artifactId>stax</artifactId>
-            <version>${stax_version}</version>
-            <properties>
-                <repository>true</repository>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <groupId>stax</groupId>
             <artifactId>stax-api</artifactId>
             <version>${stax_api_version}</version>
             <properties>

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=219994&r1=219993&r2=219994&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml Wed Jul 20 21:17:36 2005
@@ -28,9 +28,6 @@
     >
 
     <dependency>
-        <uri>xmlbeans/jars/xbean-${xmlbeans_version}.jar</uri>
-    </dependency>
-    <dependency>
         <uri>geronimo-spec/jars/geronimo-spec-corba-${geronimo_spec_corba_version}.jar</uri>
     </dependency>
     <dependency>
@@ -70,9 +67,6 @@
         <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>
 
@@ -225,6 +219,9 @@
     <gbean name="EJBBuilder" class="org.openejb.deployment.OpenEJBModuleBuilder">
         <attribute name="defaultParentId">org/apache/geronimo/Server</attribute>
         <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,J2EEServer=geronimo,j2eeType=GBean,name=WebContainer</attribute>
+        <reference name="WebServiceBuilder">
+            <name>WebServiceBuilder</name>
+        </reference>
         <reference name="Repository">
             <gbean-name>*:name=Repository,*</gbean-name>
         </reference>

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=219994&r1=219993&r2=219994&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 Wed Jul 20 21:17:36 2005
@@ -26,7 +26,7 @@
     configId="org/apache/geronimo/RuntimeDeployer"
     parentId="org/apache/geronimo/Server"
     >
-
+ 
     <dependency>
         <uri>geronimo/jars/geronimo-j2ee-schema-${geronimo_version}.jar</uri>
     </dependency>
@@ -64,9 +64,6 @@
         <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>
@@ -154,7 +151,12 @@
     <gbean name="EJBBuilder" class="org.openejb.deployment.OpenEJBModuleBuilder">
         <attribute name="defaultParentId">org/apache/geronimo/Server</attribute>
         <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,J2EEServer=geronimo,j2eeType=GBean,name=WebContainer</attribute>
-        <reference name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
+        <reference name="WebServiceBuilder">
+            <name>WebServiceBuilder</name>
+        </reference>
+        <reference name="Repository">
+            <gbean-name>*:name=Repository,*</gbean-name>
+        </reference>
     </gbean>
 
     <gbean name="JBIBuilder" class="org.apache.geronimo.servicemix.deployment.ServiceMixConfigBuilder">

Modified: geronimo/trunk/modules/assembly/src/plan/tomcat-runtime-deployer-config.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/tomcat-runtime-deployer-config.xml?rev=219994&r1=219993&r2=219994&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/tomcat-runtime-deployer-config.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/tomcat-runtime-deployer-config.xml Wed Jul 20 21:17:36 2005
@@ -24,8 +24,3 @@
         <reference name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
     </gbean>
 
-    <gbean name="EJBBuilder" class="org.openejb.deployment.OpenEJBModuleBuilder">
-        <attribute name="defaultParentId">org/apache/geronimo/Server</attribute>
-        <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,J2EEServer=geronimo,j2eeType=GBean,name=WebContainer</attribute>
-        <reference name="Repository"><gbean-name>*:name=Repository,*</gbean-name></reference>
-    </gbean>

Modified: geronimo/trunk/modules/axis-builder/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis-builder/maven.xml?rev=219994&r1=219993&r2=219994&view=diff
==============================================================================
--- geronimo/trunk/modules/axis-builder/maven.xml (original)
+++ geronimo/trunk/modules/axis-builder/maven.xml Wed Jul 20 21:17:36 2005
@@ -28,10 +28,7 @@
 
     <preGoal name="java:compile">
         <xmlbeans:schema2java
-            sourcedir="${basedir}/src"
-            sourceschema="schema/wsdl.xsd"
-            xmlconfigs="${basedir}/src/schema/xmlconfig.xml"
-            targetdir="${basedir}/target/xmlbeans"/>
+            maven.xmlbeans2.sourceschema="schema/wsdl.xsd"/>
     </preGoal>
 
 </project>

Modified: geronimo/trunk/modules/axis-builder/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis-builder/project.xml?rev=219994&r1=219993&r2=219994&view=diff
==============================================================================
--- geronimo/trunk/modules/axis-builder/project.xml (original)
+++ geronimo/trunk/modules/axis-builder/project.xml Wed Jul 20 21:17:36 2005
@@ -58,12 +58,6 @@
 
         <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>

Modified: geronimo/trunk/modules/client-builder/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/client-builder/maven.xml?rev=219994&r1=219993&r2=219994&view=diff
==============================================================================
--- geronimo/trunk/modules/client-builder/maven.xml (original)
+++ geronimo/trunk/modules/client-builder/maven.xml Wed Jul 20 21:17:36 2005
@@ -27,10 +27,6 @@
 
     <preGoal name="java:compile">
         <xmlbeans:schema2java
-            sourcedir="${basedir}/src"
-            sourceschema="schema/geronimo-application-client.xsd"
-            xmlconfigs="${basedir}/src/schema/xmlconfig.xml"
-            targetdir="${basedir}/target/xmlbeans"
-            cataloglocation="${basedir}/../j2ee-schema/src/catalog/resolver-catalog.xml"/>
+            maven.xmlbeans2.sourceschema="schema/geronimo-application-client.xsd"/>
     </preGoal>
 </project>

Modified: geronimo/trunk/modules/client-builder/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/client-builder/project.xml?rev=219994&r1=219993&r2=219994&view=diff
==============================================================================
--- geronimo/trunk/modules/client-builder/project.xml (original)
+++ geronimo/trunk/modules/client-builder/project.xml Wed Jul 20 21:17:36 2005
@@ -57,12 +57,6 @@
 
         <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>

Modified: geronimo/trunk/modules/connector-builder/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/maven.xml?rev=219994&r1=219993&r2=219994&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/maven.xml (original)
+++ geronimo/trunk/modules/connector-builder/maven.xml Wed Jul 20 21:17:36 2005
@@ -28,10 +28,7 @@
 
     <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"/>
+            maven.xmlbeans2.sourceschema="schema/geronimo-connector_1_5.xsd"/>
     </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=219994&r1=219993&r2=219994&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/project.xml (original)
+++ geronimo/trunk/modules/connector-builder/project.xml Wed Jul 20 21:17:36 2005
@@ -57,12 +57,6 @@
 
         <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>

Modified: geronimo/trunk/modules/deploy-config/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-config/project.xml?rev=219994&r1=219993&r2=219994&view=diff
==============================================================================
--- geronimo/trunk/modules/deploy-config/project.xml (original)
+++ geronimo/trunk/modules/deploy-config/project.xml Wed Jul 20 21:17:36 2005
@@ -49,12 +49,6 @@
             <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>

Modified: geronimo/trunk/modules/deploy-jsr88/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-jsr88/project.xml?rev=219994&r1=219993&r2=219994&view=diff
==============================================================================
--- geronimo/trunk/modules/deploy-jsr88/project.xml (original)
+++ geronimo/trunk/modules/deploy-jsr88/project.xml Wed Jul 20 21:17:36 2005
@@ -54,12 +54,6 @@
 
         <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>

Modified: geronimo/trunk/modules/deploy-tool/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/project.xml?rev=219994&r1=219993&r2=219994&view=diff
==============================================================================
--- geronimo/trunk/modules/deploy-tool/project.xml (original)
+++ geronimo/trunk/modules/deploy-tool/project.xml Wed Jul 20 21:17:36 2005
@@ -49,16 +49,10 @@
 
         <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=219994&r1=219993&r2=219994&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/maven.xml (original)
+++ geronimo/trunk/modules/j2ee-builder/maven.xml Wed Jul 20 21:17:36 2005
@@ -27,11 +27,7 @@
 
     <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"/>-->
+            maven.xmlbeans2.sourceschema="schema/geronimo-application.xsd"/>
     </preGoal>
 
     <preGoal name="test:compile">

Modified: geronimo/trunk/modules/j2ee-builder/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/project.xml?rev=219994&r1=219993&r2=219994&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/project.xml (original)
+++ geronimo/trunk/modules/j2ee-builder/project.xml Wed Jul 20 21:17:36 2005
@@ -57,12 +57,6 @@
 
         <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>

Modified: geronimo/trunk/modules/j2ee-schema/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-schema/maven.xml?rev=219994&r1=219993&r2=219994&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-schema/maven.xml (original)
+++ geronimo/trunk/modules/j2ee-schema/maven.xml Wed Jul 20 21:17:36 2005
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
 
-    Copyright 2004 The Apache Software Foundation
+    Copyright 2004-2005 The Apache Software Foundation
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -27,11 +27,11 @@
 
     <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,j2ee_1_4schema/j2ee_1_4.xsd,j2ee_1_4schema/connector_1_5.xsd,j2ee_1_4schema/ejb-jar_2_1.xsd,j2ee_1_4schema/web-app_2_4.xsd,j2ee_1_4schema/application-client_1_4.xsd,j2ee_1_4schema/j2ee_web_services_1_1.xsd"
-            xmlconfigs="${basedir}/src/conf/xmlconfig.xml"
-            targetdir="${basedir}/target/xmlbeans"
-            cataloglocation="${basedir}/src/catalog/resolver-catalog.xml"/>
+            maven.xmlbeans2.sourcedir="${basedir}/src"
+            maven.xmlbeans2.sourceschema="j2ee_1_4schema/application_1_4.xsd,j2ee_1_4schema/j2ee_jaxrpc_mapping_1_1.xsd,j2ee_1_3schema/connector_1_0.xsd,j2ee_1_4schema/j2ee_1_4.xsd,j2ee_1_4schema/connector_1_5.xsd,j2ee_1_4schema/ejb-jar_2_1.xsd,j2ee_1_4schema/web-app_2_4.xsd,j2ee_1_4schema/application-client_1_4.xsd,j2ee_1_4schema/j2ee_web_services_1_1.xsd"
+            maven.xmlbeans2.xmlconfigs="${basedir}/src/conf/xmlconfig.xml"
+            maven.xmlbeans2.targetdir="${basedir}/target/xmlbeans"
+            maven.xmlbeans2.cataloglocation="${basedir}/src/catalog/resolver-catalog.xml"/>
     </preGoal>
 
     <postGoal name="xdoc:register-reports">

Modified: geronimo/trunk/modules/j2ee-schema/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-schema/project.properties?rev=219994&r1=219993&r2=219994&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-schema/project.properties (original)
+++ geronimo/trunk/modules/j2ee-schema/project.properties Wed Jul 20 21:17:36 2005
@@ -7,3 +7,4 @@
 
 
 maven.idea.generated.source=xmlbeans
+

Modified: geronimo/trunk/modules/j2ee-schema/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-schema/project.xml?rev=219994&r1=219993&r2=219994&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-schema/project.xml (original)
+++ geronimo/trunk/modules/j2ee-schema/project.xml Wed Jul 20 21:17:36 2005
@@ -47,18 +47,12 @@
             <version>${xmlbeans_maven_plugin_version}</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>

Modified: geronimo/trunk/modules/jetty-builder/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty-builder/project.xml?rev=219994&r1=219993&r2=219994&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty-builder/project.xml (original)
+++ geronimo/trunk/modules/jetty-builder/project.xml Wed Jul 20 21:17:36 2005
@@ -51,12 +51,6 @@
 
         <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>

Modified: geronimo/trunk/modules/naming-builder/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/naming-builder/maven.xml?rev=219994&r1=219993&r2=219994&view=diff
==============================================================================
--- geronimo/trunk/modules/naming-builder/maven.xml (original)
+++ geronimo/trunk/modules/naming-builder/maven.xml Wed Jul 20 21:17:36 2005
@@ -24,10 +24,7 @@
 
     <preGoal name="java:compile">
         <xmlbeans:schema2java
-            sourcedir="${basedir}/src"
-            sourceschema="schema/geronimo-naming.xsd"
-            xmlconfigs="${basedir}/src/schema/xmlconfig.xml"
-            targetdir="${basedir}/target/xmlbeans"/>
+            maven.xmlbeans2.sourceschema="schema/geronimo-naming.xsd"/>
     </preGoal>
 
 </project>

Modified: geronimo/trunk/modules/naming-builder/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/naming-builder/project.xml?rev=219994&r1=219993&r2=219994&view=diff
==============================================================================
--- geronimo/trunk/modules/naming-builder/project.xml (original)
+++ geronimo/trunk/modules/naming-builder/project.xml Wed Jul 20 21:17:36 2005
@@ -50,12 +50,6 @@
 
         <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>

Modified: geronimo/trunk/modules/security-builder/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security-builder/maven.xml?rev=219994&r1=219993&r2=219994&view=diff
==============================================================================
--- geronimo/trunk/modules/security-builder/maven.xml (original)
+++ geronimo/trunk/modules/security-builder/maven.xml Wed Jul 20 21:17:36 2005
@@ -31,10 +31,7 @@
 
     <preGoal name="java:compile">
         <xmlbeans:schema2java
-            sourcedir="${basedir}/src"
-            sourceschema="schema/geronimo-security.xsd,schema/geronimo-login-config.xsd"
-            xmlconfigs="${basedir}/src/schema/xmlconfig.xml"
-            targetdir="${basedir}/target/xmlbeans"/>
+            maven.xmlbeans2.sourceschema="schema/geronimo-security.xsd,schema/geronimo-login-config.xsd"/>
     </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=219994&r1=219993&r2=219994&view=diff
==============================================================================
--- geronimo/trunk/modules/security-builder/project.xml (original)
+++ geronimo/trunk/modules/security-builder/project.xml Wed Jul 20 21:17:36 2005
@@ -57,12 +57,6 @@
 
         <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>

Modified: geronimo/trunk/modules/service-builder/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/maven.xml?rev=219994&r1=219993&r2=219994&view=diff
==============================================================================
--- geronimo/trunk/modules/service-builder/maven.xml (original)
+++ geronimo/trunk/modules/service-builder/maven.xml Wed Jul 20 21:17:36 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 05:56:06 -0400 (Tue, 14 Sep 2004) $ -->
 
@@ -24,11 +24,7 @@
 
     <preGoal name="java:compile">
         <xmlbeans:schema2java
-            sourcedir="${basedir}/src"
-            sourceschema="schema/geronimo-config.xsd,schema/geronimo-service.xsd,schema/geronimo-javabean-xmlattribute.xsd"
-            xmlconfigs="${basedir}/src/schema/xmlconfig.xml"
-            targetdir="${basedir}/target/xmlbeans"
-            cataloglocation="${basedir}/../../specs/schema/src/catalog/resolver-catalog.xml"/>
+            maven.xmlbeans2.sourceschema="schema/geronimo-config.xsd,schema/geronimo-service.xsd,schema/geronimo-javabean-xmlattribute.xsd"/>
     </preGoal>
 
 </project>

Modified: geronimo/trunk/modules/service-builder/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/project.xml?rev=219994&r1=219993&r2=219994&view=diff
==============================================================================
--- geronimo/trunk/modules/service-builder/project.xml (original)
+++ geronimo/trunk/modules/service-builder/project.xml Wed Jul 20 21:17:36 2005
@@ -57,16 +57,10 @@
 
         <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/spring-builder/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/spring-builder/project.xml?rev=219994&r1=219993&r2=219994&view=diff
==============================================================================
--- geronimo/trunk/modules/spring-builder/project.xml (original)
+++ geronimo/trunk/modules/spring-builder/project.xml Wed Jul 20 21:17:36 2005
@@ -57,12 +57,6 @@
 
         <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>

Modified: geronimo/trunk/modules/test-ddbean/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/test-ddbean/project.xml?rev=219994&r1=219993&r2=219994&view=diff
==============================================================================
--- geronimo/trunk/modules/test-ddbean/project.xml (original)
+++ geronimo/trunk/modules/test-ddbean/project.xml Wed Jul 20 21:17:36 2005
@@ -49,16 +49,10 @@
 
         <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=219994&r1=219993&r2=219994&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat-builder/project.xml (original)
+++ geronimo/trunk/modules/tomcat-builder/project.xml Wed Jul 20 21:17:36 2005
@@ -57,12 +57,6 @@
 
         <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>

Modified: geronimo/trunk/modules/tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/project.xml?rev=219994&r1=219993&r2=219994&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/project.xml (original)
+++ geronimo/trunk/modules/tomcat/project.xml Wed Jul 20 21:17:36 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$ -->
 
 <project>
@@ -52,7 +52,7 @@
              <groupId>concurrent</groupId>
              <artifactId>concurrent</artifactId>
              <version>${concurrent_version}</version>
-         </dependency>        
+         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-jetty-builder</artifactId>
@@ -145,7 +145,7 @@
        <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-j2ee</artifactId>
-            <version>${pom.currentVersion}</version>           
+            <version>${pom.currentVersion}</version>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
@@ -164,9 +164,9 @@
                 <repository>true</repository>
             </properties>
         </dependency>
-        <!-- 
+        <!--
            - Required until any realm is provided to Tomcat
-           - See StandardEngine::getRealm() 
+           - See StandardEngine::getRealm()
            -->
         <dependency>
             <groupId>tomcat</groupId>
@@ -263,23 +263,6 @@
             <groupId>xml-apis</groupId>
             <artifactId>xml-apis</artifactId>
             <version>${xml_apis_version}</version>
-        </dependency>
-        <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>
     
         <dependency>

Modified: geronimo/trunk/modules/web-builder/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/web-builder/maven.xml?rev=219994&r1=219993&r2=219994&view=diff
==============================================================================
--- geronimo/trunk/modules/web-builder/maven.xml (original)
+++ geronimo/trunk/modules/web-builder/maven.xml Wed Jul 20 21:17:36 2005
@@ -27,11 +27,7 @@
     >
     <preGoal name="java:compile">
         <xmlbeans:schema2java
-            sourcedir="${basedir}/src"
-            sourceschema="schema/geronimo-web.xsd"
-            xmlconfigs="${basedir}/src/schema/xmlconfig.xml"
-            targetdir="${basedir}/target/xmlbeans"
-            cataloglocation="${basedir}/../j2ee-schema/src/catalog/resolver-catalog.xml"/>
+            maven.xmlbeans2.sourceschema="schema/geronimo-web.xsd"/>
     </preGoal>
 
 </project>

Modified: geronimo/trunk/modules/web-builder/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/web-builder/project.xml?rev=219994&r1=219993&r2=219994&view=diff
==============================================================================
--- geronimo/trunk/modules/web-builder/project.xml (original)
+++ geronimo/trunk/modules/web-builder/project.xml Wed Jul 20 21:17:36 2005
@@ -57,12 +57,6 @@
 
         <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>

Modified: geronimo/trunk/modules/webservices/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/webservices/project.xml?rev=219994&r1=219993&r2=219994&view=diff
==============================================================================
--- geronimo/trunk/modules/webservices/project.xml (original)
+++ geronimo/trunk/modules/webservices/project.xml Wed Jul 20 21:17:36 2005
@@ -6,22 +6,22 @@
     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: 111629 $ $Date: 2004-12-11 19:52:51 -0800 (Sat, 11 Dec 2004) $ -->
 
 <project>
-    
+
     <pomVersion>3</pomVersion>
-    
+
     <extend>../../etc/project.xml</extend>
 
     <!-- ===================== -->
@@ -71,6 +71,12 @@
 
         <dependency>
             <groupId>geronimo-spec</groupId>
+            <artifactId>geronimo-spec-qname</artifactId>
+            <version>${geronimo_spec_qname_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo-spec</groupId>
             <artifactId>geronimo-spec-jaxrpc</artifactId>
             <version>${geronimo_spec_jaxrpc_version}</version>
         </dependency>
@@ -102,9 +108,6 @@
             <artifactId>castor</artifactId>
             <version>${castor_version}</version>
             <url>http://www.castor.org</url>
-            <properties>
-                <runtime>true</runtime>
-            </properties>
         </dependency>
 
         <dependency>
@@ -118,45 +121,18 @@
             <groupId>xfire</groupId>
             <artifactId>xfire</artifactId>
             <version>${xfire_version}</version>
-            <properties>
-                <runtime>true</runtime>
-            </properties>
         </dependency>
 
         <dependency>
             <groupId>xfire</groupId>
             <artifactId>xfire-java</artifactId>
             <version>${xfire_version}</version>
-            <properties>
-                <runtime>true</runtime>
-            </properties>
         </dependency>
 
         <dependency>
             <groupId>wsdl4j</groupId>
             <artifactId>wsdl4j</artifactId>
             <version>${wsdl4j_version}</version>
-            <properties>
-                <runtime>true</runtime>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax</artifactId>
-            <version>${stax_version}</version>
-            <properties>
-                <runtime>true</runtime>
-            </properties>
-        </dependency>
-
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-            <version>${stax_api_version}</version>
-            <properties>
-                <runtime>true</runtime>
-            </properties>
         </dependency>
 
         <!-- JAXR (Apache Scout) -->
@@ -164,9 +140,6 @@
             <groupId>geronimo-spec</groupId>
             <artifactId>geronimo-spec-jaxr</artifactId>
             <version>${geronimo_spec_jaxr_version}</version>
-            <properties>
-                <runtime>true</runtime>
-            </properties>
         </dependency>
 
 
@@ -174,11 +147,7 @@
             <groupId>scout</groupId>
             <artifactId>scout</artifactId>
             <version>${scout_version}</version>
-            <properties>
-                <runtime>true</runtime>
-            </properties>
         </dependency>
-
 
     </dependencies>
 

Modified: geronimo/trunk/plugins/maven-xmlbeans2-plugin/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/maven-xmlbeans2-plugin/maven.xml?rev=219994&r1=219993&r2=219994&view=diff
==============================================================================
--- geronimo/trunk/plugins/maven-xmlbeans2-plugin/maven.xml (original)
+++ geronimo/trunk/plugins/maven-xmlbeans2-plugin/maven.xml Wed Jul 20 21:17:36 2005
@@ -72,37 +72,6 @@
             dest="${maven.plugin.unpacked.dir}/${pom.artifactId}-${pom.currentVersion}/"/>
     </goal>
 
-    <goal name="clover.wrapper">
-        <!-- no src/test, don't run clover -->
-        <!--attainGoal name="clover"/-->
-    </goal>
-
-    <!-- Remove the log files -->
-    <goal name="clobber"
-        description="Removes all (non-repository installed) build generated files">
-
-        <!-- Let clean:clean do some work first -->
-        <attainGoal name="clean:clean"/>
-
-        <j:jelly xmlns="jelly:ant">
-            <delete quiet="false" failonerror="false">
-                <fileset dir="${basedir}">
-                    <include name="maven.log"/>
-                    <include name="velocity.log*"/>
-                    <include name="junit*.properties"/>
-                </fileset>
-            </delete>
-        </j:jelly>
-    </goal>
-
-    <goal name="java-src"
-        description="Creates an archive containing only java source.">
-
-        <ant:mkdir dir="${basedir}/target"/>
-        <ant:jar destfile="${basedir}/target/${pom.artifactId}-${pom.currentVersion}-java-src.jar">
-            <fileset dir="${basedir}/src/java"/>
-        </ant:jar>
-    </goal>
 
     <goal name="jar:deploy">
         <attainGoal name="plugin:repository-deploy"/>

Modified: geronimo/trunk/plugins/maven-xmlbeans2-plugin/plugin.jelly
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/maven-xmlbeans2-plugin/plugin.jelly?rev=219994&r1=219993&r2=219994&view=diff
==============================================================================
--- geronimo/trunk/plugins/maven-xmlbeans2-plugin/plugin.jelly (original)
+++ geronimo/trunk/plugins/maven-xmlbeans2-plugin/plugin.jelly Wed Jul 20 21:17:36 2005
@@ -1,7 +1,23 @@
 <?xml version="1.0"?>
+<!--
+
+    Copyright 2004-2005 The Apache Software Foundation
+
+    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.
+-->
 
 <!-- ================================================================== -->
-<!-- Geronimo deployment plugin                                         -->
+<!-- xmlbeans v2 maven plugin                                           -->
 <!-- ================================================================== -->
 <project xmlns:j="jelly:core"
     xmlns:u="jelly:util"
@@ -20,19 +36,18 @@
 
         <define:tag name="schema2java" xmlns="jelly:ant">
 
-            <j:if test="${targetdir == null}">
-                <fail>Missing required attribute: targetdir</fail>
+            <j:if test="${context.getVariable('maven.xmlbeans2.targetdir') == null}">
+                <fail>Missing required attribute: maven.xmlbeans2.targetdir</fail>
             </j:if>
-            <j:if test="${sourcedir == null}">
-                <fail>Missing required attribute: sourcedir</fail>
+            <j:if test="${context.getVariable('maven.xmlbeans2.sourcedir') == null}">
+                <fail>Missing required attribute: maven.xmlbeans2.sourcedir</fail>
             </j:if>
-            <j:if test="${sourceschema == null}">
-                <fail>Missing required attribute: sourceschema</fail>
+            <j:if test="${context.getVariable('maven.xmlbeans2.sourceschema') == null}">
+                <fail>Missing required attribute: maven.xmlbeans2.sourceschema</fail>
             </j:if>
-            <j:if test="${xmlconfigs == null}">
-                <fail>Missing required attribute: xmlconfigs</fail>
+            <j:if test="${context.getVariable('maven.xmlbeans2.xmlconfigs') == null}">
+                <fail>Missing required attribute: maven.xmlbeans2.xmlconfigs</fail>
             </j:if>
-
             <!-- set up classpath for already-compiled schemas -->
             <j:forEach var="artifact" items="${pom.artifacts}">
                 <j:set var="dependency" value="${artifact.dependency}"/>
@@ -45,31 +60,33 @@
 
                 <j:set var="uptodatePropName" value="xmlbeans.uptodate"/>
                 <j:expr value="${context.setVariable(uptodatePropName, null)}"/>
-                <j:set var="uptodateFile" value="${targetdir}/tstamp"/>
+                <j:set var="uptodateFile" value="${maven.xmlbeans2.targetdir}/tstamp"/>
 
                 <uptodate property="${uptodatePropName}"
                     targetfile="${uptodateFile}">
-                    <srcfiles dir="${sourcedir}"
-                        includes="${sourceschema}"/>
+                    <srcfiles dir="${maven.xmlbeans2.sourcedir}"
+                        includes="${maven.xmlbeans2.sourceschema}"/>
                 </uptodate>
 
+
                 <xmlbeans:SchemaCompilerWrapper
-                    sourceDir="${sourcedir}"
-                    sourceSchemas="${sourceschema}"
-                    xmlConfigs="${xmlconfigs}"
-                    javaTargetDir="${targetdir}"
+                    sourceDir="${maven.xmlbeans2.sourcedir}"
+                    sourceSchemas="${maven.xmlbeans2.sourceschema}"
+                    xmlConfigs="${maven.xmlbeans2.xmlconfigs}"
+                    javaTargetDir="${maven.xmlbeans2.targetdir}"
                     classTargetDir="${maven.build.dest}"
-                    catalogLocation="${cataloglocation}"
+                    catalogLocation="${maven.xmlbeans2.cataloglocation}"
                     classPath="${xmlbeans.classpath}"
                     resources="${pom.build.resources}"
                     buildSchemas="${context.getVariable(uptodatePropName) == null}"
+                    baseSchemaLocation="${maven.xmlbeans2.baseSchemaLocation}"
                     />
                 <j:if test="${context.getVariable(uptodatePropName) == null}">
                     <touch file="${uptodateFile}"/>
                 </j:if>
 
                 <path id="maven.xmlbeans.compile.src.set"
-                    location="${targetdir}"/>
+                    location="${maven.xmlbeans2.targetdir}"/>
                 <j:if test="${context.antProject.getReference('maven.compile.src.set') != null}">
                     <maven:addPath id="maven.compile.src.set"
                         refid="maven.xmlbeans.compile.src.set"/>

Modified: geronimo/trunk/plugins/maven-xmlbeans2-plugin/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/maven-xmlbeans2-plugin/project.properties?rev=219994&r1=219993&r2=219994&view=diff
==============================================================================
--- geronimo/trunk/plugins/maven-xmlbeans2-plugin/project.properties (original)
+++ geronimo/trunk/plugins/maven-xmlbeans2-plugin/project.properties Wed Jul 20 21:17:36 2005
@@ -1,4 +1,4 @@
-#    Copyright 2004 The Apache Software Foundation
+#    Copyright 2003-2005 The Apache Software Foundation
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -13,4 +13,16 @@
 #    limitations under the License.
 
 maven.multiproject.type=plugin
+
+maven.repo.central=apache.org
+maven.repo.central.directory=/www/cvs.apache.org/repository
+
+maven.remote.group=apcvs
+
+maven.compile.source=1.4
+maven.compile.target=1.4
+#maven.compile.deprecation=true
+maven.compile.debug=true
+maven.compile.optimize=true
+
 

Modified: geronimo/trunk/plugins/maven-xmlbeans2-plugin/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/maven-xmlbeans2-plugin/project.xml?rev=219994&r1=219993&r2=219994&view=diff
==============================================================================
--- geronimo/trunk/plugins/maven-xmlbeans2-plugin/project.xml (original)
+++ geronimo/trunk/plugins/maven-xmlbeans2-plugin/project.xml Wed Jul 20 21:17:36 2005
@@ -47,12 +47,6 @@
 
         <dependency>
             <groupId>stax</groupId>
-            <artifactId>stax</artifactId>
-            <version>1.1.1-dev</version>
-        </dependency>
-
-        <dependency>
-            <groupId>stax</groupId>
             <artifactId>stax-api</artifactId>
             <version>1.0</version>
         </dependency>

Modified: geronimo/trunk/plugins/maven-xmlbeans2-plugin/src/java/org/apache/xmlbeans/maven/SchemaCompilerWrapper.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/maven-xmlbeans2-plugin/src/java/org/apache/xmlbeans/maven/SchemaCompilerWrapper.java?rev=219994&r1=219993&r2=219994&view=diff
==============================================================================
--- geronimo/trunk/plugins/maven-xmlbeans2-plugin/src/java/org/apache/xmlbeans/maven/SchemaCompilerWrapper.java (original)
+++ geronimo/trunk/plugins/maven-xmlbeans2-plugin/src/java/org/apache/xmlbeans/maven/SchemaCompilerWrapper.java Wed Jul 20 21:17:36 2005
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2003-2004 The Apache Software Foundation
+ * Copyright 2003-2005 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -56,6 +56,8 @@
     private String classPath;
     private List resources;
     private boolean buildSchemas;
+    //this copy should not end in /
+    private String baseSchemaLocation = "schemaorg_apache_xmlbeans/src";
 
     public String getSourceDir() {
         return sourceDir;
@@ -118,7 +120,6 @@
     }
 
     public void setResources(List resources) {
-        System.out.println("setResources: " + resources);
         this.resources = resources;
     }
 
@@ -127,16 +128,25 @@
     }
 
     public void setBuildSchemas(boolean buildSchemas) {
-        System.out.println("setBuildSchemas: " + buildSchemas);
         this.buildSchemas = buildSchemas;
     }
 
+    public String getBaseSchemaLocation() {
+        return baseSchemaLocation;
+    }
+
+    public void setBaseSchemaLocation(String baseSchemaLocation) {
+        if (baseSchemaLocation != null && !(baseSchemaLocation.length() == 0)) {
+            this.baseSchemaLocation = baseSchemaLocation;
+        }
+    }
+
     public void compileSchemas() throws Exception {
         List schemas = new ArrayList();
         File base = new File(sourceDir);
         Resource resource = new Resource();
         resource.setDirectory(sourceDir);
-        resource.setTargetPath("META-INF");
+        resource.setTargetPath(baseSchemaLocation);
         for (StringTokenizer st = new StringTokenizer(sourceSchemas, ","); st.hasMoreTokens();) {
             String schemaName = st.nextToken();
             schemas.add(new File(base, schemaName));
@@ -171,7 +181,7 @@
                 entityResolver = new CatalogResolver();
             }
             URI sourceDirURI = new File(sourceDir).toURI();
-            entityResolver = new PassThroughResolver(cl, entityResolver, sourceDirURI);
+            entityResolver = new PassThroughResolver(cl, entityResolver, sourceDirURI, baseSchemaLocation);
 
             SchemaCompiler.Parameters params = new SchemaCompiler.Parameters();
             params.setBaseDir(null);
@@ -216,12 +226,15 @@
     private static class PassThroughResolver implements EntityResolver {
         private final ClassLoader cl;
         private final EntityResolver delegate;
-        private URI sourceDir;
+        private final URI sourceDir;
+        //this copy has an / appended
+        private final String baseSchemaLocation;
 
-        public PassThroughResolver(ClassLoader cl, EntityResolver delegate, URI sourceDir) {
+        public PassThroughResolver(ClassLoader cl, EntityResolver delegate, URI sourceDir, String baseSchemaLocation) {
             this.cl = cl;
             this.delegate = delegate;
             this.sourceDir = sourceDir;
+            this.baseSchemaLocation = baseSchemaLocation + "/";
         }
         public InputSource resolveEntity(String publicId,
                                          String systemId)
@@ -244,12 +257,12 @@
                 System.out.println("found in classpath at: " + localSystemId);
                 return new InputSource(in);
             }
-            in = cl.getResourceAsStream("META-INF/" + localSystemId);
+            in = cl.getResourceAsStream(baseSchemaLocation + localSystemId);
             if (in != null) {
                 System.out.println("found in classpath at: META-INF/" + localSystemId);
                 return new InputSource(in);
             }
-            System.out.println("Not found in classpath, looking in current director: " + systemId);
+            System.out.println("Not found in classpath, looking in current directory: " + systemId);
             return new InputSource(systemId);
         }
 



Mime
View raw message