[jboss-svn-commits] JBL Code SVN: r26964 - labs/jbossesb/workspace/dbevenius/jbossas5/product.

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

Author: beve
Date: 2009-06-15 01:55:53 -0400 (Mon, 15 Jun 2009)
New Revision: 26964

Modified:
   labs/jbossesb/workspace/dbevenius/jbossas5/product/build-distr.xml
   labs/jbossesb/workspace/dbevenius/jbossas5/product/build.xml
Log:
fixing the build so that an external jbossas can be used.


Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/build-distr.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/build-distr.xml	2009-06-15 03:08:00 UTC (rev 26963)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/build-distr.xml	2009-06-15 05:55:53 UTC (rev 26964)
@@ -7,19 +7,28 @@
     <!-- Load Build Properties File -->
     <property file="${org.jboss.esb.properties}"/>
 
-    <property name="build.dir" value="build"/>
-    <property name="lib.dir" value="build/lib"/>
-    <property name="aoplib.dir" value="build/aoplib"/>
-    <property name="lib.ext.dir" value="lib/ext"/>
-    <property name="services.dir" value="services"/>
+    <property name="build.dir" value="${basedir}/build"/>
+    <property name="lib.dir" value="${basedir}/build/lib"/>
+    <property name="aoplib.dir" value="${basedir}/build/aoplib"/>
+    <property name="lib.ext.dir" value="${basedir}/lib/ext"/>
+    <property name="services.dir" value="${basedir}/services"/>
     <property name="build.lib.dir" value="${build.dir}/jbossesb/lib"/>
     <property name="version" value="4.2.MR1"/>
-    <property name="esbserver.dist.dir" value="${build.dir}/jbossesb-server-${version}"/>
-    <property name="installation.files.dir" value="install"/>
+    <property name="installation.files.dir" value="${basedir}/install"/>
+    
+    <condition property="skip.server.esb" value="true">
+        <equals arg1="${skip.unzip}" arg2="true"/>
+    </condition>
+    <echo message="skip.server.esb ${skip.server.esb}"/>
 
+    <condition property="esbserver.dist.dir" value="${esb.server.home}" else="${build.dir}/jbossesb-server-${version}">
+        <available file="${esb.server.home}"/>
+    </condition>
+    
+
     <target name="dist" depends="server.dist, copy.esbserver.files" />
 
-    <target name="copy.esbserver.files" unless="skip.server.esb">
+    <target name="copy.esbserver.files">
         <copy todir="${esbserver.dist.dir}/docs" failonerror="false">
             <fileset dir="${build.dir}/jbossesb/docs">
                 <include name="**/*"/>
@@ -55,7 +64,7 @@
         <ant antfile="build.xml" dir="ftp"/>
     </target>
 
-    <target name="server.dist" depends="build.sar, unpack.server.zip, ftp-server" unless="skip.server.esb">
+    <target name="server.dist" depends="build.sar, unpack.server.zip, ftp-server">
         <ant antfile="build.xml" dir="${esb.install.location}" target="deploy"
                 inheritall="false">
                 <property name="org.jboss.esb.server.home" value="${esbserver.dist.dir}"/>

Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/build.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/build.xml	2009-06-15 03:08:00 UTC (rev 26963)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/build.xml	2009-06-15 05:55:53 UTC (rev 26964)
@@ -33,13 +33,27 @@
 	<property name="org.jboss.esb.product.properties" value="jbossesb-properties.xml"/>
 	
 	<!-- Some default build locations -->
-	<property name="org.jboss.esb.internal.dest" location="build"/>
-	<property name="org.jboss.esb.internal.jar.dest" location="build/jbossesb/lib"/>
+	<property name="org.jboss.esb.internal.dest" location="${basedir}/build"/>
+	<property name="org.jboss.esb.internal.jar.dest" location="${basedir}/build/jbossesb/lib"/>
+	
+	<condition property="skip.unzip" value="true">
+		<or>
+    		<isset property="${esb.server.home}"/>
+    		<equals arg1="${skip.unzip}" arg2="true"/>
+		</or>
+    </condition>
+	
+	<!-- 
+	<echo message="-------------> ${skip.unzip}"/>
+	<echo message="-------------> ${esb.server.home}"/>
+	-->
 
 	<!-- JBoss ESB version -->
 	<property name="version" value="4.5.GA"/>
 	<property name="esb.server.name" value="jbossesb-server-${version}"/>
-	<property name="esbserver.dist.dir" value="${org.jboss.esb.internal.dest}/${esb.server.name}"/>
+	<condition property="esb.server.home" value="${esb.server.home}" else="${org.jboss.esb.internal.dest}/${esb.server.name}">
+        <isset property="esb.server.home"/>
+    </condition>
 
 	<!-- Set internal property defaults -->
 	<property name="org.jboss.esb.installationdirectory" location="build/jbossesb"/>
@@ -99,7 +113,9 @@
 				resultproperty="@{resultproperty}">
 				<sysproperty key="ant.home" value="${ant.home}"/>
 				<sysproperty key="ant.library.dir" value="${ant.library.dir}"/>
-	                        <sysproperty key="org.jboss.esb.properties" value="${org.jboss.esb.properties}"/>
+                <sysproperty key="org.jboss.esb.properties" value="${org.jboss.esb.properties}"/>
+                <sysproperty key="esb.server.home" value="${esb.server.home}"/>
+                <sysproperty key="skip.unzip" value="${skip.unzip}"/>
 				<arg value="-cp"/>
 				<arg value="${junit.jar}"/>
 				<arg value="-f"/>
@@ -147,7 +163,7 @@
 		<ant dir="rosetta"/>
 	</target>
 
-    <target name="dependencies.get">
+    <target name="dependencies.get" unless="skip.resolve">
         <ant antfile="ivy-build.xml" />
     </target>