You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ti...@apache.org on 2019/02/07 17:53:05 UTC
[aries-tx-control] branch master updated: Add integration test for
OpenJPA 3.0.0 with XA transactions
This is an automated email from the ASF dual-hosted git repository.
timothyjward pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-tx-control.git
The following commit(s) were added to refs/heads/master by this push:
new acf0b4a Add integration test for OpenJPA 3.0.0 with XA transactions
acf0b4a is described below
commit acf0b4ad6cced73aae32122340bd2f419ff7ad10
Author: Tim Ward <ti...@apache.org>
AuthorDate: Thu Feb 7 18:52:49 2019 +0100
Add integration test for OpenJPA 3.0.0 with XA transactions
---
.../org/apache/aries/tx/control/itests/SimpleOpenJPA_3_0_0_Test.java | 1 -
.../{SimpleOpenJPA_3_0_0_Test.java => XAOpenJPA_3_0_0_Test.java} | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/tx-control-providers/jpa/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/SimpleOpenJPA_3_0_0_Test.java b/tx-control-providers/jpa/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/SimpleOpenJPA_3_0_0_Test.java
index 2a0a0d3..157afb5 100644
--- a/tx-control-providers/jpa/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/SimpleOpenJPA_3_0_0_Test.java
+++ b/tx-control-providers/jpa/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/SimpleOpenJPA_3_0_0_Test.java
@@ -54,7 +54,6 @@ public class SimpleOpenJPA_3_0_0_Test extends AbstractSimpleTransactionTest {
// OpenJPA bundles and their dependencies (JPA API is available from the tx-control)
mavenBundle("commons-pool", "commons-pool", "1.6"),
-// mavenBundle("commons-lang", "commons-lang", "2.4"),
mavenBundle("commons-collections", "commons-collections", "3.2.2"),
mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.serp", "1.15.1_1"),
mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.commons-dbcp", "1.4_3"),
diff --git a/tx-control-providers/jpa/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/SimpleOpenJPA_3_0_0_Test.java b/tx-control-providers/jpa/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/XAOpenJPA_3_0_0_Test.java
similarity index 95%
copy from tx-control-providers/jpa/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/SimpleOpenJPA_3_0_0_Test.java
copy to tx-control-providers/jpa/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/XAOpenJPA_3_0_0_Test.java
index 2a0a0d3..854b0ab 100644
--- a/tx-control-providers/jpa/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/SimpleOpenJPA_3_0_0_Test.java
+++ b/tx-control-providers/jpa/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/XAOpenJPA_3_0_0_Test.java
@@ -29,7 +29,7 @@ import java.util.Hashtable;
import org.ops4j.pax.exam.CoreOptions;
import org.ops4j.pax.exam.Option;
-public class SimpleOpenJPA_3_0_0_Test extends AbstractSimpleTransactionTest {
+public class XAOpenJPA_3_0_0_Test extends XAJPATransactionTest {
protected Dictionary<String, Object> getBaseProperties() {
Dictionary<String, Object> base = new Hashtable<>();
@@ -54,7 +54,6 @@ public class SimpleOpenJPA_3_0_0_Test extends AbstractSimpleTransactionTest {
// OpenJPA bundles and their dependencies (JPA API is available from the tx-control)
mavenBundle("commons-pool", "commons-pool", "1.6"),
-// mavenBundle("commons-lang", "commons-lang", "2.4"),
mavenBundle("commons-collections", "commons-collections", "3.2.2"),
mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.serp", "1.15.1_1"),
mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.commons-dbcp", "1.4_3"),