[jboss-cvs] JBossAS SVN: r69590 - in trunk/testsuite: src/resources/cluster/hasingleton/electionpolicy and 1 other directory.

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

Author: bstansberry at jboss.com
Date: 2008-02-04 17:18:16 -0500 (Mon, 04 Feb 2008)
New Revision: 69590

Modified:
   trunk/testsuite/imports/server-config.xml
   trunk/testsuite/src/resources/cluster/hasingleton/electionpolicy/ha-electionpolicy-beans.xml
Log:
Fix HASingletonElectionPolicyTestCase when node0 isn't localhost

Modified: trunk/testsuite/imports/server-config.xml
===================================================================
--- trunk/testsuite/imports/server-config.xml	2008-02-04 21:48:27 UTC (rev 69589)
+++ trunk/testsuite/imports/server-config.xml	2008-02-04 22:18:16 UTC (rev 69590)
@@ -257,6 +257,7 @@
          <sysproperty key="resolve.dns" value="false" />
          <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
          <sysproperty key="server.peer.id" value="0" />
+         <sysproperty key="node0.bind.address" value="${node0}" />
       </server>
       <server name="cluster-udp-1" host="${node1}">
          <jvmarg value="-Xms128m" />
@@ -269,6 +270,7 @@
          <sysproperty key="resolve.dns" value="false" />
          <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
          <sysproperty key="server.peer.id" value="1" />
+         <sysproperty key="node0.bind.address" value="${node0}" />
       </server>
       <server name="cluster-field-udp-0" host="${node0}">
          <jvmarg value="-Xms128m" />
@@ -410,6 +412,7 @@
          <sysproperty key="jboss.multiplexer.stack" value="tcp" />
          <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7600],${node1}[7600]"/>
          <sysproperty key="server.peer.id" value="0" />  
+         <sysproperty key="node0.bind.address" value="${node0}" />
       </server>
       <server name="cluster-tcp-1" host="${node1}">
          <jvmarg value="-Xms128m" />
@@ -423,6 +426,7 @@
          <sysproperty key="jboss.multiplexer.stack" value="tcp" />
          <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7600],${node1}[7600]"/>
          <sysproperty key="server.peer.id" value="1" /> 
+         <sysproperty key="node0.bind.address" value="${node0}" />
       </server>
       <server name="cluster-tcp-sync-0" host="${node0}">
          <jvmarg value="-Xms128m" />
@@ -592,6 +596,7 @@
          <sysproperty key="jboss.multiplexer.stack" value="tcp_nio" />
          <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7700],${node1}[7700]"/>
          <sysproperty key="server.peer.id" value="0" /> 
+         <sysproperty key="node0.bind.address" value="${node0}" />
 	  </server>
 	  <server name="cluster-tcp_nio-1" host="${node1}">
         <jvmarg value="-Xms128m" />
@@ -605,6 +610,7 @@
 	     <sysproperty key="jboss.multiplexer.stack" value="tcp_nio" />
         <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7700],${node1}[7700]"/>
         <sysproperty key="server.peer.id" value="1" /> 
+         <sysproperty key="node0.bind.address" value="${node0}" />
 	  </server>
 	  <server name="cluster-field-tcp_nio-0" host="${node0}">
         <jvmarg value="-Xms128m" />

Modified: trunk/testsuite/src/resources/cluster/hasingleton/electionpolicy/ha-electionpolicy-beans.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/hasingleton/electionpolicy/ha-electionpolicy-beans.xml	2008-02-04 21:48:27 UTC (rev 69589)
+++ trunk/testsuite/src/resources/cluster/hasingleton/electionpolicy/ha-electionpolicy-beans.xml	2008-02-04 22:18:16 UTC (rev 69590)
@@ -105,7 +105,7 @@
    <bean class="org.jboss.ha.singleton.HASingletonElectionPolicySimple"
           name="HASingletonElectionPolicySimple_5">
      <property name="position">0</property>
-     <property name="preferredMaster">127.0.0.1:1099</property>
+     <property name="preferredMaster">${node0.bind.address:127.0.0.1}:1099</property>
    </bean>
 
    <bean class="org.jboss.ha.singleton.HASingletonController" 
@@ -130,7 +130,7 @@
    <bean class="org.jboss.ha.singleton.HASingletonElectionPolicySimple"
           name="HASingletonElectionPolicySimple_6">
      <property name="position">-1</property>
-     <property name="preferredMaster">127.0.0.1:1099</property>
+     <property name="preferredMaster">${node0.bind.address:127.0.0.1}:1099</property>
    </bean>
 
    <bean class="org.jboss.ha.singleton.HASingletonController"