[jboss-cvs] JBoss Messaging SVN: r8308 - in branches/Branch_1_4/tests/src/org/jboss/test/messaging: tools and 1 other directory.

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

Author: gaohoward
Date: 2011-05-18 04:30:10 -0400 (Wed, 18 May 2011)
New Revision: 8308

Modified:
   branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/ClusteringTestBase.java
   branches/Branch_1_4/tests/src/org/jboss/test/messaging/tools/ServerManagement.java
Log:
JBMESSAGING-1866



Modified: branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/ClusteringTestBase.java
===================================================================
--- branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/ClusteringTestBase.java	2011-05-18 00:37:24 UTC (rev 8307)
+++ branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/ClusteringTestBase.java	2011-05-18 08:30:10 UTC (rev 8308)
@@ -28,6 +28,7 @@
 import javax.jms.Connection;
 import javax.jms.Queue;
 import javax.jms.Topic;
+import javax.management.ObjectName;
 import javax.naming.InitialContext;
 
 import org.jboss.jms.client.FailoverEvent;
@@ -72,6 +73,9 @@
 
    protected int nodeCount = 4;
    protected ServiceAttributeOverrides overrides;
+   
+   protected Long overrideNodeStateRefreshInterval = 500l;
+   protected boolean withNewFailoverModel = false;
 
    protected static ServiceAttributeOverrides currentOverrides;
 
@@ -80,6 +84,8 @@
    public ClusteringTestBase(String name)
    {
       super(name);
+      withNewFailoverModel = ServerManagement.isNewFailoverModel();
+      log.error("-------------------------------------------------------------with: " + this.withNewFailoverModel);
    }
 
    // Public ---------------------------------------------------------------------------------------
@@ -129,6 +135,14 @@
 
       for (int i = 0; i < nodeCount; i++)
       {
+         //https://issues.jboss.org/browse/JBMESSAGING-1866
+         if (withNewFailoverModel)
+         {
+            overrides = new ServiceAttributeOverrides();
+            overrides.put(new ObjectName("jboss.messaging:service=PostOffice"), 
+                       "NodeStateRefreshInterval", overrideNodeStateRefreshInterval);
+         }
+         
          startDefaultServer(i, overrides, i == 0);
 
          ic[i] = new InitialContext(ServerManagement.getJNDIEnvironment(i));

Modified: branches/Branch_1_4/tests/src/org/jboss/test/messaging/tools/ServerManagement.java
===================================================================
--- branches/Branch_1_4/tests/src/org/jboss/test/messaging/tools/ServerManagement.java	2011-05-18 00:37:24 UTC (rev 8307)
+++ branches/Branch_1_4/tests/src/org/jboss/test/messaging/tools/ServerManagement.java	2011-05-18 08:30:10 UTC (rev 8308)
@@ -117,6 +117,11 @@
    {
       return "true".equals(System.getProperty("test.clustered"));
    }
+   
+   public static boolean isNewFailoverModel()
+   {
+      return "true".equals(System.getProperty("new.failover.model"));
+   }
 
    /**
     * May return null if the server is not initialized.