geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r1221316 - in /geronimo/server/branches/2.1: ./ buildsupport/car-maven-plugin/ framework/configs/client-system/ framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/ framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-i...
Date Tue, 20 Dec 2011 15:26:28 GMT
Author: xiaming
Date: Tue Dec 20 15:26:28 2011
New Revision: 1221316

URL: http://svn.apache.org/viewvc?rev=1221316&view=rev
Log:
Revert jaxb spec api change since the jaxb tck cannot pass with geronimo jaxb spec api jar

Modified:
    geronimo/server/branches/2.1/buildsupport/car-maven-plugin/pom.xml
    geronimo/server/branches/2.1/framework/configs/client-system/pom.xml
    geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml
    geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml
    geronimo/server/branches/2.1/framework/configs/j2ee-system/pom.xml
    geronimo/server/branches/2.1/framework/configs/jee-specs/pom.xml
    geronimo/server/branches/2.1/framework/configs/jsr88-cli/pom.xml
    geronimo/server/branches/2.1/framework/configs/jsr88-deploymentfactory/pom.xml
    geronimo/server/branches/2.1/framework/configs/online-deployer/pom.xml
    geronimo/server/branches/2.1/framework/modules/geronimo-system/pom.xml
    geronimo/server/branches/2.1/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/configuration/LocalAttributeManagerReadWriteTest.java
    geronimo/server/branches/2.1/plugins/axis2/geronimo-axis2/pom.xml
    geronimo/server/branches/2.1/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java
    geronimo/server/branches/2.1/plugins/jaxws/geronimo-jaxws/pom.xml
    geronimo/server/branches/2.1/plugins/openejb/geronimo-openejb/pom.xml
    geronimo/server/branches/2.1/pom.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml
    geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml

Modified: geronimo/server/branches/2.1/buildsupport/car-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/buildsupport/car-maven-plugin/pom.xml?rev=1221316&r1=1221315&r2=1221316&view=diff
==============================================================================
--- geronimo/server/branches/2.1/buildsupport/car-maven-plugin/pom.xml (original)
+++ geronimo/server/branches/2.1/buildsupport/car-maven-plugin/pom.xml Tue Dec 20 15:26:28 2011
@@ -40,18 +40,25 @@
     
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxb_2.1_spec</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-activation_1.1_spec</artifactId>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.activation</groupId>
+                    <artifactId>activation</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.activation</groupId>
+                    <artifactId>activation</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>

Modified: geronimo/server/branches/2.1/framework/configs/client-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/configs/client-system/pom.xml?rev=1221316&r1=1221315&r2=1221316&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/configs/client-system/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/configs/client-system/pom.xml Tue Dec 20 15:26:28 2011
@@ -81,16 +81,11 @@
 
         <!-- used by plugin installer -->
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
         </dependency>
         
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-activation_1.1_spec</artifactId>
-        </dependency>
-                
-        <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
         </dependency>

Modified: geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml?rev=1221316&r1=1221315&r2=1221316&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml Tue Dec 20 15:26:28 2011
@@ -93,15 +93,10 @@
 
         <!-- used by plugin installer -->
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxb_2.1_spec</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-activation_1.1_spec</artifactId>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
         </dependency>
-                
+        
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
@@ -195,12 +190,8 @@
                         </element>
                         <!-- TODO bad idea... temp, for plugins -->
                         <element>
-                            <groupId>org.apache.geronimo.specs</groupId>
-                            <artifactId>geronimo-jaxb_2.1_spec</artifactId>
-                        </element>
-                        <element>
-                            <groupId>org.apache.geronimo.specs</groupId>
-                            <artifactId>geronimo-activation_1.1_spec</artifactId>
+                            <groupId>javax.xml.bind</groupId>
+                            <artifactId>jaxb-api</artifactId>
                         </element>
                         <element>
                             <groupId>com.sun.xml.bind</groupId>

Modified: geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml?rev=1221316&r1=1221315&r2=1221316&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml Tue Dec 20 15:26:28 2011
@@ -93,13 +93,8 @@
 
         <!-- used by plugin installer -->
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxb_2.1_spec</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-activation_1.1_spec</artifactId>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
         </dependency>
         
         <dependency>
@@ -195,12 +190,8 @@
                         </element>
                         <!-- TODO bad idea... temp, for plugins -->
                         <element>
-                            <groupId>org.apache.geronimo.specs</groupId>
-                            <artifactId>geronimo-jaxb_2.1_spec</artifactId>
-                        </element>
-                        <element>
-                            <groupId>org.apache.geronimo.specs</groupId>
-                            <artifactId>geronimo-activation_1.1_spec</artifactId>
+                            <groupId>javax.xml.bind</groupId>
+                            <artifactId>jaxb-api</artifactId>
                         </element>
                         <element>
                             <groupId>com.sun.xml.bind</groupId>

Modified: geronimo/server/branches/2.1/framework/configs/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/configs/j2ee-system/pom.xml?rev=1221316&r1=1221315&r2=1221316&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/configs/j2ee-system/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/configs/j2ee-system/pom.xml Tue Dec 20 15:26:28 2011
@@ -86,13 +86,8 @@
 
         <!-- used by plugin installer -->
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxb_2.1_spec</artifactId>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-activation_1.1_spec</artifactId>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
         </dependency>
         
         <dependency>

Modified: geronimo/server/branches/2.1/framework/configs/jee-specs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/configs/jee-specs/pom.xml?rev=1221316&r1=1221315&r2=1221316&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/configs/jee-specs/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/configs/jee-specs/pom.xml Tue Dec 20 15:26:28 2011
@@ -132,11 +132,17 @@
         -->
         <!--
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+        </dependency>
+        -->
+        <!-- JAXB Impl should not be here! -->
+        <!--
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
         </dependency>
         -->
-
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>

Modified: geronimo/server/branches/2.1/framework/configs/jsr88-cli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/configs/jsr88-cli/pom.xml?rev=1221316&r1=1221315&r2=1221316&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/configs/jsr88-cli/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/configs/jsr88-cli/pom.xml Tue Dec 20 15:26:28 2011
@@ -101,12 +101,8 @@
 
         <!-- used by plugin installer -->
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxb_2.1_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-activation_1.1_spec</artifactId>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
         </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>

