Re: svn commit: r481734 - in /geronimo/server/trunk/configs: ./ connector-deployer/ connector-deployer/src/plan/ dojo-jetty6/ jetty/ jetty6-deployer/src/plan/ openejb/ openjpa/ persistence-jpa10-deployer/ system-database/ tomcat/ transaction/ uddi-jetty6/ ...

Mon, 04 Dec 2006 09:22:04 -0800

Ok, it looks like the error can easily be avoided if I just change the reference in config.xml from transaction to transaction-jta11. It's easy enough to do that but I'm still not sure of the intent. Do we want the j2ee 1.4 servers using the jta11 transaction mgmt for now? 

Thanks,
Joe


Joe Bohn wrote:


David,

Thanks for moving the content of the sandbox over to trunk.
I noticed that these changes still differentiate the new jee5 vs. 1.4 items rather than replacing them by using names like jetty6, transaction-jta11, web-2.5, etc... However, I thought that you were no longer trying to have both 1.4 and jee5 live together in harmony. Is this just temporary and do you currently expect both jetty6 and the 1.4 jetty & tomcat assemblies to still work? I'm asking because there is currently a problem starting the tomcat or jetty (non-6) assemblies. We hit an error because the transaction-manager is registered twice (both from transaction and transaction-jta11 modules). I'm trying to figure out why the jta11 config is being included in the old assemblies but if you didn't expect to keep those alive then this might be just a waste of time. 

Regards,
Joe


[EMAIL PROTECTED] wrote:


Author: djencks
Date: Sun Dec  3 00:18:18 2006
New Revision: 481734

URL: http://svn.apache.org/viewvc?view=rev&rev=481734
Log:
GERONIMO-2616 move all tx stuff to the transaction-jta1.1 config.

Removed:
    geronimo/server/trunk/configs/transaction/
Modified:
    geronimo/server/trunk/configs/connector-deployer/pom.xml
    geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml
    geronimo/server/trunk/configs/dojo-jetty6/pom.xml
    geronimo/server/trunk/configs/jetty/pom.xml
    geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml
    geronimo/server/trunk/configs/openejb/pom.xml
    geronimo/server/trunk/configs/openjpa/pom.xml
    geronimo/server/trunk/configs/persistence-jpa10-deployer/pom.xml
    geronimo/server/trunk/configs/pom.xml
    geronimo/server/trunk/configs/system-database/pom.xml
    geronimo/server/trunk/configs/tomcat/pom.xml
    geronimo/server/trunk/configs/uddi-jetty6/pom.xml
    geronimo/server/trunk/configs/webconsole-jetty6/pom.xml

Modified: geronimo/server/trunk/configs/connector-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/connector-deployer/pom.xml?view=diff&rev=481734&r1=481733&r2=481734 ============================================================================== 
--- geronimo/server/trunk/configs/connector-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/connector-deployer/pom.xml Sun Dec 3 00:18:18 2006 
@@ -44,7 +44,7 @@
<dependency> 
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>transaction</artifactId>
+            <artifactId>transaction-jta11</artifactId>
             <version>${version}</version>
             <type>car</type>
             <scope>runtime</scope>
Modified: geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml?view=diff&rev=481734&r1=481733&r2=481734 ============================================================================== --- geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml (original) +++ geronimo/server/trunk/configs/connector-deployer/src/plan/plan.xml Sun Dec 3 00:18:18 2006 
@@ -35,7 +35,7 @@
                 <dependencies>
                     <dependency>
                         <groupId>${pom.groupId}</groupId>
-                        <artifactId>transaction</artifactId>
+                        <artifactId>transaction-jta11</artifactId>
                         <type>car</type>
                     </dependency>
                     <dependency>

