[jboss-cvs] JBossAS SVN: r66465 - trunk/testsuite/imports.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Oct 25 18:10:49 EDT 2007


Author: bstansberry at jboss.com
Date: 2007-10-25 18:10:48 -0400 (Thu, 25 Oct 2007)
New Revision: 66465

Modified:
   trunk/testsuite/imports/server-config.xml
Log:
Set distinct JBM ServerPeerID values when we run clustered tests

Modified: trunk/testsuite/imports/server-config.xml
===================================================================
--- trunk/testsuite/imports/server-config.xml	2007-10-25 22:04:44 UTC (rev 66464)
+++ trunk/testsuite/imports/server-config.xml	2007-10-25 22:10:48 UTC (rev 66465)
@@ -157,6 +157,7 @@
          <jvmarg value="-XX:MaxPermSize=256m" />
          <sysproperty key="resolve.dns" value="false" />
          <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
+         <sysproperty key="server.peer.id" value="0" />
       </server>
       <server name="node1" host="${node1}">
          <jvmarg value="-Xms128m" />
@@ -164,6 +165,7 @@
          <jvmarg value="-XX:MaxPermSize=256m" />
          <sysproperty key="resolve.dns" value="false" />
          <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
+         <sysproperty key="server.peer.id" value="1" />
       </server>
       <server name="clustered-ejb3-noBR-0" host="${node0}">
          <jvmarg value="-Xms128m" />
@@ -171,6 +173,7 @@
          <jvmarg value="-XX:MaxPermSize=256m" />
          <sysproperty key="resolve.dns" value="false" />
          <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
+         <sysproperty key="server.peer.id" value="0" />
       </server>
       <server name="clustered-ejb3-noBR-1" host="${node1}">
          <jvmarg value="-Xms128m" />
@@ -178,22 +181,25 @@
          <jvmarg value="-XX:MaxPermSize=256m" />
          <sysproperty key="resolve.dns" value="false" />
          <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
+         <sysproperty key="server.peer.id" value="1" />
       </server>
       <server name="cluster-udp-sync-0" host="${node0}">
          <jvmarg value="-Xms128m" />
          <jvmarg value="-Xmx512m" />
          <jvmarg value="-XX:MaxPermSize=256m" />
          <sysproperty key="resolve.dns" value="false" />
-        <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
-        <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
+         <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
+         <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
+         <sysproperty key="server.peer.id" value="0" />
       </server>
       <server name="cluster-udp-sync-1" host="${node1}">
          <jvmarg value="-Xms128m" />
          <jvmarg value="-Xmx512m" />
          <jvmarg value="-XX:MaxPermSize=512m" />
          <sysproperty key="resolve.dns" value="false" />
-        <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
-        <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
+         <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
+         <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
+         <sysproperty key="server.peer.id" value="1" />
       </server>
       <server name="cluster-udp-0" host="${node0}">
          <jvmarg value="-Xms128m" />
@@ -201,7 +207,8 @@
          <jvmarg value="-XX:MaxPermSize=512m" />        
          <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
          <sysproperty key="resolve.dns" value="false" />
-        <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
+         <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
+         <sysproperty key="server.peer.id" value="0" />
       </server>
       <server name="cluster-udp-1" host="${node1}">
          <jvmarg value="-Xms128m" />
@@ -209,7 +216,8 @@
          <jvmarg value="-XX:MaxPermSize=512m" />        
          <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
          <sysproperty key="resolve.dns" value="false" />
-        <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
+         <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
+         <sysproperty key="server.peer.id" value="1" />
       </server>
       <server name="cluster-field-udp-0" host="${node0}">
          <jvmarg value="-Xms128m" />
@@ -217,7 +225,8 @@
          <jvmarg value="-XX:MaxPermSize=512m" />        
          <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
          <sysproperty key="resolve.dns" value="false" />
-        <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
+         <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
+         <sysproperty key="server.peer.id" value="0" />
       </server>
       <server name="cluster-field-udp-1" host="${node1}">
          <jvmarg value="-Xms128m" />
@@ -225,7 +234,8 @@
          <jvmarg value="-XX:MaxPermSize=512m" />        
          <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
          <sysproperty key="resolve.dns" value="false" />
-        <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
+         <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
+         <sysproperty key="server.peer.id" value="1" />
       </server>
       <server name="cluster-udp-SYNC-0" host="${node0}">
          <jvmarg value="-Xms128m" />
