[jboss-svn-commits] JBL Code SVN: r11667 - in labs/jbossesb/trunk/product/samples/quickstarts: conf and 1 other directory.

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

Author: beve
Date: 2007-05-04 03:07:34 -0400 (Fri, 04 May 2007)
New Revision: 11667

Modified:
   labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration1/build.xml
   labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml
Log:
Modified base-build.xml so that both .esb files and .esb directories can be deployed/undeployed.
In the build.xml I've overridden package-deployment as the bpm_orchestration1 quickstart is deployed in exploded view.


Modified: labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration1/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration1/build.xml	2007-05-04 03:53:33 UTC (rev 11666)
+++ labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration1/build.xml	2007-05-04 07:07:34 UTC (rev 11667)
@@ -1,14 +1,15 @@
 <project name="Quickstart_bpm_orchestration1" default="esb" basedir=".">
 
-  <description>
-    ${ant.project.name}
-    ${line.separator}
-  </description>
+	<description>
+		${ant.project.name}
+		${line.separator}
+	</description>
 
   <!-- Import the base Ant build script... -->
   <import file="../conf/base-build.xml"/>
 
-  <property name="jbpm.services.build.dir" value="${product.dir}/build/services/jbpm.esb" />
+  <!--property name="jbpm.services.build.dir" value="${product.dir}/build/services/jbpm.esb" /-->
+  <property name="jbpm.services.build.dir" value="${product.dir}/build/jbossesb/lib/jbpm.esb" />
   <property name="jbossesb.inputdir" location="/tmp"/>
   <property name="project.process.dir" value="processDefinition1"/>
 	
@@ -39,7 +40,15 @@
       <fileset dir="scripts" includes="**/*" />
     </copy>
   </target>
+	
+	<!-- override as we deploy in exploded view -->
+	<target name="package-deployment"/>	
+	
+	<target name="run">
+		<echo message="This target is not implemented for this quickstart. Please run 'ant deploy' and the 'ant runtest'"/>
+	</target>
 
+	<!--
     <target name="deploy" depends="esb">
 		<description>deploy	will deploy the Quickstart .esb archive to JBoss ESB Server
     	</description>
@@ -56,15 +65,16 @@
         <echo message='******************' />
 
     </target>
+    -->
 
-  <target name="refreshProcess">
+  <target name="refreshProcess" description="Moves the changed process definition to the server without restarting all the services">
     <echo>Moves the changed process definition to the server without restarting all the services</echo>
     <copy overwrite="true" 
         file="${project.process.dir}/processdefinition.xml"
 	    tofile="${org.jboss.esb.server.deploy.dir}/${ant.project.name}.esb/processdefinition.xml"/>
   </target>
 	
-  <target name="deployProcess" depends="compile">
+  <target name="deployProcess" depends="compile" description="Sends a message to deploy the process definition">
     <echo>Sends a message to deploy the process definition</echo>
 	<java fork="yes" classname="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.test.SendTestMessage" failonerror="true">
 		<arg value="${jbossesb.inputdir}"/>
@@ -74,7 +84,7 @@
 	</java>
   </target>
       
-  <target name="startProcess" depends="compile">
+  <target name="startProcess" depends="compile" description="Sends a message to start the process instance">
 	<echo>Sends a message to start the process instance</echo>
 	<java fork="yes" classname="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.test.SendTestMessage" failonerror="true">
 	  <arg value="${jbossesb.inputdir}"/>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml	2007-05-04 03:53:33 UTC (rev 11666)
+++ labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml	2007-05-04 07:07:34 UTC (rev 11667)
@@ -124,7 +124,7 @@
             <fileset dir="${basedir}" includes="jboss-esb.xml" />
             <fileset dir="${basedir}" includes="deployment.xml" />
         </copy>
-
+    	
         <antcall target="quickstart-specific-assemblies" />
 
         <antcall target="package-deployment" />
@@ -169,7 +169,13 @@
     <target name="undeploy">
 		<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"/>        
+        <!--delete file="${org.jboss.esb.server.deploy.dir}/${ant.project.name}.esb"  quiet="false"/-->        
+    	
+    	<delete verbose="true" includeemptydirs="true">
+    		<fileset dir="${org.jboss.esb.server.deploy.dir}">
+    			<include name="${ant.project.name}.esb"/>        
+    		</fileset>
+    	</delete>
 	</target>
 
     <target name="quickstart-specific-assemblies">
@@ -189,11 +195,21 @@
     </target>
 
     <target name="deploy-esb-archive-before" unless="deploy-after">
-        <copy file="${build.dir}/${ant.project.name}.esb" overwrite="true" todir="${org.jboss.esb.server.deploy.dir}" />
+        <!--copy file="${build.dir}/${ant.project.name}.esb" overwrite="true" todir="${org.jboss.esb.server.deploy.dir}" /-->
+    	<copy todir="${org.jboss.esb.server.deploy.dir}">
+    		<fileset dir="${build.dir}">
+    			<include name="${ant.project.name}.esb"/>	
+    		</fileset>
+		</copy>
     </target>
 	
     <target name="deploy-esb-archive-after" if="deploy-after">
-        <copy file="${build.dir}/${ant.project.name}.esb" overwrite="true" todir="${org.jboss.esb.server.deploy.dir}" />        
+        <!--copy file="${build.dir}/${ant.project.name}.esb" overwrite="true" todir="${org.jboss.esb.server.deploy.dir}" /-->        
+    	<copy todir="${org.jboss.esb.server.deploy.dir}">
+    		<fileset dir="${build.dir}">
+    			<include name="${ant.project.name}.esb"/>	
+    		</fileset>
+		</copy>
     </target>
 	
 	<target name="deploy-jms-dests">
@@ -206,6 +222,7 @@
 	<target name="undeploy-jms-dests">
 		<description>undeploy-jms-dests		will undeploy the jms destination for application server
 		</description>
+		
         <delete file="${org.jboss.esb.server.deploy.dir}/${jms.destinations.file}"/>
 	</target>