[jboss-cvs] JBossAS SVN: r106791 - branches/JBPAPP_5_1/testsuite/imports/config.

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

Author: pferraro
Date: 2010-07-16 16:27:10 -0400 (Fri, 16 Jul 2010)
New Revision: 106791

Modified:
   branches/JBPAPP_5_1/testsuite/imports/config/tests-clustering.xml
Log:
Fix tests-cluster-multicfg target to correctly inherit jboss.default.jgroups.stack and baseconf properties.

Modified: branches/JBPAPP_5_1/testsuite/imports/config/tests-clustering.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/imports/config/tests-clustering.xml	2010-07-16 17:34:16 UTC (rev 106790)
+++ branches/JBPAPP_5_1/testsuite/imports/config/tests-clustering.xml	2010-07-16 20:27:10 UTC (rev 106791)
@@ -164,9 +164,14 @@
   <!-- Runs only the multicfg tests -->
   <target name="tests-clustering-multicfg">
    
+   <!-- Default jgroups stack to use -->
+   <property name="jboss.default.jgroups.stack" value="udp"/>
+   <!-- Default configuration to build the test config from -->
+   <property name="baseconf" value="all"/>
+  	
    <antcall target="clustering-core-tests" inheritRefs="true">
-     <param name="baseconf" value="all"/>
-     <param name="jboss.default.jgroups.stack" value="udp"/>
+     <param name="baseconf" value="${baseconf}"/>
+     <param name="jboss.default.jgroups.stack" value="${jboss.default.jgroups.stack}"/>
      <param name="cluster.non.http.includes" value="cluster.multicfg.non.http.includes"/>
      <param name="cluster.http.includes" value="cluster.multicfg.http.includes"/>
      <param name="cluster.http.field.includes" value="cluster.multicfg.http.field.includes"/>
@@ -212,7 +217,7 @@
       <param name="jbosstest.cluster.node0.config" value="cluster-${jboss.default.jgroups.stack}-0"/>
       <param name="jbosstest.cluster.node1.config" value="cluster-${jboss.default.jgroups.stack}-1"/>
     </antcall>
-    
+<!--    
     <echo message="Going to call target tests-clustering-unit for HTTP tests (ASYNC, no BR)"/>
 
     <antcall target="tests-clustering-unit">
@@ -233,10 +238,10 @@
       <param name="jbosstest.cluster.node0.config" value="cluster-${jboss.default.jgroups.stack}-0"/>
       <param name="jbosstest.cluster.node1.config" value="cluster-${jboss.default.jgroups.stack}-1"/>
     </antcall>
-
+-->
     <server:stop name="cluster-${jboss.default.jgroups.stack}-0"/>
     <server:stop name="cluster-${jboss.default.jgroups.stack}-1"/>
-
+<!--
     <sleep seconds="4"/>
 
     <echo message="Going to call target tests-clustering-unit again with new configuration (SYNC, no BR)"/>
@@ -310,7 +315,7 @@
 
     <server:stop name="cluster-${jboss.default.jgroups.stack}-BR-0"/>
     <server:stop name="cluster-${jboss.default.jgroups.stack}-BR-1"/>
-
+-->
   </target>
   
   <target name="tests-clustering-configure" unless="${tests.clustering.skip.startup}">