[jboss-svn-commits] JBL Code SVN: r14840 - in labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel: services/order-manager and 1 other directory.

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

Author: tfennelly
Date: 2007-09-03 14:19:44 -0400 (Mon, 03 Sep 2007)
New Revision: 14840

Modified:
   labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/build.xml
   labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/jboss-esb.xml
   labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/services/order-manager/order-manager.properties
Log:
http://jira.jboss.com/jira/browse/JBESB-977

Added a check for the directory.

Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/build.xml	2007-09-03 17:57:22 UTC (rev 14839)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/build.xml	2007-09-03 18:19:44 UTC (rev 14840)
@@ -87,7 +87,7 @@
         <fail unless="ae-available">**** DEPLOYMENT FAILED... Sorry, this Quickstart requires version 3.1 of the ActiveEndpoints 'ActiveBPEL' engine to be installed on your local Tomcat server at ${env.CATALINA_HOME}.  Download the engine from http://www.active-endpoints.com/</fail>
     </target>
 
-    <target name="build-ejb-service" depends="dependencies,assert-ejb3-available">
+    <target name="build-ejb-service" depends="dependencies,assert-ejb3-available,assert-order.approval.drop.location-available">
         <delete dir="${build.dir}/${servicename}" />
         <mkdir dir="${build.dir}/${servicename}" />
 		<javac srcdir="services/${servicename}/src" destdir="${build.dir}/${servicename}">
@@ -106,6 +106,13 @@
         </jar>
     </target>
 
+    <target name="assert-order.approval.drop.location-available">
+        <property name="order-manager-properties-file" value="services/order-manager/order-manager.properties" />
+        <property file="${order-manager-properties-file}" />
+        <available file="${order.approval.drop.location}" type="dir" property="drop-location-available" />
+        <fail unless="drop-location-available" message="***** Deployment Error: The 'Order Manager' Service is configured to drop Order Approval files in '${order.approval.drop.location}' (see ${order-manager-properties-file} file).  This directory is not currently available." />
+    </target>
+
     <target name="config-security" depends="assert-CATALINA_HOME-set, assert-ACTIVEBPEL_ENGINE-installed">
         <delete file="${env.CATALINA_HOME}/conf/activebpel.keystore" failonerror="false"/>
         <genkey keystore="${env.CATALINA_HOME}/conf/activebpel.keystore" storepass="activebpel" keypass="activebpel" keyalg="RSA" alias="activebpel">

Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/jboss-esb.xml	2007-09-03 17:57:22 UTC (rev 14839)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/jboss-esb.xml	2007-09-03 18:19:44 UTC (rev 14840)
@@ -37,6 +37,11 @@
             <jbr-bus busid="Socket-1" port="8988"/>
         </jbr-provider>
 
+        <!--
+            If you update the 'directory' attribute of the notificationChannel filter,
+            make sure to also update the 'order.approval.drop.location' property
+            in the services/order-manager/order-manager.properties file.
+        -->
         <fs-provider name="File Sys Provider">
             <fs-bus busid="notificationChannel">
                 <fs-message-filter

Modified: labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/services/order-manager/order-manager.properties
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/services/order-manager/order-manager.properties	2007-09-03 17:57:22 UTC (rev 14839)
+++ labs/jbossesb/trunk/product/samples/quickstarts/webservice_bpel/services/order-manager/order-manager.properties	2007-09-03 18:19:44 UTC (rev 14840)
@@ -1,2 +1,6 @@
-
+#
+# The Order Approval drop zone.
+# NOTE: If you change this setting, be sure to update the 'notificationChannel'
+#       bus config in the jboss-esb.xml.
+#              
 order.approval.drop.location=/ae-demo/orders
\ No newline at end of file