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

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

Author: akostadinov
Date: 2011-04-29 01:45:24 -0400 (Fri, 29 Apr 2011)
New Revision: 111264

Modified:
   branches/JBPAPP_5_1/testsuite/imports/config/tests-clustering.xml
Log:
JBPAPP-6415 tests-clustering-configure target should not depend on `conf' property because clustering-core-tests does not expect that; also make tests-clustering-cluster-ec2 consistent

Modified: branches/JBPAPP_5_1/testsuite/imports/config/tests-clustering.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/imports/config/tests-clustering.xml	2011-04-28 17:51:07 UTC (rev 111263)
+++ branches/JBPAPP_5_1/testsuite/imports/config/tests-clustering.xml	2011-04-29 05:45:24 UTC (rev 111264)
@@ -321,10 +321,9 @@
   <target name="tests-clustering-configure" unless="${tests.clustering.skip.startup}">
   	 <!-- Default configuration to build the test config from -->
   	 <property name="baseconf" value="all"/>
-     <property name="conf" value="cluster-${jboss.default.jgroups.stack}"/>
      <property name="newconf-src" value="cluster-${jboss.default.jgroups.stack}"/>
-    <create-cluster-node-from-baseconf conf="${conf}-0" baseconf="${baseconf}" newconf-src="${newconf-src}"/>
-    <create-cluster-node-from-baseconf conf="${conf}-1" baseconf="${baseconf}" newconf-src="${newconf-src}"/>
+    <create-cluster-node-from-baseconf conf="cluster-${jboss.default.jgroups.stack}-0" baseconf="${baseconf}" newconf-src="${newconf-src}"/>
+    <create-cluster-node-from-baseconf conf="cluster-${jboss.default.jgroups.stack}-1" baseconf="${baseconf}" newconf-src="${newconf-src}"/>
   </target>
 
   <target name="tests-clustering-field-configure" unless="${tests.clustering.skip.startup}">
@@ -476,18 +475,9 @@
   
   <target name="tests-clustering-cluster-ec2">
 
-    <!-- Create tests-configs content for cluster-tcp-0/1 from the cluster-udp content -->
-    <mkdir dir="${build.resources}/test-configs/cluster-tcp-0"/>
-    <copy todir="${build.resources}/test-configs/cluster-tcp-0">
-      <fileset dir="${build.resources}/test-configs/cluster-udp-0" />
-    </copy>
-    <mkdir dir="${build.resources}/test-configs/cluster-tcp-1"/>
-    <copy todir="${build.resources}/test-configs/cluster-tcp-1">
-      <fileset dir="${build.resources}/test-configs/cluster-udp-1" />
-    </copy>	
-
     <antcall target="tests-clustering">
       <param name="jboss.default.jgroups.stack" value="tcp"/>
+      <param name="newconf-src" value="cluster-udp"/>
       <param name="baseconf" value="cluster-ec2"/>
       <param name="cluster.excludes.refid" value="ec2.excludes"/>
     </antcall>