Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jca/JcaFlowWithTxLogTest.java URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jca/JcaFlowWithTxLogTest.java?view=diff&rev=466115&r1=466114&r2=466115 ============================================================================== --- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jca/JcaFlowWithTxLogTest.java (original) +++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jca/JcaFlowWithTxLogTest.java Fri Oct 20 06:59:35 2006 @@ -22,17 +22,12 @@ import javax.jbi.messaging.MessagingException; import javax.jbi.messaging.NormalizedMessage; import javax.naming.Context; -import javax.transaction.TransactionManager; import javax.xml.namespace.QName; import junit.framework.TestCase; import org.apache.activemq.broker.BrokerService; import org.apache.activemq.store.memory.MemoryPersistenceAdapter; -import org.apache.geronimo.transaction.ExtendedTransactionManager; -import org.apache.geronimo.transaction.context.TransactionContextManager; -import org.apache.geronimo.transaction.manager.TransactionLog; -import org.apache.geronimo.transaction.manager.XidFactoryImpl; import org.apache.servicemix.MessageExchangeListener; import org.apache.servicemix.client.DefaultServiceMixClient; import org.apache.servicemix.components.util.ComponentSupport; @@ -41,9 +36,7 @@ import org.apache.servicemix.jbi.jaxp.StringSource; import org.apache.servicemix.jbi.nmr.flow.Flow; import org.apache.xbean.spring.jndi.SpringInitialContextFactory; -import org.jencks.factory.GeronimoTransactionManagerFactoryBean; -import org.jencks.factory.HowlLogFactoryBean; -import org.jencks.factory.TransactionContextManagerFactoryBean; +import org.jencks.GeronimoPlatformTransactionManager; import org.jencks.factory.TransactionManagerFactoryBean; /** @@ -54,7 +47,7 @@ private JBIContainer senderContainer = new JBIContainer(); private JBIContainer receiverContainer = new JBIContainer(); private BrokerService broker; - private TransactionManager tm; + private GeronimoPlatformTransactionManager tm; public class MyEchoComponent extends ComponentSupport implements MessageExchangeListener { @@ -80,22 +73,9 @@ System.setProperty(Context.INITIAL_CONTEXT_FACTORY, SpringInitialContextFactory.class.getName()); System.setProperty(Context.PROVIDER_URL, "jndi.xml"); - XidFactoryImpl xidFactory = new XidFactoryImpl(); - HowlLogFactoryBean howlLogFactoryBean = new HowlLogFactoryBean(); - howlLogFactoryBean.setXidFactory(xidFactory); - howlLogFactoryBean.setLogFileDir("target/txlog"); - TransactionManagerFactoryBean tmcf = new TransactionManagerFactoryBean(); - tmcf.setTransactionLog((TransactionLog) howlLogFactoryBean.getObject()); - 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(); - tm = (TransactionManager) gtmfb.getObject(); + TransactionManagerFactoryBean factory = new TransactionManagerFactoryBean(); + factory.setTransactionLogDir("target/txlog"); + tm = (GeronimoPlatformTransactionManager) factory.getObject(); broker = new BrokerService(); broker.setPersistenceAdapter(new MemoryPersistenceAdapter()); @@ -104,7 +84,6 @@ JCAFlow senderFlow = new JCAFlow(); senderFlow.setJmsURL("tcp://localhost:61616"); - senderFlow.setTransactionContextManager(tcm); senderContainer.setTransactionManager(tm); senderContainer.setEmbedded(true); senderContainer.setName("senderContainer"); @@ -117,7 +96,6 @@ JCAFlow receiverFlow = new JCAFlow(); receiverFlow.setJmsURL("tcp://localhost:61616"); - receiverFlow.setTransactionContextManager(tcm); receiverContainer.setTransactionManager(tm); receiverContainer.setEmbedded(true); receiverContainer.setName("receiverContainer");
Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/MultipleJMSFlowTest.java URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/MultipleJMSFlowTest.java?view=diff&rev=466115&r1=466114&r2=466115 ============================================================================== --- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/MultipleJMSFlowTest.java (original) +++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/MultipleJMSFlowTest.java Fri Oct 20 06:59:35 2006 @@ -16,16 +16,14 @@ */ package org.apache.servicemix.jbi.nmr.flow.jms; +import junit.framework.TestCase; + import org.apache.activemq.broker.BrokerService; import org.apache.activemq.xbean.BrokerFactoryBean; import org.apache.servicemix.jbi.container.JBIContainer; import org.apache.servicemix.jbi.nmr.flow.Flow; -import org.apache.servicemix.jbi.nmr.flow.jms.JMSFlow; import org.apache.servicemix.tck.ReceiverComponent; -import org.apache.servicemix.tck.SenderComponent; import org.springframework.core.io.ClassPathResource; - -import junit.framework.TestCase; public class MultipleJMSFlowTest extends TestCase { Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/StatelessJcaFlowTest.java URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/StatelessJcaFlowTest.java?view=diff&rev=466115&r1=466114&r2=466115 ============================================================================== --- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/StatelessJcaFlowTest.java (original) +++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/StatelessJcaFlowTest.java Fri Oct 20 06:59:35 2006 @@ -18,40 +18,23 @@ import javax.transaction.TransactionManager; -import org.apache.geronimo.transaction.ExtendedTransactionManager; -import org.apache.geronimo.transaction.context.TransactionContextManager; import org.apache.servicemix.jbi.container.JBIContainer; import org.apache.servicemix.jbi.nmr.flow.jca.JCAFlow; -import org.jencks.factory.GeronimoTransactionManagerFactoryBean; -import org.jencks.factory.TransactionContextManagerFactoryBean; -import org.jencks.factory.TransactionManagerFactoryBean; +import org.jencks.GeronimoPlatformTransactionManager; public class StatelessJcaFlowTest extends StatelessJmsFlowTest { - private TransactionContextManager tcm; private TransactionManager tm; protected void setUp() 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(); + tm = new GeronimoPlatformTransactionManager(); super.setUp(); } protected JBIContainer createContainer(String name) throws Exception { JBIContainer container = new JBIContainer(); container.setName(name); - JCAFlow flow = new JCAFlow(); - flow.setJmsURL("tcp://localhost:61616"); - flow.setTransactionContextManager(tcm); + JCAFlow flow = new JCAFlow("tcp://localhost:61616"); container.setTransactionManager(tm); container.setFlow(flow); container.setUseMBeanServer(false); Modified: incubator/servicemix/trunk/servicemix-eip/pom.xml URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-eip/pom.xml?view=diff&rev=466115&r1=466114&r2=466115 ============================================================================== --- incubator/servicemix/trunk/servicemix-eip/pom.xml (original) +++ incubator/servicemix/trunk/servicemix-eip/pom.xml Fri Oct 20 06:59:35 2006 @@ -61,7 +61,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-eip/src/test/java/org/apache/servicemix/eip/AbstractEIPTransactionalTest.java URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-eip/src/test/java/org/apache/servicemix/eip/AbstractEIPTransactionalTest.java?view=diff&rev=466115&r1=466114&r2=466115 ============================================================================== --- incubator/servicemix/trunk/servicemix-eip/src/test/java/org/apache/servicemix/eip/AbstractEIPTransactionalTest.java (original) +++ incubator/servicemix/trunk/servicemix-eip/src/test/java/org/apache/servicemix/eip/AbstractEIPTransactionalTest.java Fri Oct 20 06:59:35 2006 @@ -24,13 +24,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.client.DefaultServiceMixClient; import org.apache.servicemix.jbi.container.JBIContainer; import org.apache.servicemix.jbi.nmr.flow.Flow; @@ -39,6 +32,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; @@ -57,19 +52,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); @@ -78,11 +68,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-http/pom.xml URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-http/pom.xml?view=diff&rev=466115&r1=466114&r2=466115 ============================================================================== --- incubator/servicemix/trunk/servicemix-http/pom.xml (original) +++ incubator/servicemix/trunk/servicemix-http/pom.xml Fri Oct 20 06:59:35 2006 @@ -146,7 +146,7 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>geronimo</groupId> + <groupId>org.apache.geronimo.modules</groupId> <artifactId>geronimo-activation</artifactId> <scope>provided</scope> </dependency> Modified: incubator/servicemix/trunk/servicemix-http/src/test/java/org/apache/servicemix/http/HttpTxTest.java URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-http/src/test/java/org/apache/servicemix/http/HttpTxTest.java?view=diff&rev=466115&r1=466114&r2=466115 ============================================================================== --- incubator/servicemix/trunk/servicemix-http/src/test/java/org/apache/servicemix/http/HttpTxTest.java (original) +++ incubator/servicemix/trunk/servicemix-http/src/test/java/org/apache/servicemix/http/HttpTxTest.java Fri Oct 20 06:59:35 2006 @@ -25,10 +25,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.Destination; import org.apache.servicemix.components.util.EchoComponent; @@ -38,6 +34,7 @@ import org.apache.servicemix.jbi.nmr.flow.jca.JCAFlow; import org.apache.servicemix.jbi.nmr.flow.seda.SedaFlow; import org.apache.servicemix.tck.ExchangeCompletedListener; +import org.jencks.GeronimoPlatformTransactionManager; public class HttpTxTest extends TestCase { @@ -53,15 +50,10 @@ 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(); - 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-jms/pom.xml URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-jms/pom.xml?view=diff&rev=466115&r1=466114&r2=466115 ============================================================================== --- incubator/servicemix/trunk/servicemix-jms/pom.xml (original) +++ incubator/servicemix/trunk/servicemix-jms/pom.xml Fri Oct 20 06:59:35 2006 @@ -51,11 +51,11 @@ </exclusions> </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> @@ -109,17 +109,17 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>geronimo</groupId> + <groupId>org.apache.geronimo.modules</groupId> <artifactId>geronimo-activation</artifactId> <scope>provided</scope> </dependency> <dependency> - <groupId>incubator-activemq</groupId> + <groupId>org.apache.activemq</groupId> <artifactId>activemq-ra</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>incubator-activemq</groupId> + <groupId>org.apache.activemq</groupId> <artifactId>activemq-core</artifactId> <scope>provided</scope> </dependency> Modified: incubator/servicemix/trunk/servicemix-services/pom.xml URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-services/pom.xml?view=diff&rev=466115&r1=466114&r2=466115 ============================================================================== --- incubator/servicemix/trunk/servicemix-services/pom.xml (original) +++ incubator/servicemix/trunk/servicemix-services/pom.xml Fri Oct 20 06:59:35 2006 @@ -36,7 +36,7 @@ <dependencies> <dependency> - <groupId>incubator-activemq</groupId> + <groupId>org.apache.activemq</groupId> <artifactId>activeio-core</artifactId> <optional>true</optional> </dependency> @@ -74,12 +74,12 @@ <scope>test</scope> </dependency> <dependency> - <groupId>geronimo</groupId> + <groupId>org.apache.geronimo.modules</groupId> <artifactId>geronimo-transaction</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>geronimo</groupId> + <groupId>org.apache.geronimo.modules</groupId> <artifactId>geronimo-connector</artifactId> <scope>test</scope> </dependency> Modified: incubator/servicemix/trunk/servicemix-services/src/test/java/org/apache/servicemix/store/jdbc/JdbcStoreTransactionalTest.java URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-services/src/test/java/org/apache/servicemix/store/jdbc/JdbcStoreTransactionalTest.java?view=diff&rev=466115&r1=466114&r2=466115 ============================================================================== --- incubator/servicemix/trunk/servicemix-services/src/test/java/org/apache/servicemix/store/jdbc/JdbcStoreTransactionalTest.java (original) +++ incubator/servicemix/trunk/servicemix-services/src/test/java/org/apache/servicemix/store/jdbc/JdbcStoreTransactionalTest.java Fri Oct 20 06:59:35 2006 @@ -27,15 +27,10 @@ import junit.framework.TestCase; 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.store.Store; import org.apache.servicemix.store.StoreFactory; +import org.jencks.GeronimoPlatformTransactionManager; +import org.jencks.factory.ConnectionManagerFactoryBean; import org.tranql.connector.AllExceptionsAreFatalSorter; import org.tranql.connector.jdbc.AbstractXADataSourceMCF; @@ -47,19 +42,14 @@ private TransactionManager tm; protected void setUp() throws Exception { - 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 cmFactory = new ConnectionManagerFactoryBean(); + cmFactory.setTransactionManager(tm); + cmFactory.setTransaction("xa"); + cmFactory.afterPropertiesSet(); + ConnectionManager cm = (ConnectionManager) cmFactory.getObject(); ManagedConnectionFactory mcf = new DerbyDataSourceMCF("target/testdb"); dataSource = (DataSource) mcf.createConnectionFactory(cm); JdbcStoreFactory f = new JdbcStoreFactory(); Modified: incubator/servicemix/trunk/servicemix-soap/pom.xml URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-soap/pom.xml?view=diff&rev=466115&r1=466114&r2=466115 ============================================================================== --- incubator/servicemix/trunk/servicemix-soap/pom.xml (original) +++ incubator/servicemix/trunk/servicemix-soap/pom.xml Fri Oct 20 06:59:35 2006 @@ -45,7 +45,7 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>geronimo</groupId> + <groupId>org.apache.geronimo.modules</groupId> <artifactId>geronimo-activation</artifactId> <scope>provided</scope> </dependency> Modified: incubator/servicemix/trunk/servicemix-wsn2005/pom.xml URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/servicemix-wsn2005/pom.xml?view=diff&rev=466115&r1=466114&r2=466115 ============================================================================== --- incubator/servicemix/trunk/servicemix-wsn2005/pom.xml (original) +++ incubator/servicemix/trunk/servicemix-wsn2005/pom.xml Fri Oct 20 06:59:35 2006 @@ -56,7 +56,7 @@ <scope>test</scope> </dependency> <dependency> - <groupId>incubator-activemq</groupId> + <groupId>org.apache.activemq</groupId> <artifactId>activemq-core</artifactId> <scope>provided</scope> </dependency>
