[jboss-cvs] JBossAS SVN: r61151 - in branches/Branch_4_2/testsuite/imports: sections and 1 other directory.

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

Author: bstansberry at jboss.com
Date: 2007-03-06 14:58:10 -0500 (Tue, 06 Mar 2007)
New Revision: 61151

Removed:
   branches/Branch_4_2/testsuite/imports/sections/hapolicy.xml
Modified:
   branches/Branch_4_2/testsuite/imports/sections/cluster.xml
   branches/Branch_4_2/testsuite/imports/test-jars.xml
Log:
Merge the HASingletonElectionPolicy test build with the other clustering stuff

Modified: branches/Branch_4_2/testsuite/imports/sections/cluster.xml
===================================================================
--- branches/Branch_4_2/testsuite/imports/sections/cluster.xml	2007-03-06 19:55:52 UTC (rev 61150)
+++ branches/Branch_4_2/testsuite/imports/sections/cluster.xml	2007-03-06 19:58:10 UTC (rev 61151)
@@ -35,6 +35,11 @@
           <include name="org/jboss/test/cluster/partition/*"/>
        </fileset>
     </jar>
+    
+    <!-- mbeans for testing HASingletonElectionPolicy -->
+   	<copy todir="${build.lib}"
+   	   file="${build.resources}/ha/electionpolicy/ha-electionpolicy-service.xml"
+   	   overwrite="true"/>
 
       <!-- build httpsessionreplication.jar -->
       <war warfile="${build.lib}/http-sr.war"

Deleted: branches/Branch_4_2/testsuite/imports/sections/hapolicy.xml
===================================================================
--- branches/Branch_4_2/testsuite/imports/sections/hapolicy.xml	2007-03-06 19:55:52 UTC (rev 61150)
+++ branches/Branch_4_2/testsuite/imports/sections/hapolicy.xml	2007-03-06 19:58:10 UTC (rev 61151)
@@ -1,14 +0,0 @@
-<project name="tests-hapolicy-jars">
-   <!-- jmx test -->
-   <target name="_jars-hapolicy">
-      <mkdir dir="${build.lib}"/>
-      
-      <!--build sar for testing mbean deployment -->
-      <jar destfile="${build.lib}/ha-electionpolicy.sar">
-         <fileset dir="${build.resources}/ha/electionpolicy">
-            <include name="META-INF/jboss-service.xml"/>
-         </fileset>
-      </jar>
-
-   </target>
-</project>

Modified: branches/Branch_4_2/testsuite/imports/test-jars.xml
===================================================================
--- branches/Branch_4_2/testsuite/imports/test-jars.xml	2007-03-06 19:55:52 UTC (rev 61150)
+++ branches/Branch_4_2/testsuite/imports/test-jars.xml	2007-03-06 19:58:10 UTC (rev 61151)
@@ -70,7 +70,6 @@
 	<import file="sections/xa.xml"/>
 	<import file="sections/xslt.xml"/>
 	<import file="sections/byvalue.xml"/>
-    <import file="sections/hapolicy.xml"/>
 
 	<!--
 	| Build all jar files.
@@ -152,8 +151,7 @@
       _jars-wsrp,
       _jars-xa,
       _jars-xslt,
-      _jars-byvalue,
-      _jars-hapolicy
+      _jars-byvalue
       ">
 	</target>