[jboss-svn-commits] JBL Code SVN: r17084 - in labs/jbossesb/trunk: qa and 1 other directory.

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

Author: kevin.conner at jboss.com
Date: 2007-12-07 05:18:28 -0500 (Fri, 07 Dec 2007)
New Revision: 17084

Modified:
   labs/jbossesb/trunk/product/esb-config.xml
   labs/jbossesb/trunk/qa/build.xml
Log:
Add timestamp and echo log file for shutdown: JBESB-1366

Modified: labs/jbossesb/trunk/product/esb-config.xml
===================================================================
--- labs/jbossesb/trunk/product/esb-config.xml	2007-12-07 10:12:51 UTC (rev 17083)
+++ labs/jbossesb/trunk/product/esb-config.xml	2007-12-07 10:18:28 UTC (rev 17084)
@@ -8,7 +8,6 @@
     <property name="esb.ftp.location" location="${esb.config.location}/ftp"/>
     <property name="esb.ftp.server.location" location="${esb.ftp.location}/build"/>
     <property name="esb.ftp.server.name" value="ftp-server.sar"/>
-    <property name="build.location" location="./build" /> <!-- The "build" dir in product or qa, depending on which is running. -->
 
     <property name="agent.jvmarg" value=""/>
     <property name="org.jboss.esb.server.config" value="default"/>
@@ -45,15 +44,16 @@
     <macrodef name="start-server">
     	<attribute name="serverHome"/>
     	<attribute name="serverConfig"/>
+    	<element name="serverElements" implicit="yes" optional="true"/>
         <sequential>
 	    	<echo message="Starting local ESB server"/>
             <java classname="org.jboss.Main" fork="true" spawn="true"
                 dir="@{serverHome}/bin">
                 <classpath refid="server.classpath"/>
                 <jvmarg line="${agent.jvmarg}"/>
-                <sysproperty key="build.dir" value="${build.location}" />
                 <arg value="-c"/>
                 <arg value="@{serverConfig}"/>
+            	<serverElements/>
             </java>
         </sequential>
     </macrodef>
@@ -91,7 +91,10 @@
     	<attribute name="serverConfig"/>
         <attribute name="seconds" default="120"/>
         <sequential>
-            <echo message="Waiting for ESB server to stop..."/>
+            <tstamp>
+                <format property="shutdown.time" pattern="yyyy-MM-dd HH:mm:ss z"/>
+            </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>
@@ -177,7 +180,7 @@
 		<copy todir="${esb.deploy-dir}/${esb.ftp.server.name}/res/conf"
 			file="${esb.config.location}/ftpd.properties" overwrite="true"/>
 	</target>
-
+	
     <target name="esb.init" depends="esb.init-app-server, esb.init-esb-server, esb.init-ftp-server"
     	 description="target for initialising properties">
     	<path id="server.classpath">

Modified: labs/jbossesb/trunk/qa/build.xml
===================================================================
--- labs/jbossesb/trunk/qa/build.xml	2007-12-07 10:12:51 UTC (rev 17083)
+++ labs/jbossesb/trunk/qa/build.xml	2007-12-07 10:18:28 UTC (rev 17084)
@@ -9,6 +9,7 @@
              message="JBoss ESB requires jdk1.5 to build."/>
 
 	<property name="product.dir" location="../product"/>
+	<property name="build.location" location="build"/>
 
 	<import file="${product.dir}/esb-config.xml"/>
 
@@ -73,14 +74,18 @@
 	<target name="clean" description="Clean the QA env">
 		<echo message="Cleaning..."/>
 		
-		<delete dir="${basedir}/build" />
+		<delete dir="${build.location}" />
 		<ant dir="quickstarts" target="ci-clean" />
 	</target>
 	
 	<target name="start-server" depends="esb.setup-esb">
 		<echo>server ${org.jboss.esb.server.home} ${org.jboss.esb.test.server.config}</echo>
 		<start-server serverHome="${org.jboss.esb.server.home}"
-			serverConfig="${org.jboss.esb.test.server.config}"/>
+			serverConfig="${org.jboss.esb.test.server.config}">
+			<sysproperty key="build.dir" value="${build.location}"/>
+			<jvmarg value="-Xmx512m"/>
+			<jvmarg value="-Xms512m"/>
+		</start-server>
 		<wait-on-server/>
 	</target>