[jboss-cvs] JBossAS SVN: r61886 - in trunk/testsuite: src/main/org/jboss/test/cluster/test and 3 other directories.

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

Author: jerrygauth
Date: 2007-03-30 10:15:15 -0400 (Fri, 30 Mar 2007)
New Revision: 61886

Added:
   trunk/testsuite/src/resources/cluster/rpc-cl/
   trunk/testsuite/src/resources/cluster/rpc-cl/jboss-service.xml
Modified:
   trunk/testsuite/imports/sections/cluster.xml
   trunk/testsuite/src/main/org/jboss/test/cluster/test/RPCTestCase.java
   trunk/testsuite/src/resources/cluster/rpc/jboss-service.xml
Log:
JBAS-4106, modified RpcTestCase to include scoped classloader tests

Modified: trunk/testsuite/imports/sections/cluster.xml
===================================================================
--- trunk/testsuite/imports/sections/cluster.xml	2007-03-30 13:56:45 UTC (rev 61885)
+++ trunk/testsuite/imports/sections/cluster.xml	2007-03-30 14:15:15 UTC (rev 61886)
@@ -38,6 +38,15 @@
             <include name="org/jboss/test/cluster/rpc/*"/>
          </fileset>
       </jar>
+      
+      <jar destfile="${build.lib}/rpc-cl-tests.sar">
+         <metainf dir="${build.resources}/cluster/rpc-cl">
+            <include name="jboss-service.xml"/>
+         </metainf>
+         <fileset dir="${build.classes}">
+            <include name="org/jboss/test/cluster/rpc/*"/>
+         </fileset>
+      </jar>
 
     <jar destfile="${build.lib}/partitionstatetransfer.sar">
        <metainf dir="${build.resources}/cluster/partition">

Modified: trunk/testsuite/src/main/org/jboss/test/cluster/test/RPCTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/test/RPCTestCase.java	2007-03-30 13:56:45 UTC (rev 61885)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/test/RPCTestCase.java	2007-03-30 14:15:15 UTC (rev 61886)
@@ -47,7 +47,7 @@
    
    public static Test suite() throws Exception
    {
-      Test t1 = getDeploySetup(RPCTestCase.class, "rpc-tests.sar");
+      Test t1 = getDeploySetup(RPCTestCase.class, "rpc-tests.sar, rpc-cl-tests.sar");
       return t1;
    }
 

Modified: trunk/testsuite/src/resources/cluster/rpc/jboss-service.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/rpc/jboss-service.xml	2007-03-30 13:56:45 UTC (rev 61885)
+++ trunk/testsuite/src/resources/cluster/rpc/jboss-service.xml	2007-03-30 14:15:15 UTC (rev 61886)
@@ -1,24 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <server>
-
+    
   <mbean code="org.jboss.test.cluster.rpc.RPCUser" name="jboss.test:service=RPCTestCase">
     <depends>HAPartition</depends>
     <attribute name="PartitionName">DefaultPartition</attribute>
   </mbean>
   
-  <mbean code="org.jboss.test.cluster.rpc.RPCUser" name="jboss.test:service=RPCClassLoaderTestCase">
-    <depends>HAPartition</depends>
-    <attribute name="PartitionName">DefaultPartition</attribute>
-  </mbean>
-  
   <mbean code="org.jboss.test.cluster.rpc.RPCUser" name="jboss.test:service=RPCOneNodeTestCase">
     <depends>HAPartition</depends>
     <attribute name="PartitionName">DefaultPartition</attribute>
   </mbean>
   
-  <mbean code="org.jboss.test.cluster.rpc.RPCUser" name="jboss.test:service=RPCOneNodeClassLoaderTestCase">
-    <depends>HAPartition</depends>
-    <attribute name="PartitionName">DefaultPartition</attribute>
-  </mbean>
-  
 </server>

Added: trunk/testsuite/src/resources/cluster/rpc-cl/jboss-service.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/rpc-cl/jboss-service.xml	                        (rev 0)
+++ trunk/testsuite/src/resources/cluster/rpc-cl/jboss-service.xml	2007-03-30 14:15:15 UTC (rev 61886)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+
+  <loader-repository>rpctestcase:loader=rpc-cl-tests.sar</loader-repository>
+  
+  <mbean code="org.jboss.test.cluster.rpc.RPCUser" name="jboss.test:service=RPCClassLoaderTestCase">
+    <depends>HAPartition</depends>
+    <attribute name="PartitionName">DefaultPartition</attribute>
+  </mbean>
+  
+  <mbean code="org.jboss.test.cluster.rpc.RPCUser" name="jboss.test:service=RPCOneNodeClassLoaderTestCase">
+    <depends>HAPartition</depends>
+    <attribute name="PartitionName">DefaultPartition</attribute>
+  </mbean>
+  
+</server>