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

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

Author: kevin.conner at jboss.com
Date: 2010-03-09 05:45:23 -0500 (Tue, 09 Mar 2010)
New Revision: 32002

Modified:
   labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/conf/base-build.xml
Log:
Add support for GPD deployer: JBESB-3203

Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/conf/base-build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/conf/base-build.xml	2010-03-09 10:37:57 UTC (rev 32001)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/samples/quickstarts/conf/base-build.xml	2010-03-09 10:45:23 UTC (rev 32002)
@@ -538,29 +538,52 @@
     </target>
 
     <target name="assert-jbpm-secured" depends="jbossesb-dependencies">
-        <condition property="jbpm.production.properties.set">
+        <condition property="jbossesb-server-production">
+            <available file="${org.jboss.esb.server.home}/server/production"/>
+        </condition>
+        <condition property="jbossesb-server-gpd-deployer">
+            <available file="${org.jboss.esb.server.server}/deploy/jbpm.esb/gpd-deployer.war"/>
+        </condition>
+
+        <!-- jBPM Console properties -->
+        <condition property="jbossesb-server-secured">
             <or>
+                <isset property="jbossesb-server-production"/>
+                <isset property="jbossesb-server-gpd-deployer"/>
+            </or>
+        </condition>
+        <condition property="jbpm.secure.properties.required">
+            <and>
+                <isset property="jbossesb-server-secured"/>
                 <not>
-                    <equals arg1="${org.jboss.esb.server.config}" arg2="production"/>
+                    <and>
+                        <isset property="quickstart.jbpm.console.username"/>
+                        <isset property="quickstart.jbpm.console.password"/>
+                    </and>
                 </not>
-                <and>
-                    <isset property="quickstart.jbpm.console.username"/>
-                    <isset property="quickstart.jbpm.console.password"/>
-                </and>
-            </or>
+            </and>
         </condition>
-        <fail unless="jbpm.production.properties.set" 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."/>
+        <fail if="jbpm.secure.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."/>
 
-        <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"/>
+        <condition property="org.jboss.esb.jbpm.console.upload.url" value="/gpd-deployer/upload/">
+            <isset property="jbossesb-server-gpd-deployer"/>
         </condition>
+        <condition property="org.jboss.esb.jbpm.console.upload.url" value="/jbpm-console/app/upload/">
+            <isset property="jbossesb-server-production"/>
+        </condition>
+        <condition property="org.jboss.esb.jbpm.console.upload.url" value="/jbpm-console/upload/">
+            <not>
+                <isset property="jbossesb-server-secured"/>
+            </not>
+        </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-secured"/>
         </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-secured"/>
         </condition>
     </target>