[Jboss-cvs] JBossAS SVN: r55432 - branches/Branch_4_0/testsuite

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Aug 9 01:11:57 EDT 2006


Author: bstansberry at jboss.com
Date: 2006-08-09 01:11:54 -0400 (Wed, 09 Aug 2006)
New Revision: 55432

Modified:
   branches/Branch_4_0/testsuite/build.xml
Log:
Use separate config for each cluster setup

Modified: branches/Branch_4_0/testsuite/build.xml
===================================================================
--- branches/Branch_4_0/testsuite/build.xml	2006-08-09 05:08:49 UTC (rev 55431)
+++ branches/Branch_4_0/testsuite/build.xml	2006-08-09 05:11:54 UTC (rev 55432)
@@ -1053,8 +1053,8 @@
 
     <antcall target="tests-clustering-configure" inheritRefs="true"/>
 
-    <server:start name="node0"/>
-    <server:start name="node1"/>
+    <server:start name="cluster-${jboss-junit-configuration}-0"/>
+    <server:start name="cluster-${jboss-junit-configuration}-1"/>
 
     <echo message="Going to call target tests-clustering-unit for non-HTTP tests"/>
 
@@ -1070,8 +1070,8 @@
       <param name="jboss-junit-configuration" value="Default-${jboss-junit-configuration}"/>
     </antcall>
 
-    <server:stop name="node0"/>
-    <server:stop name="node1"/>
+    <server:stop name="cluster-${jboss-junit-configuration}-0"/>
+    <server:stop name="cluster-${jboss-junit-configuration}-1"/>
 
     <sleep seconds="4"/>
 
@@ -1079,27 +1079,25 @@
 
     <antcall target="tests-clustering-field-configure" inheritRefs="true"/>
 
-    <server:start name="node0"/>
-    <server:start name="node1"/>
+    <server:start name="cluster-field-${jboss-junit-configuration}-0"/>
+    <server:start name="cluster-field-${jboss-junit-configuration}-1"/>
 
     <antcall target="tests-clustering-unit">
       <param name="cluster.includes.refid" value="cluster.field.includes"/>
       <param name="jboss-junit-configuration" value="Default-${jboss-junit-configuration}"/>
     </antcall>
 
-    <server:stop name="node0"/>
-    <server:stop name="node1"/>
+    <server:stop name="cluster-field-${jboss-junit-configuration}-0"/>
+    <server:stop name="cluster-field-${jboss-junit-configuration}-1"/>
 
     <sleep seconds="4"/>
 
     <echo message="Going to call target tests-clustering-unit again with new configuration (SYNC, no BR)"/>
 
-    <antcall target="tests-clustering-startup-with-config-change">
-       <param name="br.enabled" value="false"/>
-    </antcall>
+    <antcall target="tests-clustering-sync-configure"/>
 
-    <server:start name="node0"/>
-    <server:start name="node1"/>
+    <server:start name="cluster-${jboss-junit-configuration}-SYNC-0"/>
+    <server:start name="cluster-${jboss-junit-configuration}-SYNC-1"/>
 
     <antcall target="tests-clustering-unit">
       <param name="cluster.includes.refid" value="cluster.http.jk.includes"/>
@@ -1111,104 +1109,120 @@
       <param name="jboss-junit-configuration" value="SyncModeNUseJvm-${jboss-junit-configuration}"/>
     </antcall>
 
-    <server:stop name="node0"/>
-    <server:stop name="node1"/>
+    <server:stop name="cluster-${jboss-junit-configuration}-SYNC-0"/>
+    <server:stop name="cluster-${jboss-junit-configuration}-SYNC-1"/>
 
     <sleep seconds="4"/>
 
     <echo message="Going to call target tests-clustering-unit again for FIELD granularity tests with new configuration (SYNC, no BR)"/>
 
-    <antcall target="tests-clustering-field-startup-with-config-change">
-       <param name="br.enabled" value="false"/>
-    </antcall>
+    <antcall target="tests-clustering-field-sync-configure"/>
 
-    <server:start name="node0"/>
-    <server:start name="node1"/>
+    <server:start name="cluster-field-${jboss-junit-configuration}-SYNC-0"/>
+    <server:start name="cluster-field-${jboss-junit-configuration}-SYNC-1"/>
 
     <antcall target="tests-clustering-unit">
       <param name="cluster.includes.refid" value="cluster.field.includes"/>
       <param name="jboss-junit-configuration" value="SyncModeNUseJvm-${jboss-junit-configuration}"/>
     </antcall>
 
