Return-Path: 
 <scm-return-20630-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 90755 invoked from network); 21 Jul 2007 00:40:07 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 21 Jul 2007 00:40:07 -0000
Received: (qmail 53307 invoked by uid 500); 21 Jul 2007 00:40:08 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 53270 invoked by uid 500); 21 Jul 2007 00:40:08 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 53259 invoked by uid 99); 21 Jul 2007 00:40:08 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Jul 2007 17:40:08 -0700
X-ASF-Spam-Status: No, hits=-99.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Jul 2007 17:40:05 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 798FC1A981A; Fri, 20 Jul 2007 17:39:45 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r558204 - in /geronimo/server/trunk: ./ configs/axis2/
 configs/geronimo-gbean-deployer-bootstrap/ configs/xmlbeans/
 modules/geronimo-axis2/ modules/geronimo-client-builder/
 modules/geronimo-client-builder/src/main/schema/ modules/geronimo-c...
Date: Sat, 21 Jul 2007 00:39:44 -0000
To: scm@geronimo.apache.org
From: djencks@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070721003945.798FC1A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: djencks
Date: Fri Jul 20 17:39:40 2007
New Revision: 558204

URL: http://svn.apache.org/viewvc?view=rev&rev=558204
Log:
GERONIMO-3339 Upgrade to xmlbeans 2.3.0, improve dir structure

Added:
    geronimo/server/trunk/modules/geronimo-client-builder/src/main/xsd/
      - copied from r558046, geronimo/server/trunk/modules/geronimo-client-builder/src/main/schema/
    geronimo/server/trunk/modules/geronimo-client-builder/src/main/xsdconfig/
    geronimo/server/trunk/modules/geronimo-client-builder/src/main/xsdconfig/xmlconfig.xml
      - copied unchanged from r558046, geronimo/server/trunk/modules/geronimo-client-builder/src/main/schema/xmlconfig.xml
    geronimo/server/trunk/modules/geronimo-connector-builder/src/main/xsd/
      - copied from r558046, geronimo/server/trunk/modules/geronimo-connector-builder/src/main/schema/
    geronimo/server/trunk/modules/geronimo-connector-builder/src/main/xsdconfig/
    geronimo/server/trunk/modules/geronimo-connector-builder/src/main/xsdconfig/xmlconfig.xml
      - copied unchanged from r558046, geronimo/server/trunk/modules/geronimo-connector-builder/src/main/schema/xmlconfig.xml
    geronimo/server/trunk/modules/geronimo-corba-builder/src/main/xsd/
      - copied from r558046, geronimo/server/trunk/modules/geronimo-corba-builder/src/main/schema/
    geronimo/server/trunk/modules/geronimo-corba-builder/src/main/xsdconfig/
    geronimo/server/trunk/modules/geronimo-corba-builder/src/main/xsdconfig/xmlconfig.xml
      - copied unchanged from r558046, geronimo/server/trunk/modules/geronimo-corba-builder/src/main/schema/xmlconfig.xml
    geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/xsd/
      - copied from r558046, geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/schema/
    geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/xsdconfig/
    geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/xsdconfig/xmlconfig.xml
      - copied unchanged from r558046, geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/schema/xmlconfig.xml
    geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/xsd/
      - copied from r558046, geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/schema/
    geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/xsdconfig/
    geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/xsdconfig/xmlconfig.xml
      - copied unchanged from r558046, geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/schema/xmlconfig.xml
    geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/src/main/xsd/
      - copied from r558046, geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/src/main/schema/
    geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/src/main/xsdconfig/
    geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/src/main/xsdconfig/xmlconfig.xml
      - copied unchanged from r558046, geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/src/main/schema/xmlconfig.xml
    geronimo/server/trunk/modules/geronimo-naming-builder/src/main/xsd/
      - copied from r558046, geronimo/server/trunk/modules/geronimo-naming-builder/src/main/schema/
    geronimo/server/trunk/modules/geronimo-naming-builder/src/main/xsdconfig/
    geronimo/server/trunk/modules/geronimo-naming-builder/src/main/xsdconfig/xmlconfig.xml
      - copied unchanged from r558046, geronimo/server/trunk/modules/geronimo-naming-builder/src/main/schema/xmlconfig.xml
    geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/xsd/
      - copied from r558046, geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/schema/
    geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/xsdconfig/
    geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/xsdconfig/xmlconfig.xml
      - copied unchanged from r558046, geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/schema/xmlconfig.xml
    geronimo/server/trunk/modules/geronimo-security-builder/src/main/xsd/
      - copied from r558046, geronimo/server/trunk/modules/geronimo-security-builder/src/main/schema/
    geronimo/server/trunk/modules/geronimo-security-builder/src/main/xsdconfig/
    geronimo/server/trunk/modules/geronimo-security-builder/src/main/xsdconfig/xmlconfig.xml
      - copied unchanged from r558046, geronimo/server/trunk/modules/geronimo-security-builder/src/main/schema/xmlconfig.xml
    geronimo/server/trunk/modules/geronimo-service-builder/src/main/xsd/
      - copied from r558046, geronimo/server/trunk/modules/geronimo-service-builder/src/main/schema/
    geronimo/server/trunk/modules/geronimo-service-builder/src/main/xsdconfig/
    geronimo/server/trunk/modules/geronimo-service-builder/src/main/xsdconfig/xmlconfig.xml
      - copied unchanged from r558046, geronimo/server/trunk/modules/geronimo-service-builder/src/main/schema/xmlconfig.xml
    geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/xsd/
      - copied from r558046, geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/schema/
    geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/xsdconfig/
    geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/xsdconfig/xmlconfig.xml
      - copied unchanged from r558046, geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/schema/xmlconfig.xml
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/xsd/
      - copied from r558046, geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/schema/
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/xsdconfig/
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/xsdconfig/xmlconfig.xml
      - copied unchanged from r558046, geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/schema/xmlconfig.xml
    geronimo/server/trunk/modules/geronimo-webservices-builder/src/main/xsd/
      - copied from r558046, geronimo/server/trunk/modules/geronimo-webservices-builder/src/main/schema/
    geronimo/server/trunk/modules/geronimo-webservices-builder/src/main/xsdconfig/
    geronimo/server/trunk/modules/geronimo-webservices-builder/src/main/xsdconfig/xmlconfig.xml
      - copied unchanged from r558046, geronimo/server/trunk/modules/geronimo-webservices-builder/src/main/schema/xmlconfig.xml
