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 2003/12/25 16:45:37 UTC
cvs commit: cocoon-2.2/tools/targets init-build.xml admin-build.xml docs-build.xml test-build.xml ide-build.xml compile-build.xml webapp-build.xml samples-build.xml validate-build.xml
unico 2003/12/25 07:45:37
Modified: tools/targets init-build.xml admin-build.xml docs-build.xml
test-build.xml ide-build.xml compile-build.xml
webapp-build.xml samples-build.xml
validate-build.xml
Log:
remove block build targets
Revision Changes Path
1.2 +0 -13 cocoon-2.2/tools/targets/init-build.xml
Index: init-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.2/tools/targets/init-build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- init-build.xml 18 Nov 2003 18:56:12 -0000 1.1
+++ init-build.xml 25 Dec 2003 15:45:37 -0000 1.2
@@ -29,13 +29,6 @@
<!-- Get the build properties from an external file -->
<property file="build.properties"/>
- <!-- Allow users a chance to override without editing the main file -->
- <property file="${user.home}/cocoon.blocks.properties"/>
- <property file="local.blocks.properties"/>
-
- <!-- Get the block properties from an external file -->
- <property file="blocks.properties"/>
-
<!-- Use unless.exclude.XXX shadow props used in the
unless target attributes -->
<condition property="unless.exclude.webapp.documentation">
@@ -45,12 +38,6 @@
<or>
<istrue value="${exclude.javadocs}"/>
<istrue value="${exclude.webapp.javadocs}"/>
- </or>
- </condition>
- <condition property="unless.exclude.webapp.idldocs">
- <or>
- <istrue value="${exclude.idldocs}"/>
- <istrue value="${exclude.webapp.idldocs}"/>
</or>
</condition>
<condition property="unless.exclude.webapp.samples">
1.2 +0 -8 cocoon-2.2/tools/targets/admin-build.xml
Index: admin-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.2/tools/targets/admin-build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- admin-build.xml 18 Nov 2003 18:56:12 -0000 1.1
+++ admin-build.xml 25 Dec 2003 15:45:37 -0000 1.2
@@ -24,11 +24,3 @@
<!-- compiles and packages the core classes and the deprecated classes -->
<target name="gump-core" depends="package-core, package-deprecated, javadocs, validate-jars, junit-tests"/>
-
- <!-- compiles and packages a single block identified by ${block-name} -->
- <target name="gump-block" depends="compile-core, compile-deprecated, prepare-blocks, compile-tests">
- <ant antfile="${build.temp}/blocks-build.xml"
- inheritAll="true"
- inheritRefs="false"
- target="cocoon-block-${block-name}-tests"/>
- </target>
1.2 +2 -25 cocoon-2.2/tools/targets/docs-build.xml
Index: docs-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.2/tools/targets/docs-build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- docs-build.xml 18 Nov 2003 18:56:12 -0000 1.1
+++ docs-build.xml 25 Dec 2003 15:45:37 -0000 1.2
@@ -1,16 +1,10 @@
<!-- === Documentation Targets ================================================= -->
- <target name="prepare-docs" depends="blocks">
+ <target name="prepare-docs">
<!-- Set classpath for documentation -->
<path id="documentation.classpath">
<path refid="classpath"/>
- <fileset dir="${build.blocks}">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${blocks}">
- <include name="*/lib/*.jar"/>
- </fileset>
<path location="${tools.jar}"/>
<path location="${build.context}/WEB-INF/classes"/>
</path>
@@ -138,19 +132,7 @@
</java>
</target>
-->
-<!-- === Javadoc/IDLDoc Targets ================================================ -->
-
- <!-- Create IDL API documentation -->
- <target name="idldocs" depends="prepare" unless="unless.exclude.idldocs" description="Builds the IDL API documentation for non-java language bindings">
- <mkdir dir="${build.idldocs}"/>
- <java classname="org.openorb.compiler.doc.IdlDoc">
- <arg value="-I${idl}"/>
- <arg value="-outdir:${build.idldocs}"/>
- <arg value="-all"/>
- <arg value="-html"/>
- <arg value="${idl}/main.idl"/>
- </java>
- </target>
+<!-- === Javadoc Targets ================================================ -->
<!-- Check if javadocs have to be generated -->
<!-- Obsolete:
@@ -211,11 +193,6 @@
<!-- Creates Javadocs -->
<target name="javadocs"
- depends="prepare-blocks"
description="Builds the API documentation (javadocs)">
- <ant antfile="${build.temp}/blocks-build.xml"
- inheritAll="true"
- inheritRefs="false"
- target="javadocs"/>
</target>
1.2 +2 -20 cocoon-2.2/tools/targets/test-build.xml
Index: test-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.2/tools/targets/test-build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- test-build.xml 18 Nov 2003 18:56:12 -0000 1.1
+++ test-build.xml 25 Dec 2003 15:45:37 -0000 1.2
@@ -1,7 +1,7 @@
<!-- === Test targets =========================================================== -->
<!-- Runs all tests -->
- <target name="test" depends="junit-tests, block-tests" description="Runs all tests"/>
+ <target name="test" depends="junit-tests" description="Runs all tests"/>
<!-- Runs JUnit tests -->
<target name="junit-tests" depends="compile-tests">
@@ -21,7 +21,7 @@
</target>
<!-- Anteater tests -->
- <target name="anteater-tests" depends="compile-tests,block-anteater-tests">
+ <target name="anteater-tests" depends="compile-tests">
<property name="host" value="localhost"/>
<property name="port" value="8888"/>
<property name="base" value="/"/>
@@ -46,21 +46,3 @@
</java>
</target>
- <!-- Block tests -->
- <target name="block-tests" depends="compile-tests, prepare-blocks">
-
- <ant antfile="${build.temp}/blocks-build.xml"
- inheritAll="true"
- inheritRefs="false"
- target="tests"/>
-
- </target>
-
- <target name="block-anteater-tests" depends="prepare-blocks">
-
- <ant antfile="${build.temp}/blocks-build.xml"
- inheritAll="true"
- inheritRefs="false"
- target="prepare-anteater-tests"/>
-
- </target>
1.3 +0 -9 cocoon-2.2/tools/targets/ide-build.xml
Index: ide-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.2/tools/targets/ide-build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ide-build.xml 8 Dec 2003 11:41:18 -0000 1.2
+++ ide-build.xml 25 Dec 2003 15:45:37 -0000 1.3
@@ -31,11 +31,6 @@
<pathelement path="${src}/deprecated/java"/>
<!-- test source dir -->
<pathelement path="${src}/test"/>
- <!-- blocks source dirs -->
- <dirset dir="${blocks}">
- <include name="*/java"/>
- <include name="*/java${target.vm}"/>
- </dirset>
</path>
<path id="mockss">
@@ -54,10 +49,6 @@
<include name="optional/*.jar"/>
<include name="local/*.jar"/>
<include name="endorsed/*.jar"/>
- </fileset>
- <!-- blocks lib -->
- <fileset dir="${blocks}">
- <include name="**/*.jar"/>
</fileset>
<!-- tools libs -->
<fileset dir="${tools}/lib">
1.2 +1 -29 cocoon-2.2/tools/targets/compile-build.xml
Index: compile-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.2/tools/targets/compile-build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- compile-build.xml 18 Nov 2003 18:56:12 -0000 1.1
+++ compile-build.xml 25 Dec 2003 15:45:37 -0000 1.2
@@ -101,7 +101,7 @@
<target name="package" depends="package-core, package-deprecated, package-testcase"/>
<!-- package the core -->
- <target name="package-core" depends="compile-core, block-roles">
+ <target name="package-core" depends="compile-core">
<jar jarfile="${build}/${name}.jar" manifest="${java}/Manifest.mf">
<fileset dir="${build.dest}">
<exclude name="**/Manifest.mf"/>
@@ -130,33 +130,5 @@
<include name="org/apache/cocoon/xml/WhitespaceFilter*"/>
</fileset>
</jar>
- </target>
-
-<!-- === Block Targets ========================================================= -->
-
- <!-- prepares the blocks build -->
- <target name="prepare-blocks" depends="prepare">
- <mkdir dir="${build.blocks}"/>
-
- <xslt in="${gump.descriptor}"
- out="${build.temp}/blocks-build.xml"
- processor="trax"
- style="${tools.src}/blocks-build.xsl"/>
- </target>
-
- <!-- patch the cocoon role file -->
- <target name="block-roles" depends="prepare-blocks">
- <ant antfile="${build.temp}/blocks-build.xml"
- inheritAll="true"
- inheritRefs="false"
- target="patch-roles"/>
- </target>
-
- <!-- compiles and packages all blocks -->
- <target name="blocks" depends="compile,prepare-blocks">
- <ant antfile="${build.temp}/blocks-build.xml"
- inheritAll="true"
- inheritRefs="false"
- target="compile"/>
</target>
1.3 +6 -36 cocoon-2.2/tools/targets/webapp-build.xml
Index: webapp-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.2/tools/targets/webapp-build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- webapp-build.xml 19 Dec 2003 09:03:33 -0000 1.2
+++ webapp-build.xml 25 Dec 2003 15:45:37 -0000 1.3
@@ -1,6 +1,6 @@
<!-- === Webapp targets ==================================================== -->
- <target name="prepare-webapp" depends="package"> <!-- removed dependency on blocks -->
+ <target name="prepare-webapp" depends="package">
<mkdir dir="${build.webapp}"/>
<copy file="${webapp}/welcome.xml" tofile="${build.webapp}/welcome.xml" filtering="on"/>
@@ -52,28 +52,9 @@
</fileset>
</copy>
-<!--
- <copy todir="${build.webapp.lib}">
- <fileset dir="${build.blocks}">
- <include name="*-block.jar"/>
- </fileset>
- <mapper type="glob" from="*-block.jar" to="cocoon-*-block.jar"/>
- </copy>
-
-
- <ant antfile="${build.temp}/blocks-build.xml"
- inheritAll="true"
- inheritRefs="false"
- target="lib"/>
-
- <ant antfile="${build.temp}/blocks-build.xml"
- inheritAll="true"
- inheritRefs="false"
- target="patch-conf"/>
--->
</target>
- <target name="prepare-webapp-samples" depends="prepare-webapp, samples" unless="unless.exclude.webapp.samples"/><!-- removed dependency on block-samples -->
+ <target name="prepare-webapp-samples" depends="prepare-webapp, samples" unless="unless.exclude.webapp.samples"/>
<target name="prepare-webapp-deprecated" depends="prepare-webapp" unless="unless.exclude.deprecated">
<copy file="${build}/${name}-deprecated.jar" tofile="${build.webapp.lib}/${name}-${version}-deprecated.jar"/>
@@ -82,19 +63,6 @@
includes="**/*.xconf"
addComments="true"/>
</target>
-
- <target name="prepare-webapp-idldocs" depends="idldocs" unless="unless.exclude.webapp.idldocs">
- <mkdir dir="${build.webapp.idldocs}"/>
-
- <copy todir="${build.webapp.idldocs}" filtering="off">
- <fileset dir="${build.idldocs}"/>
- </copy>
-
- <!-- patch the welcome page to tell we have idldocs to show -->
- <xpatch file="${build.webapp}/welcome.xml"
- srcdir="${idl}"
- includes="**/*.xwelcome"/>
- </target>
<target name="prepare-webapp-javadocs" depends="javadocs" unless="unless.exclude.webapp.javadocs">
<mkdir dir="${build.webapp.javadocs}"/>
@@ -108,8 +76,10 @@
srcdir="${resources.javadoc}"
includes="**/*.xwelcome"/>
</target>
-
- <target name="prepare-webapp-docs" depends="validate-xdocs,validate-jars" unless="unless.exclude.webapp.documentation">
+ <!-- disable docs
+ <target name="prepare-webapp-docs" depends="init,validate-xdocs,validate-jars" unless="unless.exclude.webapp.documentation">
+ -->
+ <target name="prepare-webapp-docs" depends="init,validate-jars" unless="unless.exclude.webapp.documentation">
<mkdir dir="${build.webapp.docs}"/>
<copy todir="${build.webapp.docs}" filtering="on">
1.2 +0 -6 cocoon-2.2/tools/targets/samples-build.xml
Index: samples-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.2/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 18:56:12 -0000 1.1
+++ samples-build.xml 25 Dec 2003 15:45:37 -0000 1.2
@@ -46,10 +46,4 @@
includes="**/*.xwelcome"/>
</target>
- <target name="block-samples" depends="prepare" unless="unless.exclude.webapp.samples">
- <ant antfile="${build.temp}/blocks-build.xml"
- inheritAll="true"
- inheritRefs="false"
- target="samples"/>
- </target>
1.2 +0 -9 cocoon-2.2/tools/targets/validate-build.xml
Index: validate-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.2/tools/targets/validate-build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- validate-build.xml 18 Nov 2003 18:56:12 -0000 1.1
+++ validate-build.xml 25 Dec 2003 15:45:37 -0000 1.2
@@ -6,9 +6,6 @@
<fileset dir="${lib}">
<include name="**/*.jar"/>
</fileset>
- <fileset dir="${blocks}">
- <include name="*/lib/*.jar"/>
- </fileset>
</path>
<property name="all.jars" refid="all.jars"/>
@@ -29,16 +26,10 @@
<replace file="${build.temp}/current-jars.xml"
token="${user}${file.separator}lib${file.separator}"
value=""/>
- <replace file="${build.temp}/current-jars.xml"
- token="${user}${file.separator}${blocks}${file.separator}"
- value=""/>
<!-- and incase that fails, remove the base directory -->
<replace file="${build.temp}/current-jars.xml"
token="${basedir}${file.separator}lib${file.separator}"
- value=""/>
- <replace file="${build.temp}/current-jars.xml"
- token="${basedir}${file.separator}${blocks}${file.separator}"
value=""/>
<!-- replace platform-dependent path separator by '/' -->