servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r466115 [1/2] - in /incubator/servicemix/trunk: ./ apache-servicemix/ apache-servicemix/src/main/assembly/ apache-servicemix/src/main/release/conf/ geronimo/ geronimo/deployer-service/ geronimo/deployer/ geronimo/servicemix-service/ geronim...
Date Fri, 20 Oct 2006 13:59:38 GMT
Author: gnodet
Date: Fri Oct 20 06:59:35 2006
New Revision: 466115

URL: http://svn.apache.org/viewvc?view=rev&rev=466115
Log:
SM-717: upgrade to Geronimo 1.2, Jencks 2.0, ActiveMQ 4.1

Modified:
    incubator/servicemix/trunk/apache-servicemix/pom.xml
    incubator/servicemix/trunk/apache-servicemix/src/main/assembly/bin.xml
    incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/activemq.xml
    incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/jmx.xml
    incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/jndi.xml
    incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/servicemix.xml
    incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/tx.xml
    incubator/servicemix/trunk/geronimo/deployer-service/pom.xml
    incubator/servicemix/trunk/geronimo/deployer/pom.xml
    incubator/servicemix/trunk/geronimo/pom.xml
    incubator/servicemix/trunk/geronimo/servicemix-service/pom.xml
    incubator/servicemix/trunk/geronimo/servicemix/pom.xml
    incubator/servicemix/trunk/geronimo/servicemix/src/plan/geronimo-service.xml
    incubator/servicemix/trunk/pom.xml
    incubator/servicemix/trunk/samples/basic/pom.xml
    incubator/servicemix/trunk/samples/servicemix-web/pom.xml
    incubator/servicemix/trunk/sandbox/geronimo-1.0/servicemix-gbean/pom.xml
    incubator/servicemix/trunk/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/AutoDeployedBean.java
    incubator/servicemix/trunk/servicemix-common/pom.xml
    incubator/servicemix/trunk/servicemix-common/src/test/java/org/apache/servicemix/common/TransactionsTest.java
    incubator/servicemix/trunk/servicemix-components/pom.xml
    incubator/servicemix/trunk/servicemix-core/pom.xml
    incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/components/util/xstream/XStreamMarshaler.java
    incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/SpringJBIContainer.java
    incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/jca/JCAFlow.java
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/AbstractTransactionTest.java
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/JcaFlowPersistentTest.java
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/JcaFlowTransactionTest.java
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/TransactionsTest.java
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jca/JCAFlowTest.java
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jca/JcaFlowWithTxLogTest.java
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/MultipleJMSFlowTest.java
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/StatelessJcaFlowTest.java
    incubator/servicemix/trunk/servicemix-eip/pom.xml
    incubator/servicemix/trunk/servicemix-eip/src/test/java/org/apache/servicemix/eip/AbstractEIPTransactionalTest.java
    incubator/servicemix/trunk/servicemix-http/pom.xml
    incubator/servicemix/trunk/servicemix-http/src/test/java/org/apache/servicemix/http/HttpTxTest.java
    incubator/servicemix/trunk/servicemix-jms/pom.xml
    incubator/servicemix/trunk/servicemix-services/pom.xml
    incubator/servicemix/trunk/servicemix-services/src/test/java/org/apache/servicemix/store/jdbc/JdbcStoreTransactionalTest.java
    incubator/servicemix/trunk/servicemix-soap/pom.xml
    incubator/servicemix/trunk/servicemix-wsn2005/pom.xml

Modified: incubator/servicemix/trunk/apache-servicemix/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/apache-servicemix/pom.xml?view=diff&rev=466115&r1=466114&r2=466115
==============================================================================
--- incubator/servicemix/trunk/apache-servicemix/pom.xml (original)
+++ incubator/servicemix/trunk/apache-servicemix/pom.xml Fri Oct 20 06:59:35 2006
@@ -187,7 +187,7 @@
       <artifactId>jaxen</artifactId>
     </dependency>
     <dependency>
-      <groupId>incubator-activemq</groupId>
+      <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-ra</artifactId>
     </dependency>
     <dependency>

Modified: incubator/servicemix/trunk/apache-servicemix/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/apache-servicemix/src/main/assembly/bin.xml?view=diff&rev=466115&r1=466114&r2=466115
==============================================================================
--- incubator/servicemix/trunk/apache-servicemix/src/main/assembly/bin.xml (original)
+++ incubator/servicemix/trunk/apache-servicemix/src/main/assembly/bin.xml Fri Oct 20 06:59:35 2006
@@ -103,9 +103,9 @@
         <include>classworlds:classworlds</include>
 
         <include>backport-util-concurrent:backport-util-concurrent</include>
-        <include>incubator-activemq:activemq-core</include>
-        <include>incubator-activemq:activemq-ra</include>
-        <include>incubator-activemq:activeio-core</include>
+        <include>org.apache.activemq:activemq-core</include>
+        <include>org.apache.activemq:activemq-ra</include>
+        <include>org.apache.activemq:activeio-core</include>
         <include>commons-logging:commons-logging</include>
         <include>commons-beanutils:commons-beanutils-core</include>
         <include>org.apache.servicemix:servicemix-jbi</include>
@@ -129,15 +129,12 @@
         <include>org.jencks:jencks</include>
         <include>org.objectweb.howl:howl</include>
         
-        <include>geronimo:geronimo-connector</include>
-        <include>geronimo:geronimo-transaction</include>
-        <include>geronimo:geronimo-core</include>
-        <include>geronimo:geronimo-system</include>
+        <include>org.apache.geronimo.modules:geronimo-connector</include>
+        <include>org.apache.geronimo.modules:geronimo-transaction</include>
 
         <include>javax.activation:activation</include>
         <include>javax.mail:mail</include>
         
-        <include>concurrent:concurrent</include>
         <include>xstream:xstream</include>
         <include>xerces:xercesImpl</include>
         <include>xalan:xalan</include>

Modified: incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/activemq.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/activemq.xml?view=diff&rev=466115&r1=466114&r2=466115
==============================================================================
--- incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/activemq.xml (original)
+++ incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/activemq.xml Fri Oct 20 06:59:35 2006
@@ -18,31 +18,37 @@
 
 -->
 <!-- START SNIPPET: xbean -->
-<beans>
+<beans xmlns:amq="http://activemq.org/config/1.0">
   
-  <broker useJmx="true" xmlns="http://activemq.org/config/1.0">
+  <amq:broker depends-on="jmxServer">
 
-    <persistenceAdapter>
-      <journaledJDBC journalLogFiles="5" dataDirectory="file:./data/amq"/>
+    <managementContext>
+      <bean class="org.apache.activemq.broker.jmx.ManagementContext">
+        <property name="createConnector" value="false" />
+      </bean>
+    </managementContext>
+
+    <amq:persistenceAdapter>
+      <amq:journaledJDBC journalLogFiles="5" dataDirectory="./data/amq"/>
       <!-- To use a different datasource, use th following syntax : -->
       <!-- 
-      <journaledJDBC journalLogFiles="5" dataDirectory="../data" dataSource="#postgres-ds"/>
+      <amq:journaledJDBC journalLogFiles="5" dataDirectory="../data" dataSource="#postgres-ds"/>
        -->
-    </persistenceAdapter>
+    </amq:persistenceAdapter>
   
-    <transportConnectors>
-       <transportConnector uri="tcp://localhost:61616" discoveryUri="multicast://default"/>
-    </transportConnectors>
+    <amq:transportConnectors>
+       <amq:transportConnector uri="tcp://localhost:61616" discoveryUri="multicast://default"/>
+    </amq:transportConnectors>
     
-    <networkConnectors>
+    <amq:networkConnectors>
       <!-- by default just auto discover the other brokers -->
-      <networkConnector uri="multicast://default"/>
+      <amq:networkConnector uri="multicast://default"/>
       <!--  
-      <networkConnector uri="static://(tcp://host1:61616,tcp://host2:61616)"/>
+      <amq:networkConnector uri="static://(tcp://host1:61616,tcp://host2:61616)"/>
       -->
-    </networkConnectors>
+    </amq:networkConnectors>
     
-  </broker>
+  </amq:broker>
   
   <!--  This xbean configuration file supports all the standard spring xml configuration options -->
   

