From: Giovanni Meo <gmeo@cisco.com>
Date: Mon, 12 Aug 2013 16:10:37 +0000 (+0200)
Subject: Add standalone JBOSSTM-JTA component
X-Git-Tag: releasepom-0.1.0~212
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=fd6ee90c84519353b04be115e5fe21bdc5877844

Add standalone JBOSSTM-JTA component

- Introduce a proper transaction manager, and make sure infinispan
uses it.

Change-Id: I13cb4f69be095ac50e2d3ff32fe85c8fd8acdb27
Signed-off-by: Giovanni Meo <gmeo@cisco.com>
---

diff --git a/opendaylight/clustering/integrationtest/src/test/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusteringServicesIT.java b/opendaylight/clustering/integrationtest/src/test/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusteringServicesIT.java
index e40454dea2..8cbebe5134 100644
--- a/opendaylight/clustering/integrationtest/src/test/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusteringServicesIT.java
+++ b/opendaylight/clustering/integrationtest/src/test/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusteringServicesIT.java
@@ -111,6 +111,7 @@ public class ClusteringServicesIT {
                         "org.apache.felix.dependencymanager").versionAsInProject(),
             mavenBundle("org.apache.felix",
                         "org.apache.felix.dependencymanager.shell").versionAsInProject(),
+            mavenBundle("eclipselink", "javax.resource").versionAsInProject(),
             junitBundles());
     }
 
diff --git a/opendaylight/clustering/services_implementation/pom.xml b/opendaylight/clustering/services_implementation/pom.xml
index d6ff7ca6d1..1d52c4b077 100644
--- a/opendaylight/clustering/services_implementation/pom.xml
+++ b/opendaylight/clustering/services_implementation/pom.xml
@@ -39,9 +39,11 @@
         <instructions>
           <Import-Package>
             org.slf4j,
-            !org.jboss.*,
             !bsh*,
             !net.jcip.*,
+            !javax.swing,
+            !org.hornetq.*,
+            !org.jboss.*,
             javax.transaction,
             *,
             org.opendaylight.controller.clustering.services,
@@ -61,7 +63,7 @@
             *
           </DynamicImport-Package>
           <Embed-Dependency>
-            infinispan-core,jgroups,jboss-marshalling-river,jboss-marshalling,jboss-logging,staxmapper;type=!pom;inline=false
+            infinispan-core,jgroups,jboss-marshalling-river,jboss-marshalling,jboss-logging,staxmapper,narayana-jta;type=!pom;inline=false
           </Embed-Dependency>
           <Embed-Transitive>
             true
@@ -110,5 +112,10 @@
       <artifactId>sal</artifactId>
       <version>0.4.0-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>org.jboss.jbossts.jta</groupId>
+      <artifactId>narayana-jta</artifactId>
+      <version>4.17.7.Final</version>
+    </dependency>
   </dependencies>
 </project>
diff --git a/opendaylight/clustering/services_implementation/src/main/resources/config/infinispan-config.xml b/opendaylight/clustering/services_implementation/src/main/resources/config/infinispan-config.xml
index 2aa3fdb849..16dd579abb 100644
--- a/opendaylight/clustering/services_implementation/src/main/resources/config/infinispan-config.xml
+++ b/opendaylight/clustering/services_implementation/src/main/resources/config/infinispan-config.xml
@@ -24,7 +24,7 @@
   <!-- transactionManagerLookupClass="org.infinispan.transaction.lookup.JBossStandaloneJTAManagerLookup" -->
   <namedCache name="transactional-type">
     <transaction
-        transactionManagerLookupClass="org.infinispan.transaction.lookup.GenericTransactionManagerLookup"
+        transactionManagerLookupClass="org.infinispan.transaction.lookup.JBossStandaloneJTAManagerLookup"
         syncRollbackPhase="false"
         syncCommitPhase="false"
         cacheStopTimeout="30000"
diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index f5fcdbd3d5..ff6b5a1cef 100644
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -776,6 +776,11 @@
       <artifactId>javax.servlet.jsp.jstl.impl</artifactId>
       <version>1.2.0.v201210211230</version>
     </dependency>
+    <dependency>
+      <groupId>eclipselink</groupId>
+      <artifactId>javax.resource</artifactId>
+      <version>1.5.0.v200906010428</version>
+    </dependency>
     <!-- Add Pax Exam -->
     <dependency>
       <groupId>org.ops4j.pax.exam</groupId>
diff --git a/opendaylight/configuration/integrationtest/src/test/java/org/opendaylight/controller/configuration/internal/ConfigurationIT.java b/opendaylight/configuration/integrationtest/src/test/java/org/opendaylight/controller/configuration/internal/ConfigurationIT.java
index 865c891b6f..17b3414c91 100644
--- a/opendaylight/configuration/integrationtest/src/test/java/org/opendaylight/controller/configuration/internal/ConfigurationIT.java
+++ b/opendaylight/configuration/integrationtest/src/test/java/org/opendaylight/controller/configuration/internal/ConfigurationIT.java
@@ -75,6 +75,7 @@ public class ConfigurationIT {
                 mavenBundle("org.apache.commons", "commons-lang3", "3.1"),
                 mavenBundle("org.jboss.spec.javax.transaction",
                         "jboss-transaction-api_1.1_spec", "1.0.1.Final"),
+                mavenBundle("eclipselink", "javax.resource").versionAsInProject(),
                 mavenBundle("org.apache.felix",
                         "org.apache.felix.dependencymanager", "3.1.0"),
                 // List all the bundles on which the test case depends
diff --git a/opendaylight/northbound/integrationtest/src/test/java/org/opendaylight/controller/northbound/integrationtest/NorthboundIT.java b/opendaylight/northbound/integrationtest/src/test/java/org/opendaylight/controller/northbound/integrationtest/NorthboundIT.java
index 553505f4a3..ad694b0b65 100644
--- a/opendaylight/northbound/integrationtest/src/test/java/org/opendaylight/controller/northbound/integrationtest/NorthboundIT.java
+++ b/opendaylight/northbound/integrationtest/src/test/java/org/opendaylight/controller/northbound/integrationtest/NorthboundIT.java
@@ -1319,6 +1319,7 @@ public class NorthboundIT {
                 mavenBundle("commons-codec", "commons-codec"),
                 mavenBundle("virgomirror", "org.eclipse.jdt.core.compiler.batch", "3.8.0.I20120518-2145"),
                 mavenBundle("eclipselink", "javax.persistence", "2.0.4.v201112161009"),
+                mavenBundle("eclipselink", "javax.resource", "1.5.0.v200906010428"),
 
                 mavenBundle("orbit", "javax.activation", "1.1.0.v201211130549"),
                 mavenBundle("orbit", "javax.annotation", "1.1.0.v201209060031"),