Add standalone JBOSSTM-JTA component 58/858/2
authorGiovanni Meo <gmeo@cisco.com>
Mon, 12 Aug 2013 16:10:37 +0000 (18:10 +0200)
committerGiovanni Meo <gmeo@cisco.com>
Mon, 12 Aug 2013 22:21:53 +0000 (00:21 +0200)
- Introduce a proper transaction manager, and make sure infinispan
uses it.

Change-Id: I13cb4f69be095ac50e2d3ff32fe85c8fd8acdb27
Signed-off-by: Giovanni Meo <gmeo@cisco.com>
opendaylight/clustering/integrationtest/src/test/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusteringServicesIT.java
opendaylight/clustering/services_implementation/pom.xml
opendaylight/clustering/services_implementation/src/main/resources/config/infinispan-config.xml
opendaylight/commons/opendaylight/pom.xml
opendaylight/configuration/integrationtest/src/test/java/org/opendaylight/controller/configuration/internal/ConfigurationIT.java
opendaylight/northbound/integrationtest/src/test/java/org/opendaylight/controller/northbound/integrationtest/NorthboundIT.java

index e40454d..8cbebe5 100644 (file)
@@ -111,6 +111,7 @@ public class ClusteringServicesIT {
                         "org.apache.felix.dependencymanager").versionAsInProject(),\r
             mavenBundle("org.apache.felix",\r
                         "org.apache.felix.dependencymanager.shell").versionAsInProject(),\r
+            mavenBundle("eclipselink", "javax.resource").versionAsInProject(),\r
             junitBundles());\r
     }\r
 \r
index d6ff7ca..1d52c4b 100644 (file)
         <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
       <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>
index 2aa3fdb..16dd579 100644 (file)
@@ -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"
index f5fcdbd..ff6b5a1 100644 (file)
       <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>
index 865c891..17b3414 100644 (file)
@@ -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
index 553505f..ad694b0 100644 (file)
@@ -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"),