Modified: incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/jmx.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/jmx.xml?view=diff&rev=466115&r1=466114&r2=466115
==============================================================================
--- incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/jmx.xml (original)
+++ incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/jmx.xml Fri Oct 20 06:59:35 2006
@@ -18,7 +18,8 @@
 
 -->
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans xmlns:sm="http://servicemix.apache.org/config/1.0">
+<beans xmlns:sm="http://servicemix.apache.org/config/1.0"
+       xmlns:util="http://www.springframework.org/schema/util">
 
   <!-- RMI registry -->
   <sm:rmiRegistry id="rmiRegistry" port="1099" />
@@ -31,21 +32,20 @@
                    serviceUrl="service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi"
                    threaded="true"
                    daemon="true" 
-                   depends-on="rmiRegistry">
-    <property name="environment">
-      <map>
-        <!-- Comment the following lines to disable JAAS authentication for jmx
-         -->
-        <entry key="jmx.remote.authenticator">
-          <sm:jmxJaasAuthenticator authenticationService="#authenticationService"/>
-        </entry>
-        <!-- Uncomment the following lines to enable file based authentication for jmx
-        <entry key="jmx.remote.authenticator">
-          <sm:jmxPasswordAuthenticator passwords="classpath:passwords.txt" />
-        </entry>
-         -->
-      </map>
-    </property>
-  </sm:jmxConnector>  
+                   depends-on="rmiRegistry, jndi"
+                   environment="#jmxConnectorEnvironment" />
+                   
+  <util:map id="jmxConnectorEnvironment">
+      <!-- Comment the following lines to disable JAAS authentication for jmx
+       -->
+      <entry key="jmx.remote.authenticator">
+        <sm:jmxJaasAuthenticator authenticationService="#authenticationService"/>
+      </entry>
+      <!-- Uncomment the following lines to enable file based authentication for jmx
+      <entry key="jmx.remote.authenticator">
+        <sm:jmxPasswordAuthenticator passwords="classpath:passwords.txt" />
+      </entry>
+       -->
+  </util:map>
 
 </beans>

Modified: incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/jndi.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/jndi.xml?view=diff&rev=466115&r1=466114&r2=466115
==============================================================================
--- incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/jndi.xml (original)
+++ incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/jndi.xml Fri Oct 20 06:59:35 2006
@@ -19,54 +19,50 @@
 -->
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 <!-- START SNIPPET: jndi -->
-<beans>
-
-  <import resource="tx.xml" />
-  <import resource="security.xml" />
+<beans xmlns:jencks="http://jencks.org/2.0" 
+       xmlns:amq="http://activemq.org/config/1.0"
+       xmlns:amqra="http://activemq.org/ra/1.0"
+       xmlns:util="http://www.springframework.org/schema/util">
 
   <bean id="jndi" 
         class="org.apache.xbean.spring.jndi.SpringInitialContextFactory" 
         factory-method="makeInitialContext"
-        singleton="true">
-    <property name="entries">
-      <map>
-      
-        <!-- PXE DB datasource -->
-        <!--
-        <entry key="java:comp/env/jdbc/pxe__pm">
-          <bean class="org.hsqldb.jdbc.jdbcDataSource">
-            <property name="database" value="jdbc:hsqldb:mem:pxe"/>
-            <property name="user" value = "sa"/>
-            <property name="password" value = ""/>
-          </bean>
-        </entry>
-        -->
+        singleton="true"
+        entries="jndiEntries" />
         
-        <!-- wsn2005 jms connection factory -->
-        <entry key="java:comp/env/jms/wsnotificationCF">
-          <bean class="org.apache.activemq.ActiveMQConnectionFactory">
-            <property name="brokerURL" value="tcp://localhost:61616" />
-          </bean>
-        </entry>
+  <util:map id="jndiEntries">
+    <!-- PXE DB datasource -->
+    <!--
+    <entry key="java:comp/env/jdbc/pxe__pm">
+      <bean class="org.hsqldb.jdbc.jdbcDataSource">
+        <property name="database" value="jdbc:hsqldb:mem:pxe"/>
+        <property name="user" value = "sa"/>
+        <property name="password" value = ""/>
+      </bean>
+    </entry>
+    -->
+    
+    <!-- wsn2005 jms connection factory -->
+    <entry key="java:comp/env/jms/wsnotificationCF">
+      <amq:connectionFactory brokerURL="tcp://localhost:61616" />
+    </entry>
 
-        <!-- transaction manager -->
-        <entry key="javax.transaction.TransactionManager" value-ref="transactionManager" />
-        <entry key="java:comp/env/smx/TransactionManager" value-ref="transactionManager" />
-        
-        <!-- bootstrap context -->
-        <entry key="java:comp/env/smx/BootstrapContext" value-ref="bootstrapContext" />
-        
-        <!-- connection context -->
-        <entry key="java:comp/env/smx/ConnectionManager" value-ref="connectionManager" />
-        
-        <!-- Authentication service -->
-        <entry key="java:comp/env/smx/AuthenticationService" value-ref="authenticationService" />
-        
-        <!-- Keystore manager -->
-        <entry key="java:comp/env/smx/KeystoreManager" value-ref="keystoreManager" />
-      </map>
-    </property>
-  </bean>
+    <!-- transaction manager -->
+    <entry key="javax.transaction.TransactionManager" value-ref="transactionManager" />
+    <entry key="java:comp/env/smx/TransactionManager" value-ref="transactionManager" />
+    
+    <!-- bootstrap context -->
+    <entry key="java:comp/env/smx/BootstrapContext" value-ref="bootstrapContext" />
+    
+    <!-- connection context -->
+    <entry key="java:comp/env/smx/ConnectionManager" value-ref="connectionManager" />
+    
+    <!-- Authentication service -->
+    <entry key="java:comp/env/smx/AuthenticationService" value-ref="authenticationService" />
+    
+    <!-- Keystore manager -->
+    <entry key="java:comp/env/smx/KeystoreManager" value-ref="keystoreManager" />
+  </util:map>
 
   <!-- A managed JDBC DataSource for derby -->
   <!-- needs tranql derby
@@ -81,17 +77,16 @@
   -->
   
   <!-- A managed JMS ConnectionFactory for ActiveMQ -->
-  <bean id="activemqMCF" class="org.apache.activemq.ra.ActiveMQManagedConnectionFactory">
-    <property name="resourceAdapter">
-      <bean class="org.apache.activemq.ra.ActiveMQResourceAdapter">
-        <property name="serverUrl" value="vm://localhost"/>
-      </bean>
-    </property>
-  </bean>
-  <bean id="activemqCF" class="org.springframework.jca.support.LocalConnectionFactoryBean">
-    <property name="managedConnectionFactory" ref="activemqMCF"/>
-    <property name="connectionManager" ref="connectionManager"/>
-  </bean>
+  <amqra:managedConnectionFactory 
+          id="activemqMCF"
+          resourceAdapter="#activemqRA" />
+  <amqra:resourceAdapter 
+          id="activemqRA"
+          serverUrl="vm://localhost"/>
+  <jencks:connectionFactory 
+          id="activemqCF"
+          managedConnectionFactory="#activemqMCF"
+          connectionManager="#connectionManager" />
         
 </beans>
 <!-- END SNIPPET: jndi -->

Modified: incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/servicemix.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/servicemix.xml?view=diff&rev=466115&r1=466114&r2=466115
==============================================================================
--- incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/servicemix.xml (original)
+++ incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/servicemix.xml Fri Oct 20 06:59:35 2006
@@ -35,6 +35,7 @@
   <import resource="classpath:security.xml" />
   <import resource="classpath:jmx.xml" />
   <import resource="classpath:activemq.xml" />
+  <import resource="classpath:tx.xml" />
   <import resource="classpath:jndi.xml" />
 
   <!-- the JBI container -->

Modified: incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/tx.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/tx.xml?view=diff&rev=466115&r1=466114&r2=466115
==============================================================================
--- incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/tx.xml (original)
+++ incubator/servicemix/trunk/apache-servicemix/src/main/release/conf/tx.xml Fri Oct 20 06:59:35 2006
@@ -17,69 +17,38 @@
     limitations under the License.
 
 -->
