[jboss-cvs] JBossAS SVN: r96586 - branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite.

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

Author: rachmatowicz at jboss.com
Date: 2009-11-19 11:32:13 -0500 (Thu, 19 Nov 2009)
New Revision: 96586

Modified:
   branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/build.xml
Log:
Fix up missing modifications to jbosstest.cluster.node entries and URLs in targets.

Modified: branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/build.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/build.xml	2009-11-19 16:05:29 UTC (rev 96585)
+++ branches/JBPAPP_4_2_0_GA_CP_IPV6/testsuite/build.xml	2009-11-19 16:32:13 UTC (rev 96586)
@@ -1163,12 +1163,17 @@
       <sysproperty key="jboss.dist" value="${jboss.dist}"/>
       <sysproperty key="jboss.internal-server.serverroot" value="${jboss.dist}/server"/>
       <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
+	  <!-- these values override any generation of defaults in JBossTestClusteredServices -->
       <sysproperty key="jbosstest.cluster.node0" value="${node0}"/>
+      <sysproperty key="jbosstest.cluster.node0.url" value="${node0.url}"/>
       <sysproperty key="jbosstest.cluster.node0.http.url" value="${node0.http.url}"/>
       <sysproperty key="jbosstest.cluster.node0.jndi.url" value="${node0.jndi.url}"/>
+      <sysproperty key="jbosstest.cluster.node0.hajndi.url" value="${node0.hajndi.url}"/>
       <sysproperty key="jbosstest.cluster.node1" value="${node1}"/>
+      <sysproperty key="jbosstest.cluster.node1.url" value="${node1.url}"/>
       <sysproperty key="jbosstest.cluster.node1.http.url" value="${node1.http.url}"/>
       <sysproperty key="jbosstest.cluster.node1.jndi.url" value="${node1.jndi.url}"/>
+      <sysproperty key="jbosstest.cluster.node1.hajndi.url" value="${node1.hajndi.url}"/>
       <sysproperty key="build.testlog" value="${build.testlog}"/>
       <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
       <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
@@ -1384,7 +1389,7 @@
     <java classname="org.jboss.Main" fork="true" spawn="true" dir="${jboss.dist}/bin">
       <classpath refid="jboss.boot.classpath"/>
       <jvmarg line="-Xmx128m"/>
-      <arg value="--netboot=http://${node0}:18080/"/>
+      <arg value="--netboot=http://${node0.url}:18080/"/>
       <arg value="-b"/>
       <arg value="${node0}"/>
     </java>
@@ -1395,7 +1400,7 @@
     <run-junit junit.patternset="netboot.includes"
     />
     -->
-    <stop-jboss url="jnp://${node0}:11099"/>
+    <stop-jboss url="jnp://${node0.url}:11099"/>
   </target>
 
   <target name="tests-apache-tomcat-clustering" description="Execute clustering tests requiring an apache load balanced two TC nodes.">
@@ -2102,12 +2107,16 @@
       <sysproperty key="jboss.internal-server.serverroot" value="${jboss.dist}/server"/>
       <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
       <sysproperty key="jbosstest.cluster.node0" value="${node0}"/>
+      <sysproperty key="jbosstest.cluster.node0.url" value="${node0.url}"/>
       <sysproperty key="jbosstest.cluster.node0.http.url" value="${node0.http.url}"/>
       <sysproperty key="jbosstest.cluster.node0.jndi.url" value="${node0.jndi.url}"/>
+      <sysproperty key="jbosstest.cluster.node0.hajndi.url" value="${node0.hajndi.url}"/>
       <sysproperty key="jbosstest.cluster.node0.serverroot" value="${jboss.dist}/server/${jbosstest.cluster.node0.config}"/>
       <sysproperty key="jbosstest.cluster.node1" value="${node1}"/>
+      <sysproperty key="jbosstest.cluster.node1.url" value="${node1.url}"/>
       <sysproperty key="jbosstest.cluster.node1.http.url" value="${node1.http.url}"/>
       <sysproperty key="jbosstest.cluster.node1.jndi.url" value="${node1.jndi.url}"/>
+      <sysproperty key="jbosstest.cluster.node1.hajndi.url" value="${node1.hajndi.url}"/>
       <sysproperty key="jbosstest.cluster.node1.serverroot" value="${jboss.dist}/server/${jbosstest.cluster.node1.config}"/>
       <sysproperty key="build.testlog" value="${build.testlog}"/>
       <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
@@ -2354,7 +2363,7 @@
     <mkdir dir="${build.reports}"/>
     <mkdir dir="${build.testlog}"/>
     <waitfor maxwait="60" maxwaitunit="second" checkevery="5" checkeveryunit="second" timeoutproperty="startup.timeout">
-      <http url="http://${node0}:8080/"/>
+      <http url="http://${node0.url}:8080/"/>
     </waitfor>
     <fail message="Timeout waiting for server to start" if="startup.timeout"/>
     <property name="jbosstest.secure" value="true"/>
@@ -2715,7 +2724,7 @@
       <jvmarg value="-Djacorb.log.loggerFactory=org.jboss.util.Log4jLoggerFactory"/>
       <jvmarg value="-Djacorb.security.ssl.client.supported_options=0"/>
       <jvmarg value="-Djacorb.security.ssl.client.required_options=0"/>
-      <jvmarg value="-DORBInitRef.NameService=corbaloc::${node0}:3528/JBoss/Naming/root"/>
+      <jvmarg value="-DORBInitRef.NameService=corbaloc::${node0.url}:3528/JBoss/Naming/root"/>
       <jvmarg value="-Dorg.omg.PortableInterceptor.ORBInitializerClass.org.jboss.tm.iiop.TxClientInterceptorInitializer"/>
       <jvmarg value="-Djava.security.manager"/>
       <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
@@ -3234,7 +3243,7 @@
       <jvmarg value="-Djacorb.security.ssl.client.required_options=0"/>
       <jvmarg value="-Djava.security.manager"/>
       <jvmarg value="-Djava.security.policy==${build.resources}/${test}/client.policy"/>
-      <jvmarg value="-DORBInitRef.NameService=corbaloc::${node0}:3528/JBoss/Naming/root"/>
+      <jvmarg value="-DORBInitRef.NameService=corbaloc::${node0.url}:3528/JBoss/Naming/root"/>
       <jvmarg value="-Dorg.omg.PortableInterceptor.ORBInitializerClass.org.jboss.tm.iiop.TxClientInterceptorInitializer"/>
 
       <sysproperty key="log4j.properties" file="${build.resources}/log4j.properties"/>