@@ -233,8 +243,9 @@
          <jvmarg value="-XX:MaxPermSize=512m" />        
          <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
          <sysproperty key="resolve.dns" value="false" />
-        <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
-        <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
+         <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
+         <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
+         <sysproperty key="server.peer.id" value="0" />
       </server>
       <server name="cluster-udp-SYNC-1" host="${node1}">
          <jvmarg value="-Xms128m" />
@@ -242,8 +253,9 @@
          <jvmarg value="-XX:MaxPermSize=512m" />        
          <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
          <sysproperty key="resolve.dns" value="false" />
-        <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
-        <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
+         <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
+         <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
+         <sysproperty key="server.peer.id" value="1" />
       </server>
       <server name="cluster-field-udp-SYNC-0" host="${node0}">
          <jvmarg value="-Xms128m" />
@@ -251,8 +263,9 @@
          <jvmarg value="-XX:MaxPermSize=512m" />        
          <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
          <sysproperty key="resolve.dns" value="false" />
-        <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
-        <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
+         <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
+         <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
+         <sysproperty key="server.peer.id" value="0" />
       </server>
       <server name="cluster-field-udp-SYNC-1" host="${node1}">
          <jvmarg value="-Xms128m" />
@@ -260,340 +273,345 @@
          <jvmarg value="-XX:MaxPermSize=512m" />        
          <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
          <sysproperty key="resolve.dns" value="false" />
-        <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
-        <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
+         <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
+         <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
+         <sysproperty key="server.peer.id" value="1" />
       </server>
       <server name="cluster-udp-TOTAL-0" host="${node0}">
          <jvmarg value="-Xms128m" />
          <jvmarg value="-Xmx512m" />
          <jvmarg value="-XX:MaxPermSize=512m" />        
          <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
-
-        <sysproperty key="resolve.dns" value="false" />
-        <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
-        <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
+         <sysproperty key="resolve.dns" value="false" />
+         <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
+         <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
+         <sysproperty key="server.peer.id" value="0" />
       </server>
       <server name="cluster-udp-TOTAL-1" host="${node1}">
          <jvmarg value="-Xms128m" />
          <jvmarg value="-Xmx512m" />
          <jvmarg value="-XX:MaxPermSize=512m" />        
          <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
-
-        <sysproperty key="resolve.dns" value="false" />
-        <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
-        <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
+         <sysproperty key="resolve.dns" value="false" />
+         <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
+         <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
+         <sysproperty key="server.peer.id" value="1" />
       </server>
       <server name="cluster-field-udp-TOTAL-0" host="${node0}">
          <jvmarg value="-Xms128m" />
          <jvmarg value="-Xmx512m" />
          <jvmarg value="-XX:MaxPermSize=512m" />        
          <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
-
-        <sysproperty key="resolve.dns" value="false" />
-        <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
-        <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
+         <sysproperty key="resolve.dns" value="false" />
+         <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
+         <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
+         <sysproperty key="server.peer.id" value="0" />
       </server>
       <server name="cluster-field-udp-TOTAL-1" host="${node1}">
          <jvmarg value="-Xms128m" />
          <jvmarg value="-Xmx512m" />
          <jvmarg value="-XX:MaxPermSize=512m" />        
          <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
-
-        <sysproperty key="resolve.dns" value="false" />
-        <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
-        <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
+         <sysproperty key="resolve.dns" value="false" />
+         <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
+         <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
+         <sysproperty key="server.peer.id" value="1" />
       </server>
       <server name="cluster-tcp-0" host="${node0}">
          <jvmarg value="-Xms128m" />
          <jvmarg value="-Xmx512m" />
          <jvmarg value="-XX:MaxPermSize=512m" />        
          <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
-
-        <sysproperty key="resolve.dns" value="false" />
-        <sysproperty key="jboss.multiplexer.stack" value="tcp" />
-        <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7600],${node1}[7600]"/>  
+         <sysproperty key="resolve.dns" value="false" />
+         <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" />  
       </server>
       <server name="cluster-tcp-1" host="${node1}">
          <jvmarg value="-Xms128m" />
          <jvmarg value="-Xmx512m" />
          <jvmarg value="-XX:MaxPermSize=512m" />        
          <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
-
          <sysproperty key="resolve.dns" value="false" />
          <sysproperty key="jboss.multiplexer.stack" value="tcp" />
