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

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

Author: kevin.conner at jboss.com
Date: 2007-11-21 05:19:25 -0500 (Wed, 21 Nov 2007)
New Revision: 16724

Modified:
   labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml
Log:
JBESB-1004

Modified: labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml	2007-11-21 10:18:46 UTC (rev 16723)
+++ labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml	2007-11-21 10:19:25 UTC (rev 16724)
@@ -66,7 +66,7 @@
 <!-- This section handles the discovery of the messaging platform.        -->
 <!-- ==================================================================== -->
 
-    <target name="messaging-config">
+    <target name="messaging-config" depends="jbossesb-dependencies">
         <property name="org.jboss.esb.server.deploy.dir" 
             value="${org.jboss.esb.server.server}/deploy"/>
 
@@ -85,13 +85,13 @@
     </target>
 
     <!-- dependencies specific to JBoss Messaging -->
-    <target name="messaging-dependencies" if="messaging.present">
+    <target name="messaging-dependencies" if="messaging.present" depends="messaging-config">
         <property name="jms.service.file" value="jbm-queue-service.xml"/>
         <property name="jms.description" value="JBoss Messaging"/>
     </target>
 
     <!-- dependencies specific to JBoss MQ -->
-    <target name="jbossmq-dependencies" if="jbossmq.present">
+    <target name="jbossmq-dependencies" if="jbossmq.present" depends="messaging-config">
         <property name="jms.service.file" value="jbmq-queue-service.xml"/>
         <property name="jms.description" value="JBoss MQ"/>
     </target>
@@ -120,7 +120,7 @@
 <!-- ==================================================================== -->
 
 	<!-- Configure dependencies for jbossesb and source distributions -->
-	<target name="jbossesb-dependencies" depends="jbossesb-source-dependencies, jbossesb-server-dependencies">
+	<target name="jbossesb-dependencies" depends="check-jbossesb-dist, qslib-dependencies, non-qslib-dependencies, jbossesb-source-dependencies, jbossesb-server-dependencies">
 		<property name="org.jboss.esb.server.server" location="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}"/>
 
 		<path id="deployment-classpath">
@@ -198,7 +198,7 @@
 <!-- compile-classpath, exec-classpath                                    -->
 <!-- ==================================================================== -->
 
-	<target name="dependencies" depends="check-jbossesb-dist, qslib-dependencies, non-qslib-dependencies, jbossesb-dependencies, messaging-config, messaging-dependencies, jbossmq-dependencies, quickstart-specific-dependencies">
+	<target name="dependencies" depends="messaging-dependencies, jbossmq-dependencies, quickstart-specific-dependencies">
     	
 		<path id="compile-classpath">
 			<path refid="quickstart-dependencies-classpath" />
@@ -319,6 +319,15 @@
 
 	</target>
 
+	<target name="check-jms-dests" depends="messaging-dependencies">
+
+		<condition property="jms.dests.notrequired">
+			<not>	
+				<available file="${basedir}/${jms.service.file}"/>
+			</not>
+		</condition>
+	</target>
+
 	<target name="deploy-jms-dests" depends="dependencies, deploy-messaging">
 		<description>deploy-jms-dests		will deploy the jms destinations for application server
 		</description>
@@ -386,11 +395,11 @@
 <!-- This section defines standalone message deployment                   -->
 <!-- ==================================================================== -->
 
-    <target name="deploy-messaging">
+    <target name="deploy-messaging"  depends="check-jms-dests" unless="jms.dests.notrequired">
         <copy file="${jms.service.file}" overwrite="true" tofile="${org.jboss.esb.server.deploy.dir}/${ant.project.name}-queue-service.xml" failonerror="false"/>
     </target>
 
-    <target name="undeploy-messaging">
+    <target name="undeploy-messaging" depends="check-jms-dests" unless="jms.dests.notrequired">
         <delete file="${org.jboss.esb.server.deploy.dir}/${ant.project.name}-queue-service.xml" quiet="true"/>
     </target>