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

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

Author: kevin.conner at jboss.com
Date: 2006-12-08 07:47:58 -0500 (Fri, 08 Dec 2006)
New Revision: 8137

Modified:
   labs/jbossesb/trunk/product/build.xml
   labs/jbossesb/trunk/product/console/build.xml
Log:
Rewrite of console build.xml to remove windows file locking problem

Modified: labs/jbossesb/trunk/product/build.xml
===================================================================
--- labs/jbossesb/trunk/product/build.xml	2006-12-08 11:09:02 UTC (rev 8136)
+++ labs/jbossesb/trunk/product/build.xml	2006-12-08 12:47:58 UTC (rev 8137)
@@ -305,9 +305,9 @@
 	<!-- Build the tools into the main dist -->
 	<target name="org.jboss.esb.tools">
 		<!-- Build the admin console webapp. -->
-		<ant dir="console" target="build">
-			<property name="build.dir" value="${org.jboss.esb.installationdirectory}/tools/console"/>
-			<property name="prepare.release.distro" value="true"/>
+		<ant dir="console" target="dist">
+			<property name="build.tools.dir" value="${org.jboss.esb.internal.dest}/tools"/>
+			<property name="install.tools.dir" value="${org.jboss.esb.installationdirectory}/tools"/>
 		</ant>
 	</target>
 	

Modified: labs/jbossesb/trunk/product/console/build.xml
===================================================================
--- labs/jbossesb/trunk/product/console/build.xml	2006-12-08 11:09:02 UTC (rev 8136)
+++ labs/jbossesb/trunk/product/console/build.xml	2006-12-08 12:47:58 UTC (rev 8137)
@@ -9,16 +9,20 @@
     <property name="package.name"      value="jboss-esb-console"/>
 
 	<!-- Structure -->
-	<property name="src.dir"           value="src"/>
-	<property name="build.dir"         value="build" />  <!-- Note that build.dir is overridden from the product/build.xml "tools" target. -->
-	<property name="classes.dir"       value="${build.dir}/WEB-INF/classes" />
-	<property name="test.src.dir"      value="test/src"/>
-	<property name="test.classes.dir"  value="${build.dir}/test/classes" />
-	<property name="test.report.dir"   value="${build.dir}/test/report" />
-	<property name="resources.dir"     value="resources" />
-	<property name="view.dir"          value="view" />
-	<property name="distro.dir"        value="distro" />
-	<property name="product.lib.ext.dir"   value="../lib/ext" />
+	<property name="src.dir"           location="src"/>
+	<property name="build.dir"         location="build" />
+	<property name="build.tools.dir"   location="${build.dir}/tools" />
+	<property name="build.console.dir"  location="${build.tools.dir}/console" />
+	<property name="install.tools.dir"   location="${build.dir}/dist/tools" />
+	<property name="install.console.dir"  location="${install.tools.dir}/console" />
+	<property name="classes.dir"       location="${build.console.dir}/WEB-INF/classes" />
+	<property name="test.src.dir"      location="test/src"/>
+	<property name="test.classes.dir"  location="${build.console.dir}/test/classes" />
+	<property name="test.report.dir"   location="${build.console.dir}/test/report" />
+	<property name="resources.dir"     location="resources" />
+	<property name="view.dir"          location="view" />
+	<property name="distro.dir"        location="distro" />
+	<property name="product.lib.ext.dir"   location="../lib/ext" />
 
     <target name="build" description="Compile, test and package (war) the application.">
     	<!-- Compile... -->
@@ -49,21 +53,18 @@
     	<copy file="distro/postgres-jboss-beans.xml" tofile="${resources.dir}/WEB-INF/classes/jboss-beans.xml" overwrite="true">
     		<filterset filtersfile="build.properties" />
    		</copy>
-    	<delete file="${build.dir}/${package.name}.war" />
+    	<delete file="${build.console.dir}/${package.name}.war" />
     	<copy todir="${resources.dir}/WEB-INF/lib">
     		<fileset dir="${product.lib.ext.dir}" includes="milyn*.jar" />
    		</copy>
-    	<jar destfile="${build.dir}/${package.name}.war">
-    		<fileset dir="${build.dir}" excludes="test/**" />
+    	<jar destfile="${build.console.dir}/${package.name}.war">
+    		<fileset dir="${build.console.dir}" excludes="test/**" />
     		<fileset dir="${resources.dir}" includes="WEB-INF/**" />
     		<fileset dir="${view.dir}" />
-    		<fileset dir="./" includes="distro/**" />
-    		<fileset dir="./" includes="import.sql" />
+    		<fileset dir="${basedir}" includes="distro/**" />
+    		<fileset dir="${basedir}" includes="import.sql" />
     	</jar>
     	<delete dir="${resources.dir}/WEB-INF/lib" includes="milyn*.jar" />
-    	
-    	<!-- Conditional - Set to true when the build is called from the product/build.xml "tools" target. -->
-    	<antcall target="prepare.release.distro" />
     </target>
 
 	<target name="assertTestsFailed" if="test.failed">
@@ -71,27 +72,23 @@
     </target>
 	
     <target name="deploy" depends="build" description="Run tests on the application.">
-    	<copy file="${build.dir}/${package.name}.war" todir="${deploy.dir}" />
+    	<copy file="${build.console.dir}/${package.name}.war" todir="${deploy.dir}" />
     </target>
 
-	<target name="prepare.release.distro"  if="prepare.release.distro">
-    	<delete dir="${build.dir}/test" />
-    	<delete dir="${build.dir}/WEB-INF" />
-
+    <target name="dist" depends="build">
 		<!-- Unjar the war.  Will be rejared from the distro by the tools/build.xml. -->
-		<unjar src="${build.dir}/${package.name}.war" dest="${build.dir}" />
-		<delete file="${build.dir}/${package.name}.war" />
+		<unjar src="${build.console.dir}/${package.name}.war" dest="${install.console.dir}" />
 		
 		<!-- Copy the build related files to the "tools" folder. -->
-		<copy file="${build.dir}/distro/distro-build.xml" tofile="${build.dir}/../build.xml" />
-		<copy file="${build.dir}/distro/distro-CONSOLE-README.TXT" tofile="${build.dir}/../CONSOLE-README.TXT" />
-		<copy file="${build.dir}/import.sql" tofile="${build.dir}/../CONSOLE-import.sql" />
+		<copy file="${install.console.dir}/distro/distro-build.xml" tofile="${install.tools.dir}/build.xml" />
+		<copy file="${install.console.dir}/distro/distro-CONSOLE-README.TXT" tofile="${install.tools.dir}/CONSOLE-README.TXT" />
+		<copy file="${install.console.dir}/import.sql" tofile="${install.tools.dir}/CONSOLE-import.sql" />
     </target>
 	
     <target name="clean" description="Delete the build folder..">
     	<mkdir dir="${build.dir}" />
     	<delete dir="${build.dir}" failonerror="true" />
-    	<delete dir="./" includes="**/TESTS-TestSuites.xml" />
+    	<delete dir="${basedir}" includes="**/TESTS-TestSuites.xml" />
     </target>
 	
     <target name="cleantc" description="Clean Tomcat.">