[jboss-cvs] JBossAS SVN: r67464 - trunk/ejb3.

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

Author: bstansberry at jboss.com
Date: 2007-11-26 17:27:31 -0500 (Mon, 26 Nov 2007)
New Revision: 67464

Modified:
   trunk/ejb3/build-test.xml
Log:
[EJBTHREE-1131] Allow EJB3 testsuite to have JGroups send/receive via a different interface than other services

Modified: trunk/ejb3/build-test.xml
===================================================================
--- trunk/ejb3/build-test.xml	2007-11-26 22:26:31 UTC (rev 67463)
+++ trunk/ejb3/build-test.xml	2007-11-26 22:27:31 UTC (rev 67464)
@@ -55,15 +55,17 @@
        do not checkin your local.properties file into CVS-->
    <property file="local.properties"/>
 
-   <!-- Cluster node0 defaults -->
+   <!-- Cluster node defaults -->
    <property name="node0" value="${env.MYTESTIP_1}" />
    <property name="node0.http.url" value="http://${node0}:8080" />
    <property name="node0.jndi.url" value="jnp://${node0}:1099" />
    <property name="node0.jndi.port1.url" value="jnp://${node0}:1199" />
    <property name="node0.http.port1.url" value="http://${node0}:8180" />
+   <property name="node0.jgroups.bind_addr" value="${node0}" />
    <property name="node1" value="${env.MYTESTIP_2}" />
    <property name="node1.http.url" value="http://${node1}:8080" />
    <property name="node1.jndi.url" value="jnp://${node1}:1099" />
+   <property name="node1.jgroups.bind_addr" value="${node1}" />
 
    <!-- UDP Group, must be done before server-config.xml -->
    <!-- The value of the -u option passed to jboss -->
@@ -5103,8 +5105,8 @@
          </patternset>
       </create-config>
 
-      <start-jboss conf="clusteredjms" host="${node0}" jvmargs="${ejb3.jboss.jvmargs}"/>
-	  <start-jboss conf="clusteredjms2" host="${node1}" jvmargs="${ejb3.jboss.jvmargs}"/>
+      <start-jboss conf="clusteredjms" host="${node0}" jvmargs="${ejb3.jboss.jvmargs} -Djgroups.bind_addr=${node1.jgroups.bind_addr}"/>
+	  <start-jboss conf="clusteredjms2" host="${node1}" jvmargs="${ejb3.jboss.jvmargs} -Djgroups.bind_addr=${node0.jgroups.bind_addr}"/>
 
 	  <antcall target="tests-clustering-wait"/>
 
@@ -5139,8 +5141,8 @@
       <buddy-repl-config-change conf="clustered-ejb3-noBR-0"/>
       <buddy-repl-config-change conf="clustered-ejb3-noBR-1"/>
 
-      <start-jboss conf="clustered-ejb3-noBR-0" host="${node0}" jvmargs="${ejb3.jboss.jvmargs}"/>
-      <start-jboss conf="clustered-ejb3-noBR-1" host="${node1}" jvmargs="${ejb3.jboss.jvmargs}"/>
+      <start-jboss conf="clustered-ejb3-noBR-0" host="${node0}" jvmargs="${ejb3.jboss.jvmargs} -Djgroups.bind_addr=${node0.jgroups.bind_addr}"/>
+      <start-jboss conf="clustered-ejb3-noBR-1" host="${node1}" jvmargs="${ejb3.jboss.jvmargs} -Djgroups.bind_addr=${node1.jgroups.bind_addr}"/>
 
       <antcall target="tests-clustering-wait"/>
 
@@ -5188,9 +5190,9 @@
       <property name="second-node" value="node1"/> 
    
       <create-cluster-node conf="node0"/>
-      <start-jboss  conf="${first-node}" host="${node0}" jvmargs="${ejb3.jboss.jvmargs}"/>
+      <start-jboss  conf="${first-node}" host="${node0}" jvmargs="${ejb3.jboss.jvmargs} -Djgroups.bind_addr=${node0.jgroups.bind_addr}"/>
       <create-cluster-node conf="${second-node}"/>
-      <start-jboss  conf="${second-node}" host="${node1}" jvmargs="${ejb3.jboss.jvmargs}"/>
+      <start-jboss  conf="${second-node}" host="${node1}" jvmargs="${ejb3.jboss.jvmargs} -Djgroups.bind_addr=${node1.jgroups.bind_addr}"/>
    </target>
 
    <target name="tests-clustering-shutdown" unless="${tests.clustering.skip.startup}">