svn commit: rev 53837 - in incubator/beehive/trunk/controls/test: . webapps

[kentam]

Author: kentam
Date: Tue Oct  5 17:20:36 2004
New Revision: 53837

Modified:
   incubator/beehive/trunk/controls/test/build.xml
   incubator/beehive/trunk/controls/test/webapps/build.xml
Log:
Make clean targets even cleaner (delete logs, working temp dirs etc).



Modified: incubator/beehive/trunk/controls/test/build.xml
==============================================================================
--- incubator/beehive/trunk/controls/test/build.xml     (original)
+++ incubator/beehive/trunk/controls/test/build.xml     Tue Oct  5 17:20:36 2004
@@ -34,6 +34,9 @@
     <property name="controlstestbeans.jar" 
location="${build.dir}/controlstestbeans.jar"/>
     <property name="controlstestdrivers.jar" 
location="${build.dir}/controlstestdrivers.jar"/>
     <property name="test.logs" location="${basedir}/logs"/>
+    <property name="mantis.cases" location="${basedir}/mantis-cases"/>
+    <property name="mantis.logs" location="${basedir}/mantis-logs"/>
+    <property name="derby.data" location="${basedir}/test"/>
 
     <condition property="test.os" value="windows" >
        <os family="windows" />
@@ -110,7 +113,12 @@
     <target name="clean">
         <delete dir="${build.dir}"/>
         <delete dir="${test.logs}"/>
+        <delete dir="${mantis.logs}"/>
+        <delete dir="${mantis.cases}"/>
+        <delete dir="${derby.data}"/>
+        <delete file="derby.log"/>
         <delete file="velocity.log"/>
+        <delete><fileset dir="." includes="tch*.*"/></delete>
         <ant dir="webapps" target="clean"/>
     </target>
 

Modified: incubator/beehive/trunk/controls/test/webapps/build.xml
==============================================================================
--- incubator/beehive/trunk/controls/test/webapps/build.xml     (original)
+++ incubator/beehive/trunk/controls/test/webapps/build.xml     Tue Oct  5 
17:20:36 2004
@@ -150,7 +150,7 @@
         <echo message="Injecting ${derby.jar} to ${webapp.name}"/>
         <copy todir="${webapp.dir}/WEB-INF/lib" 
               file="${derby.jar}" verbose="true" 
-              overwrite="true"/>
+              overwrite="true" failonerror="true"/>
     </target>
 
     <target name="-inject.test.controls" if="do.inject.test.controls">
@@ -207,6 +207,7 @@
         </ant>
 
         <delete dir="${staging.dir}"/>
+        <delete file="velocity.log"/>
 
         <echo message="----------------------------------------------"/>
         <echo message="|     Controls controlsWeb clean ending      |"/>