[jboss-cvs] JBossAS SVN: r76415 - in trunk/testsuite: src/main/org/jboss/test/cluster/defaultcfg/test and 1 other directory.

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

Author: adrian at jboss.org
Date: 2008-07-29 08:55:26 -0400 (Tue, 29 Jul 2008)
New Revision: 76415

Modified:
   trunk/testsuite/imports/sections/cluster.xml
   trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/HASingletonControllerBeanUnitTestCase.java
   trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/PartitionRestartUnitTestCase.java
Log:
[JBAS-5803] beans.xml -> jboss-beans.xml

Modified: trunk/testsuite/imports/sections/cluster.xml
===================================================================
--- trunk/testsuite/imports/sections/cluster.xml	2008-07-29 12:38:34 UTC (rev 76414)
+++ trunk/testsuite/imports/sections/cluster.xml	2008-07-29 12:55:26 UTC (rev 76415)
@@ -62,7 +62,7 @@
       
       <!-- MC beans for testing partition restart -->
       <copy todir="${build.lib}"
-         file="${build.resources}/cluster/partition/partition-restart-beans.xml"
+         file="${build.resources}/cluster/partition/partition-restart-jboss-beans.xml"
          overwrite="true"/>
       <!-- JMX beans for testing partition restart -->
       <copy todir="${build.lib}"
@@ -86,17 +86,17 @@
    	
    	<!--beans for testing HASingletonDeployerTestCase -->
       <copy todir="${build.lib}"
-           file="${build.resources}/cluster/hasingleton/deployer/test-deploy-hasingleton-beans.xml"
+           file="${build.resources}/cluster/hasingleton/deployer/test-deploy-hasingleton-jboss-beans.xml"
            overwrite="true"/>
     
       <!--beans for testing HASingletonElectionPolicy -->
    	<copy todir="${build.lib}"
-   	     file="${build.resources}/cluster/hasingleton/electionpolicy/ha-electionpolicy-beans.xml"
+   	     file="${build.resources}/cluster/hasingleton/electionpolicy/ha-electionpolicy-jboss-beans.xml"
    	     overwrite="true"/>
    	     
    	<!--beans for testing HASingletonControllerBeanUnitTestCase -->
    	<copy todir="${build.lib}"
-   	     file="${build.resources}/cluster/hasingleton/ha-singleton-beans.xml"
+   	     file="${build.resources}/cluster/hasingleton/ha-singleton-jboss-beans.xml"
    	     overwrite="true"/>
       
       <!-- ha-invoker adaptor sar -->
@@ -634,7 +634,7 @@
    	<!-- build sfsb-passexp.sar -->
    	<jar destfile="${build.lib}/sfsb-passexp.sar">
          <fileset dir="${build.resources}/cluster/ejb2/passexp">
-            <include name="META-INF/partition-passexp-beans.xml"/>
+            <include name="META-INF/partition-passexp-jboss-beans.xml"/>
             <include name="META-INF/passexp-stacks.xml"/>
             <include name="partition-passexp-service.xml"/>
          </fileset>

Modified: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/HASingletonControllerBeanUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/HASingletonControllerBeanUnitTestCase.java	2008-07-29 12:38:34 UTC (rev 76414)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/HASingletonControllerBeanUnitTestCase.java	2008-07-29 12:55:26 UTC (rev 76415)
@@ -46,7 +46,7 @@
    
    public static Test suite() throws Exception
    {
-      return getDeploySetup(HASingletonControllerBeanUnitTestCase.class, "ha-singleton-beans.xml");
+      return getDeploySetup(HASingletonControllerBeanUnitTestCase.class, "ha-singleton-jboss-beans.xml");
    }
 
    public void testBeanDeployment() throws Exception

Modified: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/PartitionRestartUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/PartitionRestartUnitTestCase.java	2008-07-29 12:38:34 UTC (rev 76414)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/PartitionRestartUnitTestCase.java	2008-07-29 12:55:26 UTC (rev 76415)
@@ -56,7 +56,7 @@
 
    public static Test suite() throws Exception
    {
-      Test t1 = JBossClusteredTestCase.getDeploySetup(PartitionRestartUnitTestCase.class, "partition-restart-beans.xml, partition-restart-service.xml, partition-restart.jar");
+      Test t1 = JBossClusteredTestCase.getDeploySetup(PartitionRestartUnitTestCase.class, "partition-restart-jboss-beans.xml, partition-restart-service.xml, partition-restart.jar");
       return t1;
    }