Repository: camel Updated Branches: refs/heads/master ee09ce438 -> 9b6b38c72
CAMEL-10204: Using Narayana for testing (Atomikos deleted) Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9b6b38c7 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9b6b38c7 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9b6b38c7 Branch: refs/heads/master Commit: 9b6b38c72fddd50fe4184f70b1dc863dfe5c9fdf Parents: ee09ce4 Author: Nicola Ferraro <ni.ferr...@gmail.com> Authored: Thu Aug 4 12:55:40 2016 +0200 Committer: Nicola Ferraro <ni.ferr...@gmail.com> Committed: Thu Aug 4 12:55:40 2016 +0200 ---------------------------------------------------------------------- components/camel-sjms/pom.xml | 6 ---- parent/pom.xml | 2 +- tests/camel-itest/pom.xml | 33 +++++++++----------- .../src/test/resources/jbossts-properties.xml | 24 ++++++++++++++ ...omJmsToJdbcIdempotentConsumerToJmsXaTest.xml | 32 +++++-------------- .../itest/tx/Jms2RequiresNewTest-context.xml | 25 ++++----------- 6 files changed, 52 insertions(+), 70 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/9b6b38c7/components/camel-sjms/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-sjms/pom.xml b/components/camel-sjms/pom.xml index 3fc47c7..f3ad57f 100644 --- a/components/camel-sjms/pom.xml +++ b/components/camel-sjms/pom.xml @@ -91,12 +91,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.atomikos</groupId> - <artifactId>transactions-jta</artifactId> - <version>${atomikos-transactions-version}</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/camel/blob/9b6b38c7/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 637442c..071a17b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -59,7 +59,6 @@ <atmos-client-version>2.2.2</atmos-client-version> <atmosphere-version>2.4.5</atmosphere-version> <atmosphere-version-range>[2.4,3.0)</atmosphere-version-range> - <atomikos-transactions-version>4.0.4</atomikos-transactions-version> <avalon-bundle-version>4.3.1_1</avalon-bundle-version> <avalon-version>4.3.1</avalon-version> <avro-version>1.8.1</avro-version> @@ -434,6 +433,7 @@ <mustache-bundle-version>0.9.1_2</mustache-bundle-version> <mvel-version>2.2.8.Final</mvel-version> <mybatis-version>3.4.1</mybatis-version> + <narayana-version>5.3.3.Final</narayana-version> <neethi-bundle-version>3.0.1</neethi-bundle-version> <netty3-version>3.10.6.Final</netty3-version> <netty-version>4.1.4.Final</netty-version> http://git-wip-us.apache.org/repos/asf/camel/blob/9b6b38c7/tests/camel-itest/pom.xml ---------------------------------------------------------------------- diff --git a/tests/camel-itest/pom.xml b/tests/camel-itest/pom.xml index be5c947..a8d5dfd 100644 --- a/tests/camel-itest/pom.xml +++ b/tests/camel-itest/pom.xml @@ -374,33 +374,28 @@ <version>1.0.0</version> </dependency> - <!-- atomikos XA TX manager --> + <!-- Narayana XA TX manager --> <dependency> - <groupId>com.atomikos</groupId> - <artifactId>transactions</artifactId> - <version>${atomikos-transactions-version}</version> + <groupId>org.jboss.narayana.jta</groupId> + <artifactId>jdbc</artifactId> + <version>${narayana-version}</version> </dependency> <dependency> - <groupId>com.atomikos</groupId> - <artifactId>transactions-jta</artifactId> - <version>${atomikos-transactions-version}</version> + <groupId>org.jboss.narayana.jta</groupId> + <artifactId>jms</artifactId> + <version>${narayana-version}</version> </dependency> <dependency> - <groupId>com.atomikos</groupId> - <artifactId>transactions-jms</artifactId> - <version>${atomikos-transactions-version}</version> - <exclusions> - <exclusion> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> - </exclusion> - </exclusions> + <groupId>org.jboss.narayana.jta</groupId> + <artifactId>jta</artifactId> + <version>${narayana-version}</version> </dependency> <dependency> - <groupId>com.atomikos</groupId> - <artifactId>transactions-jdbc</artifactId> - <version>${atomikos-transactions-version}</version> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging</artifactId> + <version>${jboss-logging-version}</version> </dependency> + </dependencies> <build> http://git-wip-us.apache.org/repos/asf/camel/blob/9b6b38c7/tests/camel-itest/src/test/resources/jbossts-properties.xml ---------------------------------------------------------------------- diff --git a/tests/camel-itest/src/test/resources/jbossts-properties.xml b/tests/camel-itest/src/test/resources/jbossts-properties.xml new file mode 100644 index 0000000..f3616eb --- /dev/null +++ b/tests/camel-itest/src/test/resources/jbossts-properties.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd";> +<properties> + + <entry key="ObjectStoreEnvironmentBean.objectStoreDir">target</entry> + <entry key="com.arjuna.ats.arjuna.objectstore.objectStoreDir">target</entry> + +</properties> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/9b6b38c7/tests/camel-itest/src/test/resources/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsXaTest.xml ---------------------------------------------------------------------- diff --git a/tests/camel-itest/src/test/resources/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsXaTest.xml b/tests/camel-itest/src/test/resources/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsXaTest.xml index 8458db8..79dfd16 100644 --- a/tests/camel-itest/src/test/resources/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsXaTest.xml +++ b/tests/camel-itest/src/test/resources/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsXaTest.xml @@ -43,32 +43,14 @@ <property name="transactionTemplate" ref="requiredTemplate"/> </bean> - <!-- setup Atomikos for XA transaction --> - <bean id="atomikosTransactionManager" - class="com.atomikos.icatch.jta.UserTransactionManager" - init-method="init" destroy-method="close" depends-on="my-broker"> - <!-- when close is called, should we force transactions to terminate or not? --> - <property name="forceShutdown" value="false"/> - </bean> - - <!-- this is some atomikos setup you must do --> - <bean id="atomikosUserTransaction" class="com.atomikos.icatch.jta.UserTransactionImp" depends-on="my-broker"> - <property name="transactionTimeout" value="300"/> - </bean> - - <!-- this is some atomikos setup you must do --> - <bean id="connectionFactory" - class="com.atomikos.jms.AtomikosConnectionFactoryBean" - init-method="init" destroy-method="close" depends-on="my-broker"> - <property name="uniqueResourceName" value="myUniqueResource"/> - <property name="xaConnectionFactory" ref="jmsXaConnectionFactory"/> - </bean> + <!-- Setup Narayana transaction manager and user transaction --> + <bean id="narayanaTransactionManager" class="com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple" /> + <bean id="narayanaUserTransaction" class="com.arjuna.ats.internal.jta.transaction.arjunacore.UserTransactionImple" /> - <!-- this is the Spring JtaTransactionManager which under the hood uses Atomikos --> - <bean id="jtaTransactionManager" - class="org.springframework.transaction.jta.JtaTransactionManager" depends-on="my-broker"> - <property name="transactionManager" ref="atomikosTransactionManager"/> - <property name="userTransaction" ref="atomikosUserTransaction"/> + <!-- this is the Spring JtaTransactionManager which under the hood uses Narayana --> + <bean id="jtaTransactionManager" class="org.springframework.transaction.jta.JtaTransactionManager" depends-on="my-broker"> + <property name="transactionManager" ref="narayanaTransactionManager"/> + <property name="userTransaction" ref="narayanaUserTransaction"/> </bean> <!-- Is the ConnectionFactory to connect to the JMS broker --> http://git-wip-us.apache.org/repos/asf/camel/blob/9b6b38c7/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/Jms2RequiresNewTest-context.xml ---------------------------------------------------------------------- diff --git a/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/Jms2RequiresNewTest-context.xml b/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/Jms2RequiresNewTest-context.xml index 1764934..5697391 100644 --- a/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/Jms2RequiresNewTest-context.xml +++ b/tests/camel-itest/src/test/resources/org/apache/camel/itest/tx/Jms2RequiresNewTest-context.xml @@ -31,27 +31,14 @@ <property name="propagationBehaviorName" value="PROPAGATION_REQUIRES_NEW"/> </bean> - <!-- setup Atomikos for XA transaction --> - <bean id="atomikosTransactionManager" class="com.atomikos.icatch.jta.UserTransactionManager" init-method="init" destroy-method="close" depends-on="my-broker"> - <!-- when close is called, should we force transactions to terminate or not? --> - <property name="forceShutdown" value="false"/> - </bean> - - <!-- this is some atomikos setup you must do --> - <bean id="atomikosUserTransaction" class="com.atomikos.icatch.jta.UserTransactionImp" depends-on="my-broker"> - <property name="transactionTimeout" value="300"/> - </bean> - - <!-- this is some atomikos setup you must do --> - <bean id="connectionFactory" class="com.atomikos.jms.AtomikosConnectionFactoryBean" init-method="init" destroy-method="close" depends-on="my-broker"> - <property name="uniqueResourceName" value="myUniqueResource"/> - <property name="xaConnectionFactory" ref="jmsXaConnectionFactory"/> - </bean> + <!-- Setup Narayana transaction manager and user transaction --> + <bean id="narayanaTransactionManager" class="com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple" /> + <bean id="narayanaUserTransaction" class="com.arjuna.ats.internal.jta.transaction.arjunacore.UserTransactionImple" /> - <!-- this is the Spring JtaTransactionManager which under the hood uses Atomikos --> + <!-- this is the Spring JtaTransactionManager which under the hood uses Narayana --> <bean id="jtaTransactionManager" class="org.springframework.transaction.jta.JtaTransactionManager" depends-on="my-broker"> - <property name="transactionManager" ref="atomikosTransactionManager"/> - <property name="userTransaction" ref="atomikosUserTransaction"/> + <property name="transactionManager" ref="narayanaTransactionManager"/> + <property name="userTransaction" ref="narayanaUserTransaction"/> </bean> <!-- Is the ConnectionFactory to connect to the JMS broker -->
