You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2004/03/16 14:18:48 UTC
cvs commit: cocoon-2.1/tools/targets init-build.xml webapp-build.xml
cziegeler 2004/03/16 05:18:48
Modified: tools/targets init-build.xml webapp-build.xml
Log:
Fix finally bug 27217 by using properties
Revision Changes Path
1.11 +3 -0 cocoon-2.1/tools/targets/init-build.xml
Index: init-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/tools/targets/init-build.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- init-build.xml 8 Mar 2004 06:07:15 -0000 1.10
+++ init-build.xml 16 Mar 2004 13:18:48 -0000 1.11
@@ -104,6 +104,9 @@
<filter token="released.version" value="${released.version}"/>
<filter token="loglevel" value="${build.webapp.loglevel}"/>
+ <!-- Alias for the loglevel -->
+ <property name="loglevel" value="${build.webapp.loglevel}"/>
+
<!-- Set classpath -->
<path id="classpath">
<fileset dir="${lib.local}">
1.12 +0 -28 cocoon-2.1/tools/targets/webapp-build.xml
Index: webapp-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/tools/targets/webapp-build.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- webapp-build.xml 16 Mar 2004 07:42:13 -0000 1.11
+++ webapp-build.xml 16 Mar 2004 13:18:48 -0000 1.12
@@ -153,34 +153,6 @@
</target>
<target name="webapp" depends="prepare-webapp,prepare-webapp-samples,prepare-webapp-docs,prepare-webapp-javadocs,prepare-webapp-deprecated,validate-jars,validate-config,custom-conf" description="Builds web application folder">
- <!-- Filter the patched files again to eventually apply filtering to patched blocks -->
- <copy file="${build.webapp}/sitemap.xmap"
- tofile="${build.webapp}/sitemap.xmap.tmp"
- overwrite="true" filtering="on"/>
- <delete file="${build.webapp}/sitemap.xmap"/>
- <move file="${build.webapp}/sitemap.xmap.tmp"
- tofile="${build.webapp}/sitemap.xmap"/>
-
- <copy file="${build.webapp}/WEB-INF/cocoon.xconf"
- tofile="${build.webapp}/WEB-INF/cocoon.xconf.tmp"
- overwrite="true" filtering="on"/>
- <delete file="${build.webapp}/WEB-INF/cocoon.xconf"/>
- <move file="${build.webapp}/WEB-INF/cocoon.xconf.tmp"
- tofile="${build.webapp}/WEB-INF/cocoon.xconf"/>
-
- <copy file="${build.webapp}/WEB-INF/logkit.xconf"
- tofile="${build.webapp}/WEB-INF/logkit.xconf.tmp"
- overwrite="true" filtering="on"/>
- <delete file="${build.webapp}/WEB-INF/logkit.xconf"/>
- <move file="${build.webapp}/WEB-INF/logkit.xconf.tmp"
- tofile="${build.webapp}/WEB-INF/logkit.xconf"/>
-
- <copy file="${build.webapp}/WEB-INF/web.xml"
- tofile="${build.webapp}/WEB-INF/web.xml.tmp"
- overwrite="true" filtering="on"/>
- <delete file="${build.webapp}/WEB-INF/web.xml"/>
- <move file="${build.webapp}/WEB-INF/web.xml.tmp"
- tofile="${build.webapp}/WEB-INF/web.xml"/>
</target>
<target name="war" depends="webapp" description="Builds web application archive">