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

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

Author: kevin.conner at jboss.com
Date: 2007-11-21 05:27:24 -0500 (Wed, 21 Nov 2007)
New Revision: 16728

Modified:
   labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml
Log:
Support production profile: JBESB-1355

Modified: labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml	2007-11-21 10:26:43 UTC (rev 16727)
+++ labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml	2007-11-21 10:27:24 UTC (rev 16728)
@@ -26,7 +26,10 @@
 		<and>
 			<available file="${product.dir}/JBossORG-EULA.txt"/>
 			<not>
-				<available file="${product.dir}/server/default"/>
+				<or>
+					<available file="${product.dir}/server/default"/>
+					<available file="${product.dir}/server/production"/>
+				</or>
 			</not>
 		</and>
 	</condition>
@@ -34,7 +37,10 @@
 	<condition property="hierarchy.jbossesb-server">
 		<and>
 			<available file="${product.dir}/JBossORG-EULA.txt"/>
-			<available file="${product.dir}/server/default"/>
+			<or>
+				<available file="${product.dir}/server/default"/>
+				<available file="${product.dir}/server/production"/>
+			</or>
 		</and>
 	</condition>
 	<!-- Do we build against a jbossesb distribution? -->
@@ -189,7 +195,33 @@
 	<!-- Configure dependencies for jbossesb-server distribution -->
 	<target name="jbossesb-server-dependencies" if="hierarchy.jbossesb-server">
 		<property name="org.jboss.esb.server.home" value="${product.dir}"/> 
-		<property name="org.jboss.esb.server.config" value="default"/>
+
+		<condition property="jbossesb-server-production">
+			<available file="${product.dir}/server/production/deploy/jbossesb.sar"/>
+		</condition>
+		<condition property="jbossesb-server-default">
+			<available file="${product.dir}/server/default/deploy/jbossesb.sar"/>
+		</condition>
+
+		<condition property="jbossesb-server-recognised">
+			<or>
+				<isset property="jbossesb-server-production"/>
+				<isset property="jbossesb-server-default"/>
+			</or>
+		</condition>
+
+		<fail unless="jbossesb-server-recognised" message="Could not detect embedded ESB configuration"/>
+
+		<condition property="org.jboss.esb.server.config"
+			value="default">
+			<isset property="jbossesb-server-default"/>
+		</condition>
+		<condition property="org.jboss.esb.server.config"
+			value="production">
+			<isset property="jbossesb-server-production"/>
+		</condition>
+
+		<echo message="Defaulting to profile: ${org.jboss.esb.server.config}"/>
 	</target>
 	
 <!-- ==================================================================== -->