Removed:
    geronimo/server/trunk/modules/geronimo-client-builder/src/main/schema/
    geronimo/server/trunk/modules/geronimo-connector-builder/src/main/schema/
    geronimo/server/trunk/modules/geronimo-corba-builder/src/main/schema/
    geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/schema/
    geronimo/server/trunk/modules/geronimo-jetty6-builder/src/main/schema/
    geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/src/main/schema/
    geronimo/server/trunk/modules/geronimo-naming-builder/src/main/schema/
    geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/schema/
    geronimo/server/trunk/modules/geronimo-security-builder/src/main/schema/
    geronimo/server/trunk/modules/geronimo-service-builder/src/main/schema/
    geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/schema/
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/schema/
    geronimo/server/trunk/modules/geronimo-webservices-builder/src/main/schema/
Modified:
    geronimo/server/trunk/configs/axis2/pom.xml
    geronimo/server/trunk/configs/geronimo-gbean-deployer-bootstrap/pom.xml
    geronimo/server/trunk/configs/xmlbeans/pom.xml
    geronimo/server/trunk/modules/geronimo-axis2/pom.xml
    geronimo/server/trunk/modules/geronimo-client-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-connector-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-deploy-config/pom.xml
    geronimo/server/trunk/modules/geronimo-deployment/pom.xml
    geronimo/server/trunk/modules/geronimo-hot-deploy/pom.xml
    geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-j2ee-schema/pom.xml
    geronimo/server/trunk/modules/geronimo-jetty6-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/pom.xml
    geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-openejb-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-security-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-service-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-tomcat6-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-webservices-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-webservices-builder/src/test/resources/webservices-jee5.xml
    geronimo/server/trunk/pom.xml
    geronimo/server/trunk/testsupport/testsupport-common/pom.xml

Modified: geronimo/server/trunk/configs/axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/axis2/pom.xml?view=diff&rev=558204&r1=558203&r2=558204
==============================================================================
--- geronimo/server/trunk/configs/axis2/pom.xml (original)
+++ geronimo/server/trunk/configs/axis2/pom.xml Fri Jul 20 17:39:40 2007
@@ -143,8 +143,8 @@
             <artifactId>commons-codec</artifactId>
         </dependency>
         <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xbean</artifactId>