-         <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7600],${node1}[7600]"/> 
+         <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7600],${node1}[7600]"/>
+         <sysproperty key="server.peer.id" value="1" /> 
       </server>
       <server name="cluster-tcp-sync-0" host="${node0}">
          <jvmarg value="-Xms128m" />
          <jvmarg value="-Xmx512m" />
          <jvmarg value="-XX:MaxPermSize=512m" />        
          <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
-
          <sysproperty key="resolve.dns" value="false" />
          <sysproperty key="jboss.multiplexer.stack" value="tcp-sync" />
-         <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7650],${node1}[7650]"/> 
+         <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7650],${node1}[7650]"/>
+         <sysproperty key="server.peer.id" value="0" /> 
       </server>
       <server name="cluster-tcp-sync-1" host="${node1}">
          <jvmarg value="-Xms128m" />
          <jvmarg value="-Xmx512m" />
          <jvmarg value="-XX:MaxPermSize=512m" />        
          <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
-
          <sysproperty key="resolve.dns" value="false" />
          <sysproperty key="jboss.multiplexer.stack" value="tcp-sync" />
-         <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7650],${node1}[7650]"/> 
+         <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7650],${node1}[7650]"/>
+         <sysproperty key="server.peer.id" value="1" /> 
       </server>
       <server name="cluster-field-tcp-0" host="${node0}">
          <jvmarg value="-Xms128m" />
          <jvmarg value="-Xmx512m" />
          <jvmarg value="-XX:MaxPermSize=512m" />        
          <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
-
          <sysproperty key="resolve.dns" value="false" />
          <sysproperty key="jboss.multiplexer.stack" value="tcp" />
-         <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7600],${node1}[7600]"/> 
+         <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7600],${node1}[7600]"/>
+         <sysproperty key="server.peer.id" value="0" />
       </server>
       <server name="cluster-field-tcp-1" host="${node1}">
          <jvmarg value="-Xms128m" />
          <jvmarg value="-Xmx512m" />
          <jvmarg value="-XX:MaxPermSize=512m" />        
          <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
-
          <sysproperty key="resolve.dns" value="false" />
          <sysproperty key="jboss.multiplexer.stack" value="tcp" />
-         <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7600],${node1}[7600]"/> 
+         <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7600],${node1}[7600]"/>
+         <sysproperty key="server.peer.id" value="1" />
       </server>
       <server name="cluster-tcp-SYNC-0" host="${node0}">
          <jvmarg value="-Xms128m" />
          <jvmarg value="-Xmx512m" />
          <jvmarg value="-XX:MaxPermSize=512m" />        
          <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
-
          <sysproperty key="resolve.dns" value="false" />
          <sysproperty key="jboss.multiplexer.stack" value="tcp-sync" />
-         <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7650],${node1}[7650]"/> 
+         <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7650],${node1}[7650]"/>
+         <sysproperty key="server.peer.id" value="0" /> 
       </server>
       <server name="cluster-tcp-SYNC-1" host="${node1}">
          <jvmarg value="-Xms128m" />
          <jvmarg value="-Xmx512m" />
          <jvmarg value="-XX:MaxPermSize=512m" />        
          <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
-
          <sysproperty key="resolve.dns" value="false" />
          <sysproperty key="jboss.multiplexer.stack" value="tcp-sync" />
-         <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7650],${node1}[7650]"/> 
+         <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7650],${node1}[7650]"/>
+         <sysproperty key="server.peer.id" value="1" /> 
       </server>
       <server name="cluster-field-tcp-SYNC-0" host="${node0}">
          <jvmarg value="-Xms128m" />
          <jvmarg value="-Xmx512m" />
          <jvmarg value="-XX:MaxPermSize=512m" />        
          <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
-
          <sysproperty key="resolve.dns" value="false" />
          <sysproperty key="jboss.multiplexer.stack" value="tcp-sync" />
-         <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7650],${node1}[7650]"/> 
+         <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7650],${node1}[7650]"/>
+         <sysproperty key="server.peer.id" value="0" />
       </server>
       <server name="cluster-field-tcp-SYNC-1" host="${node1}">
          <jvmarg value="-Xms128m" />
          <jvmarg value="-Xmx512m" />
          <jvmarg value="-XX:MaxPermSize=512m" />        
          <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
