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

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

Author: kevin.conner at jboss.com
Date: 2009-10-25 02:55:51 -0400 (Sun, 25 Oct 2009)
New Revision: 29802

Modified:
   labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml
Log:
Change default profile for platform: JBESB-2899

Modified: labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml	2009-10-25 00:23:35 UTC (rev 29801)
+++ labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml	2009-10-25 06:55:51 UTC (rev 29802)
@@ -24,27 +24,17 @@
 	<!-- Are we embedded in a jbossesb distribution hierarchy? -->
 	<condition property="hierarchy.jbossesb">
 		<and>
-			<or>
-				<available file="${product.dir}/JBossEULA.txt"/>
-			</or>
+			<available file="${product.dir}/JBossEULA.txt"/>
 			<not>
-				<or>
-					<available file="${product.dir}/server/default"/>
-					<available file="${product.dir}/server/production"/>
-				</or>
+				<available file="${product.dir}/server/default"/>
 			</not>
 		</and>
 	</condition>
 	<!-- Are we embedded in a jbossesb-server distribution hierarchy? -->
 	<condition property="hierarchy.jbossesb-server">
 		<and>
-			<or>
-				<available file="${product.dir}/JBossEULA.txt"/>
-			</or>
-			<or>
-				<available file="${product.dir}/server/default"/>
-				<available file="${product.dir}/server/production"/>
-			</or>
+			<available file="${product.dir}/JBossEULA.txt"/>
+			<available file="${product.dir}/server/default"/>
 		</and>
 	</condition>
 	<!-- Do we build against a jbossesb distribution? -->
@@ -325,32 +315,15 @@
 		if="hierarchy.jbossesb-server">
 		<property name="org.jboss.esb.server.home" value="${product.dir}"/> 
 
-		<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>
+		<property name="org.jboss.esb.server.config" value="default"/>
 
 		<condition property="jbossesb-server-recognised">
-			<or>
-				<isset property="jbossesb-server-production"/>
-				<isset property="jbossesb-server-default"/>
-			</or>
+			<available file="${product.dir}/server/${org.jboss.esb.server.config}/deploy/jbossesb.sar"/>
 		</condition>
 
 		<fail unless="jbossesb-server-recognised" message="Could not detect embedded ESB configuration"/>
 
-		<condition property="org.jboss.esb.server.config"
-			value="production">
-			<isset property="jbossesb-server-production"/>
-		</condition>
-		<condition property="org.jboss.esb.server.config"
-			value="default">
-			<isset property="jbossesb-server-default"/>
-		</condition>
-
-		<echo message="Defaulting to profile: ${org.jboss.esb.server.config}"/>
+		<echo message="Using profile: ${org.jboss.esb.server.config}"/>
 	</target>
 	
 <!-- ==================================================================== -->
@@ -361,33 +334,35 @@
 
 	<target name="dependencies" depends="classpath-dependencies-as4, classpath-dependencies-as5, quickstart-specific-checks">
 	
-		<!-- jBPM Console properties -->
-		<condition property="jbpm.production.properties.set" value="true" else="false">
+        <condition property="jbossesb-server-production">
+            <equals arg1="${org.jboss.esb.server.config}" arg2="production"/>
+        </condition>
+
+        <!-- jBPM Console properties -->
+        <condition property="jbpm.production.properties.required">
             <and>
-                <equals arg1="${org.jboss.esb.server.config}" arg2="production"/>
-                <isset property="quickstart.jbpm.console.username"/>
-                <isset property="quickstart.jbpm.console.password"/>
+                <isset property="jbossesb-server-production"/>
+                <not>
+                    <and>
+                        <isset property="quickstart.jbpm.console.username"/>
+                        <isset property="quickstart.jbpm.console.password"/>
+                    </and>
+                </not>
             </and>
          </condition>
-        <fail message="Quickstart configuration error: ${line.separator}${line.separator} jBPM username and password must be set in ${pwd}/quickstarts.properties. ${line.separator} The jBPM web console is secured when running in production mode i.e when org.jboss.esb.server.config=production.">
-            <condition>
-                <and>
-                    <equals arg1="${org.jboss.esb.server.config}" arg2="production"/>
-                    <equals arg1="${jbpm.production.properties.set}" arg2="false"/>
-                </and>
-            </condition>
-        </fail>
+        <fail if="jbpm.production.properties.required"
+        message="Quickstart configuration error: ${line.separator}${line.separator} jBPM username and password must be set in ${pwd}/quickstarts.properties. ${line.separator} The jBPM web console is secured when running in production mode i.e when org.jboss.esb.server.config=production."/>
 
         <condition property="org.jboss.esb.jbpm.console.upload.url" value="/jbpm-console/app/upload/" else="/jbpm-console/upload/">
-            <equals arg1="${org.jboss.esb.server.config}" arg2="production"/>
+            <isset property="jbossesb-server-production"/>
         </condition>
 
         <condition property="jbpm.console.username" value="${quickstart.jbpm.console.username}" else="">
-            <equals arg1="${org.jboss.esb.server.config}" arg2="production"/>
+            <isset property="jbossesb-server-production"/>
         </condition>
 
         <condition property="jbpm.console.password" value="${quickstart.jbpm.console.password}" else="">
-            <equals arg1="${org.jboss.esb.server.config}" arg2="production"/>
+            <isset property="jbossesb-server-production"/>
         </condition>
 
 		<!-- End jBPM Console properties -->