[jboss-svn-commits] JBL Code SVN: r35206 - in labs/jbossesb/branches/JBESB_4_9_CP/product/samples/quickstarts: webservice_producer and 1 other directory.

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

Author: kevin.conner at jboss.com
Date: 2010-09-21 08:48:02 -0400 (Tue, 21 Sep 2010)
New Revision: 35206

Modified:
   labs/jbossesb/branches/JBESB_4_9_CP/product/samples/quickstarts/conf/base-build.xml
   labs/jbossesb/branches/JBESB_4_9_CP/product/samples/quickstarts/webservice_producer/build.xml
Log:
Fix webservice_producer duplicate deployments: JBESB-3480

Modified: labs/jbossesb/branches/JBESB_4_9_CP/product/samples/quickstarts/conf/base-build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_9_CP/product/samples/quickstarts/conf/base-build.xml	2010-09-21 08:37:06 UTC (rev 35205)
+++ labs/jbossesb/branches/JBESB_4_9_CP/product/samples/quickstarts/conf/base-build.xml	2010-09-21 12:48:02 UTC (rev 35206)
@@ -514,7 +514,7 @@
 	<mkdir dir="lib"/>
         <jar destfile="${build.dir}/${ant.project.name}.esb">
                    <fileset dir="${build.dir}/classes" excludes="${quickstart.classes.excludes}" includes="${quickstart.classes.includes}"/>
-                   <fileset dir="${build.dir}" includes="*.jar,*.war"/>
+                   <fileset dir="${build.dir}" includes="*.jar,*.war" excludes="${quickstart.deployment.excludes}"/>
                    <fileset dir="${build.dir}" includes="deployment.xml"/>
                    <fileset dir="${build.dir}" includes="META-INF/**" />
                    <fileset dir="${basedir}/src" excludes="**/*.java" /> <!-- Please leave the src dir in here! -->
@@ -797,6 +797,7 @@
     <property name="deploy.exploded" value="false" />
     <property name="quickstart.classes.includes" value="**"/>
     <property name="quickstart.classes.excludes" value=""/>
+    <property name="quickstart.deployment.excludes" value=""/>
 	
     <target name="quickstart-specific-dependencies">
     	<path id="quickstart-dependencies-classpath"/>

Modified: labs/jbossesb/branches/JBESB_4_9_CP/product/samples/quickstarts/webservice_producer/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_9_CP/product/samples/quickstarts/webservice_producer/build.xml	2010-09-21 08:37:06 UTC (rev 35205)
+++ labs/jbossesb/branches/JBESB_4_9_CP/product/samples/quickstarts/webservice_producer/build.xml	2010-09-21 12:48:02 UTC (rev 35206)
@@ -5,11 +5,12 @@
 		${line.separator}
 	</description>
 			
+	<property name="quickstart.classes.excludes" value="**/webserviceproducer/webservice/*"/>
+	<property name="quickstart.deployment.excludes" value="${ant.project.name}.war ${ant.project.name}_alternate.war"/>
+
 	<!-- Import the base Ant build script... -->
 	<import file="../conf/base-build.xml"/>
 
-    <property name="quickstart.classes.excludes" value="**/webserviceproducer/webservice/*"/>
-
     <target name="quickstart-specific-checks" depends="assert-ws-available"/>
 
     <target name="quickstart-specific-dependencies">
@@ -18,8 +19,9 @@
         </path>
     </target>
 
-    <target name="makewar" depends="prepare-deployment">
-
+    <target name="quickstart-specific-assemblies">
+        <!-- Overriden from the target of the same name in base-build.xml. -->
+        <!-- Called by the "deploy" target.  Don't call directly!! -->
         <!-- Build the webservice... -->
         <war warfile="build/${ant.project.name}.war"
              webxml="${basedir}/war/resources/WEB-INF/web.xml">
@@ -43,23 +45,15 @@
         </war>
     </target>
 
-	<target name="deploy" depends="makewar">
-		<copy todir="${org.jboss.esb.server.deploy.dir}"
-			file="${build.dir}/${ant.project.name}.war"/>
-		<copy todir="${org.jboss.esb.server.deploy.dir}"
-			file="${build.dir}/${ant.project.name}_alternate.war"/>
-		<copy todir="${org.jboss.esb.server.deploy.dir}"
-			file="${build.dir}/${ant.project.name}.esb"/>
-	</target>
+    <target name="quickstart-specific-deploys">
+        <copy todir="${org.jboss.esb.server.deploy.dir}" file="${build.dir}/${ant.project.name}.war"/>
+        <copy todir="${org.jboss.esb.server.deploy.dir}" file="${build.dir}/${ant.project.name}_alternate.war"/>
+    </target>
 
-	<target name="undeploy" depends="dependencies">
-		<delete verbose="true" quiet="true"
-			file="${org.jboss.esb.server.deploy.dir}/${ant.project.name}.esb"/>
-		<delete verbose="true" quiet="true"
-			file="${org.jboss.esb.server.deploy.dir}/${ant.project.name}.war"/>
-		<delete verbose="true" quiet="true"
-			file="${org.jboss.esb.server.deploy.dir}/${ant.project.name}_alternate.war"/>
-	</target>
+    <target name="quickstart-specific-undeploys">
+        <delete verbose="true" quiet="true" file="${org.jboss.esb.server.deploy.dir}/${ant.project.name}.war"/>
+        <delete verbose="true" quiet="true" file="${org.jboss.esb.server.deploy.dir}/${ant.project.name}_alternate.war"/>
+    </target>
 
     <target name="runtest" depends="compile" description="run tests over jms, http, and socket">
         <antcall target="saygoodbye_over_jms" />