[jboss-cvs] JBossAS SVN: r64777 - in branches/Branch_4_2/ejb3: src/resources/test-configs and 1 other directory.

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

Author: wolfc
Date: 2007-08-22 09:16:07 -0400 (Wed, 22 Aug 2007)
New Revision: 64777

Removed:
   branches/Branch_4_2/ejb3/src/resources/test-configs/arjuna/
Modified:
   branches/Branch_4_2/ejb3/build-test.xml
Log:
Fixed clusteredjms server shutdown and removed arjuna test config

Modified: branches/Branch_4_2/ejb3/build-test.xml
===================================================================
--- branches/Branch_4_2/ejb3/build-test.xml	2007-08-22 13:11:38 UTC (rev 64776)
+++ branches/Branch_4_2/ejb3/build-test.xml	2007-08-22 13:16:07 UTC (rev 64777)
@@ -3682,6 +3682,9 @@
 
    <target name="no-start-jboss-ejb-tests" depends="init" description="Execute all tests">
       <antcall target="test" inheritRefs="true">
+         <param name="test" value="arjuna"/>
+      </antcall>
+      <antcall target="test" inheritRefs="true">
          <param name="test" value="webservices"/>
       </antcall>
       <antcall target="test" inheritRefs="true">
@@ -4075,9 +4078,6 @@
       <start-jboss conf="arjuna" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
       <wait-on-host/>
       
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="arjuna"/>
-      </antcall>
       
       <stop-jboss jboss.dist="${ejb3.dist}"/>
       <wait-on-shutdown conf="arjuna"/>
@@ -4336,6 +4336,8 @@
       <stop-jboss url="${node0.jndi.url}" jboss.dist="${ejb3.dist}"/>
       <stop-jboss url="${node1.jndi.url}" jboss.dist="${ejb3.dist}"/>
 
+      <wait-on-shutdown conf="clusteredjms"/>
+      <wait-on-shutdown conf="clusteredjms2"/>
    </target>
 
    <target name="tests-clustering-wait" unless="${tests.clustering.skip.startup}">
@@ -4405,6 +4407,8 @@
    <target name="tests-clustering-shutdown" unless="${tests.clustering.skip.startup}">
       <stop-jboss url="${node0.jndi.url}" jboss.dist="${ejb3.dist}"/>
       <stop-jboss url="${node1.jndi.url}" jboss.dist="${ejb3.dist}"/>
+      <wait-on-shutdown conf="node0"/>
+      <wait-on-shutdown conf="node1"/>
    </target>
 
    <!-- ================================================================== -->