You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by ni...@apache.org on 2002/07/12 09:03:51 UTC
cvs commit: jakarta-avalon-excalibur cocoon.properties cocoonbuild.xml
nicolaken 2002/07/12 00:03:51
Modified: . cocoon.properties cocoonbuild.xml
Log:
Prepending cocoon properties with cocoon. to prevent unwanted overriding.
Revision Changes Path
1.2 +7 -7 jakarta-avalon-excalibur/cocoon.properties
Index: cocoon.properties
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/cocoon.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cocoon.properties 2 Jul 2002 15:43:54 -0000 1.1
+++ cocoon.properties 12 Jul 2002 07:03:51 -0000 1.2
@@ -2,14 +2,14 @@
# it implies that jakarta-avalon module is in the same dir
# as the excalibur module
-build.docs = ${build.dir}/docs
-build.context = ${build.dir}
-build.xdocs = ${build.context}/content/xdocs
-xdocs.dir = ${src.dir}/xdocs
+cocoon.build.docs = ${build.dir}/docs
+cocoon.build.context = ${build.dir}
+cocoon.build.xdocs = ${build.context}/content/xdocs
+cocoon.xdocs.dir = ${src.dir}/xdocs
skins.dir = ${src.dir}/skins
-context.dir = ${src.dir}/xdocs
-main.context.dir = ../../jakarta-avalon/src/documentation
-stylesheets.dir = ${skins.dir}
+cocoon.context.dir = ${src.dir}/xdocs
+cocoon.main.context.dir = ../../jakarta-avalon/src/documentation
+cocoon.stylesheets.dir = ${skins.dir}
tools.dir = ../../jakarta-avalon/tools/
use.skin=avalon-site
1.2 +15 -15 jakarta-avalon-excalibur/cocoonbuild.xml
Index: cocoonbuild.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/cocoonbuild.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cocoonbuild.xml 12 Jul 2002 06:35:50 -0000 1.1
+++ cocoonbuild.xml 12 Jul 2002 07:03:51 -0000 1.2
@@ -53,33 +53,33 @@
<target name="cocoon:setup-html-docs" depends="cocoon:setup-filters" description="generates the xdocs-based documentation">
<mkdir dir="${build.dir}"/>
- <mkdir dir="${build.context}"/>
- <mkdir dir="${build.docs}"/>
- <mkdir dir="${build.xdocs}"/>
+ <mkdir dir="${cocoon.build.context}"/>
+ <mkdir dir="${cocoon.build.docs}"/>
+ <mkdir dir="${cocoon.build.xdocs}"/>
<mkdir dir="${build.dir}/work"/>
- <copy todir="${build.context}" overwrite="true" filtering="on">
- <fileset dir="${main.context.dir}">
+ <copy todir="${cocoon.build.context}" overwrite="true" filtering="on">
+ <fileset dir="${cocoon.main.context.dir}">
<exclude name="**/*.gif"/>
<exclude name="**/*.jpg"/>
<exclude name="**/*.png"/>
</fileset>
</copy>
- <copy todir="${build.context}" filtering="off">
- <fileset dir="${main.context.dir}">
+ <copy todir="${cocoon.build.context}" filtering="off">
+ <fileset dir="${cocoon.main.context.dir}">
<include name="**/*.gif"/>
<include name="**/*.jpg"/>
<include name="**/*.png"/>
</fileset>
</copy>
- <copy todir="${build.xdocs}" filtering="on" overwrite="true">
- <fileset dir="${xdocs.dir}"/>
+ <copy todir="${cocoon.build.xdocs}" filtering="on" overwrite="true">
+ <fileset dir="${cocoon.xdocs.dir}"/>
</copy>
- <copy file="${main.context.dir}/resources/schema/CatalogManager.properties"
- todir="${build.context}/resources/schema" filtering="off"/>
+ <copy file="${cocoon.main.context.dir}/resources/schema/CatalogManager.properties"
+ todir="${cocoon.build.context}/resources/schema" filtering="off"/>
</target>
@@ -89,8 +89,8 @@
<echo message=" Building docs from list, please stand by ..."/>
<java classname="org.apache.cocoon.Main" fork="true" maxmemory="128m" failonerror="true">
- <arg value="-c${build.context}/"/>
- <arg value="-d${build.docs}"/>
+ <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="-b${build.dir}/brokenlinks.txt"/>
@@ -115,8 +115,8 @@
<echo message=" Crawling docs, please stand by ..."/>
<java classname="org.apache.cocoon.Main" fork="true" maxmemory="128m" failonerror="true">
- <arg value="-c${build.context}/"/>
- <arg value="-d${build.docs}"/>
+ <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="-uERROR"/>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>