[jboss-svn-commits] JBL Code SVN: r8883 - in labs/jbossesb/trunk: product and 9 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Jan 17 10:23:50 EST 2007
Author: kevin.conner at jboss.com
Date: 2007-01-17 10:23:50 -0500 (Wed, 17 Jan 2007)
New Revision: 8883
Modified:
labs/jbossesb/trunk/integration-build.xml
labs/jbossesb/trunk/product/build.xml
labs/jbossesb/trunk/product/console/build.xml
labs/jbossesb/trunk/product/core/build.xml
labs/jbossesb/trunk/product/core/listeners/build.xml
labs/jbossesb/trunk/product/core/listeners/tests/build.xml
labs/jbossesb/trunk/product/core/rosetta/build.xml
labs/jbossesb/trunk/product/core/rosetta/tests/build.xml
labs/jbossesb/trunk/product/core/services/build.xml
labs/jbossesb/trunk/product/core/services/tests/build.xml
labs/jbossesb/trunk/qa/build.xml
Log:
Make clean do a clean of everything for CI
Modified: labs/jbossesb/trunk/integration-build.xml
===================================================================
--- labs/jbossesb/trunk/integration-build.xml 2007-01-17 14:47:16 UTC (rev 8882)
+++ labs/jbossesb/trunk/integration-build.xml 2007-01-17 15:23:50 UTC (rev 8883)
@@ -1,14 +1,24 @@
<project name="JBESB-QA" default="integration" basedir=".">
+ <property name="clean.jms.dest" location="clean.jms"/>
+
<target name="integration" description="Run Continuous Integration.">
<ant dir="product">
- <target name="clean"/>
<target name="integration"/>
<target name="dist"/>
<target name="instr-report"/>
</ant>
- <ant dir="qa">
- <target name="clean"/>
- <target name="ci-test"/>
- </ant>
+ <ant dir="qa" target="ci-test"/>
</target>
+
+ <target name="clean" description="Clean the distribution" depends="clean-jms">
+ <delete file="${clean.jms.dest}"/>
+ <ant dir="qa" target="clean"/>
+ <ant dir="product" target="clean"/>
+ </target>
+
+ <target name="clean-jms" description="Clean the JMS queues">
+ <get src="http://localhost:8080/jmx-console/HtmlAdaptor?action=invokeOpByName&name=jboss.mq.destination:service=Queue,name=A&methodName=removeAllMessages" dest="${clean.jms.dest}"/>
+ <get src="http://localhost:8080/jmx-console/HtmlAdaptor?action=invokeOpByName&name=jboss.mq.destination:service=Queue,name=B&methodName=removeAllMessages" dest="${clean.jms.dest}"/>
+ <get src="http://localhost:8080/jmx-console/HtmlAdaptor?action=invokeOpByName&name=jboss.mq.destination:service=Queue,name=C&methodName=removeAllMessages" dest="${clean.jms.dest}"/>
+ </target>
</project>
Modified: labs/jbossesb/trunk/product/build.xml
===================================================================
--- labs/jbossesb/trunk/product/build.xml 2007-01-17 14:47:16 UTC (rev 8882)
+++ labs/jbossesb/trunk/product/build.xml 2007-01-17 15:23:50 UTC (rev 8883)
@@ -333,17 +333,15 @@
<echo message="Cleaning modules"/>
<echo message="Cleaning core"/>
- <ant dir="core" target="clean"/>
- </target>
+ <ant dir="core" target="clean"/>
+ <ant dir="console" target="clean"/>
- <target name="org.jboss.esb.purge">
- <echo message="Purging modules"/>
-
- <ant dir="core" target="purge"/>
-
<delete dir="${org.jboss.esb.internal.dest}"/>
<delete dir="${org.jboss.esb.internal.dest.root}"/>
<delete dir="${org.jboss.esb.internal.javadocs.dest}"/>
+ <delete>
+ <fileset dir="." includes="scout.log unittest.log"/>
+ </delete>
</target>
<!-- Short target names -->
@@ -371,9 +369,6 @@
<target name="clean">
<runant target="org.jboss.esb.clean"/>
</target>
- <target name="purge">
- <runant target="org.jboss.esb.purge"/>
- </target>
<target name="javadoc">
<runant target="org.jboss.esb.javadocs"/>
</target>
Modified: labs/jbossesb/trunk/product/console/build.xml
===================================================================
--- labs/jbossesb/trunk/product/console/build.xml 2007-01-17 14:47:16 UTC (rev 8882)
+++ labs/jbossesb/trunk/product/console/build.xml 2007-01-17 15:23:50 UTC (rev 8883)
@@ -89,7 +89,9 @@
<target name="clean" description="Delete the build folder..">
<mkdir dir="${build.dir}" />
<delete dir="${build.dir}" failonerror="true" />
- <delete dir="${basedir}" includes="**/TESTS-TestSuites.xml" />
+ <delete>
+ <fileset dir="${basedir}" includes="**/TESTS-TestSuites.xml"/>
+ </delete>
</target>
<target name="cleantc" description="Clean Tomcat.">
Modified: labs/jbossesb/trunk/product/core/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/build.xml 2007-01-17 14:47:16 UTC (rev 8882)
+++ labs/jbossesb/trunk/product/core/build.xml 2007-01-17 15:23:50 UTC (rev 8883)
@@ -96,15 +96,8 @@
<ant dir="rosetta" target="clean"/>
<ant dir="listeners" target="clean"/>
<ant dir="services" target="clean"/>
- </target>
-
- <target name="purge" depends="clean">
<delete dir="${org.jboss.esb.internal.dest}/jbossesb"/>
-
- <ant dir="rosetta" target="purge"/>
- <ant dir="listeners" target="purge"/>
- <ant dir="services" target="purge"/>
</target>
<!-- =================================================================== -->
Modified: labs/jbossesb/trunk/product/core/listeners/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/build.xml 2007-01-17 14:47:16 UTC (rev 8882)
+++ labs/jbossesb/trunk/product/core/listeners/build.xml 2007-01-17 15:23:50 UTC (rev 8883)
@@ -40,12 +40,10 @@
</target>
<target name="clean" description="Remove classes directory">
+ <ant dir="tests" target="clean"/>
<delete dir="${org.jboss.esb.listeners.classes.dir}"/>
</target>
- <target name="purge" depends="clean">
- </target>
-
<target name="generate-config-model-1.0" depends="org.jboss.esb.listeners.prepare">
<taskdef name="xmlbean" classname="org.apache.xmlbeans.impl.tool.XMLBean" classpathref="xbeans-classpath" />
<delete dir="${gendir}" /><mkdir dir="${gendir}" />
Modified: labs/jbossesb/trunk/product/core/listeners/tests/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/build.xml 2007-01-17 14:47:16 UTC (rev 8882)
+++ labs/jbossesb/trunk/product/core/listeners/tests/build.xml 2007-01-17 15:23:50 UTC (rev 8883)
@@ -49,10 +49,9 @@
<mkdir dir="${org.jboss.esb.tests.report.dir}"/>
</target>
- <target name="clean"/>
-
- <target name="purge" depends="clean">
+ <target name="clean">
<delete dir="${org.jboss.esb.tests.classes.dir}"/>
+ <delete file="TESTS-TestSuites.xml"/>
</target>
<target name="org.jboss.esb.listeners.tests.compile" if="org.jboss.esb.buildtests" depends="org.jboss.esb.tests.init">
Modified: labs/jbossesb/trunk/product/core/rosetta/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/build.xml 2007-01-17 14:47:16 UTC (rev 8882)
+++ labs/jbossesb/trunk/product/core/rosetta/build.xml 2007-01-17 15:23:50 UTC (rev 8883)
@@ -30,12 +30,10 @@
</target>
<target name="clean" description="Remove classes directory">
+ <ant dir="tests" target="clean"/>
<delete dir="${org.jboss.esb.rosetta.classes.dir}"/>
</target>
- <target name="purge" depends="clean">
- </target>
-
<target name="org.jboss.esb.rosetta.compile">
<!-- Compile common -->
<antcall target="org.jboss.esb.rosetta.internal.compile"/>
Modified: labs/jbossesb/trunk/product/core/rosetta/tests/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/build.xml 2007-01-17 14:47:16 UTC (rev 8882)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/build.xml 2007-01-17 15:23:50 UTC (rev 8883)
@@ -41,10 +41,9 @@
<mkdir dir="${org.jboss.esb.tests.report.dir}"/>
</target>
- <target name="clean"/>
-
- <target name="purge" depends="clean">
+ <target name="clean">
<delete dir="${org.jboss.esb.tests.classes.dir}"/>
+ <delete file="TESTS-TestSuites.xml"/>
</target>
<target name="org.jboss.esb.rosetta.tests.compile" if="org.jboss.esb.buildtests" depends="org.jboss.esb.tests.init">
Modified: labs/jbossesb/trunk/product/core/services/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/services/build.xml 2007-01-17 14:47:16 UTC (rev 8882)
+++ labs/jbossesb/trunk/product/core/services/build.xml 2007-01-17 15:23:50 UTC (rev 8883)
@@ -85,12 +85,10 @@
<!-- Clean -->
<!-- =================================================================== -->
<target name="clean" description="Remove classes directory">
+ <ant dir="tests" target="clean"/>
<delete dir="${org.jboss.esb.services.classes.dir}"/>
</target>
- <target name="purge" depends="clean">
- </target>
-
<!-- =================================================================== -->
<!-- Rebuild everything from scratch -->
<!-- =================================================================== -->
Modified: labs/jbossesb/trunk/product/core/services/tests/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/services/tests/build.xml 2007-01-17 14:47:16 UTC (rev 8882)
+++ labs/jbossesb/trunk/product/core/services/tests/build.xml 2007-01-17 15:23:50 UTC (rev 8883)
@@ -38,10 +38,9 @@
<mkdir dir="${org.jboss.esb.tests.report.dir}"/>
</target>
- <target name="clean"/>
-
- <target name="purge" depends="clean">
+ <target name="clean">
<delete dir="${org.jboss.esb.tests.classes.dir}"/>
+ <delete file="TESTS-TestSuites.xml"/>
</target>
<target name="org.jboss.esb.services.tests.compile" if="org.jboss.esb.buildtests" depends="org.jboss.esb.tests.init">
Modified: labs/jbossesb/trunk/qa/build.xml
===================================================================
--- labs/jbossesb/trunk/qa/build.xml 2007-01-17 14:47:16 UTC (rev 8882)
+++ labs/jbossesb/trunk/qa/build.xml 2007-01-17 15:23:50 UTC (rev 8883)
@@ -42,7 +42,11 @@
<echo message="Cleaning..."/>
<delete dir="${basedir}/build" />
- <delete file="${basedir}/qatests.log" />
+ <delete>
+ <fileset dir="." includes="qatests.log unittest.log"/>
+ </delete>
+ <!-- hardcoded in at least one test -->
+ <delete dir="${basedir}/product" />
</target>
<target name="ant">
More information about the jboss-svn-commits
mailing list