+            <groupId>org.apache.xmlbeans</groupId>
+            <artifactId>xmlbeans</artifactId>
         </dependency>
         <dependency>
             <groupId>jaxen</groupId>

Modified: geronimo/server/trunk/configs/geronimo-gbean-deployer-bootstrap/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/geronimo-gbean-deployer-bootstrap/pom.xml?view=diff&rev=558204&r1=558203&r2=558204
==============================================================================
--- geronimo/server/trunk/configs/geronimo-gbean-deployer-bootstrap/pom.xml (original)
+++ geronimo/server/trunk/configs/geronimo-gbean-deployer-bootstrap/pom.xml Fri Jul 20 17:39:40 2007
@@ -70,8 +70,8 @@
         <!-- Thirdparty Dependencies -->
 
         <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xbean</artifactId>
+            <groupId>org.apache.xmlbeans</groupId>
+            <artifactId>xmlbeans</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/configs/xmlbeans/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/xmlbeans/pom.xml?view=diff&rev=558204&r1=558203&r2=558204
==============================================================================
--- geronimo/server/trunk/configs/xmlbeans/pom.xml (original)
+++ geronimo/server/trunk/configs/xmlbeans/pom.xml Fri Jul 20 17:39:40 2007
@@ -34,16 +34,19 @@
     <packaging>car</packaging>
     
     <dependencies>
+
         <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xbean</artifactId>
+            <groupId>org.apache.xmlbeans</groupId>
+            <artifactId>xmlbeans</artifactId>
         </dependency>
-	    <dependency>
+
+        <dependency>
 	        <groupId>org.apache.geronimo.configs</groupId>
 	        <artifactId>jee-specs</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
+
         <!-- build order hint -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/trunk/modules/geronimo-axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2/pom.xml?view=diff&rev=558204&r1=558203&r2=558204
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-axis2/pom.xml Fri Jul 20 17:39:40 2007
@@ -133,8 +133,8 @@
             <artifactId>geronimo-stax-api_1.0_spec</artifactId>
         </dependency>
         <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xbean</artifactId>
+            <groupId>org.apache.xmlbeans</groupId>
+            <artifactId>xmlbeans</artifactId>
         </dependency>
         <dependency>
             <groupId>jaxen</groupId>

Modified: geronimo/server/trunk/modules/geronimo-client-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-client-builder/pom.xml?view=diff&rev=558204&r1=558203&r2=558204
==============================================================================
--- geronimo/server/trunk/modules/geronimo-client-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-client-builder/pom.xml Fri Jul 20 17:39:40 2007
@@ -59,9 +59,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
-                <configuration>
-                    <sourceSchemas>geronimo-application-client-1.2.xsd</sourceSchemas>
-                </configuration>
             </plugin>
             
             <!--

Modified: geronimo/server/trunk/modules/geronimo-connector-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector-builder/pom.xml?view=diff&rev=558204&r1=558203&r2=558204
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-connector-builder/pom.xml Fri Jul 20 17:39:40 2007
@@ -75,9 +75,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
-                <configuration>
-                    <sourceSchemas>geronimo-connector-${geronimoSchemaVersion}.xsd</sourceSchemas>
-                </configuration>
             </plugin>
             
             <!--

Modified: geronimo/server/trunk/modules/geronimo-deploy-config/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-deploy-config/pom.xml?view=diff&rev=558204&r1=558203&r2=558204
==============================================================================
--- geronimo/server/trunk/modules/geronimo-deploy-config/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-deploy-config/pom.xml Fri Jul 20 17:39:40 2007
@@ -41,8 +41,8 @@
     <dependencies>
     
         <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xbean</artifactId>
+            <groupId>org.apache.xmlbeans</groupId>
+            <artifactId>xmlbeans</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/modules/geronimo-deployment/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-deployment/pom.xml?view=diff&rev=558204&r1=558203&r2=558204
==============================================================================
--- geronimo/server/trunk/modules/geronimo-deployment/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-deployment/pom.xml Fri Jul 20 17:39:40 2007
@@ -41,8 +41,8 @@
         </dependency>
         
         <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xbean</artifactId>