-<beans xmlns:jencks="http://jencks.org/1.3">
+<beans xmlns:jencks="http://jencks.org/2.0">
 
-  <!-- XID factory -->
-  <bean id="xidFactory" class="org.apache.geronimo.transaction.manager.XidFactoryImpl" />
-
-  <!-- Transaction log -->
-  <!--
-  <bean id="transactionLog" class="org.apache.geronimo.transaction.log.UnrecoverableLog" />
-  -->
-  <jencks:howlLog 
-            id="transactionLog"
-            logFileDir="./data/txlog"
-            xidFactory="#xidFactory" />
-  
-  <!-- Internal transaction manager -->
-  <jencks:transactionManagerFactory 
-            id="extendedTransactionManager"
-            transactionLog="#transactionLog"
-            defaultTransactionTimeoutSeconds="600" />
-  
-  <!-- Transaction context manager -->
-  <jencks:transactionContextManagerFactory
-            id="transactionContextManager" 
-            transactionManager="#extendedTransactionManager"
-            xidFactory="#xidFactory" />
-  
-  <!-- Public transaction manager -->
-  <jencks:geronimoTransactionManagerFactory
+  <!-- Transaction manager -->
+  <jencks:transactionManager
             id="transactionManager"
-            transactionContextManager="#transactionContextManager" />
+            transactionLogDir="./data/txlog"
+            defaultTransactionTimeoutSeconds="600" />
   
   <!-- Work manager -->
-  <jencks:workManagerFactory
+  <jencks:workManager
             id="workManager"
             threadPoolSize="200"
-            transactionContextManager="#transactionContextManager" />
+            transactionManager="#transactionManager" />
   
   <!-- Bootstrap context for JCA -->
-  <jencks:bootstrapContextFactory
+  <jencks:bootstrapContext
             id="bootstrapContext"
-            workManager="#workManager" />
+            workManager="#workManager"
+            transactionManager="#transactionManager" />
   
   <!-- Connection manager for JCA -->
-  <bean id="connectionTracker" class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator"/>
-  <jencks:singlePoolFactory 
-            id="poolingSupport"
-            maxSize="16"
-            minSize="1"
-            blockingTimeoutMilliseconds="60"
-            idleTimeoutMinutes="60"
-            matchOne="true"
-            matchAll="true"
-            selectOneAssumeMatch="true" />
-  <jencks:xATransactionFactory
-            id="transactionSupport"
-            useTransactionCaching="true"
-            useThreadCaching="true" />
-  <jencks:connectionManagerFactory 
+  <jencks:connectionTracker id="connectionTracker" geronimoTransactionManager="#transactionManager" />
+  
+  <jencks:poolingSupport 
+            id="poolingSupport" />
+            
+  <jencks:connectionManager
             id="connectionManager"
             containerManagedSecurity="false"
-            transactionContextManager="#transactionContextManager"
+            transaction="xa"
+            transactionManager="#transactionManager"
             poolingSupport="#poolingSupport"
-            transactionSupport="#transactionSupport"
             connectionTracker="#connectionTracker" />
   
 </beans>

Modified: incubator/servicemix/trunk/geronimo/deployer-service/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/geronimo/deployer-service/pom.xml?view=diff&rev=466115&r1=466114&r2=466115
==============================================================================
--- incubator/servicemix/trunk/geronimo/deployer-service/pom.xml (original)
+++ incubator/servicemix/trunk/geronimo/deployer-service/pom.xml Fri Oct 20 06:59:35 2006
@@ -41,31 +41,31 @@
         </dependency>
         
         <dependency>
-            <groupId>geronimo</groupId>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>
             <version>${geronimo-version}</version>
         </dependency>
 
         <dependency>
-            <groupId>geronimo</groupId>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-deployment</artifactId>
             <version>${geronimo-version}</version>
         </dependency>
 
         <dependency>
-            <groupId>geronimo</groupId>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-service-builder</artifactId>
             <version>${geronimo-version}</version>
         </dependency>
 
         <dependency>
-            <groupId>geronimo</groupId>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-common</artifactId>
             <version>${geronimo-version}</version>
         </dependency>
 
         <dependency>
-            <groupId>geronimo</groupId>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee</artifactId>
             <version>${geronimo-version}</version>
         </dependency>

Modified: incubator/servicemix/trunk/geronimo/deployer/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/geronimo/deployer/pom.xml?view=diff&rev=466115&r1=466114&r2=466115
==============================================================================
--- incubator/servicemix/trunk/geronimo/deployer/pom.xml (original)
+++ incubator/servicemix/trunk/geronimo/deployer/pom.xml Fri Oct 20 06:59:35 2006
@@ -50,21 +50,21 @@
             <type>car</type>
         </dependency>
         <dependency>
-            <groupId>geronimo</groupId>
+            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${geronimo-version}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>geronimo</groupId>
+            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>
             <version>${geronimo-version}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>geronimo</groupId>
+            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-deployer</artifactId>
             <version>${geronimo-version}</version>
             <type>car</type>

Modified: incubator/servicemix/trunk/geronimo/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/geronimo/pom.xml?view=diff&rev=466115&r1=466114&r2=466115
==============================================================================
--- incubator/servicemix/trunk/geronimo/pom.xml (original)
+++ incubator/servicemix/trunk/geronimo/pom.xml Fri Oct 20 06:59:35 2006
@@ -35,7 +35,9 @@
     <packaging>pom</packaging>
   
     <properties>
-        <car-maven-plugin-version>1.1</car-maven-plugin-version>
+        <car-maven-plugin-version>${geronimo-version}</car-maven-plugin-version>
+        <geronimoVersion>${geronimo-version}</geronimoVersion>
+        <geronimoSchemaVersion>1.2</geronimoSchemaVersion>
     </properties>
     
     <modules>
@@ -45,226 +47,4 @@
         <module>deployer</module>
     </modules>
 
-    <!-- The purpose of the following dependencies
-         is only to force maven to download them
-         so that the car plugin can find all the 
-         needed jars/cars in the local maven repo -->
-    <dependencies>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>j2ee-server</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>j2ee-system</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>rmi-naming</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>j2ee-deployer</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>j2ee-deployer</artifactId>
-            <version>${geronimo-version}</version>
-            <type>car</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-system</artifactId>
-            <version>${geronimo-version}</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-management</artifactId>
-            <version>${geronimo-version}</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-core</artifactId>
-            <version>${geronimo-version}</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-client</artifactId>
-            <version>${geronimo-version}</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-j2ee-schema</artifactId>
-            <version>${geronimo-version}</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-j2ee-builder</artifactId>
-            <version>${geronimo-version}</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-naming-builder</artifactId>
-            <version>${geronimo-version}</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-security-builder</artifactId>
-            <version>${geronimo-version}</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-web-builder</artifactId>
-            <version>${geronimo-version}</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-connector-builder</artifactId>
-            <version>${geronimo-version}</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-webservices</artifactId>
-            <version>${geronimo-version}</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-naming</artifactId>
-            <version>${geronimo-version}</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-security</artifactId>
-            <version>${geronimo-version}</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-util</artifactId>
-            <version>${geronimo-version}</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-kernel</artifactId>
-            <version>${geronimo-version}</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-transaction</artifactId>
-            <version>${geronimo-version}</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-connector</artifactId>
-            <version>${geronimo-version}</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm</artifactId>
-            <version>1.4.3</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>activeio</groupId>
-            <artifactId>activeio</artifactId>
-            <version>2.0-r118</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>howl</groupId>
-            <artifactId>howl-logger</artifactId>
-            <version>0.1.11</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxr_1.0_spec</artifactId>
-            <version>1.0.1</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jsp_2.0_spec</artifactId>
-            <version>1.0.1</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
-            <version>1.0.1</version>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
-            <type>jar</type>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    
 </project>

Modified: incubator/servicemix/trunk/geronimo/servicemix-service/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/geronimo/servicemix-service/pom.xml?view=diff&rev=466115&r1=466114&r2=466115
==============================================================================
--- incubator/servicemix/trunk/geronimo/servicemix-service/pom.xml (original)
+++ incubator/servicemix/trunk/geronimo/servicemix-service/pom.xml Fri Oct 20 06:59:35 2006
@@ -39,22 +39,22 @@
             <version>${servicemix-version}</version>
         </dependency>
         <dependency>