-
-        <sysproperty key="resolve.dns" value="false" />
-        <sysproperty key="jboss.multiplexer.stack" value="tcp-sync" />
-        <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7650],${node1}[7650]"/> 
+         <sysproperty key="resolve.dns" value="false" />
+         <sysproperty key="jboss.multiplexer.stack" value="tcp-sync" />
+         <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7650],${node1}[7650]"/>
+         <sysproperty key="server.peer.id" value="1" /> 
       </server>
       <server name="cluster-tcp-TOTAL-0" host="${node0}">
          <jvmarg value="-Xms128m" />
          <jvmarg value="-Xmx512m" />
          <jvmarg value="-XX:MaxPermSize=512m" />        
          <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
-
          <sysproperty key="resolve.dns" value="false" />
          <sysproperty key="jboss.multiplexer.stack" value="tcp-sync" />
-         <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7650],${node1}[7650]"/> 
+         <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7650],${node1}[7650]"/>
+         <sysproperty key="server.peer.id" value="0" /> 
       </server>
       <server name="cluster-tcp-TOTAL-1" host="${node1}">
          <jvmarg value="-Xms128m" />
          <jvmarg value="-Xmx512m" />
          <jvmarg value="-XX:MaxPermSize=512m" />        
          <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
-
          <sysproperty key="resolve.dns" value="false" />
          <sysproperty key="jboss.multiplexer.stack" value="tcp-sync" />
-         <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7650],${node1}[7650]"/> 
+         <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7650],${node1}[7650]"/>
+         <sysproperty key="server.peer.id" value="1" /> 
       </server>
       <server name="cluster-field-tcp-TOTAL-0" host="${node0}">
          <jvmarg value="-Xms128m" />
          <jvmarg value="-Xmx512m" />
          <jvmarg value="-XX:MaxPermSize=512m" />        
          <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
-
          <sysproperty key="resolve.dns" value="false" />
          <sysproperty key="jboss.multiplexer.stack" value="tcp-sync" />
-         <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7650],${node1}[7650]"/> 
+         <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7650],${node1}[7650]"/>
+         <sysproperty key="server.peer.id" value="0" /> 
       </server>
       <server name="cluster-field-tcp-TOTAL-1" host="${node1}">
          <jvmarg value="-Xms128m" />
          <jvmarg value="-Xmx512m" />
          <jvmarg value="-XX:MaxPermSize=512m" />        
          <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
-
          <sysproperty key="resolve.dns" value="false" />
          <sysproperty key="jboss.multiplexer.stack" value="tcp-sync" />
-         <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7650],${node1}[7650]"/> 
+         <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7650],${node1}[7650]"/>
+         <sysproperty key="server.peer.id" value="1" /> 
       </server>
       <server name="cluster-tcp_nio-0" host="${node0}">
          <jvmarg value="-Xms128m" />
          <jvmarg value="-Xmx512m" />
          <jvmarg value="-XX:MaxPermSize=512m" />        
          <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
-
          <sysproperty key="resolve.dns" value="false" />
          <sysproperty key="jboss.multiplexer.stack" value="tcp_nio" />
-         <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7700],${node1}[7700]"/> 
+         <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7700],${node1}[7700]"/>
+         <sysproperty key="server.peer.id" value="0" /> 
 	  </server>
 	  <server name="cluster-tcp_nio-1" host="${node1}">
         <jvmarg value="-Xms128m" />
         <jvmarg value="-Xmx512m" />
 	     <jvmarg value="-XX:MaxPermSize=512m" />        
 	     <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
-
         <sysproperty key="resolve.dns" value="false" />
 	     <sysproperty key="jboss.multiplexer.stack" value="tcp_nio" />
-        <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7700],${node1}[7700]"/> 
+        <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7700],${node1}[7700]"/>
+        <sysproperty key="server.peer.id" value="1" /> 
 	  </server>
 	  <server name="cluster-field-tcp_nio-0" host="${node0}">
         <jvmarg value="-Xms128m" />
         <jvmarg value="-Xmx512m" />
 	     <jvmarg value="-XX:MaxPermSize=512m" />        
 	     <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
-
         <sysproperty key="resolve.dns" value="false" />
         <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" />
 	  </server>
 	  <server name="cluster-field-tcp_nio-1" host="${node1}">
         <jvmarg value="-Xms128m" />
         <jvmarg value="-Xmx512m" />
 	     <jvmarg value="-XX:MaxPermSize=512m" />        
 	     <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