+            <groupId>org.apache.xmlbeans</groupId>
+            <artifactId>xmlbeans</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/modules/geronimo-hot-deploy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-hot-deploy/pom.xml?view=diff&rev=558204&r1=558203&r2=558204
==============================================================================
--- geronimo/server/trunk/modules/geronimo-hot-deploy/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-hot-deploy/pom.xml Fri Jul 20 17:39:40 2007
@@ -44,8 +44,8 @@
         </dependency>
 
         <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xbean</artifactId>
+            <groupId>org.apache.xmlbeans</groupId>
+            <artifactId>xmlbeans</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml?view=diff&rev=558204&r1=558203&r2=558204
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/pom.xml Fri Jul 20 17:39:40 2007
@@ -236,9 +236,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
-                <configuration>
-                    <sourceSchemas>geronimo-application-1.2.xsd</sourceSchemas>
-                </configuration>
             </plugin>
         </plugins>
     </build>

Modified: geronimo/server/trunk/modules/geronimo-j2ee-schema/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-schema/pom.xml?view=diff&rev=558204&r1=558203&r2=558204
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-schema/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-schema/pom.xml Fri Jul 20 17:39:40 2007
@@ -42,8 +42,8 @@
         </dependency>
         
         <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xbean</artifactId>
+            <groupId>org.apache.xmlbeans</groupId>
+            <artifactId>xmlbeans</artifactId>
         </dependency>
         
         <dependency>

Modified: geronimo/server/trunk/modules/geronimo-jetty6-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-builder/pom.xml?view=diff&rev=558204&r1=558203&r2=558204
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-builder/pom.xml Fri Jul 20 17:39:40 2007
@@ -58,9 +58,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
-                <configuration>
-                    <sourceSchemas>geronimo-jetty-1.2.xsd,geronimo-jetty-config-1.0.xsd</sourceSchemas>
-                </configuration>
             </plugin>
             
             <!--

Modified: geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/pom.xml?view=diff&rev=558204&r1=558203&r2=558204
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6-clustering-builder-wadi/pom.xml Fri Jul 20 17:39:40 2007
@@ -54,9 +54,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
-                <configuration>
-                    <sourceSchemas>geronimo-clustering-wadi-1.2.xsd</sourceSchemas>
-                </configuration>
             </plugin>
             
             <!--

Modified: geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml?view=diff&rev=558204&r1=558203&r2=558204
==============================================================================
--- geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml Fri Jul 20 17:39:40 2007
@@ -56,9 +56,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
-                <configuration>
-                    <sourceSchemas>geronimo-naming-1.2.xsd</sourceSchemas>
-                </configuration>
             </plugin>
             
             <!--

Modified: geronimo/server/trunk/modules/geronimo-openejb-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb-builder/pom.xml?view=diff&rev=558204&r1=558203&r2=558204
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-openejb-builder/pom.xml Fri Jul 20 17:39:40 2007
@@ -80,9 +80,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
-                <configuration>
-                    <sourceSchemas>geronimo-openejb-2.0.xsd</sourceSchemas>
-                </configuration>
             </plugin>
             
             <!--

Modified: geronimo/server/trunk/modules/geronimo-security-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-security-builder/pom.xml?view=diff&rev=558204&r1=558203&r2=558204
==============================================================================
--- geronimo/server/trunk/modules/geronimo-security-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-security-builder/pom.xml Fri Jul 20 17:39:40 2007
@@ -54,9 +54,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
-                <configuration>
-                    <sourceSchemas>geronimo-subject-info-1.0.xsd,geronimo-security-2.0.xsd,geronimo-credential-store-1.0.xsd,geronimo-login-config-2.0.xsd</sourceSchemas>
-                </configuration>
             </plugin>
             
             <!--

Modified: geronimo/server/trunk/modules/geronimo-service-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-service-builder/pom.xml?view=diff&rev=558204&r1=558203&r2=558204
==============================================================================
--- geronimo/server/trunk/modules/geronimo-service-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-service-builder/pom.xml Fri Jul 20 17:39:40 2007
@@ -54,9 +54,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
-                <configuration>
-                    <sourceSchemas>geronimo-module-1.2.xsd,geronimo-javabean-xmlattribute-1.0.xsd</sourceSchemas>
-                </configuration>
             </plugin>
             
             <!--

