[jboss-cvs] JBossAS SVN: r106381 - branches/Branch_No_Multicast/testsuite/imports.

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

Author: pferraro
Date: 2010-07-01 13:27:21 -0400 (Thu, 01 Jul 2010)
New Revision: 106381

Modified:
   branches/Branch_No_Multicast/testsuite/imports/server-config.xml
Log:
Avoid duplicate jvmRoute attributes using http-cluster-node-config-change macro

Modified: branches/Branch_No_Multicast/testsuite/imports/server-config.xml
===================================================================
--- branches/Branch_No_Multicast/testsuite/imports/server-config.xml	2010-07-01 16:58:32 UTC (rev 106380)
+++ branches/Branch_No_Multicast/testsuite/imports/server-config.xml	2010-07-01 17:27:21 UTC (rev 106381)
@@ -139,6 +139,7 @@
          <jvmarg value="-XX:MaxPermSize=512m" />
          <jvmarg value="-Xmx512m" />
 -->
+         <sysproperty key="jboss.jvmRoute" value="${node0}"/>
          <sysproperty key="java.net.preferIPv4Stack" value="true" />
          <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
          <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
@@ -1618,8 +1619,10 @@
       <attribute name="conf"/>
       <sequential>
          <!-- Added jvmRoute in server.xml -->
-      	 <echo message="Giving a name to the Tomcat instance under ${jboss.dist}/server/@{conf}"/>
-      	 <replace file="${jboss.dist}/server/@{conf}/deploy/jbossweb.sar/server.xml"
+          <echo message="Giving a name to the Tomcat instance under ${jboss.dist}/server/@{conf}"/>
+          <replace file="${jboss.dist}/server/@{conf}/deploy/jbossweb.sar/server.xml"
+           token="jvmRoute=&quot;$${jboss.jvmRoute}&quot;" value=""/>
+          <replace file="${jboss.dist}/server/@{conf}/deploy/jbossweb.sar/server.xml"
            token="jvmRoute=&quot;@{conf}&quot;" value=""/>
           <replace file="${jboss.dist}/server/@{conf}/deploy/jbossweb.sar/server.xml"
             token="defaultHost" value="jvmRoute=&quot;@{conf}&quot; defaultHost"/>