Author: crossley Date: Wed Dec 29 21:50:28 2004 New Revision: 123700 URL: http://svn.apache.org/viewcvs?view=rev&rev=123700 Log: Rename the old validate-xdocs target to cocoon-validate-xdocs to avoid a clash with Forrest.
Modified: cocoon/trunk/tools/targets/docs-build.xml cocoon/trunk/tools/targets/validate-build.xml cocoon/trunk/tools/targets/webapp-build.xml Modified: cocoon/trunk/tools/targets/docs-build.xml Url: http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/docs-build.xml?view=diff&rev=123700&p1=cocoon/trunk/tools/targets/docs-build.xml&r1=123699&p2=cocoon/trunk/tools/targets/docs-build.xml&r2=123700 ============================================================================== --- cocoon/trunk/tools/targets/docs-build.xml (original) +++ cocoon/trunk/tools/targets/docs-build.xml Wed Dec 29 21:50:28 2004 @@ -97,7 +97,7 @@ <!-- Create docs --> <target name="docs" - depends="validate-jars, prepare-docs, validate-xdocs, docs_done, javadocs, do-forrest" + depends="validate-jars, prepare-docs, cocoon-validate-xdocs, docs_done, javadocs, do-forrest" unless="docs.notrequired" description="Builds the documentation"> <!-- The docs are created using forrest, so we simply copy them for now --> <mkdir dir="${build.docs}"/> @@ -147,7 +147,7 @@ --> <!-- Create printer friendly docs --> <!-- - <target name="printer-docs" depends="prepare-printer-docs, validate-xdocs, printer-docs_done" description="Builds printer-friendly documentation"> + <target name="printer-docs" depends="prepare-printer-docs, cocoon-validate-xdocs, printer-docs_done" description="Builds printer-friendly documentation"> <mkdir dir="${build.docs.printer}"/> <java classname="org.apache.cocoon.Main" fork="true" dir="${build.context.printer}" failonerror="true" maxmemory="128m"> Modified: cocoon/trunk/tools/targets/validate-build.xml Url: http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/validate-build.xml?view=diff&rev=123700&p1=cocoon/trunk/tools/targets/validate-build.xml&r1=123699&p2=cocoon/trunk/tools/targets/validate-build.xml&r2=123700 ============================================================================== --- cocoon/trunk/tools/targets/validate-build.xml (original) +++ cocoon/trunk/tools/targets/validate-build.xml Wed Dec 29 21:50:28 2004 @@ -89,7 +89,7 @@ </target> <!-- Validation of xdocs --> - <target name="validate-xdocs" depends="prepare-docs" unless="internal.exclude.validate.xdocs"> + <target name="cocoon-validate-xdocs" depends="prepare-docs" unless="internal.exclude.validate.xdocs"> <!-- <echo message="Conducting validation of core XML documentation."/> --> Modified: cocoon/trunk/tools/targets/webapp-build.xml Url: http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/webapp-build.xml?view=diff&rev=123700&p1=cocoon/trunk/tools/targets/webapp-build.xml&r1=123699&p2=cocoon/trunk/tools/targets/webapp-build.xml&r2=123700 ============================================================================== --- cocoon/trunk/tools/targets/webapp-build.xml (original) +++ cocoon/trunk/tools/targets/webapp-build.xml Wed Dec 29 21:50:28 2004 @@ -137,7 +137,7 @@ includes="**/*.xwelcome"/> </target> - <target name="prepare-webapp-docs" depends="validate-xdocs,validate-jars" unless="internal.exclude.webapp.documentation"> + <target name="prepare-webapp-docs" depends="cocoon-validate-xdocs,validate-jars" unless="internal.exclude.webapp.documentation"> <mkdir dir="${build.webapp.docs}"/> <copy todir="${build.webapp.docs}" filtering="on">
