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

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

Author: sergeypk
Date: 2007-05-17 12:32:40 -0400 (Thu, 17 May 2007)
New Revision: 2702

Modified:
   trunk/tests/build.xml
   trunk/tests/src/org/jboss/test/messaging/tools/ServerManagement.java
Log:
JBMESSAGING-960 - Use test.bind.address as jgroups.bind_addr for clustering tests. Propagate jgroups.bind_addr to spawned test servers.

Modified: trunk/tests/build.xml
===================================================================
--- trunk/tests/build.xml	2007-05-17 16:01:05 UTC (rev 2701)
+++ trunk/tests/build.xml	2007-05-17 16:32:40 UTC (rev 2702)
@@ -761,6 +761,7 @@
          <sysproperty key="remote" value="true"/>
          <sysproperty key="module.output" value="${tests.output}"/>
          <sysproperty key="test.bind.address" value="${test.bind.address}"/>
+         <sysproperty key="jgroups.bind_addr" value="${test.bind.address}"/>
          <sysproperty key="test.database" value="${clustering.tests.database}"/>
          <sysproperty key="test.serialization" value="${functional.tests.serialization}"/>
          <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-05-17 16:01:05 UTC (rev 2701)
+++ trunk/tests/src/org/jboss/test/messaging/tools/ServerManagement.java	2007-05-17 16:32:40 UTC (rev 2702)
@@ -376,6 +376,13 @@
 
       sb.append("-Dtest.bind.address=localhost").append(' ');
 
+      String jgroupsBindAddr = System.getProperty(org.jgroups.Global.BIND_ADDR);
+      if (jgroupsBindAddr != null)
+      {
+         sb.append("-D").append(org.jgroups.Global.BIND_ADDR).append("=")
+            .append(jgroupsBindAddr).append(' ');
+      }
+
       String database = System.getProperty("test.database");
       if (database != null)
       {
@@ -448,7 +455,7 @@
       }
 
       sb.append("org.jboss.test.messaging.tools.jmx.rmi.RMITestServer");
-
+      
       String commandLine = sb.toString();
 
       //System.out.println(commandLine);