Modified: geronimo/server/trunk/modules/geronimo-tomcat6-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6-builder/pom.xml?view=diff&rev=558204&r1=558203&r2=558204
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6-builder/pom.xml Fri Jul 20 17:39:40 2007
@@ -114,9 +114,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
-                <configuration>
-                    <sourceSchemas>geronimo-tomcat-1.2.xsd,geronimo-tomcat-config-1.0.xsd</sourceSchemas>
-                </configuration>
             </plugin>
 
             <plugin>

Modified: geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml?view=diff&rev=558204&r1=558203&r2=558204
==============================================================================
--- geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml Fri Jul 20 17:39:40 2007
@@ -66,9 +66,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
-                <configuration>
-                    <sourceSchemas>geronimo-web-1.2.xsd</sourceSchemas>
-                </configuration>
             </plugin>
             
             <!--

Modified: geronimo/server/trunk/modules/geronimo-webservices-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-webservices-builder/pom.xml?view=diff&rev=558204&r1=558203&r2=558204
==============================================================================
--- geronimo/server/trunk/modules/geronimo-webservices-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-webservices-builder/pom.xml Fri Jul 20 17:39:40 2007
@@ -74,9 +74,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
-                <configuration>
-                    <sourceSchemas>wsdl.xsd</sourceSchemas>
-                </configuration>
             </plugin>
             
             <!--

Modified: geronimo/server/trunk/modules/geronimo-webservices-builder/src/test/resources/webservices-jee5.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-webservices-builder/src/test/resources/webservices-jee5.xml?view=diff&rev=558204&r1=558203&r2=558204
==============================================================================
--- geronimo/server/trunk/modules/geronimo-webservices-builder/src/test/resources/webservices-jee5.xml (original)
+++ geronimo/server/trunk/modules/geronimo-webservices-builder/src/test/resources/webservices-jee5.xml Fri Jul 20 17:39:40 2007
@@ -30,7 +30,7 @@
         <wsdl-file>WEB-INF/wsdl/greeter_control.wsdl</wsdl-file>
         <port-component>
             <port-component-name>cxfPojoName</port-component-name>
-            <wsdl-service></wsdl-service>
+            <wsdl-service>webservices</wsdl-service>
             <enable-mtom>false</enable-mtom>
             <service-endpoint-interface>org.apache.greeter_control.Greeter</service-endpoint-interface>
             <service-impl-bean>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?view=diff&rev=558204&r1=558203&r2=558204
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Fri Jul 20 17:39:40 2007
@@ -542,9 +542,9 @@
             </dependency>
 
             <dependency>
-                <groupId>xmlbeans</groupId>
-                <artifactId>xbean</artifactId>
-                <version>2.2.0</version>
+                <groupId>org.apache.xmlbeans</groupId>
+                <artifactId>xmlbeans</artifactId>
+                <version>2.3.0</version>
             </dependency>
 
             <dependency>
@@ -1525,7 +1525,7 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>xmlbeans-maven-plugin</artifactId>
-                    <version>2.0.1-20070122.162531-10</version>
+                    <version>2.3.1-20070720.222301-1</version>
 
                     <executions>
                         <execution>
@@ -1536,14 +1536,11 @@
                     </executions>
 
                     <configuration>
-                        <schemaDirectory>${pom.basedir}/src/main/schema</schemaDirectory>
-                        <xmlConfigs>
-                            <xmlConfig implementation="java.io.File">${pom.basedir}/src/main/schema/xmlconfig.xml</xmlConfig>
-                        </xmlConfigs>
                         <download>true</download>
                         <quiet>false</quiet>
                     </configuration>
                 </plugin>
+
 
                 <plugin>
                     <groupId>org.codehaus.mojo.jspc</groupId>

Modified: geronimo/server/trunk/testsupport/testsupport-common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsupport/testsupport-common/pom.xml?view=diff&rev=558204&r1=558203&r2=558204
==============================================================================
--- geronimo/server/trunk/testsupport/testsupport-common/pom.xml (original)
+++ geronimo/server/trunk/testsupport/testsupport-common/pom.xml Fri Jul 20 17:39:40 2007
@@ -54,8 +54,8 @@
         <!-- xmlbeans -->
         
         <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xbean</artifactId>
+            <groupId>org.apache.xmlbeans</groupId>
+            <artifactId>xmlbeans</artifactId>
         </dependency>
         
         <dependency>