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

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

Author: kevin.conner at jboss.com
Date: 2010-01-25 01:25:29 -0500 (Mon, 25 Jan 2010)
New Revision: 31198

Modified:
   labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/conf/base-build.xml
Log:
Add support for gpd-deployer.war: JBESB-3145

Modified: labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/conf/base-build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/conf/base-build.xml	2010-01-24 01:02:54 UTC (rev 31197)
+++ labs/jbossesb/branches/JBESB_4_7_CP/product/samples/quickstarts/conf/base-build.xml	2010-01-25 06:25:29 UTC (rev 31198)
@@ -695,11 +695,20 @@
         <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="jbpm.production.properties.required">
+        <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-production"/>
+                <isset property="jbossesb-server-secured"/>
                 <not>
                     <and>
                         <isset property="quickstart.jbpm.console.username"/>
@@ -708,19 +717,27 @@
                 </not>
             </and>
          </condition>
-         <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."/>
+         <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/">
+        <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="">
-            <isset property="jbossesb-server-production"/>
+            <isset property="jbossesb-server-secured"/>
         </condition>
 
         <condition property="jbpm.console.password" value="${quickstart.jbpm.console.password}" else="">
-            <isset property="jbossesb-server-production"/>
+            <isset property="jbossesb-server-secured"/>
         </condition>
     </target>