You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by mi...@apache.org on 2005/02/04 23:43:17 UTC

svn commit: r151437 - in lenya/branches/BRANCH_1_2_X/src/targets: compile-build.xml webapp-build.xml

Author: michi
Date: Fri Feb  4 14:43:15 2005
New Revision: 151437

URL: http://svn.apache.org/viewcvs?view=rev&rev=151437
Log:
reset target integrated into clean target

Modified:
    lenya/branches/BRANCH_1_2_X/src/targets/compile-build.xml
    lenya/branches/BRANCH_1_2_X/src/targets/webapp-build.xml

Modified: lenya/branches/BRANCH_1_2_X/src/targets/compile-build.xml
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/targets/compile-build.xml?view=diff&r1=151436&r2=151437
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/targets/compile-build.xml (original)
+++ lenya/branches/BRANCH_1_2_X/src/targets/compile-build.xml Fri Feb  4 14:43:15 2005
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 
-<!-- $Id: compile-build.xml,v 1.4 2004/05/04 13:46:26 michi Exp $ -->
+<!-- $Id$ -->
 
 <project name="compile">
 
@@ -68,5 +68,10 @@
     <delete dir="${build.root}"/>
     <echo>INFO: Delete ${dist.root}</echo>
     <delete dir="${dist.root}"/>
+
+    <condition property="servlet.engine.tomcat">
+      <equals arg1="${web.app.server}" arg2="Tomcat"/>
+    </condition>
+    <antcall target="clean-tomcat"/>
   </target>
 </project>

Modified: lenya/branches/BRANCH_1_2_X/src/targets/webapp-build.xml
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/targets/webapp-build.xml?view=diff&r1=151436&r2=151437
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/targets/webapp-build.xml (original)
+++ lenya/branches/BRANCH_1_2_X/src/targets/webapp-build.xml Fri Feb  4 14:43:15 2005
@@ -180,7 +180,7 @@
   <!-- Clean targets                                                -->
   <!-- ============================================================ -->
 
-  <target name="reset" depends="clean" description="Resets the deployment by also cleaning the servlet engine context">
+  <target name="clean-tomcat" description="Resets the deployment by also cleaning the servlet engine context" if="servlet.engine.tomcat">
     <!-- Empty server cache - this directory is set in the "local.build.properties" file -->
     <echo>INFO: Delete Tomcat Cache Dir: ${tomcat.cache.dir}</echo>
     <delete dir="${tomcat.cache.dir}"/>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org