nicolaken 2002/07/12 00:13:21
Modified: . cocoon.properties cocoonbuild.xml
Log:
Added cocoon.work dir property and fixed wrong property (missed in the cocoon.x
property name changes)
Revision Changes Path
1.3 +3 -1 jakarta-avalon-excalibur/cocoon.properties
Index: cocoon.properties
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/cocoon.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cocoon.properties 12 Jul 2002 07:03:51 -0000 1.2
+++ cocoon.properties 12 Jul 2002 07:13:21 -0000 1.3
@@ -2,9 +2,10 @@
# it implies that jakarta-avalon module is in the same dir
# as the excalibur module
+cocoon.work=${build.dir}/work
cocoon.build.docs = ${build.dir}/docs
cocoon.build.context = ${build.dir}
-cocoon.build.xdocs = ${build.context}/content/xdocs
+cocoon.build.xdocs = ${cocoon.build.context}/content/xdocs
cocoon.xdocs.dir = ${src.dir}/xdocs
skins.dir = ${src.dir}/skins
cocoon.context.dir = ${src.dir}/xdocs
@@ -12,4 +13,5 @@
cocoon.stylesheets.dir = ${skins.dir}
tools.dir = ../../jakarta-avalon/tools/
use.skin=avalon-site
+
1.3 +5 -5 jakarta-avalon-excalibur/cocoonbuild.xml
Index: cocoonbuild.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/cocoonbuild.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cocoonbuild.xml 12 Jul 2002 07:03:51 -0000 1.2
+++ cocoonbuild.xml 12 Jul 2002 07:13:21 -0000 1.3
@@ -56,7 +56,7 @@
<mkdir dir="${cocoon.build.context}"/>
<mkdir dir="${cocoon.build.docs}"/>
<mkdir dir="${cocoon.build.xdocs}"/>
- <mkdir dir="${build.dir}/work"/>
+ <mkdir dir="${cocoon.work}"/>
<copy todir="${cocoon.build.context}" overwrite="true" filtering="on">
@@ -91,8 +91,8 @@
<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="-w${build.dir}/work"/>
- <arg value="-l${build.dir}/work/cocoon.log"/>
+ <arg value="-w${cocoon.work}"/>
+ <arg value="-l${cocoon.work}/cocoon.log"/>
<arg value="-b${build.dir}/brokenlinks.txt"/>
<arg value="-uERROR"/>
<arg value="-f./build/content/xdocs/uri.properties"/>
@@ -117,8 +117,8 @@
<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="-w${build.dir}/work"/>
- <arg value="-l${build.dir}/work/cocoon.log"/>
+ <arg value="-w${cocoon.work}"/>
+ <arg value="-l${cocoon.work}/cocoon.log"/>
<arg value="-uERROR"/>
<arg value="index.html"/>
<classpath>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
