You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by un...@apache.org on 2004/01/13 12:22:52 UTC
cvs commit: cocoon-2.1/tools/targets standalone-demo-build.xml init-build.xml webapp-build.xml instrumentation-build.xml dist-build.xml ide-build.xml samples-build.xml docs-build.xml compile-build.xml admin-build.xml forrest-build.xml validate-build.xml test-build.xml
unico 2004/01/13 03:22:52
Modified: . build.xml
tools/targets standalone-demo-build.xml init-build.xml
webapp-build.xml instrumentation-build.xml
dist-build.xml ide-build.xml samples-build.xml
docs-build.xml compile-build.xml admin-build.xml
forrest-build.xml validate-build.xml test-build.xml
Log:
use the new import task include the target files so that these can be made valid xml
Revision Changes Path
1.34 +27 -36 cocoon-2.1/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/build.xml,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- build.xml 18 Nov 2003 17:20:24 -0000 1.33
+++ build.xml 13 Jan 2004 11:22:51 -0000 1.34
@@ -1,5 +1,4 @@
<?xml version="1.0"?>
-<!DOCTYPE project [
<!-- ===========================================================================
* =========================== *
@@ -10,61 +9,53 @@
============================================================================ -->
- <!-- ================== Apache Cocoon targets ======================== -->
- <!ENTITY init-targets SYSTEM "tools/targets/init-build.xml">
- <!ENTITY compile-targets SYSTEM "tools/targets/compile-build.xml">
- <!ENTITY validate-targets SYSTEM "tools/targets/validate-build.xml">
- <!ENTITY samples-targets SYSTEM "tools/targets/samples-build.xml">
- <!ENTITY webapp-targets SYSTEM "tools/targets/webapp-build.xml">
- <!ENTITY ide-targets SYSTEM "tools/targets/ide-build.xml">
- <!ENTITY test-targets SYSTEM "tools/targets/test-build.xml">
- <!ENTITY docs-targets SYSTEM "tools/targets/docs-build.xml">
- <!ENTITY dist-targets SYSTEM "tools/targets/dist-build.xml">
- <!ENTITY admin-targets SYSTEM "tools/targets/admin-build.xml">
- <!ENTITY standalone-demo-targets SYSTEM "tools/targets/standalone-demo-build.xml">
- <!ENTITY instrumentation-targets SYSTEM "tools/targets/instrumentation-build.xml">
- <!-- =================================================================== -->
-
- <!-- ================== Apache Forrest targets ======================= -->
- <!ENTITY forrest-targets SYSTEM "tools/targets/forrest-build.xml">
- <!-- =================================================================== -->
-
-]>
-
<project default="webapp" basedir="." name="Apache Cocoon">
<!-- ================== Apache Cocoon targets ======================== -->
<!-- =================================================================== -->
- <!-- Initialization targets --> &init-targets;
+ <!-- Initialization targets -->
+ <import file="tools/targets/init-build.xml" />
<!-- =================================================================== -->
- <!-- Compile targets --> &compile-targets;
+ <!-- Compile targets -->
+ <import file="tools/targets/compile-build.xml" />
<!-- =================================================================== -->
- <!-- Validation targets --> &validate-targets;
+ <!-- Validation targets -->
+ <import file="tools/targets/validate-build.xml" />
<!-- =================================================================== -->
- <!-- Samples targets --> &samples-targets;
+ <!-- Samples targets -->
+ <import file="tools/targets/samples-build.xml" />
<!-- =================================================================== -->
- <!-- Web application targets --> &webapp-targets;
+ <!-- Web application targets -->
+ <import file="tools/targets/webapp-build.xml" />
<!-- =================================================================== -->
- <!-- IDE targets --> &ide-targets;
+ <!-- IDE targets -->
+ <import file="tools/targets/ide-build.xml" />
<!-- =================================================================== -->
- <!-- Testcases targets --> &test-targets;
+ <!-- Testcases targets -->
+ <import file="tools/targets/test-build.xml" />
<!-- =================================================================== -->
- <!-- Documentation targets --> &docs-targets;
+ <!-- Documentation targets -->
+ <import file="tools/targets/docs-build.xml" />
<!-- =================================================================== -->
- <!-- Distribution targets --> &dist-targets;
+ <!-- Distribution targets -->
+ <import file="tools/targets/dist-build.xml" />
<!-- =================================================================== -->
- <!-- Administration targets --> &admin-targets;
+ <!-- Administration targets -->
+ <import file="tools/targets/admin-build.xml" />
<!-- =================================================================== -->
- <!-- Standalone-demo targets --> &standalone-demo-targets;
+ <!-- Standalone-demo targets -->
+ <import file="tools/targets/standalone-demo-build.xml" />
<!-- =================================================================== -->
- <!-- Instrumentation targets --> &instrumentation-targets;
+ <!-- Instrumentation targets -->
+ <import file="tools/targets/instrumentation-build.xml" />
<!-- =================================================================== -->
<!-- ================== Apache Forrest targets ======================= -->
<!-- =================================================================== -->
- <!-- Forrest targets --> &forrest-targets;
+ <!-- Forrest targets -->
+ <import file="tools/targets/forrest-build.xml" />
<!-- =================================================================== -->
</project>
1.3 +4 -1 cocoon-2.1/tools/targets/standalone-demo-build.xml
Index: standalone-demo-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/tools/targets/standalone-demo-build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- standalone-demo-build.xml 20 Dec 2003 10:02:39 -0000 1.2
+++ standalone-demo-build.xml 13 Jan 2004 11:22:52 -0000 1.3
@@ -1,3 +1,5 @@
+<?xml version="1.0"?>
+<project name="standalone">
<!--
ant include file for "standalone-demo" build
@author bdelacretaz@codeconsult.ch
@@ -61,3 +63,4 @@
</echo>
</target>
+</project>
1.6 +7 -1 cocoon-2.1/tools/targets/init-build.xml
Index: init-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/tools/targets/init-build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- init-build.xml 3 Jan 2004 06:35:03 -0000 1.5
+++ init-build.xml 13 Jan 2004 11:22:52 -0000 1.6
@@ -1,4 +1,9 @@
-<!-- === Initialization Targets ========================================== -->
+<?xml version="1.0"?>
+<project name="init">
+
+ <description>
+ Initialization Targets
+ </description>
<target name="init">
@@ -188,3 +193,4 @@
<target name="clean-standalone-demo" depends="init" description="Cleans the standalone-demo">
<delete dir="${build.standalone.demo}"/>
</target>
+</project>
1.7 +7 -2 cocoon-2.1/tools/targets/webapp-build.xml
Index: webapp-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/tools/targets/webapp-build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- webapp-build.xml 20 Dec 2003 10:02:39 -0000 1.6
+++ webapp-build.xml 13 Jan 2004 11:22:52 -0000 1.7
@@ -1,4 +1,9 @@
-<!-- === Webapp targets ==================================================== -->
+<?xml version="1.0"?>
+<project name="webapp">
+
+ <description>
+ Webapp targets
+ </description>
<target name="prepare-webapp" depends="blocks, package">
<mkdir dir="${build.webapp}"/>
@@ -161,4 +166,4 @@
<include name="${customconf}/*.xweb" />
</xpatch>
</target>
-
+</project>
1.3 +3 -0 cocoon-2.1/tools/targets/instrumentation-build.xml
Index: instrumentation-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/tools/targets/instrumentation-build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- instrumentation-build.xml 20 Dec 2003 10:02:39 -0000 1.2
+++ instrumentation-build.xml 13 Jan 2004 11:22:52 -0000 1.3
@@ -1,3 +1,5 @@
+<?xml version="1.0"?>
+<project name="instrumentation">
<target name="start-instrumentation-client" depends="init">
<property name="lib.instrumentation" value="tools/instrumentation/lib"/>
@@ -21,3 +23,4 @@
</classpath>
</java>
</target>
+</project>
\ No newline at end of file
1.2 +9 -2 cocoon-2.1/tools/targets/dist-build.xml
Index: dist-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/tools/targets/dist-build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dist-build.xml 18 Nov 2003 17:20:23 -0000 1.1
+++ dist-build.xml 13 Jan 2004 11:22:52 -0000 1.2
@@ -1,4 +1,9 @@
-<!-- === Distribution targets ============================================== -->
+<?xml version="1.0"?>
+<project name="dist">
+
+ <description>
+ Distribution targets
+ </description>
<target name="dist" depends="init" description="[admin] Builds the distribution">
@@ -82,4 +87,6 @@
<delete file="${dist.target}/${dist.name}-src.tar.gz"/>
<delete file="${dist.target}/${dist.name}-src.zip"/>
<delete dir="${dist.root}"/>
- </target>
+ </target>
+
+</project>
1.6 +7 -1 cocoon-2.1/tools/targets/ide-build.xml
Index: ide-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/tools/targets/ide-build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ide-build.xml 9 Jan 2004 13:06:13 -0000 1.5
+++ ide-build.xml 13 Jan 2004 11:22:52 -0000 1.6
@@ -1,4 +1,9 @@
-<!-- === IDE targets =========================================================== -->
+<?xml version="1.0"?>
+<project name="ide">
+
+ <description>
+ IDE targets
+ </description>
<!-- Generate the Emacs JDE project file -->
<target name="emacs-project" depends="prepare" description="Generate the Emacs project files">
@@ -136,3 +141,4 @@
</fileset>
</delete>
</target>
+</project>
1.2 +7 -2 cocoon-2.1/tools/targets/samples-build.xml
Index: samples-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/tools/targets/samples-build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- samples-build.xml 18 Nov 2003 17:20:23 -0000 1.1
+++ samples-build.xml 13 Jan 2004 11:22:52 -0000 1.2
@@ -1,4 +1,9 @@
-<!-- === Samples Targets ======================================================= -->
+<?xml version="1.0"?>
+<project name="samples">
+
+ <description>
+ Samples Targets
+ </description>
<target name="samples" depends="prepare" unless="unless.exclude.webapp.samples">
<mkdir dir="${build.samples}"/>
@@ -52,4 +57,4 @@
inheritRefs="false"
target="samples"/>
</target>
-
+</project>
1.5 +8 -1 cocoon-2.1/tools/targets/docs-build.xml
Index: docs-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/tools/targets/docs-build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- docs-build.xml 6 Jan 2004 19:20:29 -0000 1.4
+++ docs-build.xml 13 Jan 2004 11:22:52 -0000 1.5
@@ -1,5 +1,10 @@
-<!-- === Documentation Targets ================================================= -->
+<?xml version="1.0"?>
+<project name="docs">
+ <description>
+ Documentation Targets
+ </description>
+
<target name="prepare-docs" unless="exclude.documentation" depends="blocks">
<!-- Set classpath for documentation -->
@@ -209,3 +214,5 @@
inheritRefs="false"
target="javadocs"/>
</target>
+
+</project>
1.7 +7 -1 cocoon-2.1/tools/targets/compile-build.xml
Index: compile-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/tools/targets/compile-build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- compile-build.xml 20 Dec 2003 10:02:39 -0000 1.6
+++ compile-build.xml 13 Jan 2004 11:22:52 -0000 1.7
@@ -1,4 +1,9 @@
-<!-- === Compilation Targets ============================================= -->
+<?xml version="1.0"?>
+<project name="compile">
+
+ <description>
+ Compilation Targets
+ </description>
<!-- compiles everything -->
<target name="compile"
@@ -158,3 +163,4 @@
inheritRefs="false"
target="cocoon-block-${block.name}-${target.name}" />
</target>
+</project>
1.5 +8 -2 cocoon-2.1/tools/targets/admin-build.xml
Index: admin-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/tools/targets/admin-build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- admin-build.xml 20 Dec 2003 10:02:39 -0000 1.4
+++ admin-build.xml 13 Jan 2004 11:22:52 -0000 1.5
@@ -1,5 +1,10 @@
-<!-- === Admin targets ===================================================== -->
-
+<?xml version="1.0"?>
+<project name="admin">
+
+ <description>
+ Admin targets
+ </description>
+
<!-- Creates the web site -->
<target name="site" depends="forrest, javadocs" description="[admin] Builds the site">
<mkdir dir="${site}"/>
@@ -63,3 +68,4 @@
inheritRefs="false"
target="cocoon-block-${block-name}-tests"/>
</target>
+</project>
\ No newline at end of file
1.4 +8 -1 cocoon-2.1/tools/targets/forrest-build.xml
Index: forrest-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/tools/targets/forrest-build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- forrest-build.xml 24 Dec 2003 09:12:29 -0000 1.3
+++ forrest-build.xml 13 Jan 2004 11:22:52 -0000 1.4
@@ -1,4 +1,9 @@
-<!-- === Forrest Targets ================================================= -->
+<?xml version="1.0"?>
+<project name="forrest">
+
+ <description>
+ Forrest Targets
+ </description>
<target name="forrest" depends="prepare, prepare-docs, forrest.init, validate-jars, javadocs" description="Generates static HTML documentation">
<!-- Add some other documents -->
@@ -149,4 +154,6 @@
</echo>
<fail message="Need to define $${forrest.home}"/>
</target>
+
+</project>
1.4 +7 -2 cocoon-2.1/tools/targets/validate-build.xml
Index: validate-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/tools/targets/validate-build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- validate-build.xml 3 Jan 2004 06:35:03 -0000 1.3
+++ validate-build.xml 13 Jan 2004 11:22:52 -0000 1.4
@@ -1,4 +1,9 @@
-<!-- === Validation targets ==================================================== -->
+<?xml version="1.0"?>
+<project name="validation">
+
+ <description>
+ Validation targets
+ </description>
<!-- Check if all the JAR files are properly declared in lib/jars.xml -->
<target name="validate-jars" depends="prepare" unless="unless.exclude.validate.jars">
@@ -111,4 +116,4 @@
<fileset dir="${build.context}/stylesheets" includes="**/*.xsl"/>
</jing>-->
</target>
-
+</project>
1.3 +7 -1 cocoon-2.1/tools/targets/test-build.xml
Index: test-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/tools/targets/test-build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- test-build.xml 26 Nov 2003 16:27:22 -0000 1.2
+++ test-build.xml 13 Jan 2004 11:22:52 -0000 1.3
@@ -1,4 +1,9 @@
-<!-- === Test targets =========================================================== -->
+<?xml version="1.0"?>
+<project name="test">
+
+ <description>
+ Test targets
+ </description>
<!-- Runs all tests -->
<target name="test" depends="junit-tests, block-tests" description="Runs all tests"/>
@@ -65,3 +70,4 @@
target="prepare-anteater-tests"/>
</target>
+</project>
\ No newline at end of file