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/15 19:15:11 UTC
cvs commit: cocoon-2.2/tools/targets compile-build.xml webapp-build.xml forrest-build.xml
cziegeler 2004/03/15 10:15:11
Modified: tools/targets compile-build.xml webapp-build.xml
forrest-build.xml
Log:
<action dev="CZ" type="fix" fixes-bug="27217" due-to="Andreas Hartmann" due-to-email="andreas@apache.org">
Build System: Apply filtering to patched configurations coming from the different blocks (loglevel etc.)
</action>
Revision Changes Path
1.5 +1 -1 cocoon-2.2/tools/targets/compile-build.xml
Index: compile-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.2/tools/targets/compile-build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- compile-build.xml 10 Mar 2004 08:43:22 -0000 1.4
+++ compile-build.xml 15 Mar 2004 18:15:11 -0000 1.5
@@ -138,7 +138,7 @@
<!-- package testcase code -->
<target name="package-testcase" depends="compile-tests">
- <jar jarfile="${build}/${name}-testcase.jar">
+ <jar jarfile="${build}/${name}-testcase.jar" index="true">
<fileset dir="${build.test}">
<include name="org/apache/cocoon/environment/mock/*"/>
<include name="org/apache/cocoon/components/source/SourceResolverAdapter*"/>
1.6 +14 -1 cocoon-2.2/tools/targets/webapp-build.xml
Index: webapp-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.2/tools/targets/webapp-build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- webapp-build.xml 10 Mar 2004 08:43:22 -0000 1.5
+++ webapp-build.xml 15 Mar 2004 18:15:11 -0000 1.6
@@ -139,6 +139,19 @@
</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"
+ overwrite="true" filtering="on"/>
+ <copy file="${build.webapp}/WEB-INF/cocoon.xconf"
+ tofile="${build.webapp}/WEB-INF/cocoon.xconf"
+ overwrite="true" filtering="on"/>
+ <copy file="${build.webapp}/WEB-INF/logkit.xconf"
+ tofile="${build.webapp}/WEB-INF/logkit.xconf"
+ overwrite="true" filtering="on"/>
+ <copy file="${build.webapp}/WEB-INF/web.xml"
+ tofile="${build.webapp}/WEB-INF/web.xml"
+ overwrite="true" filtering="on"/>
</target>
<target name="war" depends="webapp" description="Builds web application archive">
@@ -147,7 +160,7 @@
<!-- Create WAR manifest -->
<manifest directory="${build.webapp.lib}" manifest="${build.webapp}/WEB-INF/Manifest.mf"/>
<!-- Package WAR file -->
- <jar jarfile="${build.war}" manifest="${build.webapp}/WEB-INF/Manifest.mf">
+ <jar jarfile="${build.war}" manifest="${build.webapp}/WEB-INF/Manifest.mf" index="true">
<fileset dir="${build.webapp}"/>
</jar>
</target>
1.4 +3 -3 cocoon-2.2/tools/targets/forrest-build.xml
Index: forrest-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.2/tools/targets/forrest-build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- forrest-build.xml 10 Mar 2004 08:43:22 -0000 1.3
+++ forrest-build.xml 15 Mar 2004 18:15:11 -0000 1.4
@@ -57,7 +57,7 @@
</target>
<target name="forrest.checkenv" if="env.FORREST_HOME">
- <echo level="verbose">Found $FORREST_HOME..</echo>
+ <echo level="verbose">Found $FORREST_HOME=${env.FORREST_HOME}</echo>
<property name="forrest.home" location="${env.FORREST_HOME}"/>
<echo level="verbose">forrest.home set to ${forrest.home}</echo>
<available file="${forrest.home}" type="dir" property="forrest.home.present"/>
@@ -158,8 +158,8 @@
Then either:
- Set FORREST_HOME as the Forrest build instructions describe
- - Create a build.properties, with the forrest.home property pointing to
- the forrest shbat directory, eg:
+ - Create a project.properties, with the forrest.home property
+ pointing to the forrest shbat directory, e.g.
forrest.home=${winpath} (Windows)
forrest.home=${unixpath} (Unix)