[jboss-svn-commits] JBL Code SVN: r18260 - labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product.

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

Author: tcunning
Date: 2008-02-02 00:35:24 -0500 (Sat, 02 Feb 2008)
New Revision: 18260

Modified:
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/esb-config.xml
Log:
bug:JBESB-1513
Committing changes to stop the copy of esb bits to AS if a no-prepare
property is set.


Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/esb-config.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/esb-config.xml	2008-02-01 20:54:55 UTC (rev 18259)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/product/esb-config.xml	2008-02-02 05:35:24 UTC (rev 18260)
@@ -112,7 +112,12 @@
     <target name="esb.init-app-server" if="org.jboss.esb.server.home">
         <property name="org.jboss.esb.test.server.config" value="test-esb"/>
     	<condition property="esb.server.config.nameclash">
+		<and>
     		<equals arg1="${org.jboss.esb.test.server.config}" arg2="${org.jboss.esb.server.config}"/>
+		<not>
+		<equals arg1="true" arg2="${soa.test.no-prepare}"/>
+		</not>
+		</and>
     	</condition>
     	<fail if="esb.server.config.nameclash" message="Specified server config matches test profile name: ${org.jboss.esb.test.server.config}"/>
     	
@@ -139,7 +144,7 @@
     	<property name="org.jboss.esb.server.config.appserver" value="true"/>
 	</target>
 	
-	<target name="esb.configure-app-server" if="org.jboss.esb.server.config.appserver">
+	<target name="esb.configure-app-server" unless="soa.test.no-prepare" if="org.jboss.esb.server.config.appserver">
 		<property name="esb.target-dir" location="${org.jboss.esb.server.home}/server/${org.jboss.esb.test.server.config}"/>
     	<delete dir="${esb.target-dir}" quiet="true"/>
     	
@@ -171,7 +176,7 @@
     	<property name="org.jboss.esb.server.config.ftpserver" value="true"/>
 	</target>
 	
-	<target name="esb.configure-ftp-server" if="org.jboss.esb.server.config.ftpserver">
+	<target name="esb.configure-ftp-server" unless="soa.test.no-prepare" if="org.jboss.esb.server.config.ftpserver">
 		<ant antfile="build.xml" dir="${esb.ftp.location}"/>
 		<property name="esb.deploy-dir" location="${org.jboss.esb.server.home}/server/${org.jboss.esb.test.server.config}/deploy"/>
 		<copy todir="${esb.deploy-dir}">
@@ -191,8 +196,8 @@
 
 	<target name="esb.configure" depends="esb.init, esb.configure-app-server, esb.configure-esb-server, esb.configure-ftp-server"/>
 	
-    <target name="esb.setup-esb" depends="esb.configure" description="target for configuring a clean esb">
-    	<echo>install dir: ${esb.install.location}</echo>
+    <target name="esb.setup-esb" depends="esb.configure" unless="soa.test.no-prepare" description="target for configuring a clean esb">
+	<echo>install dir: ${esb.install.location}</echo>
     	<ant antfile="build.xml" dir="${esb.install.location}" target="deploy"
     		inheritall="false">
     		<property name="org.jboss.esb.server.home" value="${org.jboss.esb.server.home}"/>