Author: antonio Date: Mon Dec 27 05:43:53 2004 New Revision: 123406 URL: http://svn.apache.org/viewcvs?view=rev&rev=123406 Log: Add Id (version) tag Modified: cocoon/branches/BRANCH_2_1_X/tools/ide/eclipse/blocks-classpath.xsl cocoon/branches/BRANCH_2_1_X/tools/ide/eclipse/classpath-tmpl.xml cocoon/branches/BRANCH_2_1_X/tools/ide/eclipse/make-classpath.xsl cocoon/branches/BRANCH_2_1_X/tools/targets/admin-build.xml cocoon/branches/BRANCH_2_1_X/tools/targets/compile-build.xml cocoon/branches/BRANCH_2_1_X/tools/targets/dist-build.xml cocoon/branches/BRANCH_2_1_X/tools/targets/docs-build.xml cocoon/branches/BRANCH_2_1_X/tools/targets/forrest-build.xml cocoon/branches/BRANCH_2_1_X/tools/targets/ide-build.xml cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml cocoon/branches/BRANCH_2_1_X/tools/targets/instrumentation-build.xml cocoon/branches/BRANCH_2_1_X/tools/targets/samples-build.xml cocoon/branches/BRANCH_2_1_X/tools/targets/standalone-demo-build.xml cocoon/branches/BRANCH_2_1_X/tools/targets/test-build.xml cocoon/branches/BRANCH_2_1_X/tools/targets/tools-build.xml cocoon/branches/BRANCH_2_1_X/tools/targets/upgrade-build.xml cocoon/branches/BRANCH_2_1_X/tools/targets/validate-build.xml cocoon/branches/BRANCH_2_1_X/tools/targets/webapp-build.xml
Modified: cocoon/branches/BRANCH_2_1_X/tools/ide/eclipse/blocks-classpath.xsl Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/ide/eclipse/blocks-classpath.xsl?view=diff&rev=123406&p1=cocoon/branches/BRANCH_2_1_X/tools/ide/eclipse/blocks-classpath.xsl&r1=123405&p2=cocoon/branches/BRANCH_2_1_X/tools/ide/eclipse/blocks-classpath.xsl&r2=123406 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/tools/ide/eclipse/blocks-classpath.xsl (original) +++ cocoon/branches/BRANCH_2_1_X/tools/ide/eclipse/blocks-classpath.xsl Mon Dec 27 05:43:53 2004 @@ -16,6 +16,7 @@ limitations under the License. --> +<!-- @version $Id: make-classpath.xsl 106334 2004-11-23 19:52:40Z antonio $ --> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> <xsl:output method="xml" indent="yes"/> Modified: cocoon/branches/BRANCH_2_1_X/tools/ide/eclipse/classpath-tmpl.xml Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/ide/eclipse/classpath-tmpl.xml?view=diff&rev=123406&p1=cocoon/branches/BRANCH_2_1_X/tools/ide/eclipse/classpath-tmpl.xml&r1=123405&p2=cocoon/branches/BRANCH_2_1_X/tools/ide/eclipse/classpath-tmpl.xml&r2=123406 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/tools/ide/eclipse/classpath-tmpl.xml (original) +++ cocoon/branches/BRANCH_2_1_X/tools/ide/eclipse/classpath-tmpl.xml Mon Dec 27 05:43:53 2004 @@ -14,6 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --> +<!-- $Id$ --> <data> <src-dirs><item>@SRC_DIRS@</item></src-dirs> <mock-dirs><item>@MOCKS_DIRS@</item></mock-dirs> Modified: cocoon/branches/BRANCH_2_1_X/tools/ide/eclipse/make-classpath.xsl Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/ide/eclipse/make-classpath.xsl?view=diff&rev=123406&p1=cocoon/branches/BRANCH_2_1_X/tools/ide/eclipse/make-classpath.xsl&r1=123405&p2=cocoon/branches/BRANCH_2_1_X/tools/ide/eclipse/make-classpath.xsl&r2=123406 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/tools/ide/eclipse/make-classpath.xsl (original) +++ cocoon/branches/BRANCH_2_1_X/tools/ide/eclipse/make-classpath.xsl Mon Dec 27 05:43:53 2004 @@ -19,7 +19,7 @@ (see "eclipse-project" target in build.xml) @author Sylvain Wallez - @version CVS $Id$ + @version $Id$ --> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> Modified: cocoon/branches/BRANCH_2_1_X/tools/targets/admin-build.xml Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/targets/admin-build.xml?view=diff&rev=123406&p1=cocoon/branches/BRANCH_2_1_X/tools/targets/admin-build.xml&r1=123405&p2=cocoon/branches/BRANCH_2_1_X/tools/targets/admin-build.xml&r2=123406 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/tools/targets/admin-build.xml (original) +++ cocoon/branches/BRANCH_2_1_X/tools/targets/admin-build.xml Mon Dec 27 05:43:53 2004 @@ -14,12 +14,13 @@ See the License for the specific language governing permissions and limitations under the License. --> +<!-- $Id$ --> <project name="admin"> - + <description> Admin targets </description> - + <!-- Creates the web site --> <target name="site" depends="forrest" description="[admin] Builds the site"> <mkdir dir="${site}"/> Modified: cocoon/branches/BRANCH_2_1_X/tools/targets/compile-build.xml Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/targets/compile-build.xml?view=diff&rev=123406&p1=cocoon/branches/BRANCH_2_1_X/tools/targets/compile-build.xml&r1=123405&p2=cocoon/branches/BRANCH_2_1_X/tools/targets/compile-build.xml&r2=123406 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/tools/targets/compile-build.xml (original) +++ cocoon/branches/BRANCH_2_1_X/tools/targets/compile-build.xml Mon Dec 27 05:43:53 2004 @@ -14,6 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --> +<!-- $Id$ --> <project name="compile"> <description> Modified: cocoon/branches/BRANCH_2_1_X/tools/targets/dist-build.xml Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/targets/dist-build.xml?view=diff&rev=123406&p1=cocoon/branches/BRANCH_2_1_X/tools/targets/dist-build.xml&r1=123405&p2=cocoon/branches/BRANCH_2_1_X/tools/targets/dist-build.xml&r2=123406 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/tools/targets/dist-build.xml (original) +++ cocoon/branches/BRANCH_2_1_X/tools/targets/dist-build.xml Mon Dec 27 05:43:53 2004 @@ -14,6 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --> +<!-- $Id$ --> <project name="dist"> <description> @@ -29,13 +30,13 @@ <fileset dir="${tools}"> <exclude name="anttasks/**"/> <exclude name="loader/**"/> - <exclude name="lib/xalan*"/> - <exclude name="lib/xerces*"/> - <exclude name="lib/jtidy*"/> - <exclude name="lib/xml-apis.jar"/> + <exclude name="lib/xalan*"/> + <exclude name="lib/xerces*"/> + <exclude name="lib/jtidy*"/> + <exclude name="lib/xml-apis.jar"/> </fileset> </copy> - + <copy todir="${dist}/lib"> <fileset dir="${lib}"/> </copy> @@ -71,12 +72,12 @@ <fixcrlf srcdir="${dist}" includes="antRun" eol="lf"/> <fixcrlf srcdir="${dist}" includes="**.bat" eol="crlf"/> - <zip zipfile="${dist.target}/${dist.name}-src.zip" - basedir="${dist.root}" + <zip zipfile="${dist.target}/${dist.name}-src.zip" + basedir="${dist.root}" includes="${dist.name}/**"> </zip> - <tar tarfile="${dist.target}/${dist.name}-src.tar" + <tar tarfile="${dist.target}/${dist.name}-src.tar" longfile="gnu"> <tarfileset dir="${dist.root}"> <include name="${dist.name}/**"/> @@ -93,7 +94,7 @@ <gzip zipfile="${dist.target}/${dist.name}-src.tar.gz" src="${dist.target}/${dist.name}-src.tar"/> <delete file="${dist.target}/${dist.name}-src.tar"/> </target> - + <target name="clean-dist" depends="clean" description="Cleans everything and brings back to original 'CVS checkout' state"> <delete dir="${build.root}"/> <delete dir="${tools.tasks.dest}"/> @@ -102,5 +103,5 @@ <delete file="${dist.target}/${dist.name}-src.zip"/> <delete dir="${dist.root}"/> </target> - + </project> Modified: cocoon/branches/BRANCH_2_1_X/tools/targets/docs-build.xml Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/targets/docs-build.xml?view=diff&rev=123406&p1=cocoon/branches/BRANCH_2_1_X/tools/targets/docs-build.xml&r1=123405&p2=cocoon/branches/BRANCH_2_1_X/tools/targets/docs-build.xml&r2=123406 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/tools/targets/docs-build.xml (original) +++ cocoon/branches/BRANCH_2_1_X/tools/targets/docs-build.xml Mon Dec 27 05:43:53 2004 @@ -14,12 +14,13 @@ See the License for the specific language governing permissions and limitations under the License. --> +<!-- $Id$ --> <project name="docs"> <description> Documentation Targets </description> - + <target name="prepare-docs" unless="exclude.documentation" depends="blocks"> <!-- Set classpath for documentation --> @@ -235,9 +236,9 @@ </target> --> - + <!-- Creates Javadocs --> - <target name="javadocs" + <target name="javadocs" depends="prepare-blocks" description="Builds the API documentation (javadocs)" unless="internal.exclude.javadocs"> Modified: cocoon/branches/BRANCH_2_1_X/tools/targets/forrest-build.xml Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/targets/forrest-build.xml?view=diff&rev=123406&p1=cocoon/branches/BRANCH_2_1_X/tools/targets/forrest-build.xml&r1=123405&p2=cocoon/branches/BRANCH_2_1_X/tools/targets/forrest-build.xml&r2=123406 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/tools/targets/forrest-build.xml (original) +++ cocoon/branches/BRANCH_2_1_X/tools/targets/forrest-build.xml Mon Dec 27 05:43:53 2004 @@ -14,6 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --> +<!-- $Id$ --> <project name="forrest"> <description> Modified: cocoon/branches/BRANCH_2_1_X/tools/targets/ide-build.xml Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/targets/ide-build.xml?view=diff&rev=123406&p1=cocoon/branches/BRANCH_2_1_X/tools/targets/ide-build.xml&r1=123405&p2=cocoon/branches/BRANCH_2_1_X/tools/targets/ide-build.xml&r2=123406 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/tools/targets/ide-build.xml (original) +++ cocoon/branches/BRANCH_2_1_X/tools/targets/ide-build.xml Mon Dec 27 05:43:53 2004 @@ -14,6 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --> +<!-- $Id$ --> <project name="ide"> <description> Modified: cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml?view=diff&rev=123406&p1=cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml&r1=123405&p2=cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml&r2=123406 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml (original) +++ cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml Mon Dec 27 05:43:53 2004 @@ -14,6 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --> +<!-- $Id$ --> <project name="init"> <description> Modified: cocoon/branches/BRANCH_2_1_X/tools/targets/instrumentation-build.xml Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/targets/instrumentation-build.xml?view=diff&rev=123406&p1=cocoon/branches/BRANCH_2_1_X/tools/targets/instrumentation-build.xml&r1=123405&p2=cocoon/branches/BRANCH_2_1_X/tools/targets/instrumentation-build.xml&r2=123406 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/tools/targets/instrumentation-build.xml (original) +++ cocoon/branches/BRANCH_2_1_X/tools/targets/instrumentation-build.xml Mon Dec 27 05:43:53 2004 @@ -14,6 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --> +<!-- $Id$ --> <project name="instrumentation"> <target name="start-instrumentation-client" depends="init"> <property name="lib.instrumentation" value="tools/instrumentation/lib"/> Modified: cocoon/branches/BRANCH_2_1_X/tools/targets/samples-build.xml Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/targets/samples-build.xml?view=diff&rev=123406&p1=cocoon/branches/BRANCH_2_1_X/tools/targets/samples-build.xml&r1=123405&p2=cocoon/branches/BRANCH_2_1_X/tools/targets/samples-build.xml&r2=123406 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/tools/targets/samples-build.xml (original) +++ cocoon/branches/BRANCH_2_1_X/tools/targets/samples-build.xml Mon Dec 27 05:43:53 2004 @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - +<!-- $Id$ --> <project name="samples"> <description> @@ -43,7 +43,7 @@ <exclude name="**/*.gif"/> <exclude name="**/*.png"/> <!-- filtering breaks UTF-8 files --> - <exclude name="i18n/**"/> + <exclude name="i18n/**"/> <exclude name="hello-world/style/**"/> </fileset> </copy> @@ -68,7 +68,7 @@ <!-- patch the welcome page to tell we have samples to show --> <xpatch file="${build.webapp}/welcome.xml" - srcdir="${webapp.samples}" + srcdir="${webapp.samples}" includes="**/*.xwelcome"/> </target> @@ -78,4 +78,4 @@ inheritRefs="false" target="samples"/> </target> -</project> +</project> Modified: cocoon/branches/BRANCH_2_1_X/tools/targets/standalone-demo-build.xml Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/targets/standalone-demo-build.xml?view=diff&rev=123406&p1=cocoon/branches/BRANCH_2_1_X/tools/targets/standalone-demo-build.xml&r1=123405&p2=cocoon/branches/BRANCH_2_1_X/tools/targets/standalone-demo-build.xml&r2=123406 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/tools/targets/standalone-demo-build.xml (original) +++ cocoon/branches/BRANCH_2_1_X/tools/targets/standalone-demo-build.xml Mon Dec 27 05:43:53 2004 @@ -14,12 +14,11 @@ See the License for the specific language governing permissions and limitations under the License. --> +<!-- $Id$ --> <project name="standalone"> <!-- ant include file for "standalone-demo" build @author [EMAIL PROTECTED] - - $Id: standalone-demo-build.xml,v 1.4 2004/03/08 06:07:15 antonio Exp $ --> <target name="standalone-demo" depends="init, webapp" description="build webapp and copy files for standalone demo"> Modified: cocoon/branches/BRANCH_2_1_X/tools/targets/test-build.xml Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/targets/test-build.xml?view=diff&rev=123406&p1=cocoon/branches/BRANCH_2_1_X/tools/targets/test-build.xml&r1=123405&p2=cocoon/branches/BRANCH_2_1_X/tools/targets/test-build.xml&r2=123406 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/tools/targets/test-build.xml (original) +++ cocoon/branches/BRANCH_2_1_X/tools/targets/test-build.xml Mon Dec 27 05:43:53 2004 @@ -14,6 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --> +<!-- $Id$ --> <project name="test"> <description>Test targets</description> @@ -63,7 +64,7 @@ <!-- Runs JUnit tests in debug mode --> <target name="junit-test-debug" depends="compile-tests, junit-tests-prepare"> - <fail unless="junit.testcase" + <fail unless="junit.testcase" message="Please set the property $${junit.testcase} to a JUnit testcase (package.Classname, e.g. org.test.MyTestCase)."/> <echo message="The JVM will be suspended until you connect with your favourite debugger to port ${junit.test.debugport}."/> @@ -84,8 +85,8 @@ inheritAll="true" inheritRefs="false" target="tests"/> - </target> - + </target> + <target name="junit-tests-report" depends="init"> <mkdir dir="${build.test.report}"/> <junitreport todir="${build.test.output}"> @@ -103,7 +104,7 @@ <!--+ | Anteater tests +--> - + <!-- Anteater tests --> <target name="anteater-tests" depends="block-anteater-tests, core-anteater-tests" description="Runs AntEater tests"/> @@ -131,7 +132,7 @@ </java> </sequential> </macrodef> - + <target name="anteater-tests-prepare"> <!-- check whether Anteater is installed and available --> <!-- anteater parameters are set in build.properties --> @@ -161,7 +162,7 @@ <call-anteater script="run-tests.xml" target="single" targetfile="${target}"/> </target> - <!-- Block tests --> + <!-- Block tests --> <target name="block-anteater-tests" depends="prepare-blocks"> <ant antfile="${build.temp}/blocks-build.xml" inheritAll="true" Modified: cocoon/branches/BRANCH_2_1_X/tools/targets/tools-build.xml Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/targets/tools-build.xml?view=diff&rev=123406&p1=cocoon/branches/BRANCH_2_1_X/tools/targets/tools-build.xml&r1=123405&p2=cocoon/branches/BRANCH_2_1_X/tools/targets/tools-build.xml&r2=123406 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/tools/targets/tools-build.xml (original) +++ cocoon/branches/BRANCH_2_1_X/tools/targets/tools-build.xml Mon Dec 27 05:43:53 2004 @@ -14,15 +14,16 @@ See the License for the specific language governing permissions and limitations under the License. --> +<!-- $Id$ --> <project name="tools"> <description> Tools provided by Ant which could be helpful </description> - <target - name="correctLinefeed" + <target + name="correctLinefeed" description="Make sure LF is used as line feed"> - + <echo message="-------------------------------------------------------------------------------"/> <echo message="Make sure you don't have any binaries (except *.jpg, *.gif, *.jar and *.zip in the directory (or any subdirectory) which you want to correct."/> <echo message="-------------------------------------------------------------------------------"/> @@ -30,11 +31,11 @@ <input message="Please enter the basedir which should be corrected:" addproperty="target.dir"/> <fixcrlf srcdir="${target.dir}" - eol="lf" + eol="lf" includes="**/*" excludes="**/*.jpg,**/*.gif,**/*.jar,**/*.zip" /> - + </target> </project> Modified: cocoon/branches/BRANCH_2_1_X/tools/targets/upgrade-build.xml Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/targets/upgrade-build.xml?view=diff&rev=123406&p1=cocoon/branches/BRANCH_2_1_X/tools/targets/upgrade-build.xml&r1=123405&p2=cocoon/branches/BRANCH_2_1_X/tools/targets/upgrade-build.xml&r2=123406 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/tools/targets/upgrade-build.xml (original) +++ cocoon/branches/BRANCH_2_1_X/tools/targets/upgrade-build.xml Mon Dec 27 05:43:53 2004 @@ -14,6 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --> +<!-- $Id$ --> <project name="upgrade"> <description> Upgrade targets that help to convert between different Cocoon versions Modified: cocoon/branches/BRANCH_2_1_X/tools/targets/validate-build.xml Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/targets/validate-build.xml?view=diff&rev=123406&p1=cocoon/branches/BRANCH_2_1_X/tools/targets/validate-build.xml&r1=123405&p2=cocoon/branches/BRANCH_2_1_X/tools/targets/validate-build.xml&r2=123406 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/tools/targets/validate-build.xml (original) +++ cocoon/branches/BRANCH_2_1_X/tools/targets/validate-build.xml Mon Dec 27 05:43:53 2004 @@ -14,6 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --> +<!-- $Id$ --> <project name="validation"> <description> Modified: cocoon/branches/BRANCH_2_1_X/tools/targets/webapp-build.xml Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/targets/webapp-build.xml?view=diff&rev=123406&p1=cocoon/branches/BRANCH_2_1_X/tools/targets/webapp-build.xml&r1=123405&p2=cocoon/branches/BRANCH_2_1_X/tools/targets/webapp-build.xml&r2=123406 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/tools/targets/webapp-build.xml (original) +++ cocoon/branches/BRANCH_2_1_X/tools/targets/webapp-build.xml Mon Dec 27 05:43:53 2004 @@ -14,6 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --> +<!-- $Id$ --> <project name="webapp"> <description>