Author: jfrederic.clere(a)jboss.com
Date: 2009-07-24 06:12:48 -0400 (Fri, 24 Jul 2009)
New Revision: 2505
Modified:
trunk/mod_cluster/test/java/build.xml
Log:
Make it simpler to read.
Modified: trunk/mod_cluster/test/java/build.xml
===================================================================
--- trunk/mod_cluster/test/java/build.xml 2009-07-24 09:35:04 UTC (rev 2504)
+++ trunk/mod_cluster/test/java/build.xml 2009-07-24 10:12:48 UTC (rev 2505)
@@ -199,33 +199,30 @@
</target>
<!-- Test the domain logic -->
- <target name="domain" depends="compile">
- <copy file="conf/web.xml" todir="${test.classes}/conf"/>
- <!-- Create 4 server with a port to stop them -->
+ <target name="startjbossweb">
<java dir="${test.classes}"
classname="org.jboss.mod_cluster.StartJBossWeb"
spawn="true" fork="yes">
- <arg line="8009 node1 dom1 8005"/>
+ <arg line="${line}"/>
<jvmarg line="-Dcluster=${cluster}"/>
<classpath refid="tomcat.test.classpath"/>
</java>
- <java dir="${test.classes}"
classname="org.jboss.mod_cluster.StartJBossWeb"
- spawn="true" fork="yes">
- <arg line="8010 node2 dom1 8006"/>
- <jvmarg line="-Dcluster=${cluster}"/>
- <classpath refid="tomcat.test.classpath"/>
- </java>
- <java dir="${test.classes}"
classname="org.jboss.mod_cluster.StartJBossWeb"
- spawn="true" fork="yes">
- <arg line="8011 node3 dom2 8007"/>
- <jvmarg line="-Dcluster=${cluster}"/>
- <classpath refid="tomcat.test.classpath"/>
- </java>
- <java dir="${test.classes}"
classname="org.jboss.mod_cluster.StartJBossWeb"
- spawn="true" fork="yes">
- <arg line="8012 node4 dom2 8008"/>
- <jvmarg line="-Dcluster=${cluster}"/>
- <classpath refid="tomcat.test.classpath"/>
- </java>
+ <echo message="startjbossweb ${line}"/>
+ </target>
+ <target name="domain" depends="compile">
+ <copy file="conf/web.xml" todir="${test.classes}/conf"/>
+ <!-- Create 4 server with a port to stop them -->
+ <antcall target="startjbossweb">
+ <param name="line" value="8009 node1 dom1 8005"/>
+ </antcall>
+ <antcall target="startjbossweb">
+ <param name="line" value="8010 node2 dom1 8006"/>
+ </antcall>
+ <antcall target="startjbossweb">
+ <param name="line" value="8011 node3 dom2 8007"/>
+ </antcall>
+ <antcall target="startjbossweb">
+ <param name="line" value="8012 node4 dom2 8008"/>
+ </antcall>
<!-- Run a test : connect, get the node, stop it and check we stay on the domain
-->
<java dir="${test.classes}" classname="${test.runner}"
fork="yes" failonerror="${test.failonerror}">
<arg value="org.jboss.mod_cluster.Maintest"/>
Show replies by date