Modified: geronimo/server/branches/2.1/framework/configs/jsr88-deploymentfactory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/configs/jsr88-deploymentfactory/pom.xml?rev=1221316&r1=1221315&r2=1221316&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/configs/jsr88-deploymentfactory/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/configs/jsr88-deploymentfactory/pom.xml Tue Dec 20 15:26:28 2011
@@ -78,12 +78,8 @@
         
         <!-- used by plugin installer -->
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxb_2.1_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-activation_1.1_spec</artifactId>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
         </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>

Modified: geronimo/server/branches/2.1/framework/configs/online-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/configs/online-deployer/pom.xml?rev=1221316&r1=1221315&r2=1221316&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/configs/online-deployer/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/configs/online-deployer/pom.xml Tue Dec 20 15:26:28 2011
@@ -99,13 +99,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxb_2.1_spec</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-activation_1.1_spec</artifactId>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
         </dependency>
         
         <dependency>

Modified: geronimo/server/branches/2.1/framework/modules/geronimo-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-system/pom.xml?rev=1221316&r1=1221315&r2=1221316&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-system/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-system/pom.xml Tue Dec 20 15:26:28 2011
@@ -76,16 +76,11 @@
 
         <!-- plugin management -->
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-activation_1.1_spec</artifactId>
-        </dependency>
-        
-        <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
         </dependency>

