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

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

Author: pferraro
Date: 2010-12-14 22:57:59 -0500 (Tue, 14 Dec 2010)
New Revision: 109908

Modified:
   projects/cluster/ha-server-ispn/trunk/pom.xml
   projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainer.java
   projects/cluster/ha-server-ispn/trunk/src/test/java/org/jboss/ha/ispn/DefaultCacheContainerFactoryTest.java
Log:
Upgrade infinispan to 4.2.0.CR4

Modified: projects/cluster/ha-server-ispn/trunk/pom.xml
===================================================================
--- projects/cluster/ha-server-ispn/trunk/pom.xml	2010-12-14 21:04:37 UTC (rev 109907)
+++ projects/cluster/ha-server-ispn/trunk/pom.xml	2010-12-15 03:57:59 UTC (rev 109908)
@@ -32,7 +32,7 @@
   </scm>
   
   <properties>
-    <version.infinispan>4.2.0.CR3</version.infinispan>
+    <version.infinispan>4.2.0.CR4</version.infinispan>
     <version.jta>1.0.1.GA</version.jta>
     <version.junit>4.8.2</version.junit>
     <version.easymock>3.0</version.easymock>

Modified: projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainer.java
===================================================================
--- projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainer.java	2010-12-14 21:04:37 UTC (rev 109907)
+++ projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainer.java	2010-12-15 03:57:59 UTC (rev 109908)
@@ -226,6 +226,38 @@
       return this.container.getCacheNames();
    }
    
+   /**
+    * {@inheritDoc}
+    * @see org.infinispan.manager.EmbeddedCacheManager#getCoordinator()
+    */
+   @Override
+   public Address getCoordinator()
+   {
+      return this.container.getCoordinator();
+   }
+
+   /**
+    * {@inheritDoc}
+    * @see org.infinispan.manager.EmbeddedCacheManager#isDefaultRunning()
+    */
+   @Override
+   public boolean isDefaultRunning()
+   {
+      return this.container.isDefaultRunning();
+   }
+
+   /**
+    * {@inheritDoc}
+    * @see org.infinispan.manager.EmbeddedCacheManager#isRunning(java.lang.String)
+    */
+   @Override
+   public boolean isRunning(String cacheName)
+   {
+      EmbeddedCacheManager container = this.containers.get(this.appendCacheName(this.container.getGlobalConfiguration().getCacheManagerName(), cacheName));
+
+      return (container != null) ? container.isDefaultRunning() : this.container.isRunning(cacheName);
+   }
+
    @CacheStopped
    public synchronized void cacheStopped(CacheStoppedEvent event)
    {
@@ -238,7 +270,7 @@
    
    static class SingletonCacheManager extends DefaultCacheManager
    {
-      private final CacheContainer parent;
+      private final EmbeddedCacheManager parent;
       private final String cacheName;
       
       /**
@@ -246,7 +278,7 @@
        * @param globalConfiguration
        * @param defaultConfiguration
        */
-      SingletonCacheManager(CacheContainer parent, String cacheName, GlobalConfiguration globalConfiguration, Configuration defaultConfiguration)
+      SingletonCacheManager(EmbeddedCacheManager parent, String cacheName, GlobalConfiguration globalConfiguration, Configuration defaultConfiguration)
       {
          super(globalConfiguration, defaultConfiguration, false);
          
@@ -261,16 +293,21 @@
       @Override
       public <K, V> Cache<K, V> getCache(String name)
       {
-         if (this.cacheName.equals(name))
-         {
-            return super.getCache(CacheContainer.DEFAULT_CACHE_NAME);
-         }
-         
-         return this.parent.getCache(name);
+         return this.cacheName.equals(name) ? super.<K, V>getCache(CacheContainer.DEFAULT_CACHE_NAME) : this.parent.<K, V>getCache(name);
       }
 
       /**
        * {@inheritDoc}
+       * @see org.infinispan.manager.DefaultCacheManager#isRunning(java.lang.String)
+       */
+      @Override
+      public boolean isRunning(String cacheName)
+      {
+         return this.cacheName.equals(cacheName) ? super.isRunning(CacheContainer.DEFAULT_CACHE_NAME) : this.parent.isRunning(cacheName);
+      }
+
+      /**
+       * {@inheritDoc}
        * @see org.infinispan.manager.DefaultCacheManager#addListener(java.lang.Object)
        */
       @Override

Modified: projects/cluster/ha-server-ispn/trunk/src/test/java/org/jboss/ha/ispn/DefaultCacheContainerFactoryTest.java
===================================================================
--- projects/cluster/ha-server-ispn/trunk/src/test/java/org/jboss/ha/ispn/DefaultCacheContainerFactoryTest.java	2010-12-14 21:04:37 UTC (rev 109907)
+++ projects/cluster/ha-server-ispn/trunk/src/test/java/org/jboss/ha/ispn/DefaultCacheContainerFactoryTest.java	2010-12-15 03:57:59 UTC (rev 109908)
@@ -69,7 +69,7 @@
       
       try
       {
-         URL url = Thread.currentThread().getContextClassLoader().getResource("config-samples/jgroups-udp.xml");
+         URL url = Thread.currentThread().getContextClassLoader().getResource("jgroups-udp.xml");
          EasyMock.expect(channelFactory.createMultiplexerChannel(DefaultCacheContainerFactory.ChannelFactoryChannelLookup.DEFAULT_STACK, "mychannel")).andReturn(new JChannel(url));
          
          control.replay();