[jboss-svn-commits] JBL Code SVN: r13611 - labs/jbossesb/trunk/product/samples/quickstarts/conf.

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

Author: kevin.conner at jboss.com
Date: 2007-07-18 13:44:52 -0400 (Wed, 18 Jul 2007)
New Revision: 13611

Modified:
   labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml
Log:
Configuration failure after install properties

Modified: labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml	2007-07-18 17:40:06 UTC (rev 13610)
+++ labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml	2007-07-18 17:44:52 UTC (rev 13611)
@@ -139,15 +139,6 @@
 			<isset property="quickstart.org.jboss.esb.server.home"/>
 		</condition>
 
-		<condition property="esb.server.configured">
-			<and>
-				<isset property="org.jboss.esb.server.home"/>
-				<isset property="org.jboss.esb.server.config"/>
-			</and>
-		</condition>
-
-		<fail unless="esb.server.configured" message="Cannot determine target deployment, please check quickstarts.properties or deployment.properties"/>
-
 		<!-- check for installation deployment.properties -->
 		<property name="install.dir" value="${product.dir}/install"/>
 		<property file="${install.dir}/deployment.properties" prefix="install" />
@@ -165,6 +156,8 @@
 
 		<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"/>
+
 		<path id="deployment-classpath">
 			<fileset dir="${base.jbossesb}/lib" includes="*.jar"/>
 			<fileset dir="${base.jbossesb}/lib/ext" includes="*.jar"/>