Modified: geronimo/server/trunk/configs/dojo-jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/dojo-jetty6/pom.xml?view=diff&rev=481734&r1=481733&r2=481734 ============================================================================== 
--- geronimo/server/trunk/configs/dojo-jetty6/pom.xml (original)
+++ geronimo/server/trunk/configs/dojo-jetty6/pom.xml Sun Dec 3 00:18:18 2006 
@@ -34,23 +34,6 @@
<dependencies> - <!-- hack, remove when integrated in trunk--> 
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6-deployer</artifactId>
-            <version>${pom.version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.geronimo.applications</groupId>
             <artifactId>geronimo-dojo</artifactId>

Modified: geronimo/server/trunk/configs/jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty/pom.xml?view=diff&rev=481734&r1=481733&r2=481734 ============================================================================== 
--- geronimo/server/trunk/configs/jetty/pom.xml (original)
+++ geronimo/server/trunk/configs/jetty/pom.xml Sun Dec  3 00:18:18 2006
@@ -51,7 +51,7 @@
<dependency> 
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>transaction</artifactId>
+            <artifactId>transaction-jta11</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml?view=diff&rev=481734&r1=481733&r2=481734 ============================================================================== --- geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml (original) +++ geronimo/server/trunk/configs/jetty6-deployer/src/plan/plan.xml Sun Dec 3 00:18:18 2006 
@@ -70,8 +70,7 @@
                 <dependencies>
                     <dependency>
                         <groupId>${pom.groupId}</groupId>
- <!-- server artifact aliases turns this into jetty6 --> 
-                        <artifactId>jetty</artifactId>
+                        <artifactId>jetty6</artifactId>
                         <type>car</type>
                     </dependency>
                 </dependencies>

Modified: geronimo/server/trunk/configs/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/openejb/pom.xml?view=diff&rev=481734&r1=481733&r2=481734 ============================================================================== 
--- geronimo/server/trunk/configs/openejb/pom.xml (original)
+++ geronimo/server/trunk/configs/openejb/pom.xml Sun Dec 3 00:18:18 2006 
@@ -51,7 +51,7 @@
<!--<dependency>--> 
             <!--<groupId>org.apache.geronimo.configs</groupId>-->
-            <!--<artifactId>transaction</artifactId>-->
+            <!--<artifactId>transaction-jta11</artifactId>-->
             <!--<version>${version}</version>-->
             <!--<type>car</type>-->
         <!--</dependency>-->

Modified: geronimo/server/trunk/configs/openjpa/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/openjpa/pom.xml?view=diff&rev=481734&r1=481733&r2=481734 ============================================================================== 
--- geronimo/server/trunk/configs/openjpa/pom.xml (original)
+++ geronimo/server/trunk/configs/openjpa/pom.xml Sun Dec 3 00:18:18 2006 
@@ -58,7 +58,7 @@
<dependency> 
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>transaction</artifactId>
+            <artifactId>transaction-jta11</artifactId>
             <version>${pom.version}</version>
             <type>car</type>
         </dependency>
Modified: geronimo/server/trunk/configs/persistence-jpa10-deployer/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/persistence-jpa10-deployer/pom.xml?view=diff&rev=481734&r1=481733&r2=481734 ============================================================================== --- geronimo/server/trunk/configs/persistence-jpa10-deployer/pom.xml (original) +++ geronimo/server/trunk/configs/persistence-jpa10-deployer/pom.xml Sun Dec 3 00:18:18 2006 
@@ -50,7 +50,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>transaction</artifactId>
+            <artifactId>transaction-jta11</artifactId>
             <type>car</type>
             <version>${pom.version}</version>
             <scope>runtime</scope>

Modified: geronimo/server/trunk/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/pom.xml?view=diff&rev=481734&r1=481733&r2=481734 ============================================================================== 
--- geronimo/server/trunk/configs/pom.xml (original)
+++ geronimo/server/trunk/configs/pom.xml Sun Dec  3 00:18:18 2006
@@ -161,7 +161,7 @@
         <module>system-database</module>
         <module>tomcat</module>
         <module>tomcat-deployer</module>
-        <module>transaction</module>
+        <!--<module>transaction</module>-->
         <module>uddi-jetty</module>
         <module>uddi-tomcat</module>
         <module>unavailable-client-deployer</module>

Modified: geronimo/server/trunk/configs/system-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/system-database/pom.xml?view=diff&rev=481734&r1=481733&r2=481734 ============================================================================== 
--- geronimo/server/trunk/configs/system-database/pom.xml (original)
+++ geronimo/server/trunk/configs/system-database/pom.xml Sun Dec 3 00:18:18 2006 
@@ -44,7 +44,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>transaction</artifactId>
+            <artifactId>transaction-jta11</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/trunk/configs/tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/tomcat/pom.xml?view=diff&rev=481734&r1=481733&r2=481734 ============================================================================== 
--- geronimo/server/trunk/configs/tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/tomcat/pom.xml Sun Dec  3 00:18:18 2006
@@ -51,7 +51,7 @@
<dependency> 
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>transaction</artifactId>
+            <artifactId>transaction-jta11</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/trunk/configs/uddi-jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/uddi-jetty6/pom.xml?view=diff&rev=481734&r1=481733&r2=481734 ============================================================================== 
--- geronimo/server/trunk/configs/uddi-jetty6/pom.xml (original)
+++ geronimo/server/trunk/configs/uddi-jetty6/pom.xml Sun Dec 3 00:18:18 2006 
@@ -34,15 +34,6 @@
<dependencies> - <!-- hack, remove when integrated in trunk--> 
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>system-database</artifactId>

Modified: geronimo/server/trunk/configs/webconsole-jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webconsole-jetty6/pom.xml?view=diff&rev=481734&r1=481733&r2=481734 ============================================================================== 
--- geronimo/server/trunk/configs/webconsole-jetty6/pom.xml (original)
+++ geronimo/server/trunk/configs/webconsole-jetty6/pom.xml Sun Dec 3 00:18:18 2006 
@@ -34,15 +34,6 @@
<dependencies> - <!-- hack, remove when integrated in trunk--> 
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>

Reply via email to