-            <groupId>geronimo</groupId>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>
             <version>${geronimo-version}</version>
         </dependency>
         <dependency>
-            <groupId>geronimo</groupId>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-transaction</artifactId>
             <version>${geronimo-version}</version>
         </dependency>
         <dependency>
-            <groupId>geronimo</groupId>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-connector</artifactId>
             <version>${geronimo-version}</version>
         </dependency>
         <dependency>
-            <groupId>geronimo</groupId>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-transaction</artifactId>
             <version>${geronimo-version}</version>
         </dependency>

Modified: incubator/servicemix/trunk/geronimo/servicemix/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/geronimo/servicemix/pom.xml?view=diff&rev=466115&r1=466114&r2=466115
==============================================================================
--- incubator/servicemix/trunk/geronimo/servicemix/pom.xml (original)
+++ incubator/servicemix/trunk/geronimo/servicemix/pom.xml Fri Oct 20 06:59:35 2006
@@ -43,14 +43,14 @@
             <type>jar</type>
         </dependency>
         <dependency>
-            <groupId>geronimo</groupId>
+            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${geronimo-version}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>geronimo</groupId>
+            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>
             <version>${geronimo-version}</version>
             <type>car</type>
@@ -77,9 +77,9 @@
                 <extensions>true</extensions>
                 <configuration>
                     <deploymentConfigs>
-                        <deploymentConfig>geronimo/geronimo-gbean-deployer/${geronimo-version}/car</deploymentConfig>
+                        <deploymentConfig>org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimo-version}/car</deploymentConfig>
                     </deploymentConfigs>
-                    <deployerName>geronimo/geronimo-gbean-deployer/${geronimo-version}/car?j2eeType=Deployer,name=Deployer</deployerName>
+                    <deployerName>org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimo-version}/car?j2eeType=Deployer,name=Deployer</deployerName>
                     <planFileName>geronimo-service.xml</planFileName>
                     <moduleFile>${settings.localRepository}/org/apache/servicemix/geronimo/servicemix-service/${pom.version}/servicemix-service-${pom.version}.jar</moduleFile>
                 </configuration>

Modified: incubator/servicemix/trunk/geronimo/servicemix/src/plan/geronimo-service.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/geronimo/servicemix/src/plan/geronimo-service.xml?view=diff&rev=466115&r1=466114&r2=466115
==============================================================================
--- incubator/servicemix/trunk/geronimo/servicemix/src/plan/geronimo-service.xml (original)
+++ incubator/servicemix/trunk/geronimo/servicemix/src/plan/geronimo-service.xml Fri Oct 20 06:59:35 2006
@@ -20,108 +20,7 @@
 <!--
 Configuration for ServiceMix container.
 -->
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
-
-    <environment>
-        <moduleId>
-            <groupId>org.apache.servicemix.geronimo</groupId>
-            <artifactId>servicemix</artifactId>
-            <version>${servicemix-version}</version>
-            <type>car</type>
-        </moduleId>
-        <dependencies>
-            <dependency>
-                <groupId>geronimo</groupId>
-                <artifactId>j2ee-server</artifactId>
-                <version>${geronimo-version}</version>
-                <type>car</type>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.servicemix</groupId>
-                <artifactId>servicemix-jbi</artifactId>
-                <version>${servicemix-version}</version>
-                <type>jar</type>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.servicemix</groupId>
-                <artifactId>servicemix-core</artifactId>
-                <version>${servicemix-version}</version>
-                <type>jar</type>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.servicemix</groupId>
-                <artifactId>servicemix-services</artifactId>
-                <version>${servicemix-version}</version>
-                <type>jar</type>
-            </dependency>
-            <dependency>
-                <groupId>backport-util-concurrent</groupId>
-                <artifactId>backport-util-concurrent</artifactId>
-                <version>${backport-util-concurrent-version}</version>
-                <type>jar</type>
-            </dependency>
-            <dependency>
-                <groupId>incubator-activemq</groupId>
-                <artifactId>activemq-core</artifactId>
-                <version>${activemq-version}</version>
-                <type>jar</type>
-            </dependency>
-            <dependency>
-                <groupId>incubator-activemq</groupId>
-                <artifactId>activeio-core</artifactId>
-                <version>${activeio-version}</version>
-                <type>jar</type>
-            </dependency>
-            <dependency>
-                <groupId>wsdl4j</groupId>
-                <artifactId>wsdl4j</artifactId>
-                <version>${wsdl4j-version}</version>
-                <type>jar</type>
-            </dependency>
-            <dependency>
-                <groupId>org.jencks</groupId>
-                <artifactId>jencks</artifactId>
-                <version>${jencks-version}</version>
-                <type>jar</type>
-            </dependency>
-            <dependency>
-                <groupId>commons-beanutils</groupId>
-                <artifactId>commons-beanutils-core</artifactId>
-                <version>${commons-beanutils-version}</version>
-                <type>jar</type>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring</artifactId>
-                <version>${spring-version}</version>
-                <type>jar</type>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.xbean</groupId>
-                <artifactId>xbean-spring</artifactId>
-                <version>${xbean-version}</version>
-                <type>jar</type>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.xbean</groupId>
-                <artifactId>xbean-classloader</artifactId>
-                <version>${xbean-version}</version>
-                <type>jar</type>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.xbean</groupId>
-                <artifactId>xbean-server</artifactId>
-                <version>${xbean-version}</version>
-                <type>jar</type>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.xbean</groupId>
-                <artifactId>xbean-kernel</artifactId>
-                <version>${xbean-version}</version>
-                <type>jar</type>
-            </dependency>
-        </dependencies>
-    </environment>
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
 
     <gbean name="ServiceMixJBIContainer" class="org.apache.servicemix.geronimo.ServiceMixGBean">
         <attribute name="name">servicemix</attribute>

Modified: incubator/servicemix/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/pom.xml?view=diff&rev=466115&r1=466114&r2=466115
==============================================================================
--- incubator/servicemix/trunk/pom.xml (original)
+++ incubator/servicemix/trunk/pom.xml Fri Oct 20 06:59:35 2006
@@ -200,12 +200,12 @@
         <mavenAssemblyPluginVersion>2.1</mavenAssemblyPluginVersion>
         <xbean-version>2.7</xbean-version>
         <spring-version>2.0</spring-version>
-        <activemq-version>4.0.2</activemq-version>
-        <activeio-version>3.0-beta4</activeio-version>
+        <activemq-version>4.1-incubator-SNAPSHOT</activemq-version>
+        <activeio-version>3.0-SNAPSHOT</activeio-version>
         <backport-util-concurrent-version>2.1</backport-util-concurrent-version>
-        <jencks-version>1.3</jencks-version>
+        <jencks-version>2.0-SNAPSHOT</jencks-version>
         <jetty-version>6.0.1</jetty-version>
-        <geronimo-version>1.1</geronimo-version>
+        <geronimo-version>1.2-SNAPSHOT</geronimo-version>
         <servicemix-version>3.1-incubating-SNAPSHOT</servicemix-version>
         <wsdl4j-version>1.5.2</wsdl4j-version>
         <commons-beanutils-version>1.7.0</commons-beanutils-version>
@@ -222,7 +222,7 @@
             <modules>
                 <module>apache-servicemix</module>
                 <module>build</module>
-                <module>geronimo</module>
+                <!--module>geronimo</module-->
                 <module>samples</module>
                 <module>servicemix-jbi</module>
                 <module>servicemix-services</module>
@@ -382,11 +382,17 @@
             <name>Servicemix Maven2 Repository</name>
             <url>http://servicemix.org/m2-repo</url>
         </repository>
-        <!-- AMQ 4 release -->
+        <!-- Apache snapshots -->
         <repository>
-            <id>activemq-tmp-repo</id>
-            <name>ActiveMQ Maven2 Temp Repository</name>
-            <url>http://people.apache.org/~chirino/incubator-activemq-4.0.2-RC5/maven2</url>
+            <id>apache-snapshots</id>
+            <name>Apache Snapshots Repository</name>
+            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
         </repository>
         <!-- Apache releases -->
         <repository>