-
         <sysproperty key="resolve.dns" value="false" />
         <sysproperty key="jboss.multiplexer.stack" value="tcp_nio" />
-        <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7700],${node1}[7700]"/> 
+        <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7700],${node1}[7700]"/>
+        <sysproperty key="server.peer.id" value="1" /> 
 	  </server>
 	  <server name="cluster-tcp_nio-SYNC-0" host="${node0}">
         <jvmarg value="-Xms128m" />
         <jvmarg value="-Xmx512m" />
 	     <jvmarg value="-XX:MaxPermSize=512m" />        
 	     <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
-
         <sysproperty key="resolve.dns" value="false" />
         <sysproperty key="jboss.multiplexer.stack" value="tcp_nio-sync" />
-        <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7750],${node1}[7750]"/> 
+        <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7750],${node1}[7750]"/>
+        <sysproperty key="server.peer.id" value="0" /> 
 	  </server>
 	  <server name="cluster-tcp_nio-SYNC-1" host="${node1}">
         <jvmarg value="-Xms128m" />
         <jvmarg value="-Xmx512m" />
 	     <jvmarg value="-XX:MaxPermSize=512m" />        
 	     <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
-
         <sysproperty key="resolve.dns" value="false" />
         <sysproperty key="jboss.multiplexer.stack" value="tcp_nio-sync" />
-        <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7750],${node1}[7750]"/> 
+        <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7750],${node1}[7750]"/>
+        <sysproperty key="server.peer.id" value="1" />  
 	  </server>
 	  <server name="cluster-field-tcp_nio-SYNC-0" host="${node0}">
         <jvmarg value="-Xms128m" />
         <jvmarg value="-Xmx512m" />
 	     <jvmarg value="-XX:MaxPermSize=512m" />        
 	     <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
-
         <sysproperty key="resolve.dns" value="false" />
         <sysproperty key="jboss.multiplexer.stack" value="tcp_nio-sync" />
-        <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7750],${node1}[7750]"/> 
+        <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7750],${node1}[7750]"/>
+        <sysproperty key="server.peer.id" value="0" />  
 	  </server>
 	  <server name="cluster-field-tcp_nio-SYNC-1" host="${node1}">
         <jvmarg value="-Xms128m" />
         <jvmarg value="-Xmx512m" />
 	     <jvmarg value="-XX:MaxPermSize=512m" />        
 	     <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
-
         <sysproperty key="resolve.dns" value="false" />
         <sysproperty key="jboss.multiplexer.stack" value="tcp_nio-sync" />
-        <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7750],${node1}[7750]"/> 
+        <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7750],${node1}[7750]"/>
+        <sysproperty key="server.peer.id" value="1" />  
 	  </server>
 	  <server name="cluster-tcp_nio-TOTAL-0" host="${node0}">
         <jvmarg value="-Xms128m" />
         <jvmarg value="-Xmx512m" />
 	     <jvmarg value="-XX:MaxPermSize=512m" />        
 	     <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
-
         <sysproperty key="resolve.dns" value="false" />
         <sysproperty key="jboss.multiplexer.stack" value="tcp_nio-sync" />
-        <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7750],${node1}[7750]"/> 
+        <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7750],${node1}[7750]"/>
+        <sysproperty key="server.peer.id" value="0" />  
 	  </server>
 	  <server name="cluster-tcp_nio-TOTAL-1" host="${node1}">
         <jvmarg value="-Xms128m" />
         <jvmarg value="-Xmx512m" />
 	     <jvmarg value="-XX:MaxPermSize=512m" />        
 	     <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
-
         <sysproperty key="resolve.dns" value="false" />
         <sysproperty key="jboss.multiplexer.stack" value="tcp_nio-sync" />
-        <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7750],${node1}[7750]"/> 
+        <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7750],${node1}[7750]"/>
+        <sysproperty key="server.peer.id" value="1" />  
 	  </server>
 	  <server name="cluster-field-tcp_nio-TOTAL-0" host="${node0}">
         <jvmarg value="-Xms128m" />
         <jvmarg value="-Xmx512m" />
 	     <jvmarg value="-XX:MaxPermSize=512m" />        
 	     <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
-
         <sysproperty key="resolve.dns" value="false" />
         <sysproperty key="jboss.multiplexer.stack" value="tcp_nio-sync" />
