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

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

Author: pferraro
Date: 2010-08-14 00:53:37 -0400 (Sat, 14 Aug 2010)
New Revision: 107607

Modified:
   projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainerFactory.java
   projects/cluster/ha-server-ispn/trunk/src/test/java/org/jboss/ha/ispn/DefaultCacheContainerFactoryTest.java
Log:
Add ability to control whether channel auto-starts/stops.

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	2010-08-14 04:47:21 UTC (rev 107606)
+++ projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainerFactory.java	2010-08-14 04:53:37 UTC (rev 107607)
@@ -89,10 +89,20 @@
    {
       public static final String STACK = "stack";
       public static final String DEFAULT_STACK = "udp";
+      public static final String AUTO_START = "auto-start";
+      public static final String DEFAULT_AUTO_START = Boolean.toString(true);
+      public static final String AUTO_STOP = "auto-stop";
+      public static final String DEFAULT_AUTO_STOP = Boolean.toString(true);
       
+      private boolean autoStart = true;
+      private boolean autoStop = true;
+      
       @Override
       public Channel getJGroupsChannel(Properties properties)
       {
+         this.autoStart = Boolean.valueOf(properties.getProperty(AUTO_START, DEFAULT_AUTO_START));
+         this.autoStop = Boolean.valueOf(properties.getProperty(AUTO_STOP, DEFAULT_AUTO_STOP));
+         
          String stack = properties.getProperty(STACK, DEFAULT_STACK);
          String id = properties.getProperty(CHANNEL_ID);
          ChannelFactory factory = (ChannelFactory) properties.get(CHANNEL_FACTORY);
@@ -110,13 +120,13 @@
       @Override
       public boolean shouldStartAndConnect()
       {
-         return true;
+         return this.autoStart;
       }
 
       @Override
       public boolean shouldStopAndDisconnect()
       {
-         return true;
+         return this.autoStop;
       }
    }
 }

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-08-14 04:47:21 UTC (rev 107606)
+++ projects/cluster/ha-server-ispn/trunk/src/test/java/org/jboss/ha/ispn/DefaultCacheContainerFactoryTest.java	2010-08-14 04:53:37 UTC (rev 107607)
@@ -65,8 +65,6 @@
             
             Assert.assertSame(manager, cache.getCacheManager());
             Assert.assertSame(ComponentStatus.RUNNING, manager.getStatus());
-            Assert.assertTrue(manager.isCoordinator());
-            Assert.assertEquals(Collections.singletonList(manager.getAddress()), manager.getMembers());
             
             Cache<?, ?> aliasCache = result.getCache("alias");