[jboss-cvs] JBossAS SVN: r61119 - in trunk/testsuite/imports: sections and 1 other directory.

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

Author: bstansberry at jboss.com
Date: 2007-03-06 00:32:37 -0500 (Tue, 06 Mar 2007)
New Revision: 61119

Removed:
   trunk/testsuite/imports/sections/hapolicy.xml
Modified:
   trunk/testsuite/imports/sections/cluster.xml
   trunk/testsuite/imports/test-jars.xml
Log:
Move HASingletonElectionPolicy test resources in with the other cluster stuff

Modified: trunk/testsuite/imports/sections/cluster.xml
===================================================================
--- trunk/testsuite/imports/sections/cluster.xml	2007-03-06 05:30:06 UTC (rev 61118)
+++ trunk/testsuite/imports/sections/cluster.xml	2007-03-06 05:32:37 UTC (rev 61119)
@@ -1,6 +1,7 @@
 
 
 <project name="tests-cluster-jars">
+	
    <target name="_jars-cluster" depends="compile-resources">
       <war warfile="${build.lib}/dist-ss.war"
          webxml="${build.resources}/cluster/web/web.xml">
@@ -46,7 +47,12 @@
           <include name="org/jboss/test/cluster/partition/*"/>
        </fileset>
     </jar>
-
+    
+    <!--beans for testing HASingletonElectionPolicy -->
+   	<copy todir="${build.lib}"
+   	   file="${build.resources}/ha/electionpolicy/ha-electionpolicy-beans.xml"
+   	   overwrite="true"/>
+   	
       <!-- build httpsessionreplication.jar -->
       <war warfile="${build.lib}/http-sr.war"
          webxml="${build.resources}/cluster/http/web.xml">

Deleted: trunk/testsuite/imports/sections/hapolicy.xml
===================================================================
--- trunk/testsuite/imports/sections/hapolicy.xml	2007-03-06 05:30:06 UTC (rev 61118)
+++ trunk/testsuite/imports/sections/hapolicy.xml	2007-03-06 05:32:37 UTC (rev 61119)
@@ -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: trunk/testsuite/imports/test-jars.xml
===================================================================
--- trunk/testsuite/imports/test-jars.xml	2007-03-06 05:30:06 UTC (rev 61118)
+++ trunk/testsuite/imports/test-jars.xml	2007-03-06 05:32:37 UTC (rev 61119)
@@ -74,7 +74,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.
@@ -162,8 +161,7 @@
         _jars-ws,
         _jars-xa,
         _jars-xslt,
-        _jars-byvalue,
-        _jars-hapolicy
+        _jars-byvalue
         ">
    </target>