-        <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7750],${node1}[7750]"/> 
+        <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7750],${node1}[7750]"/>
+        <sysproperty key="server.peer.id" value="0" />  
 	  </server>
 	  <server name="cluster-field-tcp_nio-TOTAL-1" host="${node1}">
         <jvmarg value="-Xms128m" />
         <jvmarg value="-Xmx512m" />
 	     <jvmarg value="-XX:MaxPermSize=512m" />        
 	     <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
-
         <sysproperty key="resolve.dns" value="false" />
         <sysproperty key="jboss.multiplexer.stack" value="tcp_nio-sync" />
-        <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7750],${node1}[7750]"/> 
+        <sysproperty key="jgroups.tcpping.initial_hosts" value="${node0}[7750],${node1}[7750]"/>
+        <sysproperty key="server.peer.id" value="1" />  
 	  </server>
       <server name="tomcat-sso-cluster0" host="${node0}">
          <jvmarg value="-Xms128m" />
          <jvmarg value="-Xmx512m" />
          <jvmarg value="-XX:MaxPermSize=512m" />        
          <sysproperty key="resolve.dns" value="false" />
-        <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
-        <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
+         <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
+         <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
+         <sysproperty key="server.peer.id" value="0" /> 
       </server>
       <server name="tomcat-sso-cluster1" host="${node1}">
          <jvmarg value="-Xms128m" />
          <jvmarg value="-Xmx512m" />
          <jvmarg value="-XX:MaxPermSize=512m" />        
          <sysproperty key="resolve.dns" value="false" />
-        <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
-        <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
+         <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
+         <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
+         <sysproperty key="server.peer.id" value="1" /> 
       </server>
       <server name="tomcat-sso-cluster-br0" host="${node0}">
          <jvmarg value="-Xms128m" />
          <jvmarg value="-Xmx512m" />
          <jvmarg value="-XX:MaxPermSize=512m" />        
          <sysproperty key="resolve.dns" value="false" />
-        <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
-        <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
+         <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
+         <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
+         <sysproperty key="server.peer.id" value="0" /> 
       </server>
       <server name="tomcat-sso-cluster-br1" host="${node1}">
          <jvmarg value="-Xms128m" />
          <jvmarg value="-Xmx512m" />
          <jvmarg value="-XX:MaxPermSize=512m" />        
          <sysproperty key="resolve.dns" value="false" />
-        <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
-        <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
+         <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
+         <sysproperty key="jboss.multiplexer.stack" value="udp-sync" />
+         <sysproperty key="server.peer.id" value="1" /> 
       </server>
       <server name="binding-manager1" host="${node0}" httpPort="8180" rmiPort="1199">
         <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
@@ -709,7 +727,7 @@
    <macrodef name="create-cluster-node"
       description="Create a simplified cluster configuration">
       <attribute name="conf"/>
-      <sequential>
+   	<sequential>
          <delete dir="${jboss.dist}/server/@{conf}" failonerror="false"/>
          <echo message="creating @{conf} config, jboss.dist=${jboss.dist}"/>
          <copy todir="${jboss.dist}/server/@{conf}">
@@ -751,6 +769,9 @@
         <antcall target="modify-ejb3-repl_sync">
              <param name="file_" value="${jboss.dist}/server/@{conf}/deploy/cluster/ejb3-clustered-sfsbcache-beans.xml"/>
         </antcall>
+         <antcall target="modify-jbm-serverpeerid">
+              <param name="file_" value="${jboss.dist}/server/@{conf}/deploy/messaging/messaging-service.xml"/>
+         </antcall>
       </sequential>
    </macrodef>
 
@@ -822,6 +843,13 @@
            match="REPL_ASYNC"
            replace="REPL_SYNC"/>
    </target>
+
+   <target name="modify-jbm-serverpeerid">
+       <echo message="Making the ServerPeerID externally configurable in ${file_}"/>
+       <replaceregexp file="${file_}" byline="yes" flags="is"
+           match="ServerPeerID&quot;&gt;0&lt;"
+           replace="ServerPeerID&quot;&gt;${server.peer.id:0}&lt;"/>
+   </target>
 	
    <!-- A macro for creating a clustered sso config -->
    <macrodef name="create-cluster-sso-node"




More information about the jboss-cvs-commits mailing list