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

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

Author: kevin.conner at jboss.com
Date: 2007-06-11 06:31:48 -0400 (Mon, 11 Jun 2007)
New Revision: 12451

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

Modified: labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml	2007-06-11 09:56:13 UTC (rev 12450)
+++ labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml	2007-06-11 10:31:48 UTC (rev 12451)
@@ -234,9 +234,9 @@
 
 <!-- ==================================================================== -->
 <!-- This section defines the following public targets.                   -->
-<!-- compile, run, deploy jar, package-deployment, undeploy,              -->
-<!-- deploy-jms-dests, undeploy-jms-dests, echoCP, echoPaths, clean,      -->
-<!-- help-quickstarts, help                                               -->
+<!-- compile, run, deploy jar, prepare-deployment, package-deployment,    -->
+<!-- undeploy, deploy-jms-dests, undeploy-jms-dests, echoCP, echoPaths,   -->
+<!-- clean, help-quickstarts, help                                        -->
 <!-- ==================================================================== -->
 
     <target name="compile" depends="dependencies">
@@ -256,21 +256,11 @@
 		</java>
 	</target>
 
-    <target name="deploy" depends="compile, config">
+    <target name="deploy" depends="prepare-deployment">
 		<description>deploy				will deploy the Quickstart .esb archive to JBoss ESB Server
     	</description>
 		<echo>Deploying Quickstart to JBoss ESB/App Server...</echo>
 
-        <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" />
-
-        <antcall target="package-deployment" />
-
         <condition property="deploy.exploded.requested">
             <equals arg1="${deploy.exploded}" arg2="true" casesensitive="false"/>
         </condition>
@@ -283,6 +273,18 @@
         <antcall target="display-instructions" />
     </target>
 
+    <target name="prepare-deployment" depends="compile, config">
+        <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" />
+
+        <antcall target="package-deployment" />
+    </target>
+
     <target name="deploy-esb" unless="deploy.exploded.requested">
     	<copy todir="${org.jboss.esb.server.deploy.dir}"
             file="${build.dir}/${ant.project.name}.esb"/>	

Modified: labs/jbossesb/trunk/product/samples/quickstarts/tests/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/tests/build.xml	2007-06-11 09:56:13 UTC (rev 12450)
+++ labs/jbossesb/trunk/product/samples/quickstarts/tests/build.xml	2007-06-11 10:31:48 UTC (rev 12451)
@@ -38,6 +38,9 @@
       <fileset dir="..">
 	<include name="**/*.jar"/>
       </fileset> 
+      <dirset dir="..">
+	<include name="*/build/classes/"/>
+      </dirset>
       <fileset dir="${lib.ext}" includes="*.jar"/>
       <fileset dir="${product.lib}" includes="*.jar"/>
       <path refid="base.cp"/>
@@ -134,21 +137,10 @@
 	<macrodef name="output-esb">
 		<attribute name="quickstartdir"/>
 		<sequential>	
-			<mkdir dir="@{quickstartdir}/build/META-INF"/>
-		        <copy todir="@{quickstartdir}/build/META-INF">
-            			<fileset dir="@{quickstartdir}" includes="jboss-esb.xml" />
-            			<fileset dir="@{quickstartdir}" includes="deployment.xml" />
-        		</copy>		
-	
-			<ant antfile="build.xml"
-                		dir="@{quickstartdir}"
-                		target="jar"/>
                         <ant antfile="build.xml"
-                                dir="@{quickstartdir}"
-                                target="config"/>
-                        <ant antfile="build.xml"
-                                dir="@{quickstartdir}"
-                                target="package-deployment"/>
+                                dir="@{quickstartdir}">
+                                <target name="prepare-deployment"/>
+                        </ant>
         		<copy todir="output/lib">
                 	<fileset dir="@{quickstartdir}/build">
                        		 <include name="*.esb"/>
@@ -157,26 +149,9 @@
 		</sequential>
 	</macrodef>
 	
-	<!-- bpm_orchestration has non-standard targets -->
-	<ant antfile="build.xml"
-		dir="../bpm_orchestration1"
-		target="esb"/>	
-	<copy todir="output/lib">
-		<fileset dir="../bpm_orchestration1/build">
-			<include name="**"/>
-		</fileset>
-	</copy>
+   	<output-esb quickstartdir="../bpm_orchestration1"/>
+   	<output-esb quickstartdir="../jbpm_simple1"/>
 
-        <!-- jbpm_simple1n has non-standard targets -->
-        <ant antfile="build.xml"
-                dir="../jbpm_simple1"
-                target="esb"/>
-        <copy todir="output/lib">
-                <fileset dir="../jbpm_simple1/build">
-                        <include name="**"/>
-                </fileset>
-        </copy>	
-
    	<output-esb quickstartdir="../fun_cbr">
 	</output-esb>
    	<output-esb quickstartdir="../helloworld">