[jboss-cvs] JBossAS SVN: r110706 - in projects/cluster/ha-server-ispn/trunk: src/main/java/org/jboss/ha/ispn and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: pferraro
Date: 2011-02-17 21:20:25 -0500 (Thu, 17 Feb 2011)
New Revision: 110706

Modified:
   projects/cluster/ha-server-ispn/trunk/pom.xml
   projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainerFactory.java
Log:
Upgrade to Infinispan 4.2.1.CR2
Need to add jboss-common-core dependency - as this was dropped from Infinispan.

Modified: projects/cluster/ha-server-ispn/trunk/pom.xml
===================================================================
--- projects/cluster/ha-server-ispn/trunk/pom.xml	2011-02-17 22:54:20 UTC (rev 110705)
+++ projects/cluster/ha-server-ispn/trunk/pom.xml	2011-02-18 02:20:25 UTC (rev 110706)
@@ -32,7 +32,8 @@
   </scm>
   
   <properties>
-    <version.infinispan>4.2.0.FINAL</version.infinispan>
+    <version.infinispan>4.2.1.CR2</version.infinispan>
+    <version.common.core>2.2.17.GA</version.common.core>
     <version.jta>1.0.1.GA</version.jta>
     <version.junit>4.8.2</version.junit>
     <version.easymock>3.0</version.easymock>
@@ -69,6 +70,12 @@
       </exclusions>
     </dependency>
     
+    <dependency>
+      <groupId>org.jboss</groupId>
+      <artifactId>jboss-common-core</artifactId>
+      <version>${version.common.core}</version>
+    </dependency>
+    
     <!-- Provided (by the container) dependencies -->
     <dependency>
       <groupId>org.jboss.javaee</groupId>

Modified: projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainerFactory.java
===================================================================
--- projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainerFactory.java	2011-02-17 22:54:20 UTC (rev 110705)
+++ projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainerFactory.java	2011-02-18 02:20:25 UTC (rev 110706)
@@ -85,8 +85,8 @@
       GlobalConfiguration global = configuration.getGlobalConfiguration();
       // Don't register shutdown hook - caches/containers will stop when registry stops
       global.setShutdownHookBehavior(ShutdownHookBehavior.DONT_REGISTER);
-      global.setMBeanServerLookup(this);
-      
+      global.setMBeanServerLookupInstance(this);
+
       if (global.getTransportClass() != null)
       {
          global.setStrictPeerToPeer(false);