[jboss-svn-commits] JBL Code SVN: r17593 - labs/jbossesb/trunk/product.

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

Author: beve
Date: 2008-01-07 12:12:21 -0500 (Mon, 07 Jan 2008)
New Revision: 17593

Modified:
   labs/jbossesb/trunk/product/esb-config.xml
Log:
Work for JBESB-1451 "ant stop-server does not work with Ant 1.7"


Modified: labs/jbossesb/trunk/product/esb-config.xml
===================================================================
--- labs/jbossesb/trunk/product/esb-config.xml	2008-01-07 11:45:13 UTC (rev 17592)
+++ labs/jbossesb/trunk/product/esb-config.xml	2008-01-07 17:12:21 UTC (rev 17593)
@@ -96,14 +96,9 @@
             </tstamp>
             <echo message="${shutdown.time}: waiting for ESB server to stop, checking file @{serverHome}/server/@{serverConfig}/log/server.log ..."/>
             <waitfor maxwait="@{seconds}" maxwaitunit="second" checkevery="5" checkeveryunit="second" timeoutproperty="shutdown.timeout">
-            	 <available file="server.log">
-                	
-	                <filepath>
-	                    <fileset dir="@{serverHome}/server/@{serverConfig}/log/" includes="server.log">
-	                        <contains text="[org.jboss.system.server.Server] Shutdown complete"/>
-	                    </fileset>
-	                </filepath>
-	            </available>
+            	<isfileselected file="@{serverHome}/server/@{serverConfig}/log/server.log">
+                    <contains text="[org.jboss.system.server.Server] Shutdown complete"/>
+            	</isfileselected>
 	        </waitfor>
 	        <fail message="Timeout waiting for ESB server to shutdown." if="shutdown.timeout"/>
 	    </sequential>