leif 2002/08/07 21:21:53
Modified: . cocoonbuild.xml
Log:
.ico files were being copied with filtering on, breaking the build with an
NPE.
Revision Changes Path
1.6 +7 -5 jakarta-avalon-excalibur/cocoonbuild.xml
Index: cocoonbuild.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/cocoonbuild.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cocoonbuild.xml 19 Jul 2002 16:10:25 -0000 1.5
+++ cocoonbuild.xml 8 Aug 2002 04:21:53 -0000 1.6
@@ -61,6 +61,7 @@
<copy todir="${cocoon.build.context}" overwrite="true"
filtering="on">
<fileset dir="${cocoon.main.context.dir}">
+ <exclude name="**/*.ico"/>
<exclude name="**/*.gif"/>
<exclude name="**/*.jpg"/>
<exclude name="**/*.png"/>
@@ -69,6 +70,7 @@
<copy todir="${cocoon.build.context}" filtering="off">
<fileset dir="${cocoon.main.context.dir}">
+ <include name="**/*.ico"/>
<include name="**/*.gif"/>
<include name="**/*.jpg"/>
<include name="**/*.png"/>
@@ -89,13 +91,13 @@
<echo message=" Building docs from list, please stand by ..."/>
<java classname="org.apache.cocoon.Main" fork="true"
maxmemory="128m" failonerror="true">
- <arg value="-c${cocoon.build.context}/"/>
- <arg value="-k${cocoon.build.context}/logkit.xconf"/>
+ <arg value="-c${cocoon.build.context}/"/>
+ <arg value="-k${cocoon.build.context}/logkit.xconf"/>
<arg value="-d${cocoon.build.docs}"/>
<arg value="-w${cocoon.work}"/>
- <arg value="-l${cocoon.work}/cocoon.log"/>
+ <arg value="-l${cocoon.work}/cocoon.log"/>
<arg value="-b${build.dir}/brokenlinks.txt"/>
- <arg value="-uERROR"/>
+ <arg value="-uERROR"/>
<arg value="-f./build/content/xdocs/doc.uris"/>
<arg value="-rno"/>
<classpath>
@@ -118,7 +120,7 @@
<java classname="org.apache.cocoon.Main" fork="true"
maxmemory="128m" failonerror="true">
<arg value="-c${cocoon.build.context}/"/>
<arg value="-d${cocoon.build.docs}"/>
- <arg value="-k${cocoon.build.context}/logkit.xconf"/>
+ <arg value="-k${cocoon.build.context}/logkit.xconf"/>
<arg value="-w${cocoon.work}"/>
<arg value="-l${cocoon.work}/cocoon.log"/>
<arg value="-b${build.dir}/brokenlinks.txt"/>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
