Repository: camel Updated Branches: refs/heads/master 05a2830cb -> cb459e65f
Fixing Narayana tests Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cb459e65 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cb459e65 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cb459e65 Branch: refs/heads/master Commit: cb459e65f5fe7218e04d8176acd31697a141d073 Parents: 05a2830 Author: Nicola Ferraro <ni.ferr...@gmail.com> Authored: Mon Mar 13 17:41:18 2017 +0100 Committer: Nicola Ferraro <ni.ferr...@gmail.com> Committed: Mon Mar 13 18:41:58 2017 +0100 ---------------------------------------------------------------------- parent/pom.xml | 1 + tests/camel-itest/pom.xml | 5 +++++ .../org/apache/camel/itest/tx/Jms2RequiresNewTest-context.xml | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/cb459e65/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index e0ddf6b..f5b8ce0 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -319,6 +319,7 @@ <jboss-javaee-6-version>1.0.0.Final</jboss-javaee-6-version> <jboss-logging-version>3.3.0.Final</jboss-logging-version> <jboss-marshalling-version>1.4.10.Final</jboss-marshalling-version> + <jboss-transaction-spi.version>7.5.1.Final</jboss-transaction-spi.version> <jboss-xnio-version>3.4.3.Final</jboss-xnio-version> <jcache-bundle-version>1.0.0_1</jcache-bundle-version> <jclouds-version>2.0.0</jclouds-version> http://git-wip-us.apache.org/repos/asf/camel/blob/cb459e65/tests/camel-itest/pom.xml ---------------------------------------------------------------------- diff --git a/tests/camel-itest/pom.xml b/tests/camel-itest/pom.xml index 7adb877..68a1085 100644 --- a/tests/camel-itest/pom.xml +++ b/tests/camel-itest/pom.xml @@ -409,6 +409,11 @@ <version>${narayana-version}</version> </dependency> <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-transaction-spi</artifactId> + <version>${jboss-transaction-spi.version}</version> + </dependency> + <dependency> <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging</artifactId> <version>${jboss-logging-version}</version> http://git-wip-us.apache.org/repos/asf/camel/blob/cb459e65/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 5697391..e978289 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 @@ -32,8 +32,8 @@ </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" /> + <bean id="narayanaTransactionManager" class="com.arjuna.ats.jta.TransactionManager" factory-method="transactionManager" /> + <bean id="narayanaUserTransaction" class="com.arjuna.ats.jta.UserTransaction" factory-method="userTransaction" /> <!-- this is the Spring JtaTransactionManager which under the hood uses Narayana --> <bean id="jtaTransactionManager" class="org.springframework.transaction.jta.JtaTransactionManager" depends-on="my-broker">
