[jboss-svn-commits] JBL Code SVN: r37373 - labs/jbossesb/branches/JBESB_4_10_CP/product/samples/quickstarts/conf.

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

Author: tcunning
Date: 2011-08-09 13:08:52 -0400 (Tue, 09 Aug 2011)
New Revision: 37373

Modified:
   labs/jbossesb/branches/JBESB_4_10_CP/product/samples/quickstarts/conf/base-build.xml
Log:
JBESB-3639
Commit Kevin's patch for the hierarchy tests.


Modified: labs/jbossesb/branches/JBESB_4_10_CP/product/samples/quickstarts/conf/base-build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_10_CP/product/samples/quickstarts/conf/base-build.xml	2011-08-09 09:43:29 UTC (rev 37372)
+++ labs/jbossesb/branches/JBESB_4_10_CP/product/samples/quickstarts/conf/base-build.xml	2011-08-09 17:08:52 UTC (rev 37373)
@@ -18,6 +18,13 @@
 <!-- structure changes.                                                   -->
 <!-- ==================================================================== -->
 
+	<condition
+		property="hierarchy.test.server.config"
+		value="${quickstart.org.jboss.esb.server.config}"
+		else="default">
+		<isset property="quickstart.org.jboss.esb.server.config"/>
+	</condition>
+
 	<!-- Are we embedded in a source hierarchy? -->
 	<condition property="hierarchy.source">
 		<available file="${product.dir}/build-distr.xml"/>
@@ -32,7 +39,7 @@
 				<available file="${product.dir}/copyright.txt"/>
 			</or>
 			<not>
-				<available file="${product.dir}/server/${org.jboss.esb.server.config}"/>
+				<available file="${product.dir}/server/${hierarchy.test.server.config}"/>
 			</not>
 		</and>
 	</condition>
@@ -40,7 +47,7 @@
 	<condition property="hierarchy.jbossesb-server">
 		<and>
 			<available file="${product.dir}/copyright.txt"/>
-			<available file="${product.dir}/server/${org.jboss.esb.server.config}"/>
+			<available file="${product.dir}/server/${hierarchy.test.server.config}"/>
 		</and>
 	</condition>
 	<!-- Do we build against a jbossesb distribution? -->
@@ -321,18 +328,6 @@
 
 	<target name="jbossesb-source-dependencies"
 		depends="jbossesb-quickstart-override" if="build.jbossesb">
-		<condition 
-			property="org.jboss.esb.server.config" 
-			value="${quickstart.org.jboss.esb.server.config}">
-			<isset property="quickstart.org.jboss.esb.server.config"/>
-		</condition>
-
-		<condition
-			property="org.jboss.esb.server.home"  
-			value="${quickstart.org.jboss.esb.server.home}">
-			<isset property="quickstart.org.jboss.esb.server.home"/>
-		</condition>
-		
 		<!-- check for installation deployment.properties -->
 		<property name="install.dir" value="${product.dir}/install"/>
 		<property file="${install.dir}/deployment.properties" prefix="install" />
@@ -348,7 +343,7 @@
 			<isset property="install.org.jboss.esb.server.config"/>
 		</condition>
 
-		<property name="org.jboss.esb.server.config" value="${org.jboss.esb.server.config}"/>
+		<property name="org.jboss.esb.server.config" value="default"/>
 
 		<fail unless="org.jboss.esb.server.home" message="Cannot determine target deployment, please check quickstarts.properties or deployment.properties"/>