Modified: geronimo/server/branches/2.1/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/configuration/LocalAttributeManagerReadWriteTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/configuration/LocalAttributeManagerReadWriteTest.java?rev=1221316&r1=1221315&r2=1221316&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/configuration/LocalAttributeManagerReadWriteTest.java (original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/configuration/LocalAttributeManagerReadWriteTest.java Tue Dec 20 15:26:28 2011
@@ -35,236 +35,232 @@ import org.w3c.dom.Document;
 public class LocalAttributeManagerReadWriteTest extends TestCase {
 
     private static final String CONFIG =
-    	"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n" +
-    			"<attributes xmlns:ns2=\"http://geronimo.apache.org/xml/ns/plugins-1.3\" xmlns=\"http://geronimo.apache.org/xml/ns/attributes-1.2\">\n" +
-    			"    <comment>This is a test comment.  Without it, a default warning comment will be created</comment>\n" +
-    			"    <module name=\"org.apache.geronimo.configs/ca-helper-jetty/2.1/car\"/>\n" +
-    			"    <module name=\"org.apache.geronimo.configs/jasper/2.1/car\"/>\n" +
-    			"    <module name=\"org.apache.geronimo.configs/j2ee-server/2.1/car\"/>\n" +
-    			"    <module name=\"org.apache.geronimo.configs/transaction/2.1/car\"/>\n" +
-    			"    <module name=\"org.apache.geronimo.configs/jetty6/2.1/car\">\n" +
-    			"        <gbean name=\"JettyWebConnector\">\n" +
-    			"            <attribute name=\"host\">${ServerHostname}</attribute>\n" +
-    			"            <attribute name=\"port\">${HTTPPort + PortOffset}</attribute>\n" +
-    			"            <attribute name=\"redirectPort\">${HTTPSPortPrimary + PortOffset}</attribute>\n" +
-    			"        </gbean>\n" +
-    			"        <gbean name=\"JettyAJP13Connector\">\n" +
-    			"            <attribute name=\"host\">${ServerHostname}</attribute>\n" +
-    			"            <attribute name=\"port\">${AJPPort + PortOffset}</attribute>\n" +
-    			"            <attribute name=\"redirectPort\">${HTTPSPortPrimary + PortOffset}</attribute>\n" +
-    			"        </gbean>\n" +
-    			"        <gbean name=\"JettySSLConnector\">\n" +
-    			"            <attribute name=\"host\">${ServerHostname}</attribute>\n" +
-    			"            <attribute name=\"port\">${HTTPSPort + PortOffset}</attribute>\n" +
-    			"        </gbean>\n" +
-    			"    </module>\n" +
-    			"    <module name=\"org.apache.geronimo.configs/clustering/2.1/car\">\n" +
-    			"        <gbean name=\"Node\">\n" +
-    			"            <attribute name=\"nodeName\">${clusterNodeName}</attribute>\n" +
-    			"        </gbean>\n" +
-    			"    </module>\n" +
-    			"    <module name=\"org.apache.geronimo.configs/webservices-common/2.1/car\"/>\n" +
-    			"    <module name=\"org.apache.geronimo.configs/myfaces-deployer/2.1/car\"/>\n" +
-    			"    <module name=\"org.apache.geronimo.configs/myfaces/2.1/car\"/>\n" +
-    			"    <module name=\"org.apache.geronimo.configs/j2ee-deployer/2.1/car\">\n" +
-    			"        <gbean name=\"WebBuilder\">\n" +
-    			"            <attribute name=\"defaultNamespace\">http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0</attribute>\n" +
-    			"        </gbean>\n" +
-    			"        <gbean name=\"EnvironmentEntryBuilder\">\n" +
-    			"            <attribute name=\"eeNamespaces\">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>\n" +
-    			"        </gbean>\n" +
-    			"    </module>\n" +
-    			"    <module name=\"org.apache.geronimo.configs/activemq-ra/2.1/car\">\n" +
-    			"        <gbean name=\"ActiveMQ RA\">\n" +
-    			"            <attribute name=\"ServerUrl\">tcp://${ServerHostname}:${ActiveMQPort + PortOffset}</attribute>\n" +
-    			"        </gbean>\n" +
-    			"    </module>\n" +
-    			"    <module name=\"org.apache.geronimo.configs/activemq-broker/2.1/car\">\n" +
-    			"        <gbean name=\"ActiveMQ.tcp.default\">\n" +
-    			"            <attribute name=\"host\">${ServerHostname}</attribute>\n" +
-    			"            <attribute name=\"port\">${ActiveMQPort + PortOffset}</attribute>\n" +
-    			"        </gbean>\n" +
-    			"        <gbean name=\"ActiveMQ.stomp.default\">\n" +
-    			"            <attribute name=\"host\">${ServerHostname}</attribute>\n" +
-    			"            <attribute name=\"port\">${ActiveMQStompPort + PortOffset}</attribute>\n" +
-    			"        </gbean>\n" +
-    			"    </module>\n" +
-    			"    <module name=\"org.apache.geronimo.configs/system-database/2.1/car\">\n" +
-    			"        <gbean name=\"DerbyNetwork\">\n" +
-    			"            <attribute name=\"host\">${ServerHostname}</attribute>\n" +
-    			"            <attribute name=\"port\">${DerbyPort + PortOffset}</attribute>\n" +
-    			"        </gbean>\n" +
-    			"    </module>\n" +
-    			"    <module name=\"org.apache.geronimo.configs/connector-deployer/2.1/car\">\n" +
-    			"        <gbean name=\"ResourceRefBuilder\">\n" +
-    			"            <attribute name=\"eeNamespaces\">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>\n" +
-    			"            <attribute name=\"defaultEnvironment\">\n" +
-    			"                <environment:environment xmlns:ns2=\"http://geronimo.apache.org/xml/ns/attributes-1.2\" xmlns=\"http://geronimo.apache.org/xml/ns/plugins-1.3\" xmlns:environment=\"http://geronimo.apache.org/xml/ns/deployment-1.2\">\n" +
-    			"                    <environment:dependencies>\n" +
-    			"                        <environment:dependency>\n" +
-    			"                            <environment:groupId>org.apache.geronimo.configs</environment:groupId>\n" +
-    			"                            <environment:artifactId>j2ee-corba-yoko</environment:artifactId>\n" +
-    			"                            <environment:type>car</environment:type>\n" +
-    			"            </environment:dependency>\n" +
-    			"          </environment:dependencies>\n" +
-    			"        </environment:environment>\n" +
-    			"            </attribute>\n" +
-    			"        </gbean>\n" +
-    			"        <gbean name=\"AdminObjectRefBuilder\">\n" +
-    			"            <attribute name=\"eeNamespaces\">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>\n" +
-    			"        </gbean>\n" +
-    			"        <gbean name=\"ClientResourceRefBuilder\">\n" +
-    			"            <attribute name=\"eeNamespaces\">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>\n" +
-    			"            <attribute name=\"defaultEnvironment\">\n" +
-    			"                <environment:environment xmlns:ns2=\"http://geronimo.apache.org/xml/ns/attributes-1.2\" xmlns=\"http://geronimo.apache.org/xml/ns/plugins-1.3\" xmlns:environment=\"http://geronimo.apache.org/xml/ns/deployment-1.2\">\n" +
-    			"                    <environment:dependencies>\n" +
-    			"                        <environment:dependency>\n" +
-    			"                            <environment:groupId>org.apache.geronimo.configs</environment:groupId>\n" +
-    			"                            <environment:artifactId>client-corba-yoko</environment:artifactId>\n" +
-    			"                            <environment:type>car</environment:type>\n" +
-    			"            </environment:dependency>\n" +
-    			"          </environment:dependencies>\n" +
-    			"        </environment:environment>\n" +
-    			"            </attribute>\n" +
-    			"        </gbean>\n" +
-    			"    </module>\n" +
-    			"    <module name=\"org.apache.geronimo.configs/jasper-deployer/2.1/car\"/>\n" +
-    			"    <module name=\"org.apache.geronimo.configs/jetty6-deployer/2.1/car\"/>\n" +
-    			"    <module load=\"false\" name=\"org.apache.geronimo.configs/client-security/2.1/car\"/>\n" +
-    			"    <module load=\"false\" name=\"org.apache.geronimo.configs/client/2.1/car\"/>\n" +
-    			"    <module condition=\"props['org.apache.geronimo.jaxws.provider'] == 'axis2'\" name=\"org.apache.geronimo.configs/axis2-ejb-deployer/2.1/car\">\n" +
-    			"        <gbean name=\"Axis2ModuleBuilderExtension\">\n" +
-    			"            <attribute name=\"listener\">?name=${webcontainer}</attribute>\n" +
-    			"        </gbean>\n" +
-    			"    </module>\n" +
-    			"    <module name=\"org.apache.geronimo.configs/jaxws-ejb-deployer/2.1/car\"/>\n" +
-    			"    <module name=\"org.apache.geronimo.configs/jaxws-deployer/2.1/car\"/>\n" +
-    			"    <module name=\"org.apache.geronimo.configs/openejb-deployer/2.1/car\">\n" +
-    			"        <gbean name=\"EjbRefBuilder\">\n" +
-    			"            <attribute name=\"eeNamespaces\">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>\n" +
-    			"        </gbean>\n" +
-    			"        <gbean name=\"ClientEjbRefBuilder\">\n" +
-    			"            <attribute name=\"eeNamespaces\">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>\n" +
-    			"            <attribute name=\"host\">${ServerHostname}</attribute>\n" +
-    			"            <attribute name=\"port\">${OpenEJBPort + PortOffset}</attribute>\n" +
-    			"        </gbean>\n" +
-    			"    </module>\n" +
-    			"    <module name=\"org.apache.geronimo.configs/openejb/2.1/car\">\n" +
-    			"        <gbean name=\"EJBNetworkService\">\n" +
-    			"            <attribute name=\"port\">${OpenEJBPort + PortOffset}</attribute>\n" +
-    			"            <attribute name=\"host\">${ServerHostname}</attribute>\n" +
-    			"        </gbean>\n" +
-    			"    </module>\n" +
-    			"    <module name=\"org.apache.geronimo.configs/openjpa/2.1/car\"/>\n" +
-    			"    <module condition=\"props['org.apache.geronimo.jaxws.provider'] == 'axis2'\" name=\"org.apache.geronimo.configs/axis2-deployer/2.1/car\"/>\n" +
-    			"    <module name=\"org.apache.geronimo.configs/axis2/2.1/car\"/>\n" +
-    			"    <module name=\"org.apache.geronimo.configs/axis2-ejb/2.1/car\"/>\n" +
-    			"    <module name=\"org.apache.geronimo.plugins/system-database-jetty/2.1/car\"/>\n" +
-    			"    <module name=\"org.apache.geronimo.plugins/console-jetty/2.1/car\"/>\n" +
-    			"    <module name=\"org.apache.geronimo.plugins/pluto-support/2.1/car\"/>\n" +
-    			"    <module name=\"org.apache.geronimo.configs/spring/2.1/car\"/>\n" +
-    			"    <module name=\"org.apache.geronimo.framework/transformer-agent/2.1/car\"/>\n" +
-    			"    <module name=\"org.apache.geronimo.configs/remote-deploy-jetty/2.1/car\"/>\n" +
-    			"    <module name=\"org.apache.geronimo.configs/cxf-ejb/2.1/car\"/>\n" +
-    			"    <module name=\"org.apache.geronimo.configs/cxf/2.1/car\"/>\n" +
-    			"    <module name=\"org.apache.geronimo.plugins/debugviews-jetty/2.1/car\"/>\n" +
-    			"    <module name=\"org.apache.geronimo.configs/dojo-jetty6/2.1/car\"/>\n" +
-    			"    <module name=\"org.apache.geronimo.configs/persistence-jpa10-deployer/2.1/car\">\n" +
-    			"        <gbean name=\"PersistenceUnitBuilder\">\n" +
-    			"            <attribute name=\"defaultPersistenceProviderClassName\">org.apache.openjpa.persistence.PersistenceProviderImpl</attribute>\n" +
-    			"            <attribute name=\"defaultPersistenceUnitProperties\">openjpa.Log=commons\n" +
-    			"                                        openjpa.jdbc.SynchronizeMappings=buildSchema(ForeignKeys=true)\n" +
-    			"                                        openjpa.jdbc.UpdateManager=operation-order\n" +
-    			"                                        openjpa.Sequence=table(Table=OPENJPASEQ, Increment=100)</attribute>\n" +
-    			"            <attribute name=\"defaultEnvironment\">\n" +
-    			"                <environment:environment xmlns:ns2=\"http://geronimo.apache.org/xml/ns/attributes-1.2\" xmlns=\"http://geronimo.apache.org/xml/ns/plugins-1.3\" xmlns:environment=\"http://geronimo.apache.org/xml/ns/deployment-1.2\">\n" +
-    			"                    <environment:dependencies>\n" +
-    			"                        <environment:dependency>\n" +
-    			"                            <environment:groupId>org.apache.geronimo.configs</environment:groupId>\n" +
-    			"                            <environment:artifactId>openjpa</environment:artifactId>\n" +
-    			"                            <environment:type>car</environment:type>\n" +
-    			"            </environment:dependency>\n" +
-    			"          </environment:dependencies>\n" +
-    			"        </environment:environment>\n" +
-    			"            </attribute>\n" +
-    			"        </gbean>\n" +
-    			"    </module>\n" +
-    			"    <module name=\"org.apache.geronimo.plugins/activemq-jetty/2.1/car\"/>\n" +
-    			"    <module name=\"org.apache.geronimo.configs/jetty6-clustering-wadi/2.1/car\"/>\n" +
-    			"    <module name=\"org.apache.geronimo.configs/wadi-clustering/2.1/car\">\n" +
-    			"        <gbean name=\"DefaultBackingStrategyFactory\">\n" +
-    			"            <attribute name=\"nbReplica\">${ReplicaCount}</attribute>\n" +
-    			"        </gbean>\n" +
-    			"        <gbean name=\"DefaultDispatcherHolder\">\n" +
-    			"            <attribute name=\"endPointURI\">${EndPointURI}</attribute>\n" +
-    			"            <attribute name=\"clusterName\">${ClusterName}</attribute>\n" +
-    			"        </gbean>\n" +
-    			"    </module>\n" +
-    			"    <module name=\"org.apache.geronimo.configs/uddi-jetty6/2.1/car\"/>\n" +
-    			"    <module name=\"org.apache.geronimo.configs/axis/2.1/car\"/>\n" +
-    			"    <module name=\"org.apache.geronimo.configs/axis-deployer/2.1/car\">\n" +
-    			"        <gbean name=\"AxisModuleBuilderExtension\">\n" +
-    			"            <attribute name=\"listener\">?name=${webcontainer}</attribute>\n" +
-    			"            <attribute name=\"defaultEnvironment\">\n" +
-    			"                <environment:environment xmlns:ns2=\"http://geronimo.apache.org/xml/ns/attributes-1.2\" xmlns=\"http://geronimo.apache.org/xml/ns/plugins-1.3\" xmlns:environment=\"http://geronimo.apache.org/xml/ns/deployment-1.2\">\n" +
-    			"                    <environment:dependencies>\n" +
-    			"                        <environment:dependency>\n" +
-    			"                            <environment:groupId>org.apache.geronimo.configs</environment:groupId>\n" +
-    			"                            <environment:artifactId>${webcontainerName}</environment:artifactId>\n" +
-    			"                            <environment:type>car</environment:type>\n" +
-    			"            </environment:dependency>\n" +
-    			"          </environment:dependencies>\n" +
-    			"        </environment:environment>\n" +
-    			"            </attribute>\n" +
-    			"        </gbean>\n" +
-    			"    </module>\n" +
-    			"    <module name=\"org.apache.geronimo.configs/j2ee-corba-yoko/2.1/car\">\n" +
-    			"        <gbean name=\"NameServer\">\n" +
-    			"            <attribute name=\"port\">${COSNamingPort + PortOffset}</attribute>\n" +
-    			"            <attribute name=\"host\">${COSNamingHost}</attribute>\n" +
-    			"        </gbean>\n" +
-    			"        <gbean name=\"Server\">\n" +
-    			"            <attribute name=\"port\">${ORBSSLPort + PortOffset}</attribute>\n" +
-    			"            <attribute name=\"host\">${ORBSSLHost}</attribute>\n" +
-    			"        </gbean>\n" +
-    			"        <gbean name=\"UnprotectedServer\">\n" +
-    			"            <attribute name=\"port\">${ORBPort + PortOffset}</attribute>\n" +
-    			"            <attribute name=\"host\">${ORBHost}</attribute>\n" +
-    			"        </gbean>\n" +
-    			"    </module>\n" +
-    			"    <module name=\"org.apache.geronimo.configs/mejb/2.1/car\"/>\n" +
-    			"    <module name=\"org.apache.geronimo.configs/jetty6-clustering-builder-wadi/2.1/car\">\n" +
-    			"        <gbean name=\"JettyClusteringBuilder\">\n" +
-    			"            <attribute name=\"defaultSweepInterval\">${DefaultWadiSweepInterval}</attribute>\n" +
-    			"            <attribute name=\"defaultNumPartitions\">${DefaultWadiNumPartitions}</attribute>\n" +
-    			"        </gbean>\n" +
-    			"    </module>\n" +
-    			"    <module name=\"org.apache.geronimo.configs/hot-deployer/2.1/car\">\n" +
-    			"        <gbean name=\"HotDeployer\">\n" +
-    			"            <attribute name=\"path\">deploy/</attribute>\n" +
-    			"            <attribute name=\"pollIntervalMillis\">2000</attribute>\n" +
-    			"        </gbean>\n" +
-    			"    </module>\n" +
-    			"    <module name=\"org.apache.geronimo.configs/openejb-corba-deployer/2.1/car\"/>\n" +
-    			"    <module load=\"false\" name=\"org.apache.geronimo.configs/client-corba-yoko/2.1/car\"/>\n" +
-    			"    <module name=\"org.apache.geronimo.configs/javamail/2.1/car\">\n" +
-    			"        <gbean name=\"SMTPTransport\">\n" +
-    			"            <attribute name=\"host\">${SMTPHost}</attribute>\n" +
-    			"            <attribute name=\"port\">${SMTPPort + PortOffset}</attribute>\n" +
-    			"        </gbean>\n" +
-    			"    </module>\n" +
-    			"    <module condition=\"props.getProperty('org.apache.geronimo.jaxws.provider', 'cxf') == 'cxf'\" name=\"org.apache.geronimo.configs/cxf-deployer/2.1/car\"/>\n" +
-    			"    <module name=\"org.apache.geronimo.configs/welcome-jetty/2.1/car\"/>\n" +
-    			"    <module name=\"org.apache.geronimo.configs/sharedlib/2.1/car\"/>\n" +
-    			"    <module name=\"org.apache.geronimo.configs/client-deployer/2.1/car\"/>\n" +
-    			"    <module load=\"false\" name=\"org.apache.geronimo.configs/client-transaction/2.1/car\"/>\n" +
-    			"    <module condition=\"props.getProperty('org.apache.geronimo.jaxws.provider', 'cxf') == 'cxf'\" name=\"org.apache.geronimo.configs/cxf-ejb-deployer/2.1/car\">\n" +
-    			"        <gbean name=\"CXFModuleBuilderExtension\">\n" +
-    			"            <attribute name=\"listener\">?name=${webcontainer}</attribute>\n" +
-    			"        </gbean>\n" +
-    			"    </module>\n" +
-    			"    <module name=\"org.apache.geronimo.plugins/plancreator-jetty/2.1/car\"/>\n" +
-    			"</attributes>\n";
+            "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n" +
+                    "<ns2:attributes xmlns:ns2=\"http://geronimo.apache.org/xml/ns/attributes-1.2\" xmlns=\"http://geronimo.apache.org/xml/ns/plugins-1.3\">\n" +
+                    "    <ns2:comment>This is a test comment.  Without it, a default warning comment will be created</ns2:comment>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/ca-helper-jetty/2.1-SNAPSHOT/car\"/>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/jasper/2.1-SNAPSHOT/car\"/>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/j2ee-server/2.1-SNAPSHOT/car\"/>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/transaction/2.1-SNAPSHOT/car\"/>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/jetty6/2.1-SNAPSHOT/car\">\n" +
+                    "        <ns2:gbean name=\"JettyWebConnector\">\n" +
+                    "            <ns2:attribute name=\"host\">${ServerHostname}</ns2:attribute>\n" +
+                    "            <ns2:attribute name=\"port\">${HTTPPort + PortOffset}</ns2:attribute>\n" +
+                    "            <ns2:attribute name=\"redirectPort\">${HTTPSPortPrimary + PortOffset}</ns2:attribute>\n" +
+                    "        </ns2:gbean>\n" +
+                    "        <ns2:gbean name=\"JettyAJP13Connector\">\n" +
+                    "            <ns2:attribute name=\"host\">${ServerHostname}</ns2:attribute>\n" +
+                    "            <ns2:attribute name=\"port\">${AJPPort + PortOffset}</ns2:attribute>\n" +
+                    "            <ns2:attribute name=\"redirectPort\">${HTTPSPortPrimary + PortOffset}</ns2:attribute>\n" +
+                    "        </ns2:gbean>\n" +
+                    "        <ns2:gbean name=\"JettySSLConnector\">\n" +
+                    "            <ns2:attribute name=\"host\">${ServerHostname}</ns2:attribute>\n" +
+                    "            <ns2:attribute name=\"port\">${HTTPSPort + PortOffset}</ns2:attribute>\n" +
+                    "        </ns2:gbean>\n" +
+                    "    </ns2:module>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/clustering/2.1-SNAPSHOT/car\">\n" +
+                    "        <ns2:gbean name=\"Node\">\n" +
+                    "            <ns2:attribute name=\"nodeName\">${clusterNodeName}</ns2:attribute>\n" +
+                    "        </ns2:gbean>\n" +
+                    "    </ns2:module>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/webservices-common/2.1-SNAPSHOT/car\"/>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/myfaces-deployer/2.1-SNAPSHOT/car\"/>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/myfaces/2.1-SNAPSHOT/car\"/>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/j2ee-deployer/2.1-SNAPSHOT/car\">\n" +
+                    "        <ns2:gbean name=\"WebBuilder\">\n" +
+                    "            <ns2:attribute name=\"defaultNamespace\">http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0</ns2:attribute>\n" +
+                    "        </ns2:gbean>\n" +
+                    "        <ns2:gbean name=\"EnvironmentEntryBuilder\">\n" +
+                    "            <ns2:attribute name=\"eeNamespaces\">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</ns2:attribute>\n" +
+                    "        </ns2:gbean>\n" +
+                    "    </ns2:module>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/activemq-ra/2.1-SNAPSHOT/car\">\n" +
+                    "        <ns2:gbean name=\"ActiveMQ RA\">\n" +
+                    "            <ns2:attribute name=\"ServerUrl\">tcp://${ServerHostname}:${ActiveMQPort + PortOffset}</ns2:attribute>\n" +
+                    "        </ns2:gbean>\n" +
+                    "    </ns2:module>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/activemq-broker/2.1-SNAPSHOT/car\">\n" +
+                    "        <ns2:gbean name=\"ActiveMQ.tcp.default\">\n" +
+                    "            <ns2:attribute name=\"host\">${ServerHostname}</ns2:attribute>\n" +
+                    "            <ns2:attribute name=\"port\">${ActiveMQPort + PortOffset}</ns2:attribute>\n" +
+                    "        </ns2:gbean>\n" +
+                    "        <ns2:gbean name=\"ActiveMQ.stomp.default\">\n" +
+                    "            <ns2:attribute name=\"host\">${ServerHostname}</ns2:attribute>\n" +
+                    "            <ns2:attribute name=\"port\">${ActiveMQStompPort + PortOffset}</ns2:attribute>\n" +
+                    "        </ns2:gbean>\n" +
+                    "    </ns2:module>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/system-database/2.1-SNAPSHOT/car\">\n" +
+                    "        <ns2:gbean name=\"DerbyNetwork\">\n" +
+                    "            <ns2:attribute name=\"host\">${ServerHostname}</ns2:attribute>\n" +
+                    "            <ns2:attribute name=\"port\">${DerbyPort + PortOffset}</ns2:attribute>\n" +
+                    "        </ns2:gbean>\n" +
+                    "    </ns2:module>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/connector-deployer/2.1-SNAPSHOT/car\">\n" +
+                    "        <ns2:gbean name=\"ResourceRefBuilder\">\n" +
+                    "            <ns2:attribute name=\"eeNamespaces\">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</ns2:attribute>\n" +
+                    "            <ns2:attribute name=\"defaultEnvironment\">\n" +
+                    "                <environment:environment xmlns:environment=\"http://geronimo.apache.org/xml/ns/deployment-1.2\">\n" +
+                    "                    <environment:dependencies>\n" +
+                    "                        <environment:dependency>\n" +
+                    "                            <environment:groupId>org.apache.geronimo.configs</environment:groupId>\n" +
+                    "                            <environment:artifactId>j2ee-corba-yoko</environment:artifactId>\n" +
+                    "                            <environment:type>car</environment:type>\n" +
+                    "            </environment:dependency>\n" +
+                    "          </environment:dependencies>\n" +
+                    "        </environment:environment></ns2:attribute>\n" +
+                    "        </ns2:gbean>\n" +
+                    "        <ns2:gbean name=\"AdminObjectRefBuilder\">\n" +
+                    "            <ns2:attribute name=\"eeNamespaces\">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</ns2:attribute>\n" +
+                    "        </ns2:gbean>\n" +
+                    "        <ns2:gbean name=\"ClientResourceRefBuilder\">\n" +
+                    "            <ns2:attribute name=\"eeNamespaces\">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</ns2:attribute>\n" +
+                    "            <ns2:attribute name=\"defaultEnvironment\">\n" +
+                    "                <environment:environment xmlns:environment=\"http://geronimo.apache.org/xml/ns/deployment-1.2\">\n" +
+                    "                    <environment:dependencies>\n" +
+                    "                        <environment:dependency>\n" +
+                    "                            <environment:groupId>org.apache.geronimo.configs</environment:groupId>\n" +
+                    "                            <environment:artifactId>client-corba-yoko</environment:artifactId>\n" +
+                    "                            <environment:type>car</environment:type>\n" +
+                    "            </environment:dependency>\n" +
+                    "          </environment:dependencies>\n" +
+                    "        </environment:environment></ns2:attribute>\n" +
+                    "        </ns2:gbean>\n" +
+                    "    </ns2:module>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/jasper-deployer/2.1-SNAPSHOT/car\"/>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/jetty6-deployer/2.1-SNAPSHOT/car\"/>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/client-security/2.1-SNAPSHOT/car\" load=\"false\"/>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/client/2.1-SNAPSHOT/car\" load=\"false\"/>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/axis2-ejb-deployer/2.1-SNAPSHOT/car\" condition=\"props['org.apache.geronimo.jaxws.provider'] == 'axis2'\">\n" +
+                    "        <ns2:gbean name=\"Axis2ModuleBuilderExtension\">\n" +
+                    "            <ns2:attribute name=\"listener\">?name=${webcontainer}</ns2:attribute>\n" +
+                    "        </ns2:gbean>\n" +
+                    "    </ns2:module>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/jaxws-ejb-deployer/2.1-SNAPSHOT/car\"/>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/jaxws-deployer/2.1-SNAPSHOT/car\"/>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/openejb-deployer/2.1-SNAPSHOT/car\">\n" +
+                    "        <ns2:gbean name=\"EjbRefBuilder\">\n" +
+                    "            <ns2:attribute name=\"eeNamespaces\">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</ns2:attribute>\n" +
+                    "        </ns2:gbean>\n" +
+                    "        <ns2:gbean name=\"ClientEjbRefBuilder\">\n" +
+                    "            <ns2:attribute name=\"eeNamespaces\">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</ns2:attribute>\n" +
+                    "            <ns2:attribute name=\"host\">${ServerHostname}</ns2:attribute>\n" +
+                    "            <ns2:attribute name=\"port\">${OpenEJBPort + PortOffset}</ns2:attribute>\n" +
+                    "        </ns2:gbean>\n" +
+                    "    </ns2:module>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/openejb/2.1-SNAPSHOT/car\">\n" +
+                    "        <ns2:gbean name=\"EJBNetworkService\">\n" +
+                    "            <ns2:attribute name=\"port\">${OpenEJBPort + PortOffset}</ns2:attribute>\n" +
+                    "            <ns2:attribute name=\"host\">${ServerHostname}</ns2:attribute>\n" +
+                    "        </ns2:gbean>\n" +
+                    "    </ns2:module>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/openjpa/2.1-SNAPSHOT/car\"/>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/axis2-deployer/2.1-SNAPSHOT/car\" condition=\"props['org.apache.geronimo.jaxws.provider'] == 'axis2'\"/>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/axis2/2.1-SNAPSHOT/car\"/>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/axis2-ejb/2.1-SNAPSHOT/car\"/>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.plugins/system-database-jetty/2.1-SNAPSHOT/car\"/>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.plugins/console-jetty/2.1-SNAPSHOT/car\"/>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.plugins/pluto-support/2.1-SNAPSHOT/car\"/>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/spring/2.1-SNAPSHOT/car\"/>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.framework/transformer-agent/2.1-SNAPSHOT/car\"/>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/remote-deploy-jetty/2.1-SNAPSHOT/car\"/>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/cxf-ejb/2.1-SNAPSHOT/car\"/>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/cxf/2.1-SNAPSHOT/car\"/>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.plugins/debugviews-jetty/2.1-SNAPSHOT/car\"/>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/dojo-jetty6/2.1-SNAPSHOT/car\"/>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/persistence-jpa10-deployer/2.1-SNAPSHOT/car\">\n" +
+                    "        <ns2:gbean name=\"PersistenceUnitBuilder\">\n" +
+                    "            <ns2:attribute name=\"defaultPersistenceProviderClassName\">org.apache.openjpa.persistence.PersistenceProviderImpl</ns2:attribute>\n" +
+                    "            <ns2:attribute name=\"defaultPersistenceUnitProperties\">openjpa.Log=commons\n" +
+                    "                                        openjpa.jdbc.SynchronizeMappings=buildSchema(ForeignKeys=true)\n" +
+                    "                                        openjpa.jdbc.UpdateManager=operation-order\n" +
+                    "                                        openjpa.Sequence=table(Table=OPENJPASEQ, Increment=100)</ns2:attribute>\n" +
+                    "            <ns2:attribute name=\"defaultEnvironment\">\n" +
+                    "                <environment:environment xmlns:environment=\"http://geronimo.apache.org/xml/ns/deployment-1.2\">\n" +
+                    "                    <environment:dependencies>\n" +
+                    "                        <environment:dependency>\n" +
+                    "                            <environment:groupId>org.apache.geronimo.configs</environment:groupId>\n" +
+                    "                            <environment:artifactId>openjpa</environment:artifactId>\n" +
+                    "                            <environment:type>car</environment:type>\n" +
+                    "            </environment:dependency>\n" +
+                    "          </environment:dependencies>\n" +
+                    "        </environment:environment></ns2:attribute>\n" +
+                    "        </ns2:gbean>\n" +
+                    "    </ns2:module>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.plugins/activemq-jetty/2.1-SNAPSHOT/car\"/>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/jetty6-clustering-wadi/2.1-SNAPSHOT/car\"/>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/wadi-clustering/2.1-SNAPSHOT/car\">\n" +
+                    "        <ns2:gbean name=\"DefaultBackingStrategyFactory\">\n" +
+                    "            <ns2:attribute name=\"nbReplica\">${ReplicaCount}</ns2:attribute>\n" +
+                    "        </ns2:gbean>\n" +
+                    "        <ns2:gbean name=\"DefaultDispatcherHolder\">\n" +
+                    "            <ns2:attribute name=\"endPointURI\">${EndPointURI}</ns2:attribute>\n" +
+                    "            <ns2:attribute name=\"clusterName\">${ClusterName}</ns2:attribute>\n" +
+                    "        </ns2:gbean>\n" +
+                    "    </ns2:module>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/uddi-jetty6/2.1-SNAPSHOT/car\"/>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/axis/2.1-SNAPSHOT/car\"/>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/axis-deployer/2.1-SNAPSHOT/car\">\n" +
+                    "        <ns2:gbean name=\"AxisModuleBuilderExtension\">\n" +
+                    "            <ns2:attribute name=\"listener\">?name=${webcontainer}</ns2:attribute>\n" +
+                    "            <ns2:attribute name=\"defaultEnvironment\">\n" +
+                    "                <environment:environment xmlns:environment=\"http://geronimo.apache.org/xml/ns/deployment-1.2\">\n" +
+                    "                    <environment:dependencies>\n" +
+                    "                        <environment:dependency>\n" +
+                    "                            <environment:groupId>org.apache.geronimo.configs</environment:groupId>\n" +
+                    "                            <environment:artifactId>${webcontainerName}</environment:artifactId>\n" +
+                    "                            <environment:type>car</environment:type>\n" +
+                    "            </environment:dependency>\n" +
+                    "          </environment:dependencies>\n" +
+                    "        </environment:environment></ns2:attribute>\n" +
+                    "        </ns2:gbean>\n" +
+                    "    </ns2:module>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/j2ee-corba-yoko/2.1-SNAPSHOT/car\">\n" +
+                    "        <ns2:gbean name=\"NameServer\">\n" +
+                    "            <ns2:attribute name=\"port\">${COSNamingPort + PortOffset}</ns2:attribute>\n" +
+                    "            <ns2:attribute name=\"host\">${COSNamingHost}</ns2:attribute>\n" +
+                    "        </ns2:gbean>\n" +
+                    "        <ns2:gbean name=\"Server\">\n" +
+                    "            <ns2:attribute name=\"port\">${ORBSSLPort + PortOffset}</ns2:attribute>\n" +
+                    "            <ns2:attribute name=\"host\">${ORBSSLHost}</ns2:attribute>\n" +
+                    "        </ns2:gbean>\n" +
+                    "        <ns2:gbean name=\"UnprotectedServer\">\n" +
+                    "            <ns2:attribute name=\"port\">${ORBPort + PortOffset}</ns2:attribute>\n" +
+                    "            <ns2:attribute name=\"host\">${ORBHost}</ns2:attribute>\n" +
+                    "        </ns2:gbean>\n" +
+                    "    </ns2:module>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/mejb/2.1-SNAPSHOT/car\"/>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/jetty6-clustering-builder-wadi/2.1-SNAPSHOT/car\">\n" +
+                    "        <ns2:gbean name=\"JettyClusteringBuilder\">\n" +
+                    "            <ns2:attribute name=\"defaultSweepInterval\">${DefaultWadiSweepInterval}</ns2:attribute>\n" +
+                    "            <ns2:attribute name=\"defaultNumPartitions\">${DefaultWadiNumPartitions}</ns2:attribute>\n" +
+                    "        </ns2:gbean>\n" +
+                    "    </ns2:module>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/hot-deployer/2.1-SNAPSHOT/car\">\n" +
+                    "        <ns2:gbean name=\"HotDeployer\">\n" +
+                    "            <ns2:attribute name=\"path\">deploy/</ns2:attribute>\n" +
+                    "            <ns2:attribute name=\"pollIntervalMillis\">2000</ns2:attribute>\n" +
+                    "        </ns2:gbean>\n" +
+                    "    </ns2:module>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/openejb-corba-deployer/2.1-SNAPSHOT/car\"/>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/client-corba-yoko/2.1-SNAPSHOT/car\" load=\"false\"/>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/javamail/2.1-SNAPSHOT/car\">\n" +
+                    "        <ns2:gbean name=\"SMTPTransport\">\n" +
+                    "            <ns2:attribute name=\"host\">${SMTPHost}</ns2:attribute>\n" +
+                    "            <ns2:attribute name=\"port\">${SMTPPort + PortOffset}</ns2:attribute>\n" +
+                    "        </ns2:gbean>\n" +
+                    "    </ns2:module>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/cxf-deployer/2.1-SNAPSHOT/car\" condition=\"props.getProperty('org.apache.geronimo.jaxws.provider', 'cxf') == 'cxf'\"/>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/welcome-jetty/2.1-SNAPSHOT/car\"/>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/sharedlib/2.1-SNAPSHOT/car\"/>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/client-deployer/2.1-SNAPSHOT/car\"/>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/client-transaction/2.1-SNAPSHOT/car\" load=\"false\"/>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.configs/cxf-ejb-deployer/2.1-SNAPSHOT/car\" condition=\"props.getProperty('org.apache.geronimo.jaxws.provider', 'cxf') == 'cxf'\">\n" +
+                    "        <ns2:gbean name=\"CXFModuleBuilderExtension\">\n" +
+                    "            <ns2:attribute name=\"listener\">?name=${webcontainer}</ns2:attribute>\n" +
+                    "        </ns2:gbean>\n" +
+                    "    </ns2:module>\n" +
+                    "    <ns2:module name=\"org.apache.geronimo.plugins/plancreator-jetty/2.1-SNAPSHOT/car\"/>\n" +
+                    "</ns2:attributes>\n";
     
     public void testReadWrite() throws Exception {
         Reader reader = new StringReader(CONFIG);

Modified: geronimo/server/branches/2.1/plugins/axis2/geronimo-axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/axis2/geronimo-axis2/pom.xml?rev=1221316&r1=1221315&r2=1221316&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/axis2/geronimo-axis2/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/axis2/geronimo-axis2/pom.xml Tue Dec 20 15:26:28 2011
@@ -157,8 +157,8 @@
         </dependency>
         
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
         </dependency>
     </dependencies>
 

Modified: geronimo/server/branches/2.1/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java?rev=1221316&r1=1221315&r2=1221316&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java (original)
+++ geronimo/server/branches/2.1/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java Tue Dec 20 15:26:28 2011
@@ -43,7 +43,7 @@ public class JAXWSTools {
     { 
         { "org.apache.axis2", "axis2-jaxws-api" },
         { "org.apache.geronimo.specs", "geronimo-saaj_1.3_spec" },
-        { "org.apache.geronimo.specs",   "geronimo-jaxb_2.1_spec" },
+        { "javax.xml.bind",   "jaxb-api" },
         { "com.sun.xml.bind", "jaxb-impl" },
         { "com.sun.xml.bind", "jaxb-xjc" },
         { "com.sun.xml.ws",   "jaxws-tools" },

Modified: geronimo/server/branches/2.1/plugins/jaxws/geronimo-jaxws/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/jaxws/geronimo-jaxws/pom.xml?rev=1221316&r1=1221315&r2=1221316&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/jaxws/geronimo-jaxws/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/jaxws/geronimo-jaxws/pom.xml Tue Dec 20 15:26:28 2011
@@ -77,8 +77,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/server/branches/2.1/plugins/openejb/geronimo-openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/openejb/geronimo-openejb/pom.xml?rev=1221316&r1=1221315&r2=1221316&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/openejb/geronimo-openejb/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/openejb/geronimo-openejb/pom.xml Tue Dec 20 15:26:28 2011
@@ -114,10 +114,16 @@
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-javaagent</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.xml</groupId>
+                    <artifactId>jsr173</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- g-transaction, g-security, g-naming  come transitively from this -->

Modified: geronimo/server/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/pom.xml?rev=1221316&r1=1221315&r2=1221316&view=diff
==============================================================================
--- geronimo/server/branches/2.1/pom.xml (original)
+++ geronimo/server/branches/2.1/pom.xml Tue Dec 20 15:26:28 2011
@@ -1401,9 +1401,15 @@
             </dependency>
 
             <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-jaxb_2.1_spec</artifactId>
-                <version>1.0</version>
+                <groupId>javax.xml.bind</groupId>
+                <artifactId>jaxb-api</artifactId>
+                <version>2.1</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>javax.xml.bind</groupId>
+                        <artifactId>jsr173_api</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <dependency>
@@ -1413,7 +1419,11 @@
                 <exclusions>
                     <exclusion>
                         <groupId>javax.xml.bind</groupId>
-                        <artifactId>jaxb-api</artifactId>
+                        <artifactId>jsr173_api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.xml.bind</groupId>
+                        <artifactId>activation</artifactId>
                     </exclusion>
                 </exclusions>
             </dependency>

Modified: geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml?rev=1221316&r1=1221315&r2=1221316&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-client/pom.xml Tue Dec 20 15:26:28 2011
@@ -39,8 +39,8 @@
 
             <dependencies>
                 <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
                     <scope>provided</scope>
                 </dependency>
             </dependencies>

Modified: geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml?rev=1221316&r1=1221315&r2=1221316&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml Tue Dec 20 15:26:28 2011
@@ -64,8 +64,8 @@
                 </dependency>
         
                 <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
                     <scope>provided</scope>
                 </dependency>
             </dependencies>

Modified: geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml?rev=1221316&r1=1221315&r2=1221316&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxb-tests/jaxb-war/pom.xml Tue Dec 20 15:26:28 2011
@@ -36,8 +36,8 @@
 
             <dependencies>
                 <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
                     <scope>provided</scope>
                 </dependency>
             </dependencies>

Modified: geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml?rev=1221316&r1=1221315&r2=1221316&view=diff
==============================================================================
--- geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml (original)
+++ geronimo/server/branches/2.1/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml Tue Dec 20 15:26:28 2011
@@ -85,8 +85,8 @@
                 </dependency>
         
                 <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jaxb_2.1_spec</artifactId>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
                     <scope>provided</scope>
                 </dependency>
         



Mime
View raw message