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

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

Author: kevin.conner at jboss.com
Date: 2009-10-09 14:44:23 -0400 (Fri, 09 Oct 2009)
New Revision: 29569

Modified:
   labs/jbossesb/trunk/product/build-distr.xml
   labs/jbossesb/trunk/product/build.xml
   labs/jbossesb/trunk/qa/base-cp.xml
   labs/jbossesb/trunk/qa/build.xml
   labs/jbossesb/trunk/qa/quickstarts/build.xml
Log:
Prevent build from overwriting reference server: JBESB-2876

Modified: labs/jbossesb/trunk/product/build-distr.xml
===================================================================
--- labs/jbossesb/trunk/product/build-distr.xml	2009-10-09 09:02:05 UTC (rev 29568)
+++ labs/jbossesb/trunk/product/build-distr.xml	2009-10-09 18:44:23 UTC (rev 29569)
@@ -19,15 +19,7 @@
 	
 	<echo message="org.jboss.esb.server.home=${org.jboss.esb.server.home}"/>
 	<echo message="esbserver.dist.dir=${esbserver.dist.dir}"/>
-	<condition property="esbserver.dist.dir" value="${org.jboss.esb.server.home}" else="${build.dir}/jbossesb-server-${version}">
-        <isset property="org.jboss.esb.server.home"/>
-    </condition>
-	<echo message="esbserver.dist.dir=${esbserver.dist.dir}"/>
 	
-	<condition property="skip.server.unzip" value="true">
-	        <available file="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deployers"/>
-    </condition>
-
     <target name="dist" depends="server.dist, copy.esbserver.files" />
 
     <target name="copy.esbserver.files" unless="skip.server.esb">

Modified: labs/jbossesb/trunk/product/build.xml
===================================================================
--- labs/jbossesb/trunk/product/build.xml	2009-10-09 09:02:05 UTC (rev 29568)
+++ labs/jbossesb/trunk/product/build.xml	2009-10-09 18:44:23 UTC (rev 29569)
@@ -39,9 +39,6 @@
 	<!-- JBoss ESB version -->
 	<property name="version" value="4.6"/>
 	<property name="esb.server.name" value="jbossesb-server-${version}"/>
-	<condition property="esbserver.dist.dir" value="${org.jboss.esb.server.home}" else="${basedir}/build/jbossesb-server-${version}">
-        <isset property="org.jboss.esb.server.home"/>
-    </condition>
 	<property name="esbserver.dist.dir" value="${org.jboss.esb.internal.dest}/${esb.server.name}"/>
 
 	<!-- Set internal property defaults -->

Modified: labs/jbossesb/trunk/qa/base-cp.xml
===================================================================
--- labs/jbossesb/trunk/qa/base-cp.xml	2009-10-09 09:02:05 UTC (rev 29568)
+++ labs/jbossesb/trunk/qa/base-cp.xml	2009-10-09 18:44:23 UTC (rev 29569)
@@ -11,11 +11,10 @@
 	  - Restrict jar files to those known to be required.
 	-->
 	<property name="org.jboss.esb.server.server"
-		location="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}" />
+		location="${org.jboss.esb.server.home}/server/${org.jboss.esb.test.server.config}" />
 	<dirname property="pwd" file="${ant.file.base-cp}" />
 
 	<target name="check-as-version">
-		<property name="org.jboss.esb.server.server" location="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}"/>
 		<!-- Check for JBossAS5 -->
 		<condition property="jbossas5">
 			<available file="${org.jboss.esb.server.server}/deployers"/>
@@ -89,7 +88,6 @@
 	</target>
 
 	<target name="as5-path" if="jbossas5">
-		<property name="org.jboss.esb.server.server" location="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}"/>
 		<property name="org.jboss.esb.server.deploy.dir" location="${org.jboss.esb.server.server}/deploy"/>
 		<property name="org.jboss.esb.server.common.lib" location="${org.jboss.esb.server.home}/common/lib"/>
 

Modified: labs/jbossesb/trunk/qa/build.xml
===================================================================
--- labs/jbossesb/trunk/qa/build.xml	2009-10-09 09:02:05 UTC (rev 29568)
+++ labs/jbossesb/trunk/qa/build.xml	2009-10-09 18:44:23 UTC (rev 29569)
@@ -15,10 +15,6 @@
 	<property name="build.location" location="build"/>
         <property file="test.properties" />
 
-	<condition property="org.jboss.esb.server.home" value="${esb.server.home}">
-		<available file="${esb.server.home}"/>
-    </condition>
-
 	<import file="${product.dir}/esb-config.xml"/>
 
 	<property name="org.jboss.esb.properties" location="${product.dir}/product.properties"/>
@@ -49,7 +45,6 @@
 				<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="esb.server.home" value="${esb.server.home}"/>
 				<arg value="-cp"/>
 				<arg value="${junit.jar}"/>
 				<arg value="-f"/>

Modified: labs/jbossesb/trunk/qa/quickstarts/build.xml
===================================================================
--- labs/jbossesb/trunk/qa/quickstarts/build.xml	2009-10-09 09:02:05 UTC (rev 29568)
+++ labs/jbossesb/trunk/qa/quickstarts/build.xml	2009-10-09 18:44:23 UTC (rev 29569)
@@ -26,6 +26,8 @@
 
    <property name="junit.jar" location="${product.dir}/../testlib/junit-4.1.jar"/>
    
+   <property file="${org.jboss.esb.properties}"/>
+
    <import file="../base-cp.xml"/>
    
    <macrodef name="runant">
@@ -144,7 +146,7 @@
             <property name="quickstart.jbossesb.ftp.password" value="${org.jboss.esb.test.ftp.pwd}"/>
             <property name="quickstart.jbossesb.ftp.directory" value="${org.jboss.esb.test.ftp.dir}"/>
             <property name="org.jboss.esb.server.home" location="${qa.quickstarts.server.home}"/>
-            <property name="org.jboss.esb.server.config" value="${org.jboss.esb.server.config}"/>
+            <property name="org.jboss.esb.server.config" value="${org.jboss.esb.test.server.config}"/>
          </ant>
       </sequential>
 	</macrodef>