-    <server:stop name="node0"/>
-    <server:stop name="node1"/>
+    <server:stop name="cluster-field-${jboss-junit-configuration}-SYNC-0"/>
+    <server:stop name="cluster-field-${jboss-junit-configuration}-SYNC-1"/>
 
     <sleep seconds="4"/>
 
     <echo message="Going to call target tests-clustering-unit again with new configuration (SYNC, with BR)"/>
 
-    <antcall target="tests-clustering-startup-with-config-change">
-       <param name="br.enabled" value="true"/>
-    </antcall>
+    <antcall target="tests-clustering-br-configure"/>
 
-    <server:start name="node0"/>
-    <server:start name="node1"/>
+    <server:start name="cluster-${jboss-junit-configuration}-BR-0"/>
+    <server:start name="cluster-${jboss-junit-configuration}-BR-1"/>
 
     <antcall target="tests-clustering-unit">
       <param name="cluster.includes.refid" value="cluster.http.includes"/>
       <param name="jboss-junit-configuration" value="BuddyReplEnabled-${jboss-junit-configuration}"/>
     </antcall>
 
-    <server:stop name="node0"/>
-    <server:stop name="node1"/>
+    <server:stop name="cluster-${jboss-junit-configuration}-BR-0"/>
+    <server:stop name="cluster-${jboss-junit-configuration}-BR-1"/>
 
     <sleep seconds="4"/>
 
     <echo message="Going to call target tests-clustering-unit again for FIELD granularity tests with new configuration (SYNC, with BR)"/>
 
-    <antcall target="tests-clustering-field-startup-with-config-change">
-       <param name="br.enabled" value="true"/>
-    </antcall>
+    <antcall target="tests-clustering-field-br-configure"/>
 
-    <server:start name="node0"/>
-    <server:start name="node1"/>
+    <server:start name="cluster-field-${jboss-junit-configuration}-BR-0"/>
+    <server:start name="cluster-field-${jboss-junit-configuration}-BR-1"/>
 
     <antcall target="tests-clustering-unit">
       <param name="cluster.includes.refid" value="cluster.field.includes"/>
       <param name="jboss-junit-configuration" value="BuddyReplEnabled-${jboss-junit-configuration}"/>
     </antcall>
 
-    <server:stop name="node0"/>
-    <server:stop name="node1"/>
+    <server:stop name="cluster-field-${jboss-junit-configuration}-BR-0"/>
+    <server:stop name="cluster-field-${jboss-junit-configuration}-BR-1"/>
 
   </target>
 
   <target name="tests-clustering-configure" unless="${tests.clustering.skip.startup}">
-    <create-cluster-node conf="node0" host="${node0}"/>
-    <create-cluster-node conf="node1" host="${node1}"/>
+    <create-cluster-node conf="cluster-${jboss-junit-configuration}-0" host="${node0}"/>
+    <create-cluster-node conf="cluster-${jboss-junit-configuration}-1" host="${node1}"/>
   </target>
 
   <target name="tests-clustering-field-configure" unless="${tests.clustering.skip.startup}">
-    <create-cluster-node conf="node0" host="${node0}"/>
-    <create-cluster-node conf="node1" host="${node1}"/>
+    <create-cluster-node conf="cluster-field-${jboss-junit-configuration}-0" host="${node0}"/>
+    <create-cluster-node conf="cluster-field-${jboss-junit-configuration}-1" host="${node1}"/>
 
     <echo message="Modifying the node0 and node1 Tomcat configuration for FIELD"/>
-    <http-cluster-field-node-config-change conf="node0"/>
-    <http-cluster-field-node-config-change conf="node1"/>
+    <http-cluster-field-node-config-change conf="cluster-field-${jboss-junit-configuration}-0"/>
+    <http-cluster-field-node-config-change conf="cluster-field-${jboss-junit-configuration}-1"/>
   </target>
 
-  <target name="tests-clustering-startup-with-config-change" unless="${tests.clustering.skip.startup}">
-    <create-cluster-node conf="node0" host="${node0}"/>
-    <create-cluster-node conf="node1" host="${node1}"/>
+  <target name="tests-clustering-sync-configure" unless="${tests.clustering.skip.startup}">
+    <create-cluster-node conf="cluster-${jboss-junit-configuration}-SYNC-0" host="${node0}"/>
+    <create-cluster-node conf="cluster-${jboss-junit-configuration}-SYNC-1" host="${node1}"/>
 
