[jboss-cvs] JBossAS SVN: r91635 - in branches/JBPAPP_5_0/testsuite/imports: config and 1 other directory.

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

Author: rachmatowicz at jboss.com
Date: 2009-07-24 10:19:16 -0400 (Fri, 24 Jul 2009)
New Revision: 91635

Modified:
   branches/JBPAPP_5_0/testsuite/imports/config/tests-clustering.xml
   branches/JBPAPP_5_0/testsuite/imports/server-config.xml
Log:
Get rid of some unneeded macros and targets for TCPGOSSIP based clustering tests.

Modified: branches/JBPAPP_5_0/testsuite/imports/config/tests-clustering.xml
===================================================================
--- branches/JBPAPP_5_0/testsuite/imports/config/tests-clustering.xml	2009-07-24 13:00:10 UTC (rev 91634)
+++ branches/JBPAPP_5_0/testsuite/imports/config/tests-clustering.xml	2009-07-24 14:19:16 UTC (rev 91635)
@@ -451,43 +451,8 @@
 		   <fileset dir="${build.resources}/test-configs/cluster-tcpgossip-1"/>
 		</copy>		
 	</target>
-	
-	<target name="tests-clustered-tcpgossip">
-
-	    <mkdir dir="${build.reports}"/>
-	    <mkdir dir="${build.testlog}"/>
-	      
-	    <create-tcpgossip-config conf="cluster-tcpgossip-0" />
-		<!-- deploy the gossiprouter MBean into tcpgossip-0 only -->
-		<copy todir="${jboss.dist}/server/cluster-tcpgossip-0/deploy">
-		   <fileset dir="${build.lib}">
-		     <include name="gossiprouter-service.sar"/> 
-		   </fileset>
-		</copy>
-	    <create-tcpgossip-config conf="cluster-tcpgossip-1" />
 		
-	    <server:start name="cluster-tcpgossip-0"/>
-		<!--
-	    <server:start name="cluster-tcpgossip-1"/>
-	    -->  
-		
-		<!--
-	    <antcall target="tests-clustering-unit">
-	      <param name="cluster.includes.refid" value="cluster.ustxsticky.includes"/>
-	      <param name="jboss-junit-configuration" value="ClusteredTcpGossip"/>
-	      <param name="jbosstest.cluster.node0.config" value="cluster-tcpgossip-0"/>
-	      <param name="jbosstest.cluster.node1.config" value="cluster-tcpgossip-1"/>
-	    </antcall>
-	     -->
-	     
-	    <server:stop name="cluster-tcpgossip-0"/>
-		<!--
-	    <server:stop name="cluster-tcpgossip-1"/>
-	    -->
-		
-	  </target> 
 	
-	
    <!-- Executes a set of tests in a clustered environment -->  
    <target name="tests-clustering-unit">
       <mkdir dir="${build.reports}"/>

Modified: branches/JBPAPP_5_0/testsuite/imports/server-config.xml
===================================================================
--- branches/JBPAPP_5_0/testsuite/imports/server-config.xml	2009-07-24 13:00:10 UTC (rev 91634)
+++ branches/JBPAPP_5_0/testsuite/imports/server-config.xml	2009-07-24 14:19:16 UTC (rev 91635)
@@ -1393,24 +1393,7 @@
      </sequential>
    </macrodef> 
 
-	   <macrodef name="create-tcpgossip-config"
-	        description="Create a tcpgossip-based clustered configuration">
-	     <attribute name="conf"/>
-	     <sequential>
-	       <create-config baseconf="all" newconf="@{conf}" newconf-src="cluster-tcpgossip">
-	         <patternset>
-	            <include name="conf/**"/>
-	            <include name="deploy/**"/>
-	            <include name="deployers/**"/>            
-	            <include name="deploy-hasingleton/**"/>
-	            <include name="farm/**"/>
-	            <include name="lib/**"/>
-	         </patternset>
-	       </create-config>
-	     </sequential>
-	   </macrodef> 
 	
-	
    <!-- This macro makes a new config whose name is given by the newconf
    attribute by copying the config given by the baseconf. The content that
    is copied from baseconf is limited to the patternset nested element. In