Merge "Add container context debug osgi cli command to Switch Manager"

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 e40454dea2259c085e07fe3db3e9800dfef1209a..8cbebe5134c288bf8ce23cd599cc8e39f7100a3e 100644 (file)
--- 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(),\r
             mavenBundle("org.apache.felix",\r
                         "org.apache.felix.dependencymanager.shell").versionAsInProject(),\r
+            mavenBundle("eclipselink", "javax.resource").versionAsInProject(),\r
             junitBundles());\r
     }\r
 \r

diff --git a/opendaylight/clustering/services_implementation/pom.xml b/opendaylight/clustering/services_implementation/pom.xml
index d6ff7ca6d1804fd249eca46700381864db5cb66c..1d52c4b0777589bff90468248fefa4e4234ddef7 100644 (file)
--- 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 2aa3fdb849b6fb02a65eeb5a626ec293a1fd8817..16dd579abb83962c63f7c3efb3c21d856b1f5409 100644 (file)
--- 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 f5fcdbd3d5c33dc56c4dfa13fc7dc4f851fbb985..ff6b5a1cefe9cb5aafd082e51ee4531b7339ff49 100644 (file)
--- 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 865c891b6f0af607c0aee42625c1fc0ffa243ab7..17b3414c91e174c168895502a63a4e9c8951eb67 100644 (file)
--- 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 553505f4a347bc5191f77e59609daa6f69a98415..ad694b0b65a4cccb6b7304a12299d5feea464fdd 100644 (file)
--- 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"),