[jboss-cvs] JBoss Messaging SVN: r3252 - in trunk: tests and 1 other directories.

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

Author: timfox
Date: 2007-10-27 09:48:18 -0400 (Sat, 27 Oct 2007)
New Revision: 3252

Modified:
   trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
   trunk/tests/build.xml
   trunk/tests/src/org/jboss/test/messaging/tools/ServerManagement.java
Log:
Allow JGroups group name to be overridden by sys prop


Modified: trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java	2007-10-27 13:12:01 UTC (rev 3251)
+++ trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java	2007-10-27 13:48:18 UTC (rev 3252)
@@ -306,6 +306,16 @@
      
       this.clustered = true;
       
+      //Group name can be overridden with a system property - useful for Hudson test runs
+      String s = System.getProperty("jboss.messaging.groupname");
+      
+      if (s != null)
+      {
+         log.debug("Group name overriden to use: " + s);
+         
+         groupName = s;
+      }
+      
       groupMember = new GroupMember(groupName, stateTimeout, castTimeout, jChannelFactory, this, this);
 
       this.supportsFailover = supportsFailover;

Modified: trunk/tests/build.xml
===================================================================
--- trunk/tests/build.xml	2007-10-27 13:12:01 UTC (rev 3251)
+++ trunk/tests/build.xml	2007-10-27 13:48:18 UTC (rev 3252)
@@ -724,6 +724,7 @@
          <sysproperty key="remote" value="true"/>
          <sysproperty key="module.output" value="${tests.output}"/>
          <sysproperty key="test.bind.address" value="${test.bind.address}"/>
+         <sysproperty key="jboss.messaging.groupname" value="${jboss.messaging.groupname}"/>
          <sysproperty key="jgroups.bind_addr" value="${test.bind.address}"/>
          <sysproperty key="test.database" value="${clustering.tests.database}"/>
          <sysproperty key="test.clustered" value="true"/>

Modified: trunk/tests/src/org/jboss/test/messaging/tools/ServerManagement.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/ServerManagement.java	2007-10-27 13:12:01 UTC (rev 3251)
+++ trunk/tests/src/org/jboss/test/messaging/tools/ServerManagement.java	2007-10-27 13:48:18 UTC (rev 3252)
@@ -435,6 +435,12 @@
          sb.append("-Dtest.remoting=").append(remoting).append(' ');
       }
       
+      String groupName = System.getProperty("jboss.messaging.groupname");
+      if (groupName != null)
+      {
+         sb.append("-Djboss.messaging.groupname=").append(groupName).append(' ');
+      }
+      
       String testLogfileSuffix = System.getProperty("test.logfile.suffix");
 
       if (testLogfileSuffix == null)