jefft 02/04/12 18:07:33
Modified: . dependencies.txt gump.xml
all build.xml
altrmi build.xml
baxter build.xml
bzip2 build.xml
cache build.xml
cli build.xml
collections build.xml
component build.xml default.properties
concurrent build.xml
datasource build.xml
event build.xml
extension build.xml
fortress build.xml
i18n build.xml
instrument build.xml
instrument-client build.xml
instrument-manager build.xml
io build.xml
logger build.xml default.properties
monitor build.xml
naming build.xml
pool build.xml default.properties
sourceresolve build.xml
tar build.xml
template-product build.xml
testcase build.xml
thread build.xml
threadcontext build.xml
util build.xml
xmlbundle build.xml
zip build.xml
Log:
Split the unit test compilation into a separate target, so junit isn't
required
for ordinary builds. This has a nice side-effect of eliminating some deadlocks
due to testcase prereqs.
Revision Changes Path
1.10 +2 -2 jakarta-avalon-excalibur/dependencies.txt
Index: dependencies.txt
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/dependencies.txt,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- dependencies.txt 12 Apr 2002 10:03:12 -0000 1.9
+++ dependencies.txt 13 Apr 2002 01:07:30 -0000 1.10
@@ -21,8 +21,8 @@
* util -> framework
* baxter -> jmxri.jar
* event -> collections, concurrent, core, framework, event, util, thread,
threadcontext, pool
-* all -> collections, concurrent, instrument, event, component, pool,
logkit, logger, (recursive on fortress, commented out)
-* component -> logkit, framework, collections, logger, pool [Unit tests:
junit, util, testcase]
+* all -> collections, concurrent, instrument, event, component, pool,
logkit, logger, (recursive on fortress, commented out)
+* component -> logkit, framework, collections, logger, pool [Unit tests:
junit, util, testcase, instrument (runtime)]
** fortress -> instrument, instrument-manager, framework, testcase, event
(recursive on mpool in scratchpad), component (test class), logger, util
instrument-client -> altrmi-client-impl
* instrument-manager -> logkit, logger, framework, core, collections,
instrument, altrmi-common, altrmi-server-impl, altrmi-server-interfaces,
component, pool
1.39 +1 -1 jakarta-avalon-excalibur/gump.xml
Index: gump.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/gump.xml,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- gump.xml 12 Apr 2002 10:03:12 -0000 1.38
+++ gump.xml 13 Apr 2002 01:07:30 -0000 1.39
@@ -16,7 +16,7 @@
<depend property="logkit.jar"
project="jakarta-avalon-logkit"/>
<depend property="excalibur-pool.jar"
project="excalibur-pool"/>
<depend property="excalibur-collections.jar"
project="excalibur-collections"/>
- <depend property="excalibur-event.jar"
project="excalibur-event"/>
+ <depend property="avalon-framework.jar"
project="avalon-framework"/>
<depend property="excalibur-instrument.jar"
project="excalibur-instrument"/>
<depend property="excalibur-component.jar"
project="excalibur-component"/>
<depend property="excalibur-event.jar"
project="excalibur-event"/>
1.136 +2 -3 jakarta-avalon-excalibur/all/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/all/build.xml,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- build.xml 12 Apr 2002 11:03:30 -0000 1.135
+++ build.xml 13 Apr 2002 01:07:30 -0000 1.136
@@ -282,9 +282,8 @@
optimize="${build.optimize}"
deprecation="${build.deprecation}"
target="1.2">
- <classpath refid="project.class.path" />
- <exclude name="**/mpool/**"/> <!-- Still has recursive dep on command
-->
- <exclude name="**/test/**"/>
+ <classpath refid="project.class.path" />
+ <exclude name="**/test/**"/>
</javac>
</target>
1.12 +30 -4 jakarta-avalon-excalibur/altrmi/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/build.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.xml 12 Apr 2002 11:03:30 -0000 1.11
+++ build.xml 13 Apr 2002 01:07:30 -0000 1.12
@@ -14,8 +14,9 @@
<pathelement path="${java.class.path}"/>
<pathelement location="${build.classes}"/>
<pathelement location="${avalon-framework.jar}"/>
- <pathelement location="${junit.jar}"/>
<pathelement location="${checkstyle.jar}"/>
+ <!-- Unit testing deps -->
+ <pathelement location="${junit.jar}"/>
</path>
<property name="cp" refid="project.class.path"/>
@@ -34,12 +35,20 @@
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkFramework"/>
</target>
+ <target name="dependencies-test" depends="dist-jar, dependencies"
+ description="Check unit test dependencies"
unless="skip.dependencies">
+ <!-- Need the jar to prevent recursive deps. -->
+
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkJUnit"/>
+ </target>
+
+
<!-- Compiles the source code -->
<target name="compile" depends="dependencies" description="Compiles the
source code">
<mkdir dir="${build.classes}"/>
- <!-- Compile all classes including the tests. -->
+ <!-- Compile all classes excluding the tests. -->
<javac srcdir="${java.dir}"
destdir="${build.classes}"
debug="${build.debug}"
@@ -47,7 +56,6 @@
deprecation="${build.deprecation}"
target="1.2">
<classpath refid="project.class.path" />
- <src path="${test.dir}"/>
<include name="**/*.java"/>
</javac>
@@ -58,6 +66,24 @@
</fileset>
</copy>
+ </target>
+
+ <!-- Compiles the unit test source code -->
+ <target name="compile-test" depends="compile, dependencies-test"
description="Compiles the source code">
+
+ <mkdir dir="${build.classes}"/>
+
+ <!-- Compile all classes including the tests. -->
+ <javac srcdir="${test.dir}"
+ destdir="${build.classes}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
+ deprecation="${build.deprecation}"
+ target="1.2">
+ <classpath refid="project.class.path" />
+ <include name="**/*.java"/>
+ </javac>
+
<copy todir="${build.classes}">
<fileset dir="${test.dir}">
<exclude name="**/*.java"/>
@@ -137,7 +163,7 @@
</javadoc>
</target>
- <target name="test" depends="compile" description="Perform the unit
tests" unless="skip.tests">
+ <target name="test" depends="compile-test" description="Perform the unit
tests" unless="skip.tests">
<echo message="Performing Unit Tests" />
1.14 +30 -4 jakarta-avalon-excalibur/baxter/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/baxter/build.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- build.xml 12 Apr 2002 11:03:30 -0000 1.13
+++ build.xml 13 Apr 2002 01:07:30 -0000 1.14
@@ -13,9 +13,10 @@
<path id="project.class.path">
<pathelement path="${java.class.path}"/>
<pathelement location="${build.classes}"/>
- <pathelement location="${junit.jar}"/>
<pathelement location="${jmx.jar}"/>
<pathelement location="${checkstyle.jar}"/>
+ <!-- Unit testing deps -->
+ <pathelement location="${junit.jar}"/>
</path>
<property name="cp" refid="project.class.path"/>
@@ -37,12 +38,20 @@
</ant>
</target>
+ <target name="dependencies-test" depends="dist-jar, dependencies"
+ description="Check unit test dependencies"
unless="skip.dependencies">
+ <!-- Need the jar to prevent recursive deps. -->
+
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkJUnit"/>
+ </target>
+
+
<!-- Compiles the source code -->
<target name="compile" depends="dependencies" description="Compiles the
source code">
<mkdir dir="${build.classes}"/>
- <!-- Compile all classes including the tests. -->
+ <!-- Compile all classes excluding the tests. -->
<javac srcdir="${java.dir}"
destdir="${build.classes}"
debug="${build.debug}"
@@ -50,7 +59,6 @@
deprecation="${build.deprecation}"
target="1.2">
<classpath refid="project.class.path" />
- <src path="${test.dir}"/>
<include name="**/*.java"/>
</javac>
@@ -61,6 +69,24 @@
</fileset>
</copy>
+ </target>
+
+ <!-- Compiles the unit test source code -->
+ <target name="compile-test" depends="compile, dependencies-test"
description="Compiles the source code">
+
+ <mkdir dir="${build.classes}"/>
+
+ <!-- Compile all classes including the tests. -->
+ <javac srcdir="${test.dir}"
+ destdir="${build.classes}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
+ deprecation="${build.deprecation}"
+ target="1.2">
+ <classpath refid="project.class.path" />
+ <include name="**/*.java"/>
+ </javac>
+
<copy todir="${build.classes}">
<fileset dir="${test.dir}">
<exclude name="**/*.java"/>
@@ -120,7 +146,7 @@
</javadoc>
</target>
- <target name="test" depends="compile" description="Perform the unit
tests" unless="skip.tests">
+ <target name="test" depends="compile-test" description="Perform the unit
tests" unless="skip.tests">
<echo message="Performing Unit Tests" />
1.14 +30 -4 jakarta-avalon-excalibur/bzip2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/bzip2/build.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- build.xml 12 Apr 2002 11:03:30 -0000 1.13
+++ build.xml 13 Apr 2002 01:07:30 -0000 1.14
@@ -13,8 +13,9 @@
<path id="project.class.path">
<pathelement path="${java.class.path}"/>
<pathelement location="${build.classes}"/>
- <pathelement location="${junit.jar}"/>
<pathelement location="${checkstyle.jar}"/>
+ <!-- Unit testing deps -->
+ <pathelement location="${junit.jar}"/>
</path>
<property name="cp" refid="project.class.path"/>
@@ -32,12 +33,20 @@
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkCommon"/>
</target>
+ <target name="dependencies-test" depends="dist-jar, dependencies"
+ description="Check unit test dependencies"
unless="skip.dependencies">
+ <!-- Need the jar to prevent recursive deps. -->
+
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkJUnit"/>
+ </target>
+
+
<!-- Compiles the source code -->
<target name="compile" depends="dependencies" description="Compiles the
source code">
<mkdir dir="${build.classes}"/>
- <!-- Compile all classes including the tests. -->
+ <!-- Compile all classes excluding the tests. -->
<javac srcdir="${java.dir}"
destdir="${build.classes}"
debug="${build.debug}"
@@ -45,7 +54,6 @@
deprecation="${build.deprecation}"
target="1.2">
<classpath refid="project.class.path" />
- <src path="${test.dir}"/>
<include name="**/*.java"/>
</javac>
@@ -56,6 +64,24 @@
</fileset>
</copy>
+ </target>
+
+ <!-- Compiles the unit test source code -->
+ <target name="compile-test" depends="compile, dependencies-test"
description="Compiles the source code">
+
+ <mkdir dir="${build.classes}"/>
+
+ <!-- Compile all classes including the tests. -->
+ <javac srcdir="${test.dir}"
+ destdir="${build.classes}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
+ deprecation="${build.deprecation}"
+ target="1.2">
+ <classpath refid="project.class.path" />
+ <include name="**/*.java"/>
+ </javac>
+
<copy todir="${build.classes}">
<fileset dir="${test.dir}">
<exclude name="**/*.java"/>
@@ -115,7 +141,7 @@
</javadoc>
</target>
- <target name="test" depends="compile" description="Perform the unit
tests" unless="skip.tests">
+ <target name="test" depends="compile-test" description="Perform the unit
tests" unless="skip.tests">
<echo message="Performing Unit Tests" />
1.23 +30 -4 jakarta-avalon-excalibur/cache/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/cache/build.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- build.xml 12 Apr 2002 11:03:30 -0000 1.22
+++ build.xml 13 Apr 2002 01:07:30 -0000 1.23
@@ -14,8 +14,9 @@
<pathelement path="${java.class.path}"/>
<pathelement location="${build.classes}"/>
<pathelement location="${avalon-framework.jar}"/>
- <pathelement location="${junit.jar}"/>
<pathelement location="${checkstyle.jar}"/>
+ <!-- Unit testing deps -->
+ <pathelement location="${junit.jar}"/>
</path>
<property name="cp" refid="project.class.path"/>
@@ -33,12 +34,20 @@
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkCommon"/>
</target>
+ <target name="dependencies-test" depends="dist-jar, dependencies"
+ description="Check unit test dependencies"
unless="skip.dependencies">
+ <!-- Need the jar to prevent recursive deps. -->
+
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkJUnit"/>
+ </target>
+
+
<!-- Compiles the source code -->
<target name="compile" depends="dependencies" description="Compiles the
source code">
<mkdir dir="${build.classes}"/>
- <!-- Compile all classes including the tests. -->
+ <!-- Compile all classes excluding the tests. -->
<javac srcdir="${java.dir}"
destdir="${build.classes}"
debug="${build.debug}"
@@ -46,7 +55,6 @@
deprecation="${build.deprecation}"
target="1.2">
<classpath refid="project.class.path" />
- <src path="${test.dir}"/>
<include name="**/*.java"/>
</javac>
@@ -57,6 +65,24 @@
</fileset>
</copy>
+ </target>
+
+ <!-- Compiles the unit test source code -->
+ <target name="compile-test" depends="compile, dependencies-test"
description="Compiles the source code">
+
+ <mkdir dir="${build.classes}"/>
+
+ <!-- Compile all classes including the tests. -->
+ <javac srcdir="${test.dir}"
+ destdir="${build.classes}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
+ deprecation="${build.deprecation}"
+ target="1.2">
+ <classpath refid="project.class.path" />
+ <include name="**/*.java"/>
+ </javac>
+
<copy todir="${build.classes}">
<fileset dir="${test.dir}">
<exclude name="**/*.java"/>
@@ -116,7 +142,7 @@
</javadoc>
</target>
- <target name="test" depends="compile" description="Perform the unit
tests" unless="skip.tests">
+ <target name="test" depends="compile-test" description="Perform the unit
tests" unless="skip.tests">
<echo message="Performing Unit Tests" />
1.34 +30 -4 jakarta-avalon-excalibur/cli/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/cli/build.xml,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- build.xml 12 Apr 2002 11:03:30 -0000 1.33
+++ build.xml 13 Apr 2002 01:07:30 -0000 1.34
@@ -13,8 +13,9 @@
<path id="project.class.path">
<pathelement path="${java.class.path}"/>
<pathelement location="${build.classes}"/>
- <pathelement location="${junit.jar}"/>
<pathelement location="${checkstyle.jar}"/>
+ <!-- Unit testing deps -->
+ <pathelement location="${junit.jar}"/>
</path>
<property name="cp" refid="project.class.path"/>
@@ -32,12 +33,20 @@
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkCommon"/>
</target>
+ <target name="dependencies-test" depends="dist-jar, dependencies"
+ description="Check unit test dependencies"
unless="skip.dependencies">
+ <!-- Need the jar to prevent recursive deps. -->
+
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkJUnit"/>
+ </target>
+
+
<!-- Compiles the source code -->
<target name="compile" depends="dependencies" description="Compiles the
source code">
<mkdir dir="${build.classes}"/>
- <!-- Compile all classes including the tests. -->
+ <!-- Compile all classes excluding the tests. -->
<javac srcdir="${java.dir}"
destdir="${build.classes}"
debug="${build.debug}"
@@ -45,7 +54,6 @@
deprecation="${build.deprecation}"
target="1.2">
<classpath refid="project.class.path" />
- <src path="${test.dir}"/>
<include name="**/*.java"/>
</javac>
@@ -56,6 +64,24 @@
</fileset>
</copy>
+ </target>
+
+ <!-- Compiles the unit test source code -->
+ <target name="compile-test" depends="compile, dependencies-test"
description="Compiles the source code">
+
+ <mkdir dir="${build.classes}"/>
+
+ <!-- Compile all classes including the tests. -->
+ <javac srcdir="${test.dir}"
+ destdir="${build.classes}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
+ deprecation="${build.deprecation}"
+ target="1.2">
+ <classpath refid="project.class.path" />
+ <include name="**/*.java"/>
+ </javac>
+
<copy todir="${build.classes}">
<fileset dir="${test.dir}">
<exclude name="**/*.java"/>
@@ -115,7 +141,7 @@
</javadoc>
</target>
- <target name="test" depends="compile" description="Perform the unit
tests" unless="skip.tests">
+ <target name="test" depends="compile-test" description="Perform the unit
tests" unless="skip.tests">
<echo message="Performing Unit Tests" />
1.12 +30 -4 jakarta-avalon-excalibur/collections/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/collections/build.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.xml 12 Apr 2002 11:03:30 -0000 1.11
+++ build.xml 13 Apr 2002 01:07:30 -0000 1.12
@@ -13,8 +13,9 @@
<path id="project.class.path">
<pathelement path="${java.class.path}"/>
<pathelement location="${build.classes}"/>
- <pathelement location="${junit.jar}"/>
<pathelement location="${checkstyle.jar}"/>
+ <!-- Unit testing deps -->
+ <pathelement location="${junit.jar}"/>
</path>
<property name="cp" refid="project.class.path"/>
@@ -32,12 +33,20 @@
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkCommon"/>
</target>
+ <target name="dependencies-test" depends="dist-jar, dependencies"
+ description="Check unit test dependencies"
unless="skip.dependencies">
+ <!-- Need the jar to prevent recursive deps. -->
+
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkJUnit"/>
+ </target>
+
+
<!-- Compiles the source code -->
<target name="compile" depends="dependencies" description="Compiles the
source code">
<mkdir dir="${build.classes}"/>
- <!-- Compile all classes including the tests. -->
+ <!-- Compile all classes excluding the tests. -->
<javac srcdir="${java.dir}"
destdir="${build.classes}"
debug="${build.debug}"
@@ -45,7 +54,6 @@
deprecation="${build.deprecation}"
target="1.2">
<classpath refid="project.class.path" />
- <src path="${test.dir}"/>
<include name="**/*.java"/>
</javac>
@@ -56,6 +64,24 @@
</fileset>
</copy>
+ </target>
+
+ <!-- Compiles the unit test source code -->
+ <target name="compile-test" depends="compile, dependencies-test"
description="Compiles the source code">
+
+ <mkdir dir="${build.classes}"/>
+
+ <!-- Compile all classes including the tests. -->
+ <javac srcdir="${test.dir}"
+ destdir="${build.classes}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
+ deprecation="${build.deprecation}"
+ target="1.2">
+ <classpath refid="project.class.path" />
+ <include name="**/*.java"/>
+ </javac>
+
<copy todir="${build.classes}">
<fileset dir="${test.dir}">
<exclude name="**/*.java"/>
@@ -115,7 +141,7 @@
</javadoc>
</target>
- <target name="test" depends="compile" description="Perform the unit
tests" unless="skip.tests">
+ <target name="test" depends="compile-test" description="Perform the unit
tests" unless="skip.tests">
<echo message="Performing Unit Tests" />
1.9 +54 -7 jakarta-avalon-excalibur/component/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/component/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.xml 12 Apr 2002 11:03:30 -0000 1.8
+++ build.xml 13 Apr 2002 01:07:30 -0000 1.9
@@ -19,8 +19,12 @@
<pathelement location="${excalibur-logger.jar}"/>
<pathelement location="${excalibur-instrument.jar}"/>
<pathelement location="${excalibur-pool.jar}"/>
- <pathelement location="${junit.jar}"/>
<pathelement location="${checkstyle.jar}"/>
+ <!-- Unit testing deps -->
+ <pathelement location="${junit.jar}"/>
+ <pathelement location="${excalibur-util.jar}"/>
+ <pathelement location="${excalibur-testcase.jar}"/>
+ <pathelement location="${excalibur-instrument.jar}"/>
</path>
<property name="cp" refid="project.class.path"/>
@@ -43,12 +47,23 @@
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkPool"/>
</target>
+ <target name="dependencies-test" depends="dist-jar, dependencies"
+ description="Check unit test dependencies"
unless="skip.dependencies">
+ <!-- Need the jar to prevent recursive deps. -->
+
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkJUnit"/>
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkUtil"/>
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkTestcase"/>
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkInstrument"/>
+ </target>
+
+
<!-- Compiles the source code -->
<target name="compile" depends="dependencies" description="Compiles the
source code">
<mkdir dir="${build.classes}"/>
- <!-- Compile all classes including the tests. -->
+ <!-- Compile all classes excluding the tests. -->
<javac srcdir="${java.dir}"
destdir="${build.classes}"
debug="${build.debug}"
@@ -56,11 +71,7 @@
deprecation="${build.deprecation}"
target="1.2">
<classpath refid="project.class.path" />
- <src path="${test.dir}"/>
<include name="**/*.java"/>
-
- <!-- Exclude the tests until their cyclical dependencies can be
worked out. -->
- <exclude name="**/test/**"/>
</javac>
<!-- copy resources to same location as .class files -->
@@ -70,6 +81,42 @@
</fileset>
</copy>
+ </target>
+
+ <!-- Compiles the unit test source code -->
+ <target name="compile-test" depends="compile, dependencies-test"
description="Compiles the source code">
+
+ <mkdir dir="${build.classes}"/>
+
+ <!-- Compile all classes including the tests. -->
+ <javac srcdir="${test.dir}"
+ destdir="${build.classes}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
+ deprecation="${build.deprecation}"
+ target="1.2">
+ <classpath refid="project.class.path" />
+ <include name="**/*.java"/>
+ </javac>
+
+ </target>
+
+ <!-- Compiles the unit test source code -->
+ <target name="compile-test" depends="compile, dependencies-test"
description="Compiles the source code">
+
+ <mkdir dir="${build.classes}"/>
+
+ <!-- Compile all classes including the tests. -->
+ <javac srcdir="${test.dir}"
+ destdir="${build.classes}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
+ deprecation="${build.deprecation}"
+ target="1.2">
+ <classpath refid="project.class.path" />
+ <include name="**/*.java"/>
+ </javac>
+
<copy todir="${build.classes}">
<fileset dir="${test.dir}">
<exclude name="**/*.java"/>
@@ -129,7 +176,7 @@
</javadoc>
</target>
- <target name="test" depends="compile" description="Perform the unit
tests" unless="skip.tests">
+ <target name="test" depends="compile-test" description="Perform the unit
tests" unless="skip.tests">
<echo message="Performing Unit Tests" />
1.3 +19 -2 jakarta-avalon-excalibur/component/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/component/default.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- default.properties 8 Apr 2002 10:32:08 -0000 1.2
+++ default.properties 13 Apr 2002 01:07:31 -0000 1.3
@@ -35,21 +35,38 @@
excalibur-collections.lib=${excalibur-collections.home}
excalibur-collections.jar=${excalibur-collections.lib}/excalibur-collections-1.0.jar
-
# ----- Excalibur logger, version 1.0 or later -----
excalibur-logger.home=${basedir}/../logger/dist
excalibur-logger.lib=${excalibur-logger.home}
excalibur-logger.jar=${excalibur-logger.lib}/excalibur-logger-1.0.jar
-
# ----- Excalibur pool, version 1.0 or later -----
excalibur-pool.home=${basedir}/../pool/dist
excalibur-pool.lib=${excalibur-pool.home}
excalibur-pool.jar=${excalibur-pool.lib}/excalibur-pool-1.0.jar
# --------------------------------------------------
+# OPTIONAL LIBRARIES
+# --------------------------------------------------
+# For unit testing:
+# ----- Excalibur util, version 1.0 or later -----
+excalibur-util.home=${basedir}/../util/dist
+excalibur-util.lib=${excalibur-util.home}
+excalibur-util.jar=${excalibur-util.lib}/excalibur-util-1.0.jar
+
+# ----- Excalibur testcase, version 1.0 or later -----
+excalibur-testcase.home=${basedir}/../testcase/dist
+excalibur-testcase.lib=${excalibur-testcase.home}
+excalibur-testcase.jar=${excalibur-testcase.lib}/excalibur-testcase-1.0.jar
+
+# ----- Excalibur instrument, version 0.1 or later -----
+excalibur-instrument.home=${basedir}/../instrument/dist
+excalibur-instrument.lib=${excalibur-instrument.home}
+excalibur-instrument.jar=${excalibur-instrument.lib}/excalibur-instrument-0.1.jar
+
+# --------------------------------------------------
# Settings used to configure compile environment
build.debug = on
1.12 +30 -4 jakarta-avalon-excalibur/concurrent/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/concurrent/build.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.xml 12 Apr 2002 11:03:30 -0000 1.11
+++ build.xml 13 Apr 2002 01:07:31 -0000 1.12
@@ -13,8 +13,9 @@
<path id="project.class.path">
<pathelement path="${java.class.path}"/>
<pathelement location="${build.classes}"/>
- <pathelement location="${junit.jar}"/>
<pathelement location="${checkstyle.jar}"/>
+ <!-- Unit testing deps -->
+ <pathelement location="${junit.jar}"/>
</path>
<property name="cp" refid="project.class.path"/>
@@ -32,12 +33,20 @@
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkCommon"/>
</target>
+ <target name="dependencies-test" depends="dist-jar, dependencies"
+ description="Check unit test dependencies"
unless="skip.dependencies">
+ <!-- Need the jar to prevent recursive deps. -->
+
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkJUnit"/>
+ </target>
+
+
<!-- Compiles the source code -->
<target name="compile" depends="dependencies" description="Compiles the
source code">
<mkdir dir="${build.classes}"/>
- <!-- Compile all classes including the tests. -->
+ <!-- Compile all classes excluding the tests. -->
<javac srcdir="${java.dir}"
destdir="${build.classes}"
debug="${build.debug}"
@@ -45,7 +54,6 @@
deprecation="${build.deprecation}"
target="1.2">
<classpath refid="project.class.path" />
- <src path="${test.dir}"/>
<include name="**/*.java"/>
</javac>
@@ -56,6 +64,24 @@
</fileset>
</copy>
+ </target>
+
+ <!-- Compiles the unit test source code -->
+ <target name="compile-test" depends="compile, dependencies-test"
description="Compiles the source code">
+
+ <mkdir dir="${build.classes}"/>
+
+ <!-- Compile all classes including the tests. -->
+ <javac srcdir="${test.dir}"
+ destdir="${build.classes}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
+ deprecation="${build.deprecation}"
+ target="1.2">
+ <classpath refid="project.class.path" />
+ <include name="**/*.java"/>
+ </javac>
+
<copy todir="${build.classes}">
<fileset dir="${test.dir}">
<exclude name="**/*.java"/>
@@ -115,7 +141,7 @@
</javadoc>
</target>
- <target name="test" depends="compile" description="Perform the unit
tests" unless="skip.tests">
+ <target name="test" depends="compile-test" description="Perform the unit
tests" unless="skip.tests">
<echo message="Performing Unit Tests" />
1.7 +30 -4 jakarta-avalon-excalibur/datasource/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/datasource/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml 12 Apr 2002 11:03:30 -0000 1.6
+++ build.xml 13 Apr 2002 01:07:31 -0000 1.7
@@ -13,8 +13,9 @@
<path id="project.class.path">
<pathelement path="${java.class.path}"/>
<pathelement location="${build.classes}"/>
- <pathelement location="${junit.jar}"/>
<pathelement location="${checkstyle.jar}"/>
+ <!-- Unit testing deps -->
+ <pathelement location="${junit.jar}"/>
</path>
<property name="cp" refid="project.class.path"/>
@@ -32,12 +33,20 @@
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkCommon"/>
</target>
+ <target name="dependencies-test" depends="dist-jar, dependencies"
+ description="Check unit test dependencies"
unless="skip.dependencies">
+ <!-- Need the jar to prevent recursive deps. -->
+
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkJUnit"/>
+ </target>
+
+
<!-- Compiles the source code -->
<target name="compile" depends="dependencies" description="Compiles the
source code">
<mkdir dir="${build.classes}"/>
- <!-- Compile all classes including the tests. -->
+ <!-- Compile all classes excluding the tests. -->
<javac srcdir="${java.dir}"
destdir="${build.classes}"
debug="${build.debug}"
@@ -45,7 +54,6 @@
deprecation="${build.deprecation}"
target="1.2">
<classpath refid="project.class.path" />
- <src path="${test.dir}"/>
<include name="**/*.java"/>
</javac>
@@ -56,6 +64,24 @@
</fileset>
</copy>
+ </target>
+
+ <!-- Compiles the unit test source code -->
+ <target name="compile-test" depends="compile, dependencies-test"
description="Compiles the source code">
+
+ <mkdir dir="${build.classes}"/>
+
+ <!-- Compile all classes including the tests. -->
+ <javac srcdir="${test.dir}"
+ destdir="${build.classes}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
+ deprecation="${build.deprecation}"
+ target="1.2">
+ <classpath refid="project.class.path" />
+ <include name="**/*.java"/>
+ </javac>
+
<copy todir="${build.classes}">
<fileset dir="${test.dir}">
<exclude name="**/*.java"/>
@@ -115,7 +141,7 @@
</javadoc>
</target>
- <target name="test" depends="compile" description="Perform the unit
tests" unless="skip.tests">
+ <target name="test" depends="compile-test" description="Perform the unit
tests" unless="skip.tests">
<echo message="Performing Unit Tests" />
1.16 +30 -4 jakarta-avalon-excalibur/event/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/event/build.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- build.xml 12 Apr 2002 11:03:30 -0000 1.15
+++ build.xml 13 Apr 2002 01:07:31 -0000 1.16
@@ -13,7 +13,6 @@
<path id="project.class.path">
<pathelement path="${java.class.path}"/>
<pathelement location="${build.classes}"/>
- <pathelement location="${junit.jar}"/>
<pathelement location="${excalibur-collections.jar}"/>
<pathelement location="${excalibur-concurrent.jar}"/>
<pathelement location="${excalibur-thread.jar}"/>
@@ -24,6 +23,8 @@
<pathelement location="${avalon-framework.jar}"/>
<pathelement location="${excalibur-util.jar}"/>
<pathelement location="${checkstyle.jar}"/>
+ <!-- Unit testing deps -->
+ <pathelement location="${junit.jar}"/>
</path>
<property name="cp" refid="project.class.path"/>
@@ -48,12 +49,20 @@
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkFramework"/>
</target>
+ <target name="dependencies-test" depends="dist-jar, dependencies"
+ description="Check unit test dependencies"
unless="skip.dependencies">
+ <!-- Need the jar to prevent recursive deps. -->
+
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkJUnit"/>
+ </target>
+
+
<!-- Compiles the source code -->
<target name="compile" depends="dependencies" description="Compiles the
source code">
<mkdir dir="${build.classes}"/>
- <!-- Compile all classes including the tests. -->
+ <!-- Compile all classes excluding the tests. -->
<javac srcdir="${java.dir}"
destdir="${build.classes}"
debug="${build.debug}"
@@ -61,7 +70,6 @@
deprecation="${build.deprecation}"
target="1.2">
<classpath refid="project.class.path" />
- <src path="${test.dir}"/>
<include name="**/*.java"/>
</javac>
@@ -72,6 +80,24 @@
</fileset>
</copy>
+ </target>
+
+ <!-- Compiles the unit test source code -->
+ <target name="compile-test" depends="compile, dependencies-test"
description="Compiles the source code">
+
+ <mkdir dir="${build.classes}"/>
+
+ <!-- Compile all classes including the tests. -->
+ <javac srcdir="${test.dir}"
+ destdir="${build.classes}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
+ deprecation="${build.deprecation}"
+ target="1.2">
+ <classpath refid="project.class.path" />
+ <include name="**/*.java"/>
+ </javac>
+
<copy todir="${build.classes}">
<fileset dir="${test.dir}">
<exclude name="**/*.java"/>
@@ -131,7 +157,7 @@
</javadoc>
</target>
- <target name="test" depends="compile" description="Perform the unit
tests" unless="skip.tests">
+ <target name="test" depends="compile-test" description="Perform the unit
tests" unless="skip.tests">
<echo message="Performing Unit Tests" />
1.38 +30 -4 jakarta-avalon-excalibur/extension/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/extension/build.xml,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- build.xml 12 Apr 2002 11:03:30 -0000 1.37
+++ build.xml 13 Apr 2002 01:07:31 -0000 1.38
@@ -13,8 +13,9 @@
<path id="project.class.path">
<pathelement path="${java.class.path}"/>
<pathelement location="${build.classes}"/>
- <pathelement location="${junit.jar}"/>
<pathelement location="${checkstyle.jar}"/>
+ <!-- Unit testing deps -->
+ <pathelement location="${junit.jar}"/>
</path>
<property name="cp" refid="project.class.path"/>
@@ -32,12 +33,20 @@
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkCommon"/>
</target>
+ <target name="dependencies-test" depends="dist-jar, dependencies"
+ description="Check unit test dependencies"
unless="skip.dependencies">
+ <!-- Need the jar to prevent recursive deps. -->
+
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkJUnit"/>
+ </target>
+
+
<!-- Compiles the source code -->
<target name="compile" depends="dependencies" description="Compiles the
source code">
<mkdir dir="${build.classes}"/>
- <!-- Compile all classes including the tests. -->
+ <!-- Compile all classes excluding the tests. -->
<javac srcdir="${java.dir}"
destdir="${build.classes}"
debug="${build.debug}"
@@ -45,7 +54,6 @@
deprecation="${build.deprecation}"
target="1.2">
<classpath refid="project.class.path" />
- <src path="${test.dir}"/>
<include name="**/*.java"/>
</javac>
@@ -56,6 +64,24 @@
</fileset>
</copy>
+ </target>
+
+ <!-- Compiles the unit test source code -->
+ <target name="compile-test" depends="compile, dependencies-test"
description="Compiles the source code">
+
+ <mkdir dir="${build.classes}"/>
+
+ <!-- Compile all classes including the tests. -->
+ <javac srcdir="${test.dir}"
+ destdir="${build.classes}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
+ deprecation="${build.deprecation}"
+ target="1.2">
+ <classpath refid="project.class.path" />
+ <include name="**/*.java"/>
+ </javac>
+
<copy todir="${build.classes}">
<fileset dir="${test.dir}">
<exclude name="**/*.java"/>
@@ -115,7 +141,7 @@
</javadoc>
</target>
- <target name="test" depends="compile" description="Perform the unit
tests" unless="skip.tests">
+ <target name="test" depends="compile-test" description="Perform the unit
tests" unless="skip.tests">
<echo message="Performing Unit Tests" />
1.6 +30 -4 jakarta-avalon-excalibur/fortress/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.xml 12 Apr 2002 11:03:30 -0000 1.5
+++ build.xml 13 Apr 2002 01:07:31 -0000 1.6
@@ -25,8 +25,9 @@
<pathelement location="${excalibur-util.jar}"/>
<pathelement location="${excalibur-component.jar}"/>
<pathelement location="${excalibur-logger.jar}"/>
- <pathelement location="${junit.jar}"/>
<pathelement location="${checkstyle.jar}"/>
+ <!-- Unit testing deps -->
+ <pathelement location="${junit.jar}"/>
</path>
<property name="cp" refid="project.class.path"/>
@@ -54,12 +55,20 @@
</ant>
</target>
+ <target name="dependencies-test" depends="dist-jar, dependencies"
+ description="Check unit test dependencies"
unless="skip.dependencies">
+ <!-- Need the jar to prevent recursive deps. -->
+
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkJUnit"/>
+ </target>
+
+
<!-- Compiles the source code -->
<target name="compile" depends="dependencies" description="Compiles the
source code">
<mkdir dir="${build.classes}"/>
- <!-- Compile all classes including the tests. -->
+ <!-- Compile all classes excluding the tests. -->
<javac srcdir="${java.dir}"
destdir="${build.classes}"
debug="${build.debug}"
@@ -67,7 +76,6 @@
deprecation="${build.deprecation}"
target="1.2">
<classpath refid="project.class.path" />
- <src path="${test.dir}"/>
<include name="**/*.java"/>
</javac>
@@ -78,6 +86,24 @@
</fileset>
</copy>
+ </target>
+
+ <!-- Compiles the unit test source code -->
+ <target name="compile-test" depends="compile, dependencies-test"
description="Compiles the source code">
+
+ <mkdir dir="${build.classes}"/>
+
+ <!-- Compile all classes including the tests. -->
+ <javac srcdir="${test.dir}"
+ destdir="${build.classes}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
+ deprecation="${build.deprecation}"
+ target="1.2">
+ <classpath refid="project.class.path" />
+ <include name="**/*.java"/>
+ </javac>
+
<copy todir="${build.classes}">
<fileset dir="${test.dir}">
<exclude name="**/*.java"/>
@@ -137,7 +163,7 @@
</javadoc>
</target>
- <target name="test" depends="compile" description="Perform the unit
tests" unless="skip.tests">
+ <target name="test" depends="compile-test" description="Perform the unit
tests" unless="skip.tests">
<echo message="Performing Unit Tests" />
1.36 +30 -4 jakarta-avalon-excalibur/i18n/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/i18n/build.xml,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- build.xml 12 Apr 2002 11:03:31 -0000 1.35
+++ build.xml 13 Apr 2002 01:07:31 -0000 1.36
@@ -13,8 +13,9 @@
<path id="project.class.path">
<pathelement path="${java.class.path}"/>
<pathelement location="${build.classes}"/>
- <pathelement location="${junit.jar}"/>
<pathelement location="${checkstyle.jar}"/>
+ <!-- Unit testing deps -->
+ <pathelement location="${junit.jar}"/>
</path>
<property name="cp" refid="project.class.path"/>
@@ -32,12 +33,20 @@
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkCommon"/>
</target>
+ <target name="dependencies-test" depends="dist-jar, dependencies"
+ description="Check unit test dependencies"
unless="skip.dependencies">
+ <!-- Need the jar to prevent recursive deps. -->
+
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkJUnit"/>
+ </target>
+
+
<!-- Compiles the source code -->
<target name="compile" depends="dependencies" description="Compiles the
source code">
<mkdir dir="${build.classes}"/>
- <!-- Compile all classes including the tests. -->
+ <!-- Compile all classes excluding the tests. -->
<javac srcdir="${java.dir}"
destdir="${build.classes}"
debug="${build.debug}"
@@ -45,7 +54,6 @@
deprecation="${build.deprecation}"
target="1.2">
<classpath refid="project.class.path" />
- <src path="${test.dir}"/>
<include name="**/*.java"/>
</javac>
@@ -56,6 +64,24 @@
</fileset>
</copy>
+ </target>
+
+ <!-- Compiles the unit test source code -->
+ <target name="compile-test" depends="compile, dependencies-test"
description="Compiles the source code">
+
+ <mkdir dir="${build.classes}"/>
+
+ <!-- Compile all classes including the tests. -->
+ <javac srcdir="${test.dir}"
+ destdir="${build.classes}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
+ deprecation="${build.deprecation}"
+ target="1.2">
+ <classpath refid="project.class.path" />
+ <include name="**/*.java"/>
+ </javac>
+
<copy todir="${build.classes}">
<fileset dir="${test.dir}">
<exclude name="**/*.java"/>
@@ -115,7 +141,7 @@
</javadoc>
</target>
- <target name="test" depends="compile" description="Perform the unit
tests" unless="skip.tests">
+ <target name="test" depends="compile-test" description="Perform the unit
tests" unless="skip.tests">
<echo message="Performing Unit Tests" />
1.14 +30 -4 jakarta-avalon-excalibur/instrument/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/instrument/build.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- build.xml 12 Apr 2002 11:03:31 -0000 1.13
+++ build.xml 13 Apr 2002 01:07:31 -0000 1.14
@@ -13,8 +13,9 @@
<path id="project.class.path">
<pathelement path="${java.class.path}"/>
<pathelement location="${build.classes}"/>
- <pathelement location="${junit.jar}"/>
<pathelement location="${checkstyle.jar}"/>
+ <!-- Unit testing deps -->
+ <pathelement location="${junit.jar}"/>
</path>
<property name="cp" refid="project.class.path"/>
@@ -32,12 +33,20 @@
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkCommon"/>
</target>
+ <target name="dependencies-test" depends="dist-jar, dependencies"
+ description="Check unit test dependencies"
unless="skip.dependencies">
+ <!-- Need the jar to prevent recursive deps. -->
+
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkJUnit"/>
+ </target>
+
+
<!-- Compiles the source code -->
<target name="compile" depends="dependencies" description="Compiles the
source code">
<mkdir dir="${build.classes}"/>
- <!-- Compile all classes including the tests. -->
+ <!-- Compile all classes excluding the tests. -->
<javac srcdir="${java.dir}"
destdir="${build.classes}"
debug="${build.debug}"
@@ -45,7 +54,6 @@
deprecation="${build.deprecation}"
target="1.2">
<classpath refid="project.class.path" />
- <src path="${test.dir}"/>
<include name="**/*.java"/>
</javac>
@@ -56,6 +64,24 @@
</fileset>
</copy>
+ </target>
+
+ <!-- Compiles the unit test source code -->
+ <target name="compile-test" depends="compile, dependencies-test"
description="Compiles the source code">
+
+ <mkdir dir="${build.classes}"/>
+
+ <!-- Compile all classes including the tests. -->
+ <javac srcdir="${test.dir}"
+ destdir="${build.classes}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
+ deprecation="${build.deprecation}"
+ target="1.2">
+ <classpath refid="project.class.path" />
+ <include name="**/*.java"/>
+ </javac>
+
<copy todir="${build.classes}">
<fileset dir="${test.dir}">
<exclude name="**/*.java"/>
@@ -115,7 +141,7 @@
</javadoc>
</target>
- <target name="test" depends="compile" description="Perform the unit
tests" unless="skip.tests">
+ <target name="test" depends="compile-test" description="Perform the unit
tests" unless="skip.tests">
<echo message="Performing Unit Tests" />
1.20 +29 -3 jakarta-avalon-excalibur/instrument-client/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-client/build.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- build.xml 12 Apr 2002 11:03:31 -0000 1.19
+++ build.xml 13 Apr 2002 01:07:31 -0000 1.20
@@ -19,6 +19,7 @@
<pathelement location="${excalibur-altrmi-common.jar}"/>
<pathelement location="${excalibur-altrmi-generator.jar}"/>
<pathelement
location="${excalibur-instrument-manager-interfaces.jar}"/>
+ <!-- Unit testing deps -->
<pathelement location="${junit.jar}"/>
<pathelement location="${checkstyle.jar}"/>
</path>
@@ -47,12 +48,20 @@
</ant>
</target>
+ <target name="dependencies-test" depends="dist-jar, dependencies"
+ description="Check unit test dependencies"
unless="skip.dependencies">
+ <!-- Need the jar to prevent recursive deps. -->
+
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkJUnit"/>
+ </target>
+
+
<!-- Compiles the source code -->
<target name="compile" depends="dependencies" description="Compiles the
source code">
<mkdir dir="${build.classes}"/>
- <!-- Compile all classes including the tests. -->
+ <!-- Compile all classes excluding the tests. -->
<javac srcdir="${java.dir}"
destdir="${build.classes}"
debug="${build.debug}"
@@ -60,7 +69,6 @@
deprecation="${build.deprecation}"
target="1.2">
<classpath refid="project.class.path" />
- <src path="${test.dir}"/>
<include name="**/*.java"/>
</javac>
@@ -71,6 +79,24 @@
</fileset>
</copy>
+ </target>
+
+ <!-- Compiles the unit test source code -->
+ <target name="compile-test" depends="compile, dependencies-test"
description="Compiles the source code">
+
+ <mkdir dir="${build.classes}"/>
+
+ <!-- Compile all classes including the tests. -->
+ <javac srcdir="${test.dir}"
+ destdir="${build.classes}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
+ deprecation="${build.deprecation}"
+ target="1.2">
+ <classpath refid="project.class.path" />
+ <include name="**/*.java"/>
+ </javac>
+
<copy todir="${build.classes}">
<fileset dir="${test.dir}">
<exclude name="**/*.java"/>
@@ -136,7 +162,7 @@
</javadoc>
</target>
- <target name="test" depends="compile" description="Perform the unit
tests" unless="skip.tests">
+ <target name="test" depends="compile-test" description="Perform the unit
tests" unless="skip.tests">
<echo message="Performing Unit Tests" />
1.19 +30 -4 jakarta-avalon-excalibur/instrument-manager/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-manager/build.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- build.xml 12 Apr 2002 11:03:31 -0000 1.18
+++ build.xml 13 Apr 2002 01:07:31 -0000 1.19
@@ -24,8 +24,9 @@
<pathelement location="${excalibur-altrmi-common.jar}"/>
<pathelement location="${excalibur-altrmi-server-impl.jar}"/>
<pathelement location="${excalibur-altrmi-server-interfaces.jar}"/>
- <pathelement location="${junit.jar}"/>
<pathelement location="${checkstyle.jar}"/>
+ <!-- Unit testing deps -->
+ <pathelement location="${junit.jar}"/>
</path>
<property name="cp" refid="project.class.path"/>
@@ -64,12 +65,20 @@
</ant>
</target>
+ <target name="dependencies-test" depends="dist-jar, dependencies"
+ description="Check unit test dependencies"
unless="skip.dependencies">
+ <!-- Need the jar to prevent recursive deps. -->
+
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkJUnit"/>
+ </target>
+
+
<!-- Compiles the source code -->
<target name="compile" depends="dependencies" description="Compiles the
source code">
<mkdir dir="${build.classes}"/>
- <!-- Compile all classes including the tests. -->
+ <!-- Compile all classes excluding the tests. -->
<javac srcdir="${java.dir}"
destdir="${build.classes}"
debug="${build.debug}"
@@ -77,7 +86,6 @@
deprecation="${build.deprecation}"
target="1.2">
<classpath refid="project.class.path" />
- <src path="${test.dir}"/>
<include name="**/*.java"/>
</javac>
@@ -88,6 +96,24 @@
</fileset>
</copy>
+ </target>
+
+ <!-- Compiles the unit test source code -->
+ <target name="compile-test" depends="compile, dependencies-test"
description="Compiles the source code">
+
+ <mkdir dir="${build.classes}"/>
+
+ <!-- Compile all classes including the tests. -->
+ <javac srcdir="${test.dir}"
+ destdir="${build.classes}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
+ deprecation="${build.deprecation}"
+ target="1.2">
+ <classpath refid="project.class.path" />
+ <include name="**/*.java"/>
+ </javac>
+
<copy todir="${build.classes}">
<fileset dir="${test.dir}">
<exclude name="**/*.java"/>
@@ -157,7 +183,7 @@
</javadoc>
</target>
- <target name="test" depends="compile" description="Perform the unit
tests" unless="skip.tests">
+ <target name="test" depends="compile-test" description="Perform the unit
tests" unless="skip.tests">
<echo message="Performing Unit Tests" />
1.38 +30 -4 jakarta-avalon-excalibur/io/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/io/build.xml,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- build.xml 12 Apr 2002 11:03:31 -0000 1.37
+++ build.xml 13 Apr 2002 01:07:31 -0000 1.38
@@ -13,8 +13,9 @@
<path id="project.class.path">
<pathelement path="${java.class.path}"/>
<pathelement location="${build.classes}"/>
- <pathelement location="${junit.jar}"/>
<pathelement location="${checkstyle.jar}"/>
+ <!-- Unit testing deps -->
+ <pathelement location="${junit.jar}"/>
</path>
<property name="cp" refid="project.class.path"/>
@@ -32,12 +33,20 @@
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkCommon"/>
</target>
+ <target name="dependencies-test" depends="dist-jar, dependencies"
+ description="Check unit test dependencies"
unless="skip.dependencies">
+ <!-- Need the jar to prevent recursive deps. -->
+
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkJUnit"/>
+ </target>
+
+
<!-- Compiles the source code -->
<target name="compile" depends="dependencies" description="Compiles the
source code">
<mkdir dir="${build.classes}"/>
- <!-- Compile all classes including the tests. -->
+ <!-- Compile all classes excluding the tests. -->
<javac srcdir="${java.dir}"
destdir="${build.classes}"
debug="${build.debug}"
@@ -45,7 +54,6 @@
deprecation="${build.deprecation}"
target="1.2">
<classpath refid="project.class.path" />
- <src path="${test.dir}"/>
<include name="**/*.java"/>
</javac>
@@ -56,6 +64,24 @@
</fileset>
</copy>
+ </target>
+
+ <!-- Compiles the unit test source code -->
+ <target name="compile-test" depends="compile, dependencies-test"
description="Compiles the source code">
+
+ <mkdir dir="${build.classes}"/>
+
+ <!-- Compile all classes including the tests. -->
+ <javac srcdir="${test.dir}"
+ destdir="${build.classes}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
+ deprecation="${build.deprecation}"
+ target="1.2">
+ <classpath refid="project.class.path" />
+ <include name="**/*.java"/>
+ </javac>
+
<copy todir="${build.classes}">
<fileset dir="${test.dir}">
<exclude name="**/*.java"/>
@@ -115,7 +141,7 @@
</javadoc>
</target>
- <target name="test" depends="compile" description="Perform the unit
tests" unless="skip.tests">
+ <target name="test" depends="compile-test" description="Perform the unit
tests" unless="skip.tests">
<echo message="Performing Unit Tests" />
1.8 +36 -7 jakarta-avalon-excalibur/logger/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/logger/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.xml 12 Apr 2002 11:03:31 -0000 1.7
+++ build.xml 13 Apr 2002 01:07:32 -0000 1.8
@@ -15,8 +15,13 @@
<pathelement location="${build.classes}"/>
<pathelement location="${avalon-logkit.jar}"/>
<pathelement location="${avalon-framework.jar}"/>
- <pathelement location="${junit.jar}"/>
<pathelement location="${checkstyle.jar}"/>
+ <!-- Unit testing deps -->
+ <pathelement location="${junit.jar}"/>
+ <pathelement location="${excalibur-testcase.jar}"/>
+ <pathelement location="${excalibur-component.jar}"/>
+ <pathelement location="${excalibur-collections.jar}"/>
+ <pathelement location="${excalibur-pool.jar}"/>
</path>
<property name="cp" refid="project.class.path"/>
@@ -52,6 +57,17 @@
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkLogkit"/>
</target>
+ <target name="dependencies-test" depends="dist-jar, dependencies"
+ description="Check unit test dependencies"
unless="skip.dependencies">
+ <!-- Need the jar to prevent recursive deps. -->
+
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkJUnit"/>
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkTestcase"/>
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkComponent"/>
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkCollections"/>
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkPool"/>
+ </target>
+
<!-- Compiles the source code -->
<target name="compile" depends="dependencies, check-environment"
description="Compiles the source code">
@@ -65,7 +81,6 @@
deprecation="${build.deprecation}"
target="1.2">
<classpath refid="project.class.path" />
- <src path="${test.dir}"/>
<include name="**/*.java"/>
<exclude name="**/Log4J*"
unless="log4j.present"/>
@@ -76,10 +91,6 @@
<exclude
name="org/apache/avalon/excalibur/logger/factory/JDBCTargetFactory.java"
unless="datasource.present"/>
- <!-- Exclude the tests for now because they depend on the
testcase project, -->
- <!-- which in turn depends on logger. These tests need to be
rewritten to -->
- <!-- remove the dependencies. -->
- <exclude name="**/test/**"/>
</javac>
<!-- copy resources to same location as .class files -->
@@ -89,6 +100,24 @@
</fileset>
</copy>
+ </target>
+
+ <!-- Compiles the unit test source code -->
+ <target name="compile-test" depends="compile, dependencies-test"
description="Compiles the source code">
+
+ <mkdir dir="${build.classes}"/>
+
+ <!-- Compile all classes including the tests. -->
+ <javac srcdir="${test.dir}"
+ destdir="${build.classes}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
+ deprecation="${build.deprecation}"
+ target="1.2">
+ <classpath refid="project.class.path" />
+ <include name="**/*.java"/>
+ </javac>
+
<copy todir="${build.classes}">
<fileset dir="${test.dir}">
<exclude name="**/*.java"/>
@@ -148,7 +177,7 @@
</javadoc>
</target>
- <target name="test" depends="compile" description="Perform the unit
tests" unless="skip.tests">
+ <target name="test" depends="compile-test" description="Perform the unit
tests" unless="skip.tests">
<echo message="Performing Unit Tests" />
1.3 +27 -0 jakarta-avalon-excalibur/logger/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/logger/default.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- default.properties 8 Apr 2002 10:32:11 -0000 1.2
+++ default.properties 13 Apr 2002 01:07:32 -0000 1.3
@@ -25,9 +25,36 @@
avalon-logkit.home=${basedir}/../../jakarta-avalon-logkit
avalon-logkit.lib=${avalon-logkit.home}/build/lib
avalon-logkit.jar=${avalon-logkit.lib}/logkit.jar
+
+
+# --------------------------------------------------
+# OPTIONAL LIBRARIES
# --------------------------------------------------
+# For unit testing:
+
+# ----- Excalibur component, version 1.0 or later -----
+excalibur-component.home=${basedir}/../component/dist
+excalibur-component.lib=${excalibur-component.home}
+excalibur-component.jar=${excalibur-component.lib}/excalibur-component-1.0.jar
+
+# ----- Excalibur collections, version 1.0 or later -----
+excalibur-collections.home=${basedir}/../collections/dist
+excalibur-collections.lib=${excalibur-collections.home}
+excalibur-collections.jar=${excalibur-collections.lib}/excalibur-collections-1.0.jar
+# ----- Excalibur testcase, version 1.0 or later -----
+excalibur-testcase.home=${basedir}/../testcase/dist
+excalibur-testcase.lib=${excalibur-testcase.home}
+excalibur-testcase.jar=${excalibur-testcase.lib}/excalibur-testcase-1.0.jar
+
+# ----- Excalibur pool, version 1.0 or later -----
+excalibur-pool.home=${basedir}/../pool/dist
+excalibur-pool.lib=${excalibur-pool.home}
+excalibur-pool.jar=${excalibur-pool.lib}/excalibur-pool-1.0.jar
+
+
+# --------------------------------------------------
# Settings used to configure compile environment
build.debug = on
1.7 +30 -4 jakarta-avalon-excalibur/monitor/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/monitor/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml 12 Apr 2002 11:03:31 -0000 1.6
+++ build.xml 13 Apr 2002 01:07:32 -0000 1.7
@@ -13,8 +13,9 @@
<path id="project.class.path">
<pathelement path="${java.class.path}"/>
<pathelement location="${build.classes}"/>
- <pathelement location="${junit.jar}"/>
<pathelement location="${checkstyle.jar}"/>
+ <!-- Unit testing deps -->
+ <pathelement location="${junit.jar}"/>
</path>
<property name="cp" refid="project.class.path"/>
@@ -32,12 +33,20 @@
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkCommon"/>
</target>
+ <target name="dependencies-test" depends="dist-jar, dependencies"
+ description="Check unit test dependencies"
unless="skip.dependencies">
+ <!-- Need the jar to prevent recursive deps. -->
+
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkJUnit"/>
+ </target>
+
+
<!-- Compiles the source code -->
<target name="compile" depends="dependencies" description="Compiles the
source code">
<mkdir dir="${build.classes}"/>
- <!-- Compile all classes including the tests. -->
+ <!-- Compile all classes excluding the tests. -->
<javac srcdir="${java.dir}"
destdir="${build.classes}"
debug="${build.debug}"
@@ -45,7 +54,6 @@
deprecation="${build.deprecation}"
target="1.2">
<classpath refid="project.class.path" />
- <src path="${test.dir}"/>
<include name="**/*.java"/>
</javac>
@@ -56,6 +64,24 @@
</fileset>
</copy>
+ </target>
+
+ <!-- Compiles the unit test source code -->
+ <target name="compile-test" depends="compile, dependencies-test"
description="Compiles the source code">
+
+ <mkdir dir="${build.classes}"/>
+
+ <!-- Compile all classes including the tests. -->
+ <javac srcdir="${test.dir}"
+ destdir="${build.classes}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
+ deprecation="${build.deprecation}"
+ target="1.2">
+ <classpath refid="project.class.path" />
+ <include name="**/*.java"/>
+ </javac>
+
<copy todir="${build.classes}">
<fileset dir="${test.dir}">
<exclude name="**/*.java"/>
@@ -115,7 +141,7 @@
</javadoc>
</target>
- <target name="test" depends="compile" description="Perform the unit
tests" unless="skip.tests">
+ <target name="test" depends="compile-test" description="Perform the unit
tests" unless="skip.tests">
<echo message="Performing Unit Tests" />
1.38 +30 -4 jakarta-avalon-excalibur/naming/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/naming/build.xml,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- build.xml 12 Apr 2002 11:03:31 -0000 1.37
+++ build.xml 13 Apr 2002 01:07:32 -0000 1.38
@@ -13,8 +13,9 @@
<path id="project.class.path">
<pathelement path="${java.class.path}"/>
<pathelement location="${build.classes}"/>
- <pathelement location="${junit.jar}"/>
<pathelement location="${checkstyle.jar}"/>
+ <!-- Unit testing deps -->
+ <pathelement location="${junit.jar}"/>
</path>
<property name="cp" refid="project.class.path"/>
@@ -32,12 +33,20 @@
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkCommon"/>
</target>
+ <target name="dependencies-test" depends="dist-jar, dependencies"
+ description="Check unit test dependencies"
unless="skip.dependencies">
+ <!-- Need the jar to prevent recursive deps. -->
+
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkJUnit"/>
+ </target>
+
+
<!-- Compiles the source code -->
<target name="compile" depends="dependencies" description="Compiles the
source code">
<mkdir dir="${build.classes}"/>
- <!-- Compile all classes including the tests. -->
+ <!-- Compile all classes excluding the tests. -->
<javac srcdir="${java.dir}"
destdir="${build.classes}"
debug="${build.debug}"
@@ -45,7 +54,6 @@
deprecation="${build.deprecation}"
target="1.2">
<classpath refid="project.class.path" />
- <src path="${test.dir}"/>
<include name="**/*.java"/>
</javac>
@@ -63,6 +71,24 @@
</fileset>
</copy>
+ </target>
+
+ <!-- Compiles the unit test source code -->
+ <target name="compile-test" depends="compile, dependencies-test"
description="Compiles the source code">
+
+ <mkdir dir="${build.classes}"/>
+
+ <!-- Compile all classes including the tests. -->
+ <javac srcdir="${test.dir}"
+ destdir="${build.classes}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
+ deprecation="${build.deprecation}"
+ target="1.2">
+ <classpath refid="project.class.path" />
+ <include name="**/*.java"/>
+ </javac>
+
<copy todir="${build.classes}">
<fileset dir="${test.dir}">
<exclude name="**/*.java"/>
@@ -122,7 +148,7 @@
</javadoc>
</target>
- <target name="test" depends="compile" description="Perform the unit
tests" unless="skip.tests">
+ <target name="test" depends="compile-test" description="Perform the unit
tests" unless="skip.tests">
<echo message="Performing Unit Tests" />
1.12 +34 -4 jakarta-avalon-excalibur/pool/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/pool/build.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.xml 12 Apr 2002 11:03:31 -0000 1.11
+++ build.xml 13 Apr 2002 01:07:32 -0000 1.12
@@ -17,8 +17,11 @@
<pathelement location="${avalon-framework.jar}"/>
<pathelement location="${excalibur-collections.jar}"/>
<pathelement location="${excalibur-instrument.jar}"/>
- <pathelement location="${junit.jar}"/>
<pathelement location="${checkstyle.jar}"/>
+ <!-- Unit testing deps -->
+ <pathelement location="${junit.jar}"/>
+ <pathelement location="${junitperf.jar}"/>
+ <pathelement location="${excalibur-testcase.jar}"/>
</path>
<property name="cp" refid="project.class.path"/>
@@ -40,12 +43,22 @@
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkInstrument"/>
</target>
+ <target name="dependencies-test" depends="dist-jar, dependencies"
+ description="Check unit test dependencies"
unless="skip.dependencies">
+ <!-- Need the jar to prevent recursive deps. -->
+
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkJUnit"/>
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkJUnitPerf"/>
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkTestcase"/>
+ </target>
+
+
<!-- Compiles the source code -->
<target name="compile" depends="dependencies" description="Compiles the
source code">
<mkdir dir="${build.classes}"/>
- <!-- Compile all classes including the tests. -->
+ <!-- Compile all classes excluding the tests. -->
<javac srcdir="${java.dir}"
destdir="${build.classes}"
debug="${build.debug}"
@@ -53,7 +66,6 @@
deprecation="${build.deprecation}"
target="1.2">
<classpath refid="project.class.path" />
- <src path="${test.dir}"/>
<include name="**/*.java"/>
<!-- Exclude the tests until their cyclical dependencies can be
worked out. -->
@@ -67,6 +79,24 @@
</fileset>
</copy>
+ </target>
+
+ <!-- Compiles the unit test source code -->
+ <target name="compile-test" depends="compile, dependencies-test"
description="Compiles the source code">
+
+ <mkdir dir="${build.classes}"/>
+
+ <!-- Compile all classes including the tests. -->
+ <javac srcdir="${test.dir}"
+ destdir="${build.classes}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
+ deprecation="${build.deprecation}"
+ target="1.2">
+ <classpath refid="project.class.path" />
+ <include name="**/*.java"/>
+ </javac>
+
<copy todir="${build.classes}">
<fileset dir="${test.dir}">
<exclude name="**/*.java"/>
@@ -126,7 +156,7 @@
</javadoc>
</target>
- <target name="test" depends="compile" description="Perform the unit
tests" unless="skip.tests">
+ <target name="test" depends="compile-test" description="Perform the unit
tests" unless="skip.tests">
<echo message="Performing Unit Tests" />
1.5 +18 -0 jakarta-avalon-excalibur/pool/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/pool/default.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- default.properties 11 Apr 2002 23:26:13 -0000 1.4
+++ default.properties 13 Apr 2002 01:07:32 -0000 1.5
@@ -35,6 +35,24 @@
avalon-logkit.jar=${avalon-logkit.lib}/logkit.jar
# --------------------------------------------------
+# OPTIONAL LIBRARIES
+# --------------------------------------------------
+
+# For unit testing:
+junitperf.jar = ${tools.dir}/lib/junitperf.jar
+
+# ----- Excalibur testcase, version 1.0 or later -----
+excalibur-testcase.home=${basedir}/../testcase/dist
+excalibur-testcase.lib=${excalibur-testcase.home}
+excalibur-testcase.jar=${excalibur-testcase.lib}/excalibur-testcase-1.0.jar
+
+# ----- Excalibur instrument, version 0.1 or later -----
+excalibur-instrument.home=${basedir}/../instrument/dist
+excalibur-instrument.lib=${excalibur-instrument.home}
+excalibur-instrument.jar=${excalibur-instrument.lib}/excalibur-instrument-0.1.jar
+
+
+# --------------------------------------------------
# Settings used to configure compile environment
1.7 +30 -4 jakarta-avalon-excalibur/sourceresolve/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/sourceresolve/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml 12 Apr 2002 11:03:31 -0000 1.6
+++ build.xml 13 Apr 2002 01:07:32 -0000 1.7
@@ -13,8 +13,9 @@
<path id="project.class.path">
<pathelement path="${java.class.path}"/>
<pathelement location="${build.classes}"/>
- <pathelement location="${junit.jar}"/>
<pathelement location="${checkstyle.jar}"/>
+ <!-- Unit testing deps -->
+ <pathelement location="${junit.jar}"/>
</path>
<property name="cp" refid="project.class.path"/>
@@ -32,12 +33,20 @@
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkCommon"/>
</target>
+ <target name="dependencies-test" depends="dist-jar, dependencies"
+ description="Check unit test dependencies"
unless="skip.dependencies">
+ <!-- Need the jar to prevent recursive deps. -->
+
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkJUnit"/>
+ </target>
+
+
<!-- Compiles the source code -->
<target name="compile" depends="dependencies" description="Compiles the
source code">
<mkdir dir="${build.classes}"/>
- <!-- Compile all classes including the tests. -->
+ <!-- Compile all classes excluding the tests. -->
<javac srcdir="${java.dir}"
destdir="${build.classes}"
debug="${build.debug}"
@@ -45,7 +54,6 @@
deprecation="${build.deprecation}"
target="1.2">
<classpath refid="project.class.path" />
- <src path="${test.dir}"/>
<include name="**/*.java"/>
</javac>
@@ -56,6 +64,24 @@
</fileset>
</copy>
+ </target>
+
+ <!-- Compiles the unit test source code -->
+ <target name="compile-test" depends="compile, dependencies-test"
description="Compiles the source code">
+
+ <mkdir dir="${build.classes}"/>
+
+ <!-- Compile all classes including the tests. -->
+ <javac srcdir="${test.dir}"
+ destdir="${build.classes}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
+ deprecation="${build.deprecation}"
+ target="1.2">
+ <classpath refid="project.class.path" />
+ <include name="**/*.java"/>
+ </javac>
+
<copy todir="${build.classes}">
<fileset dir="${test.dir}">
<exclude name="**/*.java"/>
@@ -115,7 +141,7 @@
</javadoc>
</target>
- <target name="test" depends="compile" description="Perform the unit
tests" unless="skip.tests">
+ <target name="test" depends="compile-test" description="Perform the unit
tests" unless="skip.tests">
<echo message="Performing Unit Tests" />
1.17 +30 -4 jakarta-avalon-excalibur/tar/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/tar/build.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- build.xml 12 Apr 2002 11:03:31 -0000 1.16
+++ build.xml 13 Apr 2002 01:07:32 -0000 1.17
@@ -13,8 +13,9 @@
<path id="project.class.path">
<pathelement path="${java.class.path}"/>
<pathelement location="${build.classes}"/>
- <pathelement location="${junit.jar}"/>
<pathelement location="${checkstyle.jar}"/>
+ <!-- Unit testing deps -->
+ <pathelement location="${junit.jar}"/>
</path>
<property name="cp" refid="project.class.path"/>
@@ -32,12 +33,20 @@
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkCommon"/>
</target>
+ <target name="dependencies-test" depends="dist-jar, dependencies"
+ description="Check unit test dependencies"
unless="skip.dependencies">
+ <!-- Need the jar to prevent recursive deps. -->
+
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkJUnit"/>
+ </target>
+
+
<!-- Compiles the source code -->
<target name="compile" depends="dependencies" description="Compiles the
source code">
<mkdir dir="${build.classes}"/>
- <!-- Compile all classes including the tests. -->
+ <!-- Compile all classes excluding the tests. -->
<javac srcdir="${java.dir}"
destdir="${build.classes}"
debug="${build.debug}"
@@ -45,7 +54,6 @@
deprecation="${build.deprecation}"
target="1.2">
<classpath refid="project.class.path" />
- <src path="${test.dir}"/>
<include name="**/*.java"/>
</javac>
@@ -56,6 +64,24 @@
</fileset>
</copy>
+ </target>
+
+ <!-- Compiles the unit test source code -->
+ <target name="compile-test" depends="compile, dependencies-test"
description="Compiles the source code">
+
+ <mkdir dir="${build.classes}"/>
+
+ <!-- Compile all classes including the tests. -->
+ <javac srcdir="${test.dir}"
+ destdir="${build.classes}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
+ deprecation="${build.deprecation}"
+ target="1.2">
+ <classpath refid="project.class.path" />
+ <include name="**/*.java"/>
+ </javac>
+
<copy todir="${build.classes}">
<fileset dir="${test.dir}">
<exclude name="**/*.java"/>
@@ -115,7 +141,7 @@
</javadoc>
</target>
- <target name="test" depends="compile" description="Perform the unit
tests" unless="skip.tests">
+ <target name="test" depends="compile-test" description="Perform the unit
tests" unless="skip.tests">
<echo message="Performing Unit Tests" />
1.15 +30 -4 jakarta-avalon-excalibur/template-product/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/template-product/build.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- build.xml 12 Apr 2002 11:03:31 -0000 1.14
+++ build.xml 13 Apr 2002 01:07:32 -0000 1.15
@@ -13,8 +13,9 @@
<path id="project.class.path">
<pathelement path="${java.class.path}"/>
<pathelement location="${build.classes}"/>
- <pathelement location="${junit.jar}"/>
<pathelement location="${checkstyle.jar}"/>
+ <!-- Unit testing deps -->
+ <pathelement location="${junit.jar}"/>
</path>
<property name="cp" refid="project.class.path"/>
@@ -32,12 +33,20 @@
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkCommon"/>
</target>
+ <target name="dependencies-test" depends="dist-jar, dependencies"
+ description="Check unit test dependencies"
unless="skip.dependencies">
+ <!-- Need the jar to prevent recursive deps. -->
+
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkJUnit"/>
+ </target>
+
+
<!-- Compiles the source code -->
<target name="compile" depends="dependencies" description="Compiles the
source code">
<mkdir dir="${build.classes}"/>
- <!-- Compile all classes including the tests. -->
+ <!-- Compile all classes excluding the tests. -->
<javac srcdir="${java.dir}"
destdir="${build.classes}"
debug="${build.debug}"
@@ -45,7 +54,6 @@
deprecation="${build.deprecation}"
target="1.2">
<classpath refid="project.class.path" />
- <src path="${test.dir}"/>
<include name="**/*.java"/>
</javac>
@@ -56,6 +64,24 @@
</fileset>
</copy>
+ </target>
+
+ <!-- Compiles the unit test source code -->
+ <target name="compile-test" depends="compile, dependencies-test"
description="Compiles the source code">
+
+ <mkdir dir="${build.classes}"/>
+
+ <!-- Compile all classes including the tests. -->
+ <javac srcdir="${test.dir}"
+ destdir="${build.classes}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
+ deprecation="${build.deprecation}"
+ target="1.2">
+ <classpath refid="project.class.path" />
+ <include name="**/*.java"/>
+ </javac>
+
<copy todir="${build.classes}">
<fileset dir="${test.dir}">
<exclude name="**/*.java"/>
@@ -115,7 +141,7 @@
</javadoc>
</target>
- <target name="test" depends="compile" description="Perform the unit
tests" unless="skip.tests">
+ <target name="test" depends="compile-test" description="Perform the unit
tests" unless="skip.tests">
<echo message="Performing Unit Tests" />
1.8 +30 -4 jakarta-avalon-excalibur/testcase/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/testcase/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.xml 12 Apr 2002 11:03:32 -0000 1.7
+++ build.xml 13 Apr 2002 01:07:32 -0000 1.8
@@ -17,8 +17,9 @@
<pathelement location="${avalon-framework.jar}"/>
<pathelement location="${excalibur-logger.jar}"/>
<pathelement location="${excalibur-component.jar}"/>
- <pathelement location="${junit.jar}"/>
<pathelement location="${checkstyle.jar}"/>
+ <!-- Unit testing deps -->
+ <pathelement location="${junit.jar}"/>
</path>
<property name="cp" refid="project.class.path"/>
@@ -40,12 +41,20 @@
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkComponent"/>
</target>
+ <target name="dependencies-test" depends="dist-jar, dependencies"
+ description="Check unit test dependencies"
unless="skip.dependencies">
+ <!-- Need the jar to prevent recursive deps. -->
+
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkJUnit"/>
+ </target>
+
+
<!-- Compiles the source code -->
<target name="compile" depends="dependencies" description="Compiles the
source code">
<mkdir dir="${build.classes}"/>
- <!-- Compile all classes including the tests. -->
+ <!-- Compile all classes excluding the tests. -->
<javac srcdir="${java.dir}"
destdir="${build.classes}"
debug="${build.debug}"
@@ -53,7 +62,6 @@
deprecation="${build.deprecation}"
target="1.2">
<classpath refid="project.class.path" />
- <src path="${test.dir}"/>
<include name="**/*.java"/>
</javac>
@@ -64,6 +72,24 @@
</fileset>
</copy>
+ </target>
+
+ <!-- Compiles the unit test source code -->
+ <target name="compile-test" depends="compile, dependencies-test"
description="Compiles the source code">
+
+ <mkdir dir="${build.classes}"/>
+
+ <!-- Compile all classes including the tests. -->
+ <javac srcdir="${test.dir}"
+ destdir="${build.classes}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
+ deprecation="${build.deprecation}"
+ target="1.2">
+ <classpath refid="project.class.path" />
+ <include name="**/*.java"/>
+ </javac>
+
<copy todir="${build.classes}">
<fileset dir="${test.dir}">
<exclude name="**/*.java"/>
@@ -123,7 +149,7 @@
</javadoc>
</target>
- <target name="test" depends="compile" description="Perform the unit
tests" unless="skip.tests">
+ <target name="test" depends="compile-test" description="Perform the unit
tests" unless="skip.tests">
<echo message="Performing Unit Tests" />
1.10 +30 -4 jakarta-avalon-excalibur/thread/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/thread/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.xml 12 Apr 2002 11:03:32 -0000 1.9
+++ build.xml 13 Apr 2002 01:07:32 -0000 1.10
@@ -18,8 +18,9 @@
<pathelement location="${excalibur-threadcontext.jar}"/>
<pathelement location="${excalibur-instrument.jar}"/>
<pathelement location="${excalibur-pool.jar}"/>
- <pathelement location="${junit.jar}"/>
<pathelement location="${checkstyle.jar}"/>
+ <!-- Unit testing deps -->
+ <pathelement location="${junit.jar}"/>
</path>
<property name="cp" refid="project.class.path"/>
@@ -41,12 +42,20 @@
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkFramework"/>
</target>
+ <target name="dependencies-test" depends="dist-jar, dependencies"
+ description="Check unit test dependencies"
unless="skip.dependencies">
+ <!-- Need the jar to prevent recursive deps. -->
+
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkJUnit"/>
+ </target>
+
+
<!-- Compiles the source code -->
<target name="compile" depends="dependencies" description="Compiles the
source code">
<mkdir dir="${build.classes}"/>
- <!-- Compile all classes including the tests. -->
+ <!-- Compile all classes excluding the tests. -->
<javac srcdir="${java.dir}"
destdir="${build.classes}"
debug="${build.debug}"
@@ -54,7 +63,6 @@
deprecation="${build.deprecation}"
target="1.2">
<classpath refid="project.class.path" />
- <src path="${test.dir}"/>
<include name="**/*.java"/>
</javac>
@@ -65,6 +73,24 @@
</fileset>
</copy>
+ </target>
+
+ <!-- Compiles the unit test source code -->
+ <target name="compile-test" depends="compile, dependencies-test"
description="Compiles the source code">
+
+ <mkdir dir="${build.classes}"/>
+
+ <!-- Compile all classes including the tests. -->
+ <javac srcdir="${test.dir}"
+ destdir="${build.classes}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
+ deprecation="${build.deprecation}"
+ target="1.2">
+ <classpath refid="project.class.path" />
+ <include name="**/*.java"/>
+ </javac>
+
<copy todir="${build.classes}">
<fileset dir="${test.dir}">
<exclude name="**/*.java"/>
@@ -124,7 +150,7 @@
</javadoc>
</target>
- <target name="test" depends="compile" description="Perform the unit
tests" unless="skip.tests">
+ <target name="test" depends="compile-test" description="Perform the unit
tests" unless="skip.tests">
<echo message="Performing Unit Tests" />
1.9 +30 -4 jakarta-avalon-excalibur/threadcontext/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/threadcontext/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.xml 12 Apr 2002 11:03:32 -0000 1.8
+++ build.xml 13 Apr 2002 01:07:32 -0000 1.9
@@ -13,8 +13,9 @@
<path id="project.class.path">
<pathelement path="${java.class.path}"/>
<pathelement location="${build.classes}"/>
- <pathelement location="${junit.jar}"/>
<pathelement location="${checkstyle.jar}"/>
+ <!-- Unit testing deps -->
+ <pathelement location="${junit.jar}"/>
</path>
<property name="cp" refid="project.class.path"/>
@@ -32,12 +33,20 @@
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkCommon"/>
</target>
+ <target name="dependencies-test" depends="dist-jar, dependencies"
+ description="Check unit test dependencies"
unless="skip.dependencies">
+ <!-- Need the jar to prevent recursive deps. -->
+
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkJUnit"/>
+ </target>
+
+
<!-- Compiles the source code -->
<target name="compile" depends="dependencies" description="Compiles the
source code">
<mkdir dir="${build.classes}"/>
- <!-- Compile all classes including the tests. -->
+ <!-- Compile all classes excluding the tests. -->
<javac srcdir="${java.dir}"
destdir="${build.classes}"
debug="${build.debug}"
@@ -45,7 +54,6 @@
deprecation="${build.deprecation}"
target="1.2">
<classpath refid="project.class.path" />
- <src path="${test.dir}"/>
<include name="**/*.java"/>
</javac>
@@ -56,6 +64,24 @@
</fileset>
</copy>
+ </target>
+
+ <!-- Compiles the unit test source code -->
+ <target name="compile-test" depends="compile, dependencies-test"
description="Compiles the source code">
+
+ <mkdir dir="${build.classes}"/>
+
+ <!-- Compile all classes including the tests. -->
+ <javac srcdir="${test.dir}"
+ destdir="${build.classes}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
+ deprecation="${build.deprecation}"
+ target="1.2">
+ <classpath refid="project.class.path" />
+ <include name="**/*.java"/>
+ </javac>
+
<copy todir="${build.classes}">
<fileset dir="${test.dir}">
<exclude name="**/*.java"/>
@@ -115,7 +141,7 @@
</javadoc>
</target>
- <target name="test" depends="compile" description="Perform the unit
tests" unless="skip.tests">
+ <target name="test" depends="compile-test" description="Perform the unit
tests" unless="skip.tests">
<echo message="Performing Unit Tests" />
1.8 +30 -4 jakarta-avalon-excalibur/util/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/util/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.xml 12 Apr 2002 11:03:32 -0000 1.7
+++ build.xml 13 Apr 2002 01:07:32 -0000 1.8
@@ -14,8 +14,9 @@
<pathelement path="${java.class.path}"/>
<pathelement location="${build.classes}"/>
<pathelement location="${avalon-framework.jar}"/>
- <pathelement location="${junit.jar}"/>
<pathelement location="${checkstyle.jar}"/>
+ <!-- Unit testing deps -->
+ <pathelement location="${junit.jar}"/>
</path>
<property name="cp" refid="project.class.path"/>
@@ -34,12 +35,20 @@
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkFramework"/>
</target>
+ <target name="dependencies-test" depends="dist-jar, dependencies"
+ description="Check unit test dependencies"
unless="skip.dependencies">
+ <!-- Need the jar to prevent recursive deps. -->
+
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkJUnit"/>
+ </target>
+
+
<!-- Compiles the source code -->
<target name="compile" depends="dependencies" description="Compiles the
source code">
<mkdir dir="${build.classes}"/>
- <!-- Compile all classes including the tests. -->
+ <!-- Compile all classes excluding the tests. -->
<javac srcdir="${java.dir}"
destdir="${build.classes}"
debug="${build.debug}"
@@ -47,7 +56,6 @@
deprecation="${build.deprecation}"
target="1.2">
<classpath refid="project.class.path" />
- <src path="${test.dir}"/>
<include name="**/*.java"/>
</javac>
@@ -58,6 +66,24 @@
</fileset>
</copy>
+ </target>
+
+ <!-- Compiles the unit test source code -->
+ <target name="compile-test" depends="compile, dependencies-test"
description="Compiles the source code">
+
+ <mkdir dir="${build.classes}"/>
+
+ <!-- Compile all classes including the tests. -->
+ <javac srcdir="${test.dir}"
+ destdir="${build.classes}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
+ deprecation="${build.deprecation}"
+ target="1.2">
+ <classpath refid="project.class.path" />
+ <include name="**/*.java"/>
+ </javac>
+
<copy todir="${build.classes}">
<fileset dir="${test.dir}">
<exclude name="**/*.java"/>
@@ -117,7 +143,7 @@
</javadoc>
</target>
- <target name="test" depends="compile" description="Perform the unit
tests" unless="skip.tests">
+ <target name="test" depends="compile-test" description="Perform the unit
tests" unless="skip.tests">
<echo message="Performing Unit Tests" />
1.7 +30 -4 jakarta-avalon-excalibur/xmlbundle/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/xmlbundle/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml 12 Apr 2002 11:03:32 -0000 1.6
+++ build.xml 13 Apr 2002 01:07:32 -0000 1.7
@@ -13,8 +13,9 @@
<path id="project.class.path">
<pathelement path="${java.class.path}"/>
<pathelement location="${build.classes}"/>
- <pathelement location="${junit.jar}"/>
<pathelement location="${checkstyle.jar}"/>
+ <!-- Unit testing deps -->
+ <pathelement location="${junit.jar}"/>
</path>
<property name="cp" refid="project.class.path"/>
@@ -32,12 +33,20 @@
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkCommon"/>
</target>
+ <target name="dependencies-test" depends="dist-jar, dependencies"
+ description="Check unit test dependencies"
unless="skip.dependencies">
+ <!-- Need the jar to prevent recursive deps. -->
+
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkJUnit"/>
+ </target>
+
+
<!-- Compiles the source code -->
<target name="compile" depends="dependencies" description="Compiles the
source code">
<mkdir dir="${build.classes}"/>
- <!-- Compile all classes including the tests. -->
+ <!-- Compile all classes excluding the tests. -->
<javac srcdir="${java.dir}"
destdir="${build.classes}"
debug="${build.debug}"
@@ -45,7 +54,6 @@
deprecation="${build.deprecation}"
target="1.2">
<classpath refid="project.class.path" />
- <src path="${test.dir}"/>
<include name="**/*.java"/>
</javac>
@@ -56,6 +64,24 @@
</fileset>
</copy>
+ </target>
+
+ <!-- Compiles the unit test source code -->
+ <target name="compile-test" depends="compile, dependencies-test"
description="Compiles the source code">
+
+ <mkdir dir="${build.classes}"/>
+
+ <!-- Compile all classes including the tests. -->
+ <javac srcdir="${test.dir}"
+ destdir="${build.classes}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
+ deprecation="${build.deprecation}"
+ target="1.2">
+ <classpath refid="project.class.path" />
+ <include name="**/*.java"/>
+ </javac>
+
<copy todir="${build.classes}">
<fileset dir="${test.dir}">
<exclude name="**/*.java"/>
@@ -115,7 +141,7 @@
</javadoc>
</target>
- <target name="test" depends="compile" description="Perform the unit
tests" unless="skip.tests">
+ <target name="test" depends="compile-test" description="Perform the unit
tests" unless="skip.tests">
<echo message="Performing Unit Tests" />
1.17 +30 -4 jakarta-avalon-excalibur/zip/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/zip/build.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- build.xml 12 Apr 2002 11:03:32 -0000 1.16
+++ build.xml 13 Apr 2002 01:07:33 -0000 1.17
@@ -13,8 +13,9 @@
<path id="project.class.path">
<pathelement path="${java.class.path}"/>
<pathelement location="${build.classes}"/>
- <pathelement location="${junit.jar}"/>
<pathelement location="${checkstyle.jar}"/>
+ <!-- Unit testing deps -->
+ <pathelement location="${junit.jar}"/>
</path>
<property name="cp" refid="project.class.path"/>
@@ -32,12 +33,20 @@
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkCommon"/>
</target>
+ <target name="dependencies-test" depends="dist-jar, dependencies"
+ description="Check unit test dependencies"
unless="skip.dependencies">
+ <!-- Need the jar to prevent recursive deps. -->
+
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkJUnit"/>
+ </target>
+
+
<!-- Compiles the source code -->
<target name="compile" depends="dependencies" description="Compiles the
source code">
<mkdir dir="${build.classes}"/>
- <!-- Compile all classes including the tests. -->
+ <!-- Compile all classes excluding the tests. -->
<javac srcdir="${java.dir}"
destdir="${build.classes}"
debug="${build.debug}"
@@ -45,7 +54,6 @@
deprecation="${build.deprecation}"
target="1.2">
<classpath refid="project.class.path" />
- <src path="${test.dir}"/>
<include name="**/*.java"/>
</javac>
@@ -56,6 +64,24 @@
</fileset>
</copy>
+ </target>
+
+ <!-- Compiles the unit test source code -->
+ <target name="compile-test" depends="compile, dependencies-test"
description="Compiles the source code">
+
+ <mkdir dir="${build.classes}"/>
+
+ <!-- Compile all classes including the tests. -->
+ <javac srcdir="${test.dir}"
+ destdir="${build.classes}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
+ deprecation="${build.deprecation}"
+ target="1.2">
+ <classpath refid="project.class.path" />
+ <include name="**/*.java"/>
+ </javac>
+
<copy todir="${build.classes}">
<fileset dir="${test.dir}">
<exclude name="**/*.java"/>
@@ -115,7 +141,7 @@
</javadoc>
</target>
- <target name="test" depends="compile" description="Perform the unit
tests" unless="skip.tests">
+ <target name="test" depends="compile-test" description="Perform the unit
tests" unless="skip.tests">
<echo message="Performing Unit Tests" />
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
