[jboss-cvs] JBossAS SVN: r109938 - in trunk: testsuite/src/main/org/jboss/test/cluster/testutil and 1 other directory.

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

Author: pferraro
Date: 2010-12-15 12:36:39 -0500 (Wed, 15 Dec 2010)
New Revision: 109938

Modified:
   trunk/component-matrix/pom.xml
   trunk/testsuite/src/main/org/jboss/test/cluster/testutil/SessionTestUtil.java
Log:
JBAS-8672 Upgrade Infinispan to 4.2.0.CR4, ha-server-ispn to 1.0.0.CR8

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2010-12-15 17:22:07 UTC (rev 109937)
+++ trunk/component-matrix/pom.xml	2010-12-15 17:36:39 UTC (rev 109938)
@@ -70,7 +70,7 @@
     <version.org.hibernate.javax.persistence>1.0.0.Final</version.org.hibernate.javax.persistence>
     <version.org.hibernate.legacy>4.0.2.GA</version.org.hibernate.legacy>
     <version.org.hibernate.validator>4.1.0.Final</version.org.hibernate.validator>
-    <version.org.infinispan>4.2.0.CR3</version.org.infinispan>
+    <version.org.infinispan>4.2.0.CR4</version.org.infinispan>
     <version.org.jboss.aop>2.2.1.Alpha3</version.org.jboss.aop>
     <version.org.jboss.aspects.currentinvocation>1.0.1</version.org.jboss.aspects.currentinvocation>
     <version.org.jboss.aspects.remoting>1.0.1.GA</version.org.jboss.aspects.remoting>
@@ -82,7 +82,7 @@
     <version.org.jboss.cluster.client>1.1.2.Final</version.org.jboss.cluster.client>
     <version.org.jboss.cluster.server.api>2.0.0.CR1</version.org.jboss.cluster.server.api>
     <version.org.jboss.cluster.server.core>1.0.0.CR2</version.org.jboss.cluster.server.core>
-    <version.org.jboss.cluster.server.ispn>1.0.0.CR7</version.org.jboss.cluster.server.ispn>
+    <version.org.jboss.cluster.server.ispn>1.0.0.CR8</version.org.jboss.cluster.server.ispn>
     <version.org.jboss.cluster.cache.spi>3.0.0.CR1</version.org.jboss.cluster.cache.spi>
     <version.org.jboss.cluster.cache.ispn>1.0.0.CR8</version.org.jboss.cluster.cache.ispn>
     <version.org.jboss.common.core>2.2.17.GA</version.org.jboss.common.core>

Modified: trunk/testsuite/src/main/org/jboss/test/cluster/testutil/SessionTestUtil.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/testutil/SessionTestUtil.java	2010-12-15 17:22:07 UTC (rev 109937)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/testutil/SessionTestUtil.java	2010-12-15 17:36:39 UTC (rev 109938)
@@ -57,9 +57,7 @@
 import org.infinispan.manager.DefaultCacheManager;
 import org.infinispan.manager.EmbeddedCacheManager;
 import org.infinispan.remoting.transport.Address;
-import org.infinispan.transaction.tm.BatchModeTransactionManager;
 import org.infinispan.util.concurrent.IsolationLevel;
-import org.jboss.ha.ispn.DefaultCacheContainer;
 import org.jboss.logging.Logger;
 import org.jboss.metadata.javaee.spec.EmptyMetaData;
 import org.jboss.metadata.web.jboss.JBossWebMetaData;
@@ -302,6 +300,24 @@
          {
             return sessionContainer.getCacheNames();
          }
+
+         @Override
+         public Address getCoordinator()
+         {
+            return sessionContainer.getCoordinator();
+         }
+
+         @Override
+         public boolean isRunning(String cacheName)
+         {
+            return cacheName.equals("jboss.web") ? jvmRouteContainer.isDefaultRunning() : sessionContainer.isRunning(cacheName);
+         }
+
+         @Override
+         public boolean isDefaultRunning()
+         {
+            return sessionContainer.isDefaultRunning();
+         }
       };
    }