You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2004/08/09 14:31:00 UTC
svn commit: rev 36110 - in cocoon/branches/new-kernel: . legal lib lib/core lib/optional src/blocks/cocoon.apache.org/jdbc-connector/src/protected/org/apache/cocoon/blocks/jdbc src/confpatch src/deprecated src/java src/java/org src/mocks/sun src/resources src/samples src/test src/webapp tools tools/ide tools/instrumentation tools/jetty tools/lib tools/src tools/targets
Author: cziegeler
Date: Mon Aug 9 05:30:59 2004
New Revision: 36110
Added:
cocoon/branches/new-kernel/lib/optional/servlet-2_3.jar (contents, props changed)
Removed:
cocoon/branches/new-kernel/DESKTOP.INI
cocoon/branches/new-kernel/INSTALL.txt
cocoon/branches/new-kernel/KEYS
cocoon/branches/new-kernel/README.txt
cocoon/branches/new-kernel/announcement.xml
cocoon/branches/new-kernel/blocks.properties
cocoon/branches/new-kernel/cli.xconf
cocoon/branches/new-kernel/cocoon.bat
cocoon/branches/new-kernel/cocoon.sh
cocoon/branches/new-kernel/forrest.properties
cocoon/branches/new-kernel/legal/altrmi-client-impl-0.9.2.jar.license.txt
cocoon/branches/new-kernel/legal/altrmi-client-interfaces-0.9.2.jar.license.txt
cocoon/branches/new-kernel/legal/altrmi-common-0.9.2.jar.license.txt
cocoon/branches/new-kernel/legal/altrmi-registry-0.9.2.jar.license.txt
cocoon/branches/new-kernel/legal/altrmi-server-impl-0.9.2.jar.license.txt
cocoon/branches/new-kernel/legal/altrmi-server-interfacesl-0.9.2.jar.license.txt
cocoon/branches/new-kernel/legal/ant-junit.jar.license.txt
cocoon/branches/new-kernel/legal/avalon-fortress-tools-1.1.jar.license.txt
cocoon/branches/new-kernel/legal/avalon-framework-api-4.1.5.jar.license.txt
cocoon/branches/new-kernel/legal/avalon-framework-impl-4.1.5.jar.license.txt
cocoon/branches/new-kernel/legal/bcel-5.1.jar.license.txt
cocoon/branches/new-kernel/legal/commons-beanutils-1.6.1.jar.license.txt
cocoon/branches/new-kernel/legal/commons-cli-1.0.jar.license.txt
cocoon/branches/new-kernel/legal/commons-collections-3.1.jar.license.txt
cocoon/branches/new-kernel/legal/commons-httpclient-2.0-final.jar.license.txt
cocoon/branches/new-kernel/legal/commons-jexl-1.0-beta-1-20040113.jar.license.txt
cocoon/branches/new-kernel/legal/commons-jxpath-20030909.jar.license.txt
cocoon/branches/new-kernel/legal/commons-lang-2.0.jar.license.txt
cocoon/branches/new-kernel/legal/commons-logging-1.0.4.jar.license.txt
cocoon/branches/new-kernel/legal/excalibur-event-api-1.1.jar.license.txt
cocoon/branches/new-kernel/legal/excalibur-event-impl-1.1.jar.license.txt
cocoon/branches/new-kernel/legal/excalibur-i18n-1.1.jar.license.txt
cocoon/branches/new-kernel/legal/excalibur-instrument-1.0.jar.license.txt
cocoon/branches/new-kernel/legal/excalibur-instrument-client-2003-03-31.jar.license.txt
cocoon/branches/new-kernel/legal/excalibur-instrument-manager-1.0.jar.license.txt
cocoon/branches/new-kernel/legal/excalibur-instrument-manager-interfaces-1.0.jar.license.txt
cocoon/branches/new-kernel/legal/excalibur-io-1.1.jar.license.txt
cocoon/branches/new-kernel/legal/excalibur-lfecycle-1.0.jar.license.txt
cocoon/branches/new-kernel/legal/excalibur-logger-1.1.jar.license.txt
cocoon/branches/new-kernel/legal/excalibur-monitor-1.0.2.jar.license.txt
cocoon/branches/new-kernel/legal/excalibur-naming-1.0.jar.license.txt
cocoon/branches/new-kernel/legal/excalibur-pool-1.2.jar.license.txt
cocoon/branches/new-kernel/legal/excalibur-sourceresolve-1.1.jar.license.txt
cocoon/branches/new-kernel/legal/excalibur-store-1.0.jar.license.txt
cocoon/branches/new-kernel/legal/excalibur-xmlutil-1.0.jar.license.txt
cocoon/branches/new-kernel/legal/jakarta-regexp-1.3.jar.license.txt
cocoon/branches/new-kernel/legal/jdtcore-2.1.3.jar.license.txt
cocoon/branches/new-kernel/legal/jetty-4.2.19.jar.license.html
cocoon/branches/new-kernel/legal/jing-20030619.jar.license.txt
cocoon/branches/new-kernel/legal/jisp-2.5.1.jar.license.txt
cocoon/branches/new-kernel/legal/jstyle.jar.license.txt
cocoon/branches/new-kernel/legal/junit.jar.license.txt
cocoon/branches/new-kernel/legal/logkit-1.2.2.jar.license.txt
cocoon/branches/new-kernel/legal/pizza-1.1.jar.license.txt
cocoon/branches/new-kernel/legal/qdox-1.1.jar.license.txt
cocoon/branches/new-kernel/legal/rhino1.5r4-continuations-20040629T1232.jar.license.txt
cocoon/branches/new-kernel/legal/servlet_2_2.jar.license.txt
cocoon/branches/new-kernel/legal/util.concurrent-1.3.4.jar.license.txt
cocoon/branches/new-kernel/legal/xml-commons-resolver-1.1.jar.license.txt
cocoon/branches/new-kernel/legal/xmlunit0.8.jar.license.txt
cocoon/branches/new-kernel/lib/core/avalon-fortress-tools-1.1.jar
cocoon/branches/new-kernel/lib/core/avalon-framework-api-4.1.5.jar
cocoon/branches/new-kernel/lib/core/avalon-framework-impl-4.1.5.jar
cocoon/branches/new-kernel/lib/core/bcel-5.1.jar
cocoon/branches/new-kernel/lib/core/commons-beanutils-1.6.1.jar
cocoon/branches/new-kernel/lib/core/commons-cli-1.0.jar
cocoon/branches/new-kernel/lib/core/commons-collections-3.1.jar
cocoon/branches/new-kernel/lib/core/commons-httpclient-2.0-final.jar
cocoon/branches/new-kernel/lib/core/commons-jexl-1.0-beta-1-20040113.jar
cocoon/branches/new-kernel/lib/core/commons-jxpath-20030909.jar
cocoon/branches/new-kernel/lib/core/commons-lang-2.0.jar
cocoon/branches/new-kernel/lib/core/excalibur-event-api-1.1.jar
cocoon/branches/new-kernel/lib/core/excalibur-event-impl-1.1.jar
cocoon/branches/new-kernel/lib/core/excalibur-fortress-container-20040405.jar
cocoon/branches/new-kernel/lib/core/excalibur-i18n-1.1.jar
cocoon/branches/new-kernel/lib/core/excalibur-instrument-1.0.jar
cocoon/branches/new-kernel/lib/core/excalibur-instrument-manager-1.0.jar
cocoon/branches/new-kernel/lib/core/excalibur-instrument-manager-interfaces-1.0.jar
cocoon/branches/new-kernel/lib/core/excalibur-io-1.1.jar
cocoon/branches/new-kernel/lib/core/excalibur-lifecycle-1.0.jar
cocoon/branches/new-kernel/lib/core/excalibur-logger-1.1.jar
cocoon/branches/new-kernel/lib/core/excalibur-monitor-1.0.2.jar
cocoon/branches/new-kernel/lib/core/excalibur-naming-1.0.jar
cocoon/branches/new-kernel/lib/core/excalibur-pool-1.2.jar
cocoon/branches/new-kernel/lib/core/excalibur-sourceresolve-1.1.jar
cocoon/branches/new-kernel/lib/core/excalibur-store-1.0.jar
cocoon/branches/new-kernel/lib/core/excalibur-xmlutil-1.0.jar
cocoon/branches/new-kernel/lib/core/jakarta-regexp-1.3.jar
cocoon/branches/new-kernel/lib/core/javacApi-0.9.jar
cocoon/branches/new-kernel/lib/core/javacImpl-0.9.jar
cocoon/branches/new-kernel/lib/core/jisp-2.5.1.jar
cocoon/branches/new-kernel/lib/core/logkit-1.2.2.jar
cocoon/branches/new-kernel/lib/core/rhino1.5r4-continuations-20040629T1232.jar
cocoon/branches/new-kernel/lib/core/util.concurrent-1.3.4.jar
cocoon/branches/new-kernel/lib/core/xml-commons-resolver-1.1.jar
cocoon/branches/new-kernel/lib/jars.xml
cocoon/branches/new-kernel/lib/optional/altrmi-common-0.9.2.jar
cocoon/branches/new-kernel/lib/optional/altrmi-registry-0.9.2.jar
cocoon/branches/new-kernel/lib/optional/altrmi-server-impl-0.9.2.jar
cocoon/branches/new-kernel/lib/optional/altrmi-server-interfaces-0.9.2.jar
cocoon/branches/new-kernel/lib/optional/commons-logging-1.0.4.jar
cocoon/branches/new-kernel/lib/optional/jdtcore-2.1.3.jar
cocoon/branches/new-kernel/lib/optional/pizza-1.1.jar
cocoon/branches/new-kernel/lib/optional/servlet_2_2.jar
cocoon/branches/new-kernel/mount-table.xml.sample
cocoon/branches/new-kernel/src/confpatch/
cocoon/branches/new-kernel/src/deprecated/
cocoon/branches/new-kernel/src/java/Manifest.mf
cocoon/branches/new-kernel/src/java/org/
cocoon/branches/new-kernel/src/mocks/sun/
cocoon/branches/new-kernel/src/resources/
cocoon/branches/new-kernel/src/samples/
cocoon/branches/new-kernel/src/test/
cocoon/branches/new-kernel/src/webapp/
cocoon/branches/new-kernel/tools/.cvsignore
cocoon/branches/new-kernel/tools/ide/
cocoon/branches/new-kernel/tools/instrumentation/
cocoon/branches/new-kernel/tools/jetty/
cocoon/branches/new-kernel/tools/lib/qdox-1.1.jar
cocoon/branches/new-kernel/tools/src/
cocoon/branches/new-kernel/tools/targets/admin-build.xml
cocoon/branches/new-kernel/tools/targets/dist-build.xml
cocoon/branches/new-kernel/tools/targets/docs-build.xml
cocoon/branches/new-kernel/tools/targets/forrest-build.xml
cocoon/branches/new-kernel/tools/targets/ide-build.xml
cocoon/branches/new-kernel/tools/targets/instrumentation-build.xml
cocoon/branches/new-kernel/tools/targets/samples-build.xml
cocoon/branches/new-kernel/tools/targets/standalone-demo-build.xml
cocoon/branches/new-kernel/tools/targets/test-build.xml
cocoon/branches/new-kernel/tools/targets/tools-build.xml
cocoon/branches/new-kernel/tools/targets/upgrade-build.xml
cocoon/branches/new-kernel/tools/targets/validate-build.xml
cocoon/branches/new-kernel/tools/targets/webapp-build.xml
Modified:
cocoon/branches/new-kernel/ (props changed)
cocoon/branches/new-kernel/build.properties
cocoon/branches/new-kernel/build.xml
cocoon/branches/new-kernel/src/blocks/cocoon.apache.org/jdbc-connector/src/protected/org/apache/cocoon/blocks/jdbc/WirableConnection.java
cocoon/branches/new-kernel/tools/ (props changed)
cocoon/branches/new-kernel/tools/targets/compile-build.xml
cocoon/branches/new-kernel/tools/targets/init-build.xml
Log:
Clean up kernel
Remove everything that is currently not relevant
Modified: cocoon/branches/new-kernel/build.properties
==============================================================================
--- cocoon/branches/new-kernel/build.properties (original)
+++ cocoon/branches/new-kernel/build.properties Mon Aug 9 05:30:59 2004
@@ -21,84 +21,9 @@
# The build system will override these properties with the ones in the
# 'local.build.properties' file.
-# ---- Webapp ------------------------------------------------------------------
-
-exclude.webapp.documentation=true
-exclude.webapp.javadocs=true
-#exclude.webapp.samples=true
-
-# ---- Build Exclusions --------------------------------------------------------
-
-exclude.deprecated=true
-exclude.documentation=true
-exclude.javadocs=true
-
-# ---- Configuration -----------------------------------------------------------
-
-#include.driver.oracle=true
-#include.driver.postgre=true
-#include.driver.odbc=true
-#config.allow-reloads=true
-#config.enable-uploads=true
-
-# ---- Validation --------------------------------------------------------------
-
-#exclude.validate.config=true
-#exclude.validate.xdocs=true
-#exclude.validate.jars=true
-
-# ---- Forrest -----------------------------------------------------------------
-
-# set $FORREST_HOME and $PATH as instructed by Forrest
-
-# ---- Anteater ----------------------------------------------------------------
-
-anteater.home = /default-from-build.properties/anteater-0.9.16
-anteater.target.host = localhost
-anteater.target.port = 8888
-anteater.target.base.path = /
-anteater.option.haltonerror = true
-
-# disable some long-running tests by default
-# anteater.test.bug26186InternalRequestMemoryLeak.enabled = true
-
-# ---- Build -------------------------------------------------------------------
-
build.root=build
build=${build.root}/${name}-${version}
build.dest=${build}/classes
-build.mocks=${build}/mocks
-build.test=${build}/test
-build.docs=${build}/docs
-build.docs.printer=${build}/printer-docs
-build.site=${build}/site
-build.xdocs=${build}/xdocs
-build.javadocs=${build}/javadocs
-build.context=${build}/documentation
-build.context.printer=${build}/printer-documentation
-build.blocks=${build}/blocks
-build.deprecated=${build}/deprecated
-build.samples=${build}/samples
-build.temp=${build}/temp
-build.mounttable=../../mount-table.xml
-
-build.docs.loglevel=ERROR
-build.docs.printer.loglevel=ERROR
-
-# ------ Webapp Build Properties -----------------------------------------------
-
-build.webapp=${build.root}/webapp
-build.webapp.webinf=${build.webapp}/WEB-INF
-build.webapp.classes=${build.webapp.webinf}/classes
-build.webapp.lib=${build.webapp.webinf}/lib
-build.webapp.samples=${build.webapp}/samples
-build.webapp.docs=${build.webapp}/docs
-build.webapp.javadocs=${build.webapp}/api/java
-build.webapp.loglevel=DEBUG
-build.war=${build}/${name}.war
-
-# ------ Standalone-demo Build Properties --------------------------------------
-build.standalone.demo=${build.root}/standalone-demo
# ---- Compilation -------------------------------------------------------------
@@ -122,40 +47,11 @@
# Directory Layout
src=src
-java=${src}/java
-mocks=${src}/mocks
-test=${src}/test
-resources=${src}/resources
-resources.styles=${resources}/styles
-resources.logos=${resources}/logos
-resources.javadoc=${resources}/javadoc
-documentation=${src}/documentation
-docs=${documentation}/xdocs
-images=${documentation}/images
-blocks=${src}${file.separator}blocks
-samples=${src}/samples
-webapp=${src}/webapp
-webapp.samples=${webapp}/samples
-customconf=${src}/confpatch
-
-# Deprecated Stuff
-deprecated=${src}/deprecated
-deprecated.src=${deprecated}/java
-deprecated.conf=${deprecated}/conf
# Tools
tools=tools
tools.lib=${tools}/lib
tools.src=${tools}/src
-tools.tasks.src=${tools.src}/anttasks
-tools.tasks.dest=${tools}/anttasks
-tools.loader.src=${tools.src}/loader
-tools.loader.dest=${tools}/loader
-tools.jetty=${tools}/jetty
-
-# IDE
-ide.eclipse.outputdir=${build.root}/eclipse/classes
-ide.eclipse.export.libs=false
# Libraries
lib=lib
@@ -164,14 +60,11 @@
lib.optional=${lib}/optional
lib.local=${lib}/local
-# Distribution Directories
-dist.root=dist
-dist=${dist.root}/${name}-${version}
-dist.name=${name}-${version}
-dist.target=${dist.root}
-
-# Site Directory
-site=../cocoon-site/site/2.2
-
# Legal
legal=legal
+
+version=0.1-pre-alpha
+year=2004
+name=cocoon-new-kernel
+Name=Cocoon New Kernel
+fullname=Apache Cocoon New Kernel
Modified: cocoon/branches/new-kernel/build.xml
==============================================================================
--- cocoon/branches/new-kernel/build.xml (original)
+++ cocoon/branches/new-kernel/build.xml Mon Aug 9 05:30:59 2004
@@ -24,7 +24,7 @@
============================================================================ -->
-<project default="webapp" basedir="." name="Apache Cocoon">
+<project default="compile" basedir="." name="Apache Cocoon">
<!-- ================== Apache Cocoon targets ======================== -->
@@ -34,50 +34,5 @@
<!-- =================================================================== -->
<!-- Compile targets -->
<import file="tools/targets/compile-build.xml" />
- <!-- =================================================================== -->
- <!-- Validation targets -->
- <import file="tools/targets/validate-build.xml" />
- <!-- =================================================================== -->
- <!-- Samples targets -->
- <import file="tools/targets/samples-build.xml" />
- <!-- =================================================================== -->
- <!-- Web application targets -->
- <import file="tools/targets/webapp-build.xml" />
- <!-- =================================================================== -->
- <!-- IDE targets -->
- <import file="tools/targets/ide-build.xml" />
- <!-- =================================================================== -->
- <!-- Testcases targets -->
- <import file="tools/targets/test-build.xml" />
- <!-- =================================================================== -->
- <!-- Documentation targets -->
- <import file="tools/targets/docs-build.xml" />
- <!-- =================================================================== -->
- <!-- Distribution targets -->
- <import file="tools/targets/dist-build.xml" />
- <!-- =================================================================== -->
- <!-- Administration targets -->
- <import file="tools/targets/admin-build.xml" />
- <!-- =================================================================== -->
- <!-- Standalone-demo targets -->
- <import file="tools/targets/standalone-demo-build.xml" />
- <!-- =================================================================== -->
- <!-- Instrumentation targets -->
- <import file="tools/targets/instrumentation-build.xml" />
- <!-- =================================================================== -->
- <!-- Upgrade targets -->
- <import file="tools/targets/upgrade-build.xml" />
- <!-- =================================================================== -->
- <!-- Tools targets -->
- <import file="tools/targets/tools-build.xml" />
- <!-- =================================================================== -->
-
- <!-- ================== Apache Forrest targets ======================= -->
-
- <!-- =================================================================== -->
- <!-- Forrest targets -->
- <import file="tools/targets/forrest-build.xml" />
- <!-- =================================================================== -->
-
</project>
Added: cocoon/branches/new-kernel/lib/optional/servlet-2_3.jar
==============================================================================
Binary file. No diff available.
Modified: cocoon/branches/new-kernel/src/blocks/cocoon.apache.org/jdbc-connector/src/protected/org/apache/cocoon/blocks/jdbc/WirableConnection.java
==============================================================================
--- cocoon/branches/new-kernel/src/blocks/cocoon.apache.org/jdbc-connector/src/protected/org/apache/cocoon/blocks/jdbc/WirableConnection.java (original)
+++ cocoon/branches/new-kernel/src/blocks/cocoon.apache.org/jdbc-connector/src/protected/org/apache/cocoon/blocks/jdbc/WirableConnection.java Mon Aug 9 05:30:59 2004
@@ -27,6 +27,7 @@
import org.apache.cocoon.kernel.composition.Component;
import org.apache.cocoon.kernel.composition.Wire;
+import org.apache.cocoon.kernel.resolution.Resolver;
/**
*
@@ -61,7 +62,7 @@
*
* @param wire the {@link Wire} instance associated with this instance.
*/
- public void contextualize(Wire wire) {
+ public void contextualize(Wire wire, Resolver resolver) {
this.wire = wire;
}
Modified: cocoon/branches/new-kernel/tools/targets/compile-build.xml
==============================================================================
--- cocoon/branches/new-kernel/tools/targets/compile-build.xml (original)
+++ cocoon/branches/new-kernel/tools/targets/compile-build.xml Mon Aug 9 05:30:59 2004
@@ -21,39 +21,10 @@
</description>
<!-- compiles everything -->
- <target name="compile" depends="compile-core, compile-deprecated, compile-tests"/>
+ <target name="compile" depends="prepare">
- <!-- compiles the core -->
- <target name="compile-core" depends="prepare">
-
- <!-- copy those files that need to be in the classpath -->
- <copy todir="${build.dest}">
- <fileset dir="${java}">
- <exclude name="**/*.java"/>
- <exclude name="**/*.xroles"/>
- <exclude name="**/*.xconf"/>
- </fileset>
- </copy>
-
- <!-- generate fortress meta descriptors -->
- <fortress-meta destdir="${build.dest}">
- <fileset dir="${java}">
- <include name="**/*.java"/>
- </fileset>
- </fortress-meta>
+ <mkdir dir="${build.dest}"/>
- <!-- compile mock classes -->
- <mkdir dir="${build.mocks}"/>
- <javac srcdir="${mocks}"
- destdir="${build.mocks}"
- debug="${compiler.debug}"
- optimize="${compiler.optimize}"
- deprecation="${compiler.deprecation}"
- target="${target.vm}"
- nowarn="${compiler.nowarn}"
- compiler="${compiler}"
- classpathref="classpath"/>
-
<!-- compile kernel source files -->
<javac srcdir="src/kernel"
destdir="${build.dest}"
@@ -65,8 +36,8 @@
compiler="${compiler}"
classpathref="classpath"/>
- <!-- compile core source files -->
- <javac srcdir="${java}"
+ <!-- compile sample block -->
+ <javac srcdir="src/blocks/cocoon.apache.org/jdbc-connector/src/protected"
destdir="${build.dest}"
debug="${compiler.debug}"
optimize="${compiler.optimize}"
@@ -75,91 +46,17 @@
nowarn="${compiler.nowarn}"
compiler="${compiler}"
classpathref="classpath"/>
-
- </target>
-
- <!-- compiles deprecated code -->
- <target name="compile-deprecated" depends="prepare" unless="unless.exclude.deprecated">
- <mkdir dir="${build.deprecated}"/>
-
- <xpatch file="${build.dest}/org/apache/cocoon/cocoon.roles"
- srcdir="${deprecated.conf}"
- includes="**/*.xroles"/>
-
- <javac srcdir="${deprecated.src}"
- destdir="${build.deprecated}"
- debug="${compiler.debug}"
- optimize="${compiler.optimize}"
- deprecation="${compiler.deprecation}"
- target="${target.vm}"
- compiler="${compiler}"
- classpathref="classpath"/>
- </target>
-
- <target name="compile-tests" depends="compile-core, compile-deprecated">
- <mkdir dir="${build.test}"/>
-
- <!-- Copy test files to build test dir -->
- <copy todir="${build.test}" filtering="on">
- <fileset dir="${test}" excludes="**/*.java"/>
- </copy>
-
- <path id="test.classpath">
- <path refid="classpath"/>
- <pathelement location="${build.dest}" />
- <!-- FIXME Resolver tests depend on deprecated stuff -->
- <pathelement location="${build.deprecated}" />
- <pathelement location="${build.test}" />
- <fileset dir="${tools.lib}">
- <include name="*.jar"/>
- </fileset>
- </path>
-
- <!-- Compile tests -->
- <javac srcdir="${test}"
- destdir="${build.test}"
- debug="${compiler.debug}"
- optimize="${compiler.optimize}"
- deprecation="${compiler.deprecation}"
- target="${target.vm}"
- compiler="${compiler}"
- classpathref="test.classpath"/>
- </target>
+ </target>
<!-- === Package Targets ======================================================= -->
- <!-- packages everything -->
- <target name="package" depends="package-core, package-deprecated, package-testcase"/>
-
<!-- package the core -->
- <target name="package-core" depends="compile-core">
- <jar jarfile="${build}/${name}.jar" manifest="${java}/Manifest.mf">
+ <target name="package" depends="compile">
+ <jar jarfile="${build}/${name}.jar">
<fileset dir="${build.dest}">
<exclude name="**/Manifest.mf"/>
</fileset>
</jar>
</target>
- <!-- package deprecated code -->
- <target name="package-deprecated" depends="compile-deprecated" unless="unless.exclude.deprecated">
- <jar jarfile="${build}/${name}-deprecated.jar">
- <fileset dir="${build.deprecated}"/>
- </jar>
- </target>
-
- <!-- package testcase code -->
- <target name="package-testcase" depends="compile-tests">
- <jar jarfile="${build}/${name}-testcase.jar" index="true">
- <fileset dir="${build.test}">
- <include name="org/apache/cocoon/environment/mock/*"/>
- <include name="org/apache/cocoon/components/source/SourceResolverAdapter*"/>
- <include name="org/apache/cocoon/AbstractCompositeTestCase*"/>
- <include name="org/apache/cocoon/acting/AbstractActionTestCase*"/>
- <include name="org/apache/cocoon/generation/AbstractGeneratorTestCase*"/>
- <include name="org/apache/cocoon/transformation/AbstractTransformerTestCase*"/>
- <include name="org/apache/cocoon/serialization/AbstractSerializerTestCase*"/>
- <include name="org/apache/cocoon/xml/WhitespaceFilter*"/>
- </fileset>
- </jar>
- </target>
</project>
Modified: cocoon/branches/new-kernel/tools/targets/init-build.xml
==============================================================================
--- cocoon/branches/new-kernel/tools/targets/init-build.xml (original)
+++ cocoon/branches/new-kernel/tools/targets/init-build.xml Mon Aug 9 05:30:59 2004
@@ -25,9 +25,6 @@
<!-- Set the timestamps -->
<tstamp/>
- <!-- Get the (constant) cocoon properties -->
- <property file="src/java/org/apache/cocoon/cocoon.properties"/>
-
<!-- Detecting the current jvm -->
<condition property="target.vm" value="1.5">
<equals arg1="1.5" arg2="${ant.java.version}"/>
@@ -44,10 +41,6 @@
</not>
</condition>
- <!-- The location of tools.jar, relative to the JAVA_HOME home. -->
- <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
- <available file="${tools.jar}" property="tools.jar.present"/>
-
<!-- Allow users a chance to override without editing the main file -->
<property file="${user.home}/cocoon.build.properties"/>
<property file="local.build.properties"/>
@@ -55,51 +48,6 @@
<!-- Get the build properties from an external file -->
<property file="build.properties"/>
- <!-- Use unless.exclude.XXX shadow props used in the
- unless target attributes -->
- <condition property="unless.exclude.webapp.documentation">
- <istrue value="${exclude.webapp.documentation}"/>
- </condition>
- <condition property="unless.exclude.webapp.javadocs">
- <or>
- <istrue value="${exclude.javadocs}"/>
- <istrue value="${exclude.webapp.javadocs}"/>
- </or>
- </condition>
- <condition property="unless.exclude.webapp.samples">
- <istrue value="${exclude.webapp.samples}"/>
- </condition>
-
- <condition property="unless.exclude.deprecated">
- <istrue value="${exclude.deprecated}"/>
- </condition>
- <condition property="unless.exclude.javadocs">
- <istrue value="${exclude.javadocs}"/>
- </condition>
- <condition property="unless.exclude.validate.jars">
- <istrue value="${exclude.validate.jars}"/>
- </condition>
- <condition property="unless.exclude.validate.config">
- <istrue value="${exclude.validate.config}"/>
- </condition>
- <condition property="unless.exclude.validate.xdocs">
- <or>
- <istrue value="${exclude.validate.xdocs}"/>
- <istrue value="${exclude.documentation}"/>
- </or>
- </condition>
-
- <filter token="Name" value="${fullname}"/>
- <filter token="name" value="${fullname}"/>
- <filter token="year" value="${year}"/>
- <filter token="version" value="${version}"/>
- <filter token="date" value="${TODAY}"/>
- <filter token="released.version" value="${released.version}"/>
- <filter token="loglevel" value="${build.webapp.loglevel}"/>
-
- <!-- Alias for the loglevel -->
- <property name="loglevel" value="${build.webapp.loglevel}"/>
-
<!-- Set classpath -->
<path id="classpath">
<fileset dir="${lib.local}">
@@ -114,74 +62,18 @@
<fileset dir="${lib.core}">
<include name="*.jar"/>
</fileset>
- <!-- Currently, we have no JVM dependent libraries
- <fileset dir="${lib.core}/jvm${target.vm}">
- <include name="*.jar"/>
- </fileset>
- -->
<fileset dir="${lib.optional}">
<include name="*.jar"/>
</fileset>
- <path location="${build.mocks}"/>
<path location="${build.dest}"/>
</path>
</target>
- <target name="init-tasks" depends="init">
-
- <!-- Set classpath for building ant tasks -->
- <path id="tasks.classpath">
- <path refid="classpath"/>
- <fileset dir="${tools.lib}">
- <include name="*.jar"/>
- </fileset>
- <path location="${tools.tasks.dest}"/>
- </path>
-
- <!-- compile the ant tasks -->
- <mkdir dir="${tools.tasks.dest}"/>
- <javac srcdir="${tools.tasks.src}"
- destdir="${tools.tasks.dest}"
- debug="off"
- optimize="on"
- deprecation="on"
- target="1.3"
- nowarn="on"
- compiler="${compiler}"
- classpathref="tasks.classpath"/>
-
- <!-- A task to patch xml files -->
- <taskdef name="xpatch" classname="XConfToolTask"
- classpath="${tools.tasks.dest}"/>
-
- <!-- Jing is used in various targets for XML validation with RELAX NG -->
- <taskdef name="jing" classname="com.thaiopensource.relaxng.util.JingTask"
- classpathref="tasks.classpath"/>
-
- <!-- Fortress meta info task -->
- <taskdef name="fortress-meta"
- classname="org.apache.avalon.fortress.tools.ComponentMetaInfoCollector"
- classpathref="tasks.classpath"/>
-
- <!-- compile the loader, used to change classpath especially for
- the CLI and Jetty -->
- <mkdir dir="${tools.loader.dest}"/>
- <javac srcdir="${tools.loader.src}"
- destdir="${tools.loader.dest}"
- debug="off"
- optimize="on"
- deprecation="on"
- target="1.3"
- nowarn="on"
- compiler="${compiler}"/>
-
- </target>
-
<!-- === Preparation Targets ============================================= -->
<!-- Prepare the build directory -->
- <target name="prepare" depends="init-tasks">
+ <target name="prepare" depends="init">
<echo>======================================================================
${fullname} ${version} [${year}]
======================================================================
@@ -201,21 +93,9 @@
<!-- Clean -->
<target name="clean"
- depends="clean-cocoon,clean-webapp,clean-standalone-demo"
- description="Cleans the cocoon build, webapp and standalone-demo"/>
-
- <!-- Clean the cocoon build directory -->
- <target name="clean-cocoon" depends="init" description="Cleans the cocoon build">
+ depends="init"
+ description="Cleans the build">
<delete dir="${build}"/>
</target>
- <!-- Clean the webapp -->
- <target name="clean-webapp" depends="init" description="Cleans the webapp">
- <delete dir="${build.webapp}"/>
- </target>
-
- <!-- Clean the standalone demo -->
- <target name="clean-standalone-demo" depends="init" description="Cleans the standalone-demo">
- <delete dir="${build.standalone.demo}"/>
- </target>
</project>