@@ -400,18 +406,6 @@
                 <enabled>false</enabled>
             </snapshots>
         </repository>
-        <!-- Apache snapshots -->
-        <repository>
-            <id>apache-snapshots</id>
-            <name>Apache Snapshot repository</name>
-            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
     </repositories>
 
     <pluginRepositories>
@@ -654,22 +648,22 @@
             </dependency>
 
             <dependency>
-                <groupId>incubator-activemq</groupId>
+                <groupId>org.apache.activemq</groupId>
                 <artifactId>activeio-core</artifactId>
                 <version>${activeio-version}</version>
             </dependency>
             <dependency>
-                <groupId>incubator-activemq</groupId>
+                <groupId>org.apache.activemq</groupId>
                 <artifactId>activemq-core</artifactId>
                 <version>${activemq-version}</version>
             </dependency>
             <dependency>
-                <groupId>incubator-activemq</groupId>
+                <groupId>org.apache.activemq</groupId>
                 <artifactId>activemq-ra</artifactId>
                 <version>${activemq-version}</version>
             </dependency>
             <dependency>
-                <groupId>incubator-activemq</groupId>
+                <groupId>org.apache.activemq</groupId>
                 <artifactId>activemq-web</artifactId>
                 <version>${activemq-version}</version>
             </dependency>
@@ -883,62 +877,62 @@
                 <version>0.3-alpha</version>
             </dependency>
             <dependency>
-                <groupId>geronimo</groupId>
+                <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-activation</artifactId>
                 <version>${geronimo-version}</version>
             </dependency>
             <dependency>
-                <groupId>geronimo</groupId>
+                <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-common</artifactId>
                 <version>${geronimo-version}</version>
             </dependency>
             <dependency>
-                <groupId>geronimo</groupId>
+                <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-connector</artifactId>
                 <version>${geronimo-version}</version>
             </dependency>
             <dependency>
-                <groupId>geronimo</groupId>
+                <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-core</artifactId>
                 <version>${geronimo-version}</version>
             </dependency>
             <dependency>
-                <groupId>geronimo</groupId>
+                <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-deployment</artifactId>
                 <version>${geronimo-version}</version>
             </dependency>
             <dependency>
-                <groupId>geronimo</groupId>
+                <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-j2ee</artifactId>
                 <version>${geronimo-version}</version>
             </dependency>
             <dependency>
-                <groupId>geronimo</groupId>
+                <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-kernel</artifactId>
                 <version>${geronimo-version}</version>
             </dependency>
             <dependency>
-                <groupId>geronimo</groupId>
+                <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-network</artifactId>
                 <version>${geronimo-version}</version>
             </dependency>
             <dependency>
-                <groupId>geronimo</groupId>
+                <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-remoting</artifactId>
                 <version>${geronimo-version}</version>
             </dependency>
             <dependency>
-                <groupId>geronimo</groupId>
+                <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-security</artifactId>
                 <version>${geronimo-version}</version>
             </dependency>
             <dependency>
-                <groupId>geronimo</groupId>
+                <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-system</artifactId>
                 <version>${geronimo-version}</version>
             </dependency>
             <dependency>
-                <groupId>geronimo</groupId>
+                <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-transaction</artifactId>
                 <version>${geronimo-version}</version>
             </dependency>
@@ -1103,27 +1097,27 @@
             <dependency>
                 <groupId>lingo</groupId>
                 <artifactId>lingo</artifactId>
-                <version>1.0</version>
+                <version>1.1</version>
                 <exclusions>
                     <exclusion>
-                        <groupId>backport175</groupId>
-                        <artifactId>backport175</artifactId>
+                        <groupId>concurrent</groupId>
+                        <artifactId>concurrent</artifactId>
                     </exclusion>
                     <exclusion>
-                        <groupId>hsqldb</groupId>
-                        <artifactId>hsqldb</artifactId>
+                        <groupId>springframework</groupId>
+                        <artifactId>spring</artifactId>
                     </exclusion>
                     <exclusion>
                         <groupId>cglib</groupId>
                         <artifactId>cglib-full</artifactId>
                     </exclusion>
                     <exclusion>
-                        <groupId>xmlpull</groupId>
-                        <artifactId>xmlpull</artifactId>
+                        <groupId>aopalliance</groupId>
+                        <artifactId>aopalliance</artifactId>
                     </exclusion>
                     <exclusion>
-                        <groupId>jencks</groupId>
-                        <artifactId>jencks-all</artifactId>
+                        <groupId>geronimo-spec</groupId>
+                        <artifactId>geronimo-spec-jms</artifactId>
                     </exclusion>
                     <exclusion>
                         <groupId>geronimo-spec</groupId>
@@ -1131,23 +1125,35 @@
                     </exclusion>
                     <exclusion>
                         <groupId>geronimo-spec</groupId>
-                        <artifactId>geronimo-spec-jms</artifactId>
+                        <artifactId>geronimo-spec-j2ee-management</artifactId>
                     </exclusion>
                     <exclusion>
                         <groupId>geronimo-spec</groupId>
                         <artifactId>geronimo-spec-j2ee-connector</artifactId>
                     </exclusion>
                     <exclusion>
-                        <groupId>geronimo-spec</groupId>
-                        <artifactId>geronimo-spec-j2ee-management</artifactId>
-                    </exclusion>
-                    <exclusion>
                         <groupId>activemq</groupId>
                         <artifactId>activemq</artifactId>
                     </exclusion>
                     <exclusion>
                         <groupId>activemq</groupId>
                         <artifactId>activemq-ra</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>jencks</groupId>
+                        <artifactId>jencks-all</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>xmlpull</groupId>
+                        <artifactId>xmlpull</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>hsqldb</groupId>
+                        <artifactId>hsqldb</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>backport175</groupId>
+                        <artifactId>backport175</artifactId>
                     </exclusion>
                 </exclusions>
             </dependency>

Modified: incubator/servicemix/trunk/samples/basic/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/basic/pom.xml?view=diff&rev=466115&r1=466114&r2=466115
==============================================================================
--- incubator/servicemix/trunk/samples/basic/pom.xml (original)
+++ incubator/servicemix/trunk/samples/basic/pom.xml Fri Oct 20 06:59:35 2006
@@ -98,11 +98,11 @@
             <artifactId>quartz</artifactId>
         </dependency>
         <dependency>
-            <groupId>incubator-activemq</groupId>
+            <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-ra</artifactId>
         </dependency>
         <dependency>
-            <groupId>incubator-activemq</groupId>
+            <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-core</artifactId>
         </dependency>
     </dependencies>

Modified: incubator/servicemix/trunk/samples/servicemix-web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/servicemix-web/pom.xml?view=diff&rev=466115&r1=466114&r2=466115
==============================================================================
--- incubator/servicemix/trunk/samples/servicemix-web/pom.xml (original)
+++ incubator/servicemix/trunk/samples/servicemix-web/pom.xml Fri Oct 20 06:59:35 2006
@@ -102,7 +102,7 @@
       <artifactId>quartz</artifactId>
     </dependency>
     <dependency>
-      <groupId>incubator-activemq</groupId>
+      <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-ra</artifactId>
     </dependency>
     <dependency>

Modified: incubator/servicemix/trunk/sandbox/geronimo-1.0/servicemix-gbean/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/sandbox/geronimo-1.0/servicemix-gbean/pom.xml?view=diff&rev=466115&r1=466114&r2=466115
==============================================================================
--- incubator/servicemix/trunk/sandbox/geronimo-1.0/servicemix-gbean/pom.xml (original)
+++ incubator/servicemix/trunk/sandbox/geronimo-1.0/servicemix-gbean/pom.xml Fri Oct 20 06:59:35 2006
@@ -40,17 +40,17 @@
           <artifactId>servicemix-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>geronimo</groupId>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>geronimo</groupId>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-deployment</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>geronimo</groupId>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: incubator/servicemix/trunk/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/AutoDeployedBean.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/AutoDeployedBean.java?view=diff&rev=466115&r1=466114&r2=466115
