[jboss-cvs] JBossAS SVN: r64776 - trunk/ejb3.

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

Author: wolfc
Date: 2007-08-22 09:11:38 -0400 (Wed, 22 Aug 2007)
New Revision: 64776

Modified:
   trunk/ejb3/build-test.xml
Log:
Waiting for server shutdown


Modified: trunk/ejb3/build-test.xml
===================================================================
--- trunk/ejb3/build-test.xml	2007-08-22 12:25:33 UTC (rev 64775)
+++ trunk/ejb3/build-test.xml	2007-08-22 13:11:38 UTC (rev 64776)
@@ -101,7 +101,7 @@
             <available file="server.log">
                <filepath>
                   <fileset dir="${jboss.dist}/server/@{conf}/log/" includes="server.log">
-                     <contains text="[org.jboss.system.server.profileservice.ServerImpl] Shutdown complete"/>
+                     <contains text="[org.jboss.bootstrap.microcontainer.ServerImpl] Shutdown complete"/>
                   </fileset>
                </filepath>
             </available>
@@ -4865,6 +4865,8 @@
       <stop-jboss url="${node0.jndi.url}"/>
       <stop-jboss url="${node1.jndi.url}"/>
 
+      <wait-on-shutdown conf="clusteredjms"/>
+      <wait-on-shutdown conf="clusteredjms2"/>
    </target>
 
    <target name="tests-clustering-wait" unless="${tests.clustering.skip.startup}">
@@ -4903,6 +4905,8 @@
    <target name="tests-clustering-shutdown" unless="${tests.clustering.skip.startup}">
       <stop-jboss url="${node0.jndi.url}"/>
       <stop-jboss url="${node1.jndi.url}"/>
+      <wait-on-shutdown conf="node0"/>
+      <wait-on-shutdown conf="node1"/>
    </target>
 
    <!-- ================================================================== -->