[jboss-svn-commits] JBL Code SVN: r34708 - labs/jbossesb/branches/JBESB_4_9_CP/qa/quickstarts.

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

Author: kevin.conner at jboss.com
Date: 2010-08-13 10:56:08 -0400 (Fri, 13 Aug 2010)
New Revision: 34708

Modified:
   labs/jbossesb/branches/JBESB_4_9_CP/qa/quickstarts/build.xml
Log:
Revert to properties, initialise on compile, inherit properties: JBESB-2450

Modified: labs/jbossesb/branches/JBESB_4_9_CP/qa/quickstarts/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_9_CP/qa/quickstarts/build.xml	2010-08-13 12:47:06 UTC (rev 34707)
+++ labs/jbossesb/branches/JBESB_4_9_CP/qa/quickstarts/build.xml	2010-08-13 14:56:08 UTC (rev 34708)
@@ -168,11 +168,11 @@
    </target>
 
    <target name="clean-esb" if="quickstarts.exist">
-   	<foreach target="qclean" param="quickstartfile">
+   	<foreach target="qclean" param="quickstartfile" inheritall="true">
        	  <path>
-      	 	<dirset dir="${product.build}/jbossesb/samples">
-      	 		<include name="quickstarts/*"/>
-      	 		<exclude name="quickstarts/conf"/>
+      	 	<dirset dir="${org.jboss.esb.test.quickstarts.dir}">
+      	 		<include name="*"/>
+      	 		<exclude name="conf"/>
        	  	</dirset>
        	  </path>
        	</foreach>
@@ -183,27 +183,27 @@
 		target="prepare-deployment"/>
    </target>
 
-   <target name="compile-esb">
-   	<foreach target="pdeploy" param="quickstartfile">
+   <target name="compile-esb" depends="init">
+   	<foreach target="pdeploy" param="quickstartfile" inheritall="true">
        	  <path>
-      	 	<dirset dir="${product.build}/jbossesb/samples">
-      	 		<include name="quickstarts/*"/>
-      	 		<exclude name="quickstarts/conf"/>
+      	 	<dirset dir="${org.jboss.esb.test.quickstarts.dir}">
+      	 		<include name="*"/>
+      	 		<exclude name="conf"/>
 
       	 		<!-- Quickstarts which require an ejb3 
       	 		     	container are excepted -->
-      	 		<exclude name="quickstarts/business_service"/>
-      	 		<exclude name="quickstarts/ejbprocessor"/>
+      	 		<exclude name="business_service"/>
+      	 		<exclude name="ejbprocessor"/>
 
 			<!-- Quickstarts which require AS 5.0+  
 			     	are excepted-->
-			<exclude name="quickstarts/security_saml"/>
+			<exclude name="security_saml"/>
 				
 			<!-- Quickstarts which require remoting upgrades
 			     	are excepted -->
-			<exclude name="quickstarts/webservice_mtom"/>
-			<exclude name="quickstarts/webservice_wsaddressing"/>
-			<exclude name="quickstarts/webservice_wssecurity"/>
+			<exclude name="webservice_mtom"/>
+			<exclude name="webservice_wsaddressing"/>
+			<exclude name="webservice_wssecurity"/>
        	  	</dirset>
        	  </path>
        	</foreach>