[jboss-cvs] JBossAS SVN: r64845 - branches/JBPAPP_4_2_0_GA_CP/ejb3.

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

Author: wolfc
Date: 2007-08-24 07:35:59 -0400 (Fri, 24 Aug 2007)
New Revision: 64845

Modified:
   branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml
Log:
Merged wait-on-shutdown and arjuna-test clean from Branch_4_2

Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml	2007-08-24 11:34:00 UTC (rev 64844)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml	2007-08-24 11:35:59 UTC (rev 64845)
@@ -3650,6 +3650,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">
@@ -4025,26 +4028,6 @@
 
    </target>
 
-   <target name="arjuna-test" depends="init">
-      <create-config baseconf="default" newconf="arjuna" jboss.dist="${ejb3.dist}">
-         <patternset>
-            <include name="conf/**"/>
-            <include name="deploy*/**"/>
-            <include name="lib/**"/>
-         </patternset>
-      </create-config>
-     
-      <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"/>
-   </target>
-
    <target name="libdeployment-test" depends="init">
       <create-config baseconf="all" newconf="libdeployment" jboss.dist="${ejb3.dist}">
          <patternset>
@@ -4213,6 +4196,7 @@
       </antcall>
       
       <stop-jboss url="${node0.jndi.url}" jboss.dist="${ejb3.dist}"/>
+      <wait-on-shutdown conf="all"/>
    </target>
 	
    <target name="removedislocal-test">
@@ -4233,6 +4217,7 @@
       </antcall>
       
       <stop-jboss url="${node0.jndi.url}" jboss.dist="${ejb3.dist}"/>
+      <wait-on-shutdown conf="all"/>
    </target>
 	
    <target name="multi-instance-localfromremote-test">
@@ -4264,6 +4249,8 @@
       <stop-jboss url="${node0.jndi.url}" jboss.dist="${ejb3.dist}"/>
       <stop-jboss url="${node0.jndi.port1.url}" jboss.dist="${ejb3.dist}"/>
 
+      <wait-on-shutdown conf="localfromremote1"/>
+      <wait-on-shutdown conf="localfromremote2"/>
    </target>
 	
    <target name="clustered-jms-test">
@@ -4298,6 +4285,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-multi-instance-wait" unless="${tests.clustering.skip.startup}">
@@ -4367,6 +4356,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>
 
    <!-- ================================================================== -->