svn commit: r219002 - /lenya/trunk/src/targets/webapp-build.xml

Author: jann
Date: Thu Jul 14 00:11:17 2005
New Revision: 219002

URL: http://svn.apache.org/viewcvs?rev=219002&view=rev
Log:
rename task install to install-tomcat (that's what it does) and execute
task if servlet engine is tomcat. build.sh will now correctly build the tomcat
webapp.


Modified:
    lenya/trunk/src/targets/webapp-build.xml

Modified: lenya/trunk/src/targets/webapp-build.xml
URL: 
http://svn.apache.org/viewcvs/lenya/trunk/src/targets/webapp-build.xml?rev=219002&r1=219001&r2=219002&view=diff
==============================================================================
--- lenya/trunk/src/targets/webapp-build.xml (original)
+++ lenya/trunk/src/targets/webapp-build.xml Thu Jul 14 00:11:17 2005
@@ -133,6 +133,7 @@
        <condition property="servlet.engine.tomcat">
       <equals arg1="${web.app.server}" arg2="Tomcat"/>
     </condition>
+    <antcall target="install-tomcat"/>
     <antcall target="successfully-built-message-tomcat"/>
 
     <condition property="servlet.engine.jetty">
@@ -146,7 +147,8 @@
   <target name="copy-cocoon.xconf" if="cocoon.xconf.copy">
     <copy
        file="${build.webapp}/WEB-INF/cocoon.xconf.ant_patch"
-       toFile="${build.webapp}/WEB-INF/cocoon.xconf"/>
+       toFile="${build.webapp}/WEB-INF/cocoon.xconf"
+       overwrite="true"/>
   </target>
 
   <!--
@@ -178,7 +180,7 @@
   </target>
 
   <!-- Install the webapp -->
-  <target name="install" depends="webapp" description="Install the webapp into 
servlet engine context">
+  <target name="install-tomcat" description="Install the webapp into Tomcat 
servlet engine context" if="servlet.engine.tomcat">
     <!-- Copy From build.webapp=${build.webapp} To 
tomcat.webapps.dir=${tomcat.webapps.dir} -->
     <copy todir="${tomcat.webapps.dir}" filtering="off">
       <fileset dir="${build.webapp}" excludes="${target.install.excludes}"/>