[jboss-cvs] JBossAS SVN: r67453 - branches/Branch_4_2/ejb3.

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

Author: bstansberry at jboss.com
Date: 2007-11-26 16:09:53 -0500 (Mon, 26 Nov 2007)
New Revision: 67453

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

Modified: branches/Branch_4_2/ejb3/build-test.xml
===================================================================
--- branches/Branch_4_2/ejb3/build-test.xml	2007-11-26 20:49:17 UTC (rev 67452)
+++ branches/Branch_4_2/ejb3/build-test.xml	2007-11-26 21:09:53 UTC (rev 67453)
@@ -52,15 +52,17 @@
        do not checkin your local.properties file into CVS-->
    <property file="local.properties"/>
 
-   <!-- Cluster node0 defaults -->
+   <!-- Cluster node defaults -->
    <property name="node0" value="localhost" />
    <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="${hostname}" />
    <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}" />
 
 
    <!-- Import the jboss server run targets -->
@@ -4569,9 +4571,9 @@
          </patternset>
       </create-config>
       
-      <start-jboss conf="clusteredjms2" host="${node1}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
+     <start-jboss conf="clusteredjms2" host="${node1}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs} -Djgroups.bind_addr=${node1.jgroups.bind_addr}"/>
    	  <antcall target="tests-clusteredjms2-wait"/> 
-   	  <start-jboss conf="clusteredjms" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>	 
+	  <start-jboss conf="clusteredjms" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs} -Djgroups.bind_addr=${node0.jgroups.bind_addr}"/>	 
    	  <antcall target="tests-clusteredjms-wait"/>
 	
 	  <antcall target="test-with-jvmargs" inheritRefs="true">
@@ -4676,8 +4678,8 @@
       <create-ejb3-cluster-node conf="clustered-ejb3-BR-0" conf-src="buddy-repl" jboss.dist="${ejb3.dist}"/>
       <create-ejb3-cluster-node conf="clustered-ejb3-BR-1" conf-src="buddy-repl"  jboss.dist="${ejb3.dist}"/>
 
-      <start-jboss conf="clustered-ejb3-BR-0" host="${node0}" jvmargs="-Xmx512M"/>
-      <start-jboss conf="clustered-ejb3-BR-1" host="${node1}" jvmargs="-Xmx512M"/>
+      <start-jboss conf="clustered-ejb3-BR-0" host="${node0}" jvmargs="${ejb3.jboss.jvmargs} -Djgroups.bind_addr=${node0.jgroups.bind_addr}"/>
+      <start-jboss conf="clustered-ejb3-BR-1" host="${node1}" jvmargs="${ejb3.jboss.jvmargs} -Djgroups.bind_addr=${node1.jgroups.bind_addr}"/>
 
       <antcall target="tests-clustering-wait"/>
 
@@ -4695,9 +4697,9 @@
 
    <target name="tests-clustering-startup" unless="${tests.clustering.skip.startup}">
       <create-ejb3-cluster-node conf="node0" jboss.dist="${ejb3.dist}"/>
-      <start-jboss conf="node0" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
+      <start-jboss conf="node0" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs} -Djgroups.bind_addr=${node0.jgroups.bind_addr}"/>
       <create-ejb3-cluster-node conf="node1" jboss.dist="${ejb3.dist}"/>
-      <start-jboss conf="node1" host="${node1}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
+      <start-jboss conf="node1" host="${node1}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs} -Djgroups.bind_addr=${node1.jgroups.bind_addr}"/>
    </target>
 
    <target name="tests-clustering-shutdown" unless="${tests.clustering.skip.startup}">