-    <echo message="Modifying the node0 and node1 Tomcat configuration for REPL_SYNC/UseJK/BR=${br.enabled}"/>
-    <http-cluster-node-config-change conf="node0" useBuddyRepl="${br.enabled}"/>
-    <http-cluster-node-config-change conf="node1" useBuddyRepl="${br.enabled}"/>
+    <echo message="Modifying the node0 and node1 Tomcat configuration for REPL_SYNC/UseJK"/>
+    <http-cluster-node-config-change conf="cluster-${jboss-junit-configuration}-SYNC-0" useBuddyRepl="false"/>
+    <http-cluster-node-config-change conf="cluster-${jboss-junit-configuration}-SYNC-1" useBuddyRepl="false"/>
   </target>
 
-  <target name="tests-clustering-field-startup-with-config-change" unless="${tests.clustering.skip.startup}">
-    <create-cluster-node conf="node0" host="${node0}"/>
-    <create-cluster-node conf="node1" host="${node1}"/>
+  <target name="tests-clustering-field-sync-configure" unless="${tests.clustering.skip.startup}">
+    <create-cluster-node conf="cluster-field-${jboss-junit-configuration}-SYNC-0" host="${node0}"/>
+    <create-cluster-node conf="cluster-field-${jboss-junit-configuration}-SYNC-1" host="${node1}"/>
 
     <echo message="Modifying the node0 and node1 Tomcat configuration for FIELD"/>
-    <http-cluster-field-node-config-change conf="node0"/>
-    <http-cluster-field-node-config-change conf="node1"/>
+    <http-cluster-field-node-config-change conf="cluster-field-${jboss-junit-configuration}-SYNC-0"/>
+    <http-cluster-field-node-config-change conf="cluster-field-${jboss-junit-configuration}-SYNC-1"/>
 
-    <echo message="Modifying the node0 and node1 Tomcat configuration for REPL_SYNC/UseJK/BR=${br.enabled}"/>
-    <http-cluster-node-config-change conf="node0" useBuddyRepl="${br.enabled}"/>
-    <http-cluster-node-config-change conf="node1" useBuddyRepl="${br.enabled}"/>
+    <echo message="Modifying the node0 and node1 Tomcat configuration for REPL_SYNC/UseJK"/>
+    <http-cluster-node-config-change conf="cluster-field-${jboss-junit-configuration}-SYNC-0" useBuddyRepl="false"/>
+    <http-cluster-node-config-change conf="cluster-field-${jboss-junit-configuration}-SYNC-1" useBuddyRepl="false"/>
   </target>
 
+  <target name="tests-clustering-br-configure" unless="${tests.clustering.skip.startup}">
+    <create-cluster-node conf="cluster-${jboss-junit-configuration}-BR-0" host="${node0}"/>
+    <create-cluster-node conf="cluster-${jboss-junit-configuration}-BR-1" host="${node1}"/>
+
+    <echo message="Modifying the node0 and node1 Tomcat configuration for REPL_SYNC/UseJK/BR"/>
+    <http-cluster-node-config-change conf="cluster-${jboss-junit-configuration}-SYNC-0" useBuddyRepl="true"/>
+    <http-cluster-node-config-change conf="cluster-${jboss-junit-configuration}-SYNC-1" useBuddyRepl="true"/>
+  </target>
+
+  <target name="tests-clustering-field-br-configure" unless="${tests.clustering.skip.startup}">
+    <create-cluster-node conf="cluster-field-${jboss-junit-configuration}-BR-0" host="${node0}"/>
+    <create-cluster-node conf="cluster-field-${jboss-junit-configuration}-BR-1" host="${node1}"/>
+
+    <echo message="Modifying the node0 and node1 Tomcat configuration for FIELD"/>
+    <http-cluster-field-node-config-change conf="cluster-field-${jboss-junit-configuration}-BR-0"/>
+    <http-cluster-field-node-config-change conf="cluster-field-${jboss-junit-configuration}-BR-1"/>
+
+    <echo message="Modifying the node0 and node1 Tomcat configuration for REPL_SYNC/UseJK/BR"/>
+    <http-cluster-node-config-change conf="cluster-field-${jboss-junit-configuration}-SYNC-0" useBuddyRepl="true"/>
+    <http-cluster-node-config-change conf="cluster-field-${jboss-junit-configuration}-SYNC-1" useBuddyRepl="true"/>
+  </target>
+
   <!-- Tests of tomcat needing a ssl connector
   -->
   <target name="tomcat-ssl-tests"




More information about the jboss-cvs-commits mailing list