You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2014/12/12 17:38:51 UTC
[1/2] activemq-6 git commit: Add TM Locator impl to JMSBridge tests
Repository: activemq-6
Updated Branches:
refs/heads/master 4045e8974 -> 64cc435ea
Add TM Locator impl to JMSBridge tests
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/891e3ef1
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/891e3ef1
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/891e3ef1
Branch: refs/heads/master
Commit: 891e3ef1cb7b217bc450b324fda0c29919a1a9ec
Parents: 4045e89
Author: Martyn Taylor <mt...@redhat.com>
Authored: Fri Dec 12 12:51:23 2014 +0000
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Fri Dec 12 16:35:13 2014 +0000
----------------------------------------------------------------------
tests/integration-tests/pom.xml | 8 +++++
.../bridge/TransactionManagerLocatorImpl.java | 36 ++++++++++++++++++++
...sions.transactions.TransactionManagerLocator | 1 +
3 files changed, 45 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/891e3ef1/tests/integration-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/pom.xml b/tests/integration-tests/pom.xml
index 83848d8..07a4984 100644
--- a/tests/integration-tests/pom.xml
+++ b/tests/integration-tests/pom.xml
@@ -172,10 +172,18 @@
<artifactId>jboss-javaee</artifactId>
<version>5.0.0.GA</version>
</dependency>
+
+ <!-- Needed for JMS Bridge Tests -->
<dependency>
<groupId>org.jboss.jbossts.jts</groupId>
<artifactId>jbossjts-jacorb</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-transaction-spi</artifactId>
+ <version>7.1.0.Final</version>
+ </dependency>
+
<!--Vertx provided dependencies-->
<dependency>
<groupId>io.vertx</groupId>
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/891e3ef1/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/TransactionManagerLocatorImpl.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/TransactionManagerLocatorImpl.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/TransactionManagerLocatorImpl.java
new file mode 100644
index 0000000..5ab404f
--- /dev/null
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/bridge/TransactionManagerLocatorImpl.java
@@ -0,0 +1,36 @@
+/**
+ * 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.
+ */
+
+package org.apache.activemq.tests.integration.jms.bridge;
+
+import javax.transaction.TransactionManager;
+
+import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple;
+import org.apache.activemq.service.extensions.transactions.TransactionManagerLocator;
+
+/**
+ * @author mtaylor
+ */
+
+public class TransactionManagerLocatorImpl implements TransactionManagerLocator
+{
+ @Override
+ public TransactionManager getTransactionManager()
+ {
+ return new TransactionManagerImple();
+ }
+}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/891e3ef1/tests/integration-tests/src/test/resources/META-INF/services/org.apache.activemq.service.extensions.transactions.TransactionManagerLocator
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/resources/META-INF/services/org.apache.activemq.service.extensions.transactions.TransactionManagerLocator b/tests/integration-tests/src/test/resources/META-INF/services/org.apache.activemq.service.extensions.transactions.TransactionManagerLocator
new file mode 100644
index 0000000..fe26423
--- /dev/null
+++ b/tests/integration-tests/src/test/resources/META-INF/services/org.apache.activemq.service.extensions.transactions.TransactionManagerLocator
@@ -0,0 +1 @@
+org.apache.activemq.tests.integration.jms.bridge.TransactionManagerLocatorImpl
[2/2] activemq-6 git commit: Merging #44 on fixing tests
Posted by cl...@apache.org.
Merging #44 on fixing tests
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/64cc435e
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/64cc435e
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/64cc435e
Branch: refs/heads/master
Commit: 64cc435ea72ff8bfe359fe3e4f12cdf3d19a3b73
Parents: 4045e89 891e3ef
Author: Clebert Suconic <cl...@apache.org>
Authored: Fri Dec 12 11:38:23 2014 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Dec 12 11:38:23 2014 -0500
----------------------------------------------------------------------
tests/integration-tests/pom.xml | 8 +++++
.../bridge/TransactionManagerLocatorImpl.java | 36 ++++++++++++++++++++
...sions.transactions.TransactionManagerLocator | 1 +
3 files changed, 45 insertions(+)
----------------------------------------------------------------------