[jboss-svn-commits] JBL Code SVN: r13600 - in labs/jbossesb/trunk/product/samples/quickstarts: helloworld_ftp_action and 1 other directories.

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

Author: kevin.conner at jboss.com
Date: 2007-07-18 04:57:30 -0400 (Wed, 18 Jul 2007)
New Revision: 13600

Modified:
   labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml
   labs/jbossesb/trunk/product/samples/quickstarts/helloworld_ftp_action/build.xml
   labs/jbossesb/trunk/product/samples/quickstarts/static_router/build.xml
Log:
Added ftp config assertion: JBESB-715

Modified: labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml	2007-07-18 08:19:20 UTC (rev 13599)
+++ labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml	2007-07-18 08:57:30 UTC (rev 13600)
@@ -430,6 +430,17 @@
         <echo message="JBoss EJB3 container found on target '${org.jboss.esb.server.deploy.dir}'." />
     </target>
 
+    <target name="assert-ftp-config">
+        <condition property="quickstart.ftp.config">
+            <and>
+                <isset property="quickstart.jbossesb.ftp.hostname"/>
+                <isset property="quickstart.jbossesb.ftp.username"/>
+                <isset property="quickstart.jbossesb.ftp.password"/>
+                <isset property="quickstart.jbossesb.ftp.directory"/>
+            </and>
+        </condition>
+        <fail unless="quickstart.ftp.config" message="Please configure ftp properties in quickstart.properties"/>
+    </target>
 <!-- ==================================================================== -->
 <!-- This section defines properties/targets to be overridden by the      -->
 <!-- quickstart specific build.xml file.                                  -->

Modified: labs/jbossesb/trunk/product/samples/quickstarts/helloworld_ftp_action/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/helloworld_ftp_action/build.xml	2007-07-18 08:19:20 UTC (rev 13599)
+++ labs/jbossesb/trunk/product/samples/quickstarts/helloworld_ftp_action/build.xml	2007-07-18 08:57:30 UTC (rev 13600)
@@ -9,7 +9,7 @@
 	
 	<import file="../conf/base-build.xml"/>
   
-	<target name="config" unless="readonly.mode">
+	<target name="config" unless="readonly.mode" depends="assert-ftp-config">
 		<antcall target="filter_jboss-esb.xml">
 				<param name="file.name" value="jboss-esb-unfiltered.xml"/>
 				<param name="to.file.name" value="${basedir}/jboss-esb.xml"/>
@@ -17,11 +17,6 @@
 		<copy file="log4j.xml" tofile="build/log4j.xml"/>
 	</target>
 	
-	<fail unless="quickstart.jbossesb.ftp.hostname" message="quickstart.jbossesb.ftp.hostname must be set in quickstart.properties"/>
-	<fail unless="quickstart.jbossesb.ftp.username" message="quickstart.jbossesb.ftp.username must be set in quickstart.properties"/>
-	<fail unless="quickstart.jbossesb.ftp.password" message="quickstart.jbossesb.ftp.password must be set in quickstart.properties"/>
-	<fail unless="quickstart.jbossesb.ftp.directory" message="quickstart.jbossesb.ftp.directory must be set in quickstart.properties"/>
-	
 	<target name="runtest" depends="compile"
 		description="will create a test file that will trigger the FTP action">
 		<tstamp>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/static_router/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/static_router/build.xml	2007-07-18 08:19:20 UTC (rev 13599)
+++ labs/jbossesb/trunk/product/samples/quickstarts/static_router/build.xml	2007-07-18 08:57:30 UTC (rev 13600)
@@ -25,7 +25,7 @@
 	<property name="jbossesb.service3.input" location="${jbossesb.service3.dir}/input"/>
 	<property name="jbossesb.service3.post" location="${jbossesb.service3.dir}/post"/>
 
-	<target name="config">
+	<target name="config" depends="assert-ftp-config">
 		<delete dir="${jbossesb.rootdir}" quiet="true"/>
 		<mkdir dir="${jbossesb.rootdir}"/>
 		<mkdir dir="${jbossesb.staticrouter.dir}"/>