==============================================================================
--- incubator/servicemix/trunk/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/AutoDeployedBean.java (original)
+++ incubator/servicemix/trunk/servicemix-bean/src/test/java/org/apache/servicemix/bean/beans/AutoDeployedBean.java Fri Oct 20 06:59:35 2006
@@ -29,7 +29,7 @@
 /**
  * A simple POJO which uses annotations to expose it on a JBI bus
  *
- * @version $Revision: $
+ * @version $Revision$
  */
 @Endpoint(name="cheese", targetNamespace = "urn:test", serviceName = "service")
 public class AutoDeployedBean {

Modified: incubator/servicemix/trunk/servicemix-common/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-common/pom.xml?view=diff&rev=466115&r1=466114&r2=466115
==============================================================================
--- incubator/servicemix/trunk/servicemix-common/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-common/pom.xml Fri Oct 20 06:59:35 2006
@@ -71,7 +71,7 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>incubator-activemq</groupId>
+      <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-ra</artifactId>
       <scope>test</scope>
     </dependency>

Modified: incubator/servicemix/trunk/servicemix-common/src/test/java/org/apache/servicemix/common/TransactionsTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-common/src/test/java/org/apache/servicemix/common/TransactionsTest.java?view=diff&rev=466115&r1=466114&r2=466115
==============================================================================
--- incubator/servicemix/trunk/servicemix-common/src/test/java/org/apache/servicemix/common/TransactionsTest.java (original)
+++ incubator/servicemix/trunk/servicemix-common/src/test/java/org/apache/servicemix/common/TransactionsTest.java Fri Oct 20 06:59:35 2006
@@ -30,10 +30,6 @@
 import junit.framework.TestCase;
 
 import org.apache.activemq.broker.BrokerService;
-import org.apache.geronimo.transaction.context.GeronimoTransactionManager;
-import org.apache.geronimo.transaction.context.TransactionContextManager;
-import org.apache.geronimo.transaction.manager.TransactionManagerImpl;
-import org.apache.geronimo.transaction.manager.XidFactoryImpl;
 import org.apache.servicemix.client.DefaultServiceMixClient;
 import org.apache.servicemix.client.ServiceMixClient;
 import org.apache.servicemix.jbi.container.JBIContainer;
@@ -41,13 +37,12 @@
 import org.apache.servicemix.jbi.nmr.flow.Flow;
 import org.apache.servicemix.jbi.nmr.flow.jca.JCAFlow;
 import org.apache.servicemix.jbi.nmr.flow.seda.SedaFlow;
+import org.jencks.GeronimoPlatformTransactionManager;
 
 public class TransactionsTest extends TestCase {
 
     private JBIContainer jbi;
     private BrokerService broker;
-    private TransactionManagerImpl exTransactionManager;
-    private TransactionContextManager transactionContextManager;
     private TransactionManager txManager;
     private Component component;
     private ServiceMixClient client;
@@ -63,15 +58,10 @@
         broker.addConnector("tcp://localhost:61616");
         broker.start();
         
-        exTransactionManager = new TransactionManagerImpl(600, new XidFactoryImpl(), null, null);
-        transactionContextManager = new TransactionContextManager(exTransactionManager, exTransactionManager);
-        txManager = (TransactionManager) new GeronimoTransactionManager(transactionContextManager);
-        
-        JCAFlow jcaFlow = new JCAFlow();
-        jcaFlow.setTransactionContextManager(transactionContextManager);
+        txManager = (TransactionManager) new GeronimoPlatformTransactionManager();
         
         jbi = new JBIContainer();
-        jbi.setFlows(new Flow[] { new SedaFlow(), jcaFlow });
+        jbi.setFlows(new Flow[] { new SedaFlow(), new JCAFlow() });
         jbi.setEmbedded(true);
         jbi.setUseMBeanServer(false);
         jbi.setTransactionManager(txManager);

Modified: incubator/servicemix/trunk/servicemix-components/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-components/pom.xml?view=diff&rev=466115&r1=466114&r2=466115
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/pom.xml Fri Oct 20 06:59:35 2006
@@ -208,7 +208,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>incubator-activemq</groupId>
+      <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-ra</artifactId>
       <scope>test</scope>
     </dependency>

Modified: incubator/servicemix/trunk/servicemix-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/pom.xml?view=diff&rev=466115&r1=466114&r2=466115
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/pom.xml (original)
+++ incubator/servicemix/trunk/servicemix-core/pom.xml Fri Oct 20 06:59:35 2006
@@ -52,22 +52,22 @@
       <artifactId>xml-apis</artifactId>
     </dependency>
     <dependency>
-      <groupId>geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-connector</artifactId>
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-transaction</artifactId>
       <optional>true</optional>
     </dependency>
 
     <dependency>
-      <groupId>incubator-activemq</groupId>
+      <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>incubator-activemq</groupId>
+      <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-ra</artifactId>
       <optional>true</optional>
     </dependency>
@@ -140,11 +140,11 @@
       <artifactId>jencks</artifactId>
     </dependency>
     <dependency>
-      <groupId>geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-connector</artifactId>
     </dependency>
     <dependency>
-      <groupId>geronimo</groupId>
+      <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-transaction</artifactId>
     </dependency>
     <dependency>
@@ -196,15 +196,17 @@
     <dependency>
       <groupId>xmlbeans</groupId>
       <artifactId>xmlpublic</artifactId>
+      <scope>optional</scope>
     </dependency>
     <dependency>
       <groupId>xmlbeans</groupId>
       <artifactId>xbean</artifactId>
+      <scope>optional</scope>
     </dependency>
-
     <dependency>
       <groupId>lingo</groupId>
       <artifactId>lingo</artifactId>
+      <scope>test</scope>
     </dependency>
 
     <dependency>

Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/components/util/xstream/XStreamMarshaler.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/components/util/xstream/XStreamMarshaler.java?view=diff&rev=466115&r1=466114&r2=466115
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/components/util/xstream/XStreamMarshaler.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/components/util/xstream/XStreamMarshaler.java Fri Oct 20 06:59:35 2006
@@ -16,17 +16,6 @@
  */
 package org.apache.servicemix.components.util.xstream;
 
-import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.io.xml.DomReader;
-import com.thoughtworks.xstream.io.xml.DomWriter;
-
-import org.apache.servicemix.jbi.jaxp.SourceTransformer;
-import org.apache.servicemix.jbi.jaxp.StringSource;
-import org.apache.servicemix.jbi.messaging.DefaultMarshaler;
-import org.apache.servicemix.jbi.messaging.PojoMarshaler;
-import org.logicblaze.lingo.LingoInvocation;
-import org.w3c.dom.Document;
-
 import javax.jbi.messaging.MessageExchange;
 import javax.jbi.messaging.MessagingException;
 import javax.jbi.messaging.NormalizedMessage;
@@ -37,6 +26,16 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamSource;
 
+import org.apache.servicemix.jbi.jaxp.SourceTransformer;
+import org.apache.servicemix.jbi.jaxp.StringSource;
+import org.apache.servicemix.jbi.messaging.DefaultMarshaler;
+import org.apache.servicemix.jbi.messaging.PojoMarshaler;
+import org.w3c.dom.Document;
+
+import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.io.xml.DomReader;
+import com.thoughtworks.xstream.io.xml.DomWriter;
+
 /**
  * A {@link PojoMarshaler} for <a href="http://xStream.codehaus.org/">XStream</a> which
  * streams the object to an a W3C DOM Document so that other components can access
@@ -136,7 +135,11 @@
 
     protected XStream createXStream() {
         XStream answer = new XStream();
-        answer.alias("invoke", LingoInvocation.class);
+        try {
+        	answer.alias("invoke", Class.forName("org.logicblaze.lingo.LingoInvocation"));
+        } catch (ClassNotFoundException e) {
+        	// Ignore
+        }
         return answer;
     }
 

Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/SpringJBIContainer.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/SpringJBIContainer.java?view=diff&rev=466115&r1=466114&r2=466115
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/SpringJBIContainer.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/SpringJBIContainer.java Fri Oct 20 06:59:35 2006
@@ -20,6 +20,7 @@
 import javax.jbi.component.ServiceUnitManager;
 import javax.resource.spi.work.WorkManager;
 
+import org.apache.geronimo.transaction.manager.GeronimoTransactionManager;
 import org.apache.servicemix.components.util.ComponentAdaptor;
 import org.apache.servicemix.jbi.framework.ComponentMBeanImpl;
 import org.jencks.factory.WorkManagerFactoryBean;
@@ -171,9 +172,11 @@
 
 	protected WorkManager createWorkManager() throws JBIException {
         WorkManagerFactoryBean factory = new WorkManagerFactoryBean();
-        factory.setApplicationContext(applicationContext);
+        if (getTransactionManager() instanceof GeronimoTransactionManager) {
+        	factory.setTransactionManager((GeronimoTransactionManager) getTransactionManager());
+        }
         try {
-            return factory.getWorkManager();
+            return (WorkManager) factory.getObject();
         }
         catch (Exception e) {
             throw new JBIException("Failed to start WorkManager: " + e, e);

Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/jca/JCAFlow.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/jca/JCAFlow.java?view=diff&rev=466115&r1=466114&r2=466115
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/jca/JCAFlow.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/nmr/flow/jca/JCAFlow.java Fri Oct 20 06:59:35 2006
@@ -61,12 +61,10 @@
 import org.apache.activemq.ra.ActiveMQResourceAdapter;
 import org.apache.geronimo.connector.outbound.connectionmanagerconfig.SinglePool;
 import org.apache.geronimo.connector.outbound.connectionmanagerconfig.XATransactions;
-import org.apache.geronimo.transaction.context.TransactionContextManager;
 import org.apache.servicemix.JbiConstants;
 import org.apache.servicemix.executors.Executor;
 import org.apache.servicemix.executors.ExecutorFactory;
 import org.apache.servicemix.executors.WorkManagerWrapper;
-import org.apache.servicemix.jbi.container.SpringJBIContainer;
 import org.apache.servicemix.jbi.event.ComponentAdapter;
 import org.apache.servicemix.jbi.event.ComponentEvent;
 import org.apache.servicemix.jbi.event.ComponentListener;
@@ -80,7 +78,6 @@
 import org.apache.servicemix.jbi.servicedesc.InternalEndpoint;
 import org.jencks.SingletonEndpointFactory;
 import org.jencks.factory.ConnectionManagerFactoryBean;
-import org.springframework.context.ApplicationContext;
 
 import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
 import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArraySet;
@@ -103,7 +100,6 @@
     private Map connectorMap = new ConcurrentHashMap();
     private AtomicBoolean started = new AtomicBoolean(false);
     private Set subscriberSet = new CopyOnWriteArraySet();
-    private TransactionContextManager transactionContextManager;
     private ConnectionManager connectionManager;
     private Connector containerConnector;
     private Connector broadcastConnector;
@@ -112,6 +108,13 @@
     private EndpointListener endpointListener;
     private ComponentListener componentListener;
 
+    public JCAFlow() {
+    }
+    
+    public JCAFlow(String jmsURL) {
+    	this.jmsURL = jmsURL;
+    }
+    
     /**
      * The type of Flow
      * 
@@ -550,18 +553,8 @@
 	public ConnectionManager getConnectionManager() throws Exception {
 		if (connectionManager == null) {
         	ConnectionManagerFactoryBean cmfb = new ConnectionManagerFactoryBean();
-        	cmfb.setTransactionContextManager(getTransactionContextManager());
-        	cmfb.setPoolingSupport(new SinglePool(
-        			16, // max size 
-        			0, // min size
-        			100, // blockingTimeoutMilliseconds
-                    1, // idleTimeoutMinutes 
-                    true, // matchOne
-                    true,  // matchAll
-                    true)); // selectOneAssumeMatch
-        	cmfb.setTransactionSupport(new XATransactions(
-        			true, // useTransactionCaching
-        			false)); // useThreadCaching
+        	cmfb.setTransactionManager((TransactionManager) broker.getContainer().getTransactionManager());
+        	cmfb.setTransaction("xa");
         	cmfb.afterPropertiesSet();
 			connectionManager = (ConnectionManager) cmfb.getObject();
 		}
@@ -570,26 +563,6 @@
 
 	public void setConnectionManager(ConnectionManager connectionManager) {
 		this.connectionManager = connectionManager;
-	}
-
-	public TransactionContextManager getTransactionContextManager() {
-        if (transactionContextManager == null) {
-            if (broker != null && broker.getContainer() instanceof SpringJBIContainer) {
-                ApplicationContext applicationContext = ((SpringJBIContainer) broker.getContainer()).getApplicationContext();
-                if (applicationContext != null) {
-                    Map map = applicationContext.getBeansOfType(TransactionContextManager.class);
-                    if( map.size() == 1) {
-                        transactionContextManager = (TransactionContextManager) map.values().iterator().next();
-                    }
-                }
-            }
-        }
-		return transactionContextManager;
-	}
-
-	public void setTransactionContextManager(
-			TransactionContextManager transactionContextManager) {
-		this.transactionContextManager = transactionContextManager;
 	}
 
     public String toString(){

Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/AbstractTransactionTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/AbstractTransactionTest.java?view=diff&rev=466115&r1=466114&r2=466115
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/AbstractTransactionTest.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/AbstractTransactionTest.java Fri Oct 20 06:59:35 2006
@@ -16,8 +16,11 @@
  */
 package org.apache.servicemix.jbi.messaging;
 
-import org.apache.geronimo.transaction.ExtendedTransactionManager;
-import org.apache.geronimo.transaction.context.TransactionContextManager;
+import javax.jbi.JBIException;
+import javax.transaction.TransactionManager;
+
+import junit.framework.TestCase;
+
 import org.apache.servicemix.jbi.RuntimeJBIException;
 import org.apache.servicemix.jbi.container.ActivationSpec;
 import org.apache.servicemix.jbi.container.JBIContainer;
@@ -27,20 +30,11 @@
 import org.apache.servicemix.tck.Receiver;
 import org.apache.servicemix.tck.ReceiverComponent;
 import org.apache.servicemix.tck.SenderComponent;
-import org.jencks.factory.GeronimoTransactionManagerFactoryBean;
-import org.jencks.factory.TransactionContextManagerFactoryBean;
-import org.jencks.factory.TransactionManagerFactoryBean;
+import org.jencks.GeronimoPlatformTransactionManager;
 import org.springframework.transaction.TransactionStatus;
-import org.springframework.transaction.jta.JtaTransactionManager;
 import org.springframework.transaction.support.TransactionCallback;
 import org.springframework.transaction.support.TransactionTemplate;
 
-import javax.jbi.JBIException;
-import javax.transaction.TransactionManager;
-import javax.transaction.UserTransaction;
-
-import junit.framework.TestCase;
-
 /**
  * @version $Revision$
  */
@@ -50,7 +44,6 @@
     
     protected TransactionTemplate tt;
     protected TransactionManager tm;
-    protected TransactionContextManager tcm;
     protected JBIContainer senderContainer;
     
     /*
@@ -67,18 +60,9 @@
     }
     
     protected void createTransactionLayer() throws Exception {
-        TransactionManagerFactoryBean tmcf = new TransactionManagerFactoryBean();
-        tmcf.afterPropertiesSet();
-        ExtendedTransactionManager etm = (ExtendedTransactionManager) tmcf.getObject();
-        TransactionContextManagerFactoryBean tcmfb = new TransactionContextManagerFactoryBean();
-        tcmfb.setTransactionManager(etm);
-        tcmfb.afterPropertiesSet();
-        tcm = (TransactionContextManager) tcmfb.getObject();
-        GeronimoTransactionManagerFactoryBean gtmfb = new GeronimoTransactionManagerFactoryBean();
-        gtmfb.setTransactionContextManager(tcm);
-        gtmfb.afterPropertiesSet();
-        tm = (TransactionManager) gtmfb.getObject();
-        tt = new TransactionTemplate(new JtaTransactionManager((UserTransaction) tm));
+    	GeronimoPlatformTransactionManager gtm = new GeronimoPlatformTransactionManager();
+    	tm = gtm;
+        tt = new TransactionTemplate(gtm);
     }
     
     protected JBIContainer createJbiContainer(String name) throws Exception {

Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/JcaFlowPersistentTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/JcaFlowPersistentTest.java?view=diff&rev=466115&r1=466114&r2=466115
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/JcaFlowPersistentTest.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/JcaFlowPersistentTest.java Fri Oct 20 06:59:35 2006
@@ -43,9 +43,7 @@
     }
     
     protected Flow createFlow() {
-    	JCAFlow flow = new JCAFlow();
-    	flow.setJmsURL("tcp://localhost:61216");
-    	flow.setTransactionContextManager(tcm);
+    	JCAFlow flow = new JCAFlow("tcp://localhost:61216");
     	return flow;
     }
 

Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/JcaFlowTransactionTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/JcaFlowTransactionTest.java?view=diff&rev=466115&r1=466114&r2=466115
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/JcaFlowTransactionTest.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/JcaFlowTransactionTest.java Fri Oct 20 06:59:35 2006
@@ -42,9 +42,7 @@
     }
     
     protected Flow createFlow() {
-    	JCAFlow flow = new JCAFlow();
-    	flow.setJmsURL("tcp://localhost:61216");
-    	flow.setTransactionContextManager(tcm);
+    	JCAFlow flow = new JCAFlow("tcp://localhost:61216");
     	return flow;
     }
 

Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/TransactionsTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/TransactionsTest.java?view=diff&rev=466115&r1=466114&r2=466115
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/TransactionsTest.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/messaging/TransactionsTest.java Fri Oct 20 06:59:35 2006
@@ -38,13 +38,6 @@
 
 import org.apache.activemq.broker.BrokerService;
 import org.apache.derby.jdbc.EmbeddedXADataSource;
-import org.apache.geronimo.connector.outbound.GenericConnectionManager;
-import org.apache.geronimo.connector.outbound.connectionmanagerconfig.NoPool;
-import org.apache.geronimo.connector.outbound.connectionmanagerconfig.XATransactions;
-import org.apache.geronimo.transaction.context.GeronimoTransactionManager;
-import org.apache.geronimo.transaction.context.TransactionContextManager;
-import org.apache.geronimo.transaction.manager.TransactionManagerImpl;
-import org.apache.geronimo.transaction.manager.XidFactoryImpl;
 import org.apache.servicemix.MessageExchangeListener;
 import org.apache.servicemix.client.DefaultServiceMixClient;
 import org.apache.servicemix.client.ServiceMixClient;
@@ -57,6 +50,8 @@
 import org.apache.servicemix.store.Store;
 import org.apache.servicemix.store.jdbc.JdbcStoreFactory;
 import org.apache.servicemix.tck.ExchangeCompletedListener;
+import org.jencks.GeronimoPlatformTransactionManager;
+import org.jencks.factory.ConnectionManagerFactoryBean;
 import org.tranql.connector.AllExceptionsAreFatalSorter;
 import org.tranql.connector.jdbc.AbstractXADataSourceMCF;
 
@@ -82,19 +77,14 @@
         broker.addConnector("tcp://localhost:61616");
         broker.start();
         
-        TransactionManagerImpl exTransactionManager = new TransactionManagerImpl(600, new XidFactoryImpl(), null, null);
-        TransactionContextManager transactionContextManager = new TransactionContextManager(exTransactionManager, exTransactionManager);
-        tm = (TransactionManager) new GeronimoTransactionManager(transactionContextManager);
+        tm = new GeronimoPlatformTransactionManager();
         
         // Create an embedded database for testing tx results when commit / rollback
-        ConnectionManager cm = new GenericConnectionManager(
-                        new XATransactions(true, true),
-                        new NoPool(),
-                        false,
-                        null,
-                        transactionContextManager,
-                        "connectionManager",
-                        GenericConnectionManager.class.getClassLoader());
+        ConnectionManagerFactoryBean factory = new ConnectionManagerFactoryBean();
+        factory.setTransactionManager(tm);
+        factory.setTransaction("xa");
+        factory.afterPropertiesSet();
+        ConnectionManager cm = (ConnectionManager) factory.getObject();
         ManagedConnectionFactory mcf = new DerbyDataSourceMCF("target/testdb");
         dataSource = (DataSource) mcf.createConnectionFactory(cm);
         
@@ -105,11 +95,8 @@
         storeFactory.setTransactional(true);
         store = storeFactory.open("store");
         
-        JCAFlow jcaFlow = new JCAFlow();
-        jcaFlow.setTransactionContextManager(transactionContextManager);
-        
         jbi = new JBIContainer();
-        jbi.setFlows(new Flow[] { new SedaFlow(), jcaFlow });
+        jbi.setFlows(new Flow[] { new SedaFlow(), new JCAFlow() });
         jbi.setEmbedded(true);
         jbi.setUseMBeanServer(false);
         jbi.setCreateMBeanServer(false);

Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jca/JCAFlowTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jca/JCAFlowTest.java?view=diff&rev=466115&r1=466114&r2=466115
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jca/JCAFlowTest.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jca/JCAFlowTest.java Fri Oct 20 06:59:35 2006
@@ -18,8 +18,6 @@
 
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.xbean.BrokerFactoryBean;
-import org.apache.geronimo.transaction.ExtendedTransactionManager;
-import org.apache.geronimo.transaction.context.TransactionContextManager;
 import org.apache.servicemix.jbi.RuntimeJBIException;
 import org.apache.servicemix.jbi.container.ActivationSpec;
 import org.apache.servicemix.jbi.container.JBIContainer;
@@ -27,18 +25,13 @@
 import org.apache.servicemix.jbi.resolver.ServiceNameEndpointResolver;
 import org.apache.servicemix.tck.ReceiverComponent;
 import org.apache.servicemix.tck.SenderComponent;
-import org.jencks.factory.GeronimoTransactionManagerFactoryBean;
-import org.jencks.factory.TransactionContextManagerFactoryBean;
-import org.jencks.factory.TransactionManagerFactoryBean;
+import org.jencks.GeronimoPlatformTransactionManager;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.transaction.TransactionStatus;
-import org.springframework.transaction.jta.JtaTransactionManager;
 import org.springframework.transaction.support.TransactionCallback;
 import org.springframework.transaction.support.TransactionTemplate;
 
 import javax.jbi.JBIException;
-import javax.transaction.TransactionManager;
-import javax.transaction.UserTransaction;
 
 import junit.framework.TestCase;
 
@@ -58,18 +51,8 @@
     protected void setUp() throws Exception {
         super.setUp();
         
-        TransactionManagerFactoryBean tmcf = new TransactionManagerFactoryBean();
-        tmcf.afterPropertiesSet();
-        ExtendedTransactionManager etm = (ExtendedTransactionManager) tmcf.getObject();
-        TransactionContextManagerFactoryBean tcmfb = new TransactionContextManagerFactoryBean();
-        tcmfb.setTransactionManager(etm);
-        tcmfb.afterPropertiesSet();
-        TransactionContextManager tcm = (TransactionContextManager) tcmfb.getObject();
-        GeronimoTransactionManagerFactoryBean gtmfb = new GeronimoTransactionManagerFactoryBean();
-        gtmfb.setTransactionContextManager(tcm);
-        gtmfb.afterPropertiesSet();
-        TransactionManager tm = (TransactionManager) gtmfb.getObject();
-        tt = new TransactionTemplate(new JtaTransactionManager((UserTransaction) tm));
+        GeronimoPlatformTransactionManager tm = new GeronimoPlatformTransactionManager();
+        tt = new TransactionTemplate(tm);
        
         BrokerFactoryBean bfb = new BrokerFactoryBean(new ClassPathResource("org/apache/servicemix/jbi/nmr/flow/jca/broker.xml"));
         bfb.afterPropertiesSet();
@@ -78,7 +61,6 @@
         
         JCAFlow senderFlow = new JCAFlow();
         senderFlow.setJmsURL("tcp://localhost:61216");
-        senderFlow.setTransactionContextManager(tcm);
         senderContainer.setTransactionManager(tm);
         senderContainer.setEmbedded(true);
         senderContainer.setName("senderContainer");
@@ -90,7 +72,6 @@
         
         JCAFlow receiverFlow = new JCAFlow();
         receiverFlow.setJmsURL("tcp://localhost:61216");
-        receiverFlow.setTransactionContextManager(tcm);
         receiverContainer.setTransactionManager(tm);
         receiverContainer.setEmbedded(true);
         receiverContainer.setName("receiverContainer");



Mime
View raw message