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

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

Author: kevin.conner at jboss.com
Date: 2007-06-13 10:39:31 -0400 (Wed, 13 Jun 2007)
New Revision: 12543

Modified:
   labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml
Log:
Remove antcalls from base-build.xml

Modified: labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml	2007-06-13 13:08:13 UTC (rev 12542)
+++ labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml	2007-06-13 14:39:31 UTC (rev 12543)
@@ -250,33 +250,25 @@
 		</java>
 	</target>
 
-    <target name="deploy" depends="prepare-deployment">
+    <target name="deploy" depends="prepare-deployment, check-exploded, deploy-esb, deploy-exploded-esb, quickstart-specific-deploys, display-instructions">
 		<description>deploy				will deploy the Quickstart .esb archive to JBoss ESB Server
     	</description>
-		<echo>Deploying Quickstart to JBoss ESB/App Server...</echo>
-
-        <condition property="deploy.exploded.requested">
-            <equals arg1="${deploy.exploded}" arg2="true" casesensitive="false"/>
-        </condition>
-
-        <antcall target="deploy-esb"/>
-        <antcall target="deploy-exploded-esb"/>
-
-        <antcall target="quickstart-specific-deploys" />
-
-        <antcall target="display-instructions" />
     </target>
 
-    <target name="prepare-deployment" depends="compile, config">
+    <target name="prepare-deployment" depends="compile, config, copy-metainf, quickstart-specific-assemblies, package-deployment"/>
+
+    <target name="copy-metainf">
         <mkdir dir="${build.dir}/META-INF" />
         <copy todir="${build.dir}/META-INF">
             <fileset dir="${basedir}" includes="jboss-esb.xml" />
             <fileset dir="${basedir}" includes="deployment.xml" />
         </copy>
-    	
-        <antcall target="quickstart-specific-assemblies" />
+    </target>
 
-        <antcall target="package-deployment" />
+    <target name="check-exploded">
+        <condition property="deploy.exploded.requested">
+            <equals arg1="${deploy.exploded}" arg2="true" casesensitive="false"/>
+        </condition>
     </target>
 
     <target name="deploy-esb" unless="deploy.exploded.requested">
@@ -305,7 +297,7 @@
         </jar>
     </target>
 	
-    <target name="undeploy" depends="dependencies, undeploy-messaging">
+    <target name="undeploy" depends="dependencies, undeploy-messaging, quickstart-specific-undeploys">
 		<description>	undeploy			will undeploy the Quickstart .esb archive from JBoss ESB Server
 		</description>
         <!--delete file="${org.jboss.esb.server.deploy.dir}/${ant.project.name}.esb"  quiet="false"/-->        
@@ -315,7 +307,6 @@
     	<delete verbose="true" includeemptydirs="true" quiet="true"
     	  file="${org.jboss.esb.server.deploy.dir}/${ant.project.name}.esb"/>
 
-        <antcall target="quickstart-specific-undeploys" />
 	</target>
 
 	<target name="deploy-jms-dests" depends="dependencies, deploy-messaging">
@@ -346,11 +337,10 @@
 		</echo>
 	</target>
 
-	<target name="clean">
+	<target name="clean" depends="quickstart-specific-clean">
 		<description>clean				cleans the project
 		</description>
 
-        <antcall target="quickstart-specific-clean" />
 
         <delete dir="${build.dir}" />
 		<delete>