avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From je...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/zip build.xml default.properties
Date Tue, 16 Apr 2002 12:00:43 GMT
jefft       02/04/16 05:00:43

  Modified:    .        depchecker.xml dependencies.txt
               altrmi   build.xml default.properties
               baxter   build.xml default.properties
               bzip2    build.xml default.properties
               cache    build.xml default.properties
               cli      build.xml default.properties
               collections build.xml default.properties
               component build.xml default.properties
               concurrent build.xml default.properties
               datasource ant.properties.sample build.xml
                        default.properties
               event    build.xml default.properties
               extension build.xml default.properties
               fortress build.xml default.properties
               i18n     build.xml default.properties
               instrument build.xml default.properties
               instrument-client build.xml default.properties
               instrument-manager build.xml default.properties
               io       build.xml default.properties
               logger   build.xml default.properties
               monitor  build.xml default.properties
               naming   build.xml default.properties
               pool     build.xml default.properties
               sourceresolve build.xml default.properties
               tar      build.xml default.properties
               template-product build.xml default.properties
               testcase build.xml default.properties
               thread   build.xml default.properties
               threadcontext build.xml default.properties
               util     build.xml default.properties
               xmlbundle build.xml default.properties
               zip      build.xml default.properties
  Log:
  Compile unit tests into a separate directory (build/testclasses), being the
  simplest way to prevent testing classes ending up in the jars.
  
  Revision  Changes    Path
  1.16      +8 -1      jakarta-avalon-excalibur/depchecker.xml
  
  Index: depchecker.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/depchecker.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- depchecker.xml	14 Apr 2002 12:16:40 -0000	1.15
  +++ depchecker.xml	16 Apr 2002 12:00:39 -0000	1.16
  @@ -3,7 +3,7 @@
   <!--
   ============================================================
                   Dependency updater
  -                   Version $Revision: 1.15 $
  +                   Version $Revision: 1.16 $
              Jeff Turner <jefft@apache.org>
   
   This Ant script provides "functions" to check if
  @@ -270,6 +270,13 @@
               <property name="name" value="excalibur-util.jar"/>
               <property name="path" value="${excalibur-util.jar}"/>
               <property name="proj.home" value="${basedir}/../util"/>
  +        </ant>
  +    </target>
  +    <target name="checkCache">
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
  +            <property name="name" value="excalibur-cache.jar"/>
  +            <property name="path" value="${excalibur-cache.jar}"/>
  +            <property name="proj.home" value="${basedir}/../cache"/>
           </ant>
       </target>
       <target name="checkComponent">
  
  
  
  1.15      +2 -2      jakarta-avalon-excalibur/dependencies.txt
  
  Index: dependencies.txt
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/dependencies.txt,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- dependencies.txt	13 Apr 2002 12:46:22 -0000	1.14
  +++ dependencies.txt	16 Apr 2002 12:00:39 -0000	1.15
  @@ -20,11 +20,11 @@
   * altrmi -> framework
   * util -> framework
   * baxter -> jmxri.jar
  -* datasource -> pool, logkit, framework [Unit tests: junit, testcase, component, logger]
  +* datasource -> pool, logkit, framework [Unit tests: junit, testcase, component, logger, collections, concurrent]
   * event -> collections, concurrent, core, framework, event, util, thread, threadcontext, pool
   * all -> framework, collections, concurrent, instrument, event, component, pool, logkit, logger, datasource, (recursive on fortress, commented out) [Unit tests: junit, testcase]
   * 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
  +* fortress -> instrument, instrument-manager, framework, event (recursive on mpool in scratchpad), component (test class), logger, util [Unit tests: junit, testcase, pool, datasource, cache]
   instrument-client -> framework, altrmi-client-impl, altrmi-client-interfaces, altrmi-common, altrmi-generator, altrmi-manager-interfaces
   * instrument-manager -> logkit, logger, framework, core, collections, instrument, altrmi-common, altrmi-server-impl, altrmi-server-interfaces, component, pool
   * logger -> logkit, framework. [Unit tests: junit, testcase, component, collections, pool]
  
  
  
  1.16      +22 -12    jakarta-avalon-excalibur/altrmi/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/build.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- build.xml	16 Apr 2002 05:12:39 -0000	1.15
  +++ build.xml	16 Apr 2002 12:00:39 -0000	1.16
  @@ -15,10 +15,7 @@
           <pathelement location="${build.classes}"/>
           <pathelement location="${avalon-framework.jar}"/>
           <pathelement location="${checkstyle.jar}"/>
  -        <!-- Unit testing deps -->
  -        <pathelement location="${junit.jar}"/>
       </path>
  -    <property name="cp" refid="project.class.path"/>
   
       <path id="tools.class.path">
           <pathelement location="${junit.jar}"/>
  @@ -27,6 +24,13 @@
           <fileset dir="${tools.dir}/ext"/>
       </path>
   
  +    <path id="test.class.path">
  +        <pathelement location="${build.testclasses}"/>
  +        <pathelement location="${junit.jar}"/>
  +        <path refid="project.class.path"/>
  +    </path>
  +    <property name="cp" refid="test.class.path"/>
  +
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  @@ -71,21 +75,27 @@
   
       <!-- Compiles the unit test source code -->
       <target name="compile-test" depends="compile, dependencies-test" description="Compiles the source code">
  +        <mkdir dir="${build.testsrc}"/>
   
  -        <mkdir dir="${build.classes}"/>
  +        <!-- Copy over all of the tests applying test filters -->
  +        <copy todir="${build.testsrc}">
  +            <fileset dir="${test.dir}"/>
  +        </copy>
   
  -        <!-- Compile all classes including the tests. -->
  -        <javac srcdir="${test.dir}"
  -            destdir="${build.classes}"
  +        <mkdir dir="${build.testclasses}"/>
  +
  +        <!-- Compile all test classes. -->
  +        <javac srcdir="${build.testsrc}"
  +            destdir="${build.testclasses}"
               debug="${build.debug}"
               optimize="${build.optimize}"
               deprecation="${build.deprecation}"
               target="1.2">
  -            <classpath refid="project.class.path" />
  +            <classpath refid="test.class.path" />
               <include name="**/*.java"/>
           </javac>
   
  -        <copy todir="${build.classes}">
  +        <copy todir="${build.testclasses}">
               <fileset dir="${test.dir}">
                   <exclude name="**/*.java"/>
                   <exclude name="**/package.html"/>
  @@ -175,13 +185,13 @@
               haltonfailure="${junit.failonerror}"
               printsummary="yes"
               dir="${build.tests}">
  -            <classpath refid="project.class.path"/>
  +            <classpath refid="test.class.path"/>
   
               <formatter type="xml"/>    <!-- xml reports for junitreport -->
  -            <formatter type="plain"/>  <!-- text reports for humans     -->
  +            <formatter type="plain" usefile="false"/>  <!-- text reports for humans     -->
   
               <batchtest todir="${build.tests}">
  -                <fileset dir="${build.classes}">
  +                <fileset dir="${build.testclasses}">
                       <include name="**/test/*TestCase.class"/>
                       <exclude name="**/Abstract*"/>
                   </fileset>
  
  
  
  1.4       +2 -0      jakarta-avalon-excalibur/altrmi/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/default.properties,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- default.properties	13 Apr 2002 05:20:02 -0000	1.3
  +++ default.properties	16 Apr 2002 12:00:39 -0000	1.4
  @@ -32,6 +32,8 @@
   
   #  location of intermediate products
   build.dir = ${basedir}/build
  +build.testsrc = ${build.dir}/testsrc
  +build.testclasses = ${build.dir}/testclasses
   build.lib = ${build.dir}/lib
   build.conf = ${build.dir}/conf
   build.classes = ${build.dir}/classes
  
  
  
  1.18      +22 -12    jakarta-avalon-excalibur/baxter/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/baxter/build.xml,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- build.xml	16 Apr 2002 05:12:39 -0000	1.17
  +++ build.xml	16 Apr 2002 12:00:39 -0000	1.18
  @@ -15,10 +15,7 @@
           <pathelement location="${build.classes}"/>
           <pathelement location="${jmx.jar}"/>
           <pathelement location="${checkstyle.jar}"/>
  -        <!-- Unit testing deps -->
  -        <pathelement location="${junit.jar}"/>
       </path>
  -    <property name="cp" refid="project.class.path"/>
   
       <path id="tools.class.path">
           <pathelement location="${junit.jar}"/>
  @@ -27,6 +24,13 @@
           <fileset dir="${tools.dir}/ext"/>
       </path>
   
  +    <path id="test.class.path">
  +        <pathelement location="${build.testclasses}"/>
  +        <pathelement location="${junit.jar}"/>
  +        <path refid="project.class.path"/>
  +    </path>
  +    <property name="cp" refid="test.class.path"/>
  +
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  @@ -74,21 +78,27 @@
   
       <!-- Compiles the unit test source code -->
       <target name="compile-test" depends="compile, dependencies-test" description="Compiles the source code">
  +        <mkdir dir="${build.testsrc}"/>
   
  -        <mkdir dir="${build.classes}"/>
  +        <!-- Copy over all of the tests applying test filters -->
  +        <copy todir="${build.testsrc}">
  +            <fileset dir="${test.dir}"/>
  +        </copy>
   
  -        <!-- Compile all classes including the tests. -->
  -        <javac srcdir="${test.dir}"
  -            destdir="${build.classes}"
  +        <mkdir dir="${build.testclasses}"/>
  +
  +        <!-- Compile all test classes. -->
  +        <javac srcdir="${build.testsrc}"
  +            destdir="${build.testclasses}"
               debug="${build.debug}"
               optimize="${build.optimize}"
               deprecation="${build.deprecation}"
               target="1.2">
  -            <classpath refid="project.class.path" />
  +            <classpath refid="test.class.path" />
               <include name="**/*.java"/>
           </javac>
   
  -        <copy todir="${build.classes}">
  +        <copy todir="${build.testclasses}">
               <fileset dir="${test.dir}">
                   <exclude name="**/*.java"/>
                   <exclude name="**/package.html"/>
  @@ -158,13 +168,13 @@
               haltonfailure="${junit.failonerror}"
               printsummary="yes"
               dir="${build.tests}">
  -            <classpath refid="project.class.path"/>
  +            <classpath refid="test.class.path"/>
   
               <formatter type="xml"/>    <!-- xml reports for junitreport -->
  -            <formatter type="plain"/>  <!-- text reports for humans     -->
  +            <formatter type="plain" usefile="false"/>  <!-- text reports for humans     -->
   
               <batchtest todir="${build.tests}">
  -                <fileset dir="${build.classes}">
  +                <fileset dir="${build.testclasses}">
                       <include name="**/test/*TestCase.class"/>
                       <exclude name="**/Abstract*"/>
                   </fileset>
  
  
  
  1.5       +2 -0      jakarta-avalon-excalibur/baxter/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/baxter/default.properties,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- default.properties	13 Apr 2002 11:26:16 -0000	1.4
  +++ default.properties	16 Apr 2002 12:00:39 -0000	1.5
  @@ -26,6 +26,8 @@
   
   #  location of intermediate products
   build.dir = build
  +build.testsrc = ${build.dir}/testsrc
  +build.testclasses = ${build.dir}/testclasses
   build.lib = ${build.dir}/lib
   build.conf = ${build.dir}/conf
   build.classes = ${build.dir}/classes
  
  
  
  1.18      +22 -12    jakarta-avalon-excalibur/bzip2/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/bzip2/build.xml,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- build.xml	16 Apr 2002 05:12:39 -0000	1.17
  +++ build.xml	16 Apr 2002 12:00:39 -0000	1.18
  @@ -14,10 +14,7 @@
           <pathelement path="${java.class.path}"/>
           <pathelement location="${build.classes}"/>
           <pathelement location="${checkstyle.jar}"/>
  -        <!-- Unit testing deps -->
  -        <pathelement location="${junit.jar}"/>
       </path>
  -    <property name="cp" refid="project.class.path"/>
   
       <path id="tools.class.path">
           <pathelement location="${junit.jar}"/>
  @@ -26,6 +23,13 @@
           <fileset dir="${tools.dir}/ext"/>
       </path>
   
  +    <path id="test.class.path">
  +        <pathelement location="${build.testclasses}"/>
  +        <pathelement location="${junit.jar}"/>
  +        <path refid="project.class.path"/>
  +    </path>
  +    <property name="cp" refid="test.class.path"/>
  +
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  @@ -69,21 +73,27 @@
   
       <!-- Compiles the unit test source code -->
       <target name="compile-test" depends="compile, dependencies-test" description="Compiles the source code">
  +        <mkdir dir="${build.testsrc}"/>
   
  -        <mkdir dir="${build.classes}"/>
  +        <!-- Copy over all of the tests applying test filters -->
  +        <copy todir="${build.testsrc}">
  +            <fileset dir="${test.dir}"/>
  +        </copy>
   
  -        <!-- Compile all classes including the tests. -->
  -        <javac srcdir="${test.dir}"
  -            destdir="${build.classes}"
  +        <mkdir dir="${build.testclasses}"/>
  +
  +        <!-- Compile all test classes. -->
  +        <javac srcdir="${build.testsrc}"
  +            destdir="${build.testclasses}"
               debug="${build.debug}"
               optimize="${build.optimize}"
               deprecation="${build.deprecation}"
               target="1.2">
  -            <classpath refid="project.class.path" />
  +            <classpath refid="test.class.path" />
               <include name="**/*.java"/>
           </javac>
   
  -        <copy todir="${build.classes}">
  +        <copy todir="${build.testclasses}">
               <fileset dir="${test.dir}">
                   <exclude name="**/*.java"/>
                   <exclude name="**/package.html"/>
  @@ -153,13 +163,13 @@
               haltonfailure="${junit.failonerror}"
               printsummary="yes"
               dir="${build.tests}">
  -            <classpath refid="project.class.path"/>
  +            <classpath refid="test.class.path"/>
   
               <formatter type="xml"/>    <!-- xml reports for junitreport -->
  -            <formatter type="plain"/>  <!-- text reports for humans     -->
  +            <formatter type="plain" usefile="false"/>  <!-- text reports for humans     -->
   
               <batchtest todir="${build.tests}">
  -                <fileset dir="${build.classes}">
  +                <fileset dir="${build.testclasses}">
                       <include name="**/test/*TestCase.class"/>
                       <exclude name="**/Abstract*"/>
                   </fileset>
  
  
  
  1.5       +2 -0      jakarta-avalon-excalibur/bzip2/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/bzip2/default.properties,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- default.properties	13 Apr 2002 11:26:16 -0000	1.4
  +++ default.properties	16 Apr 2002 12:00:39 -0000	1.5
  @@ -21,6 +21,8 @@
   
   #  location of intermediate products
   build.dir = build
  +build.testsrc = ${build.dir}/testsrc
  +build.testclasses = ${build.dir}/testclasses
   build.lib = ${build.dir}/lib
   build.conf = ${build.dir}/conf
   build.classes = ${build.dir}/classes
  
  
  
  1.27      +22 -12    jakarta-avalon-excalibur/cache/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/cache/build.xml,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- build.xml	16 Apr 2002 05:12:39 -0000	1.26
  +++ build.xml	16 Apr 2002 12:00:40 -0000	1.27
  @@ -15,10 +15,7 @@
           <pathelement location="${build.classes}"/>
           <pathelement location="${avalon-framework.jar}"/>
           <pathelement location="${checkstyle.jar}"/>
  -        <!-- Unit testing deps -->
  -        <pathelement location="${junit.jar}"/>
       </path>
  -    <property name="cp" refid="project.class.path"/>
   
       <path id="tools.class.path">
           <pathelement location="${junit.jar}"/>
  @@ -27,6 +24,13 @@
           <fileset dir="${tools.dir}/ext"/>
       </path>
   
  +    <path id="test.class.path">
  +        <pathelement location="${build.testclasses}"/>
  +        <pathelement location="${junit.jar}"/>
  +        <path refid="project.class.path"/>
  +    </path>
  +    <property name="cp" refid="test.class.path"/>
  +
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  @@ -70,21 +74,27 @@
   
       <!-- Compiles the unit test source code -->
       <target name="compile-test" depends="compile, dependencies-test" description="Compiles the source code">
  +        <mkdir dir="${build.testsrc}"/>
   
  -        <mkdir dir="${build.classes}"/>
  +        <!-- Copy over all of the tests applying test filters -->
  +        <copy todir="${build.testsrc}">
  +            <fileset dir="${test.dir}"/>
  +        </copy>
   
  -        <!-- Compile all classes including the tests. -->
  -        <javac srcdir="${test.dir}"
  -            destdir="${build.classes}"
  +        <mkdir dir="${build.testclasses}"/>
  +
  +        <!-- Compile all test classes. -->
  +        <javac srcdir="${build.testsrc}"
  +            destdir="${build.testclasses}"
               debug="${build.debug}"
               optimize="${build.optimize}"
               deprecation="${build.deprecation}"
               target="1.2">
  -            <classpath refid="project.class.path" />
  +            <classpath refid="test.class.path" />
               <include name="**/*.java"/>
           </javac>
   
  -        <copy todir="${build.classes}">
  +        <copy todir="${build.testclasses}">
               <fileset dir="${test.dir}">
                   <exclude name="**/*.java"/>
                   <exclude name="**/package.html"/>
  @@ -154,13 +164,13 @@
               haltonfailure="${junit.failonerror}"
               printsummary="yes"
               dir="${build.tests}">
  -            <classpath refid="project.class.path"/>
  +            <classpath refid="test.class.path"/>
   
               <formatter type="xml"/>    <!-- xml reports for junitreport -->
  -            <formatter type="plain"/>  <!-- text reports for humans     -->
  +            <formatter type="plain" usefile="false"/>  <!-- text reports for humans     -->
   
               <batchtest todir="${build.tests}">
  -                <fileset dir="${build.classes}">
  +                <fileset dir="${build.testclasses}">
                       <include name="**/test/*TestCase.class"/>
                       <exclude name="**/Abstract*"/>
                   </fileset>
  
  
  
  1.5       +2 -0      jakarta-avalon-excalibur/cache/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/cache/default.properties,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- default.properties	13 Apr 2002 11:26:16 -0000	1.4
  +++ default.properties	16 Apr 2002 12:00:40 -0000	1.5
  @@ -32,6 +32,8 @@
   
   #  location of intermediate products
   build.dir = build
  +build.testsrc = ${build.dir}/testsrc
  +build.testclasses = ${build.dir}/testclasses
   build.lib = ${build.dir}/lib
   build.conf = ${build.dir}/conf
   build.classes = ${build.dir}/classes
  
  
  
  1.38      +22 -12    jakarta-avalon-excalibur/cli/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/cli/build.xml,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- build.xml	16 Apr 2002 05:12:39 -0000	1.37
  +++ build.xml	16 Apr 2002 12:00:40 -0000	1.38
  @@ -14,10 +14,7 @@
           <pathelement path="${java.class.path}"/>
           <pathelement location="${build.classes}"/>
           <pathelement location="${checkstyle.jar}"/>
  -        <!-- Unit testing deps -->
  -        <pathelement location="${junit.jar}"/>
       </path>
  -    <property name="cp" refid="project.class.path"/>
   
       <path id="tools.class.path">
           <pathelement location="${junit.jar}"/>
  @@ -26,6 +23,13 @@
           <fileset dir="${tools.dir}/ext"/>
       </path>
   
  +    <path id="test.class.path">
  +        <pathelement location="${build.testclasses}"/>
  +        <pathelement location="${junit.jar}"/>
  +        <path refid="project.class.path"/>
  +    </path>
  +    <property name="cp" refid="test.class.path"/>
  +
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  @@ -69,21 +73,27 @@
   
       <!-- Compiles the unit test source code -->
       <target name="compile-test" depends="compile, dependencies-test" description="Compiles the source code">
  +        <mkdir dir="${build.testsrc}"/>
   
  -        <mkdir dir="${build.classes}"/>
  +        <!-- Copy over all of the tests applying test filters -->
  +        <copy todir="${build.testsrc}">
  +            <fileset dir="${test.dir}"/>
  +        </copy>
   
  -        <!-- Compile all classes including the tests. -->
  -        <javac srcdir="${test.dir}"
  -            destdir="${build.classes}"
  +        <mkdir dir="${build.testclasses}"/>
  +
  +        <!-- Compile all test classes. -->
  +        <javac srcdir="${build.testsrc}"
  +            destdir="${build.testclasses}"
               debug="${build.debug}"
               optimize="${build.optimize}"
               deprecation="${build.deprecation}"
               target="1.2">
  -            <classpath refid="project.class.path" />
  +            <classpath refid="test.class.path" />
               <include name="**/*.java"/>
           </javac>
   
  -        <copy todir="${build.classes}">
  +        <copy todir="${build.testclasses}">
               <fileset dir="${test.dir}">
                   <exclude name="**/*.java"/>
                   <exclude name="**/package.html"/>
  @@ -153,13 +163,13 @@
               haltonfailure="${junit.failonerror}"
               printsummary="yes"
               dir="${build.tests}">
  -            <classpath refid="project.class.path"/>
  +            <classpath refid="test.class.path"/>
   
               <formatter type="xml"/>    <!-- xml reports for junitreport -->
  -            <formatter type="plain"/>  <!-- text reports for humans     -->
  +            <formatter type="plain" usefile="false"/>  <!-- text reports for humans     -->
   
               <batchtest todir="${build.tests}">
  -                <fileset dir="${build.classes}">
  +                <fileset dir="${build.testclasses}">
                       <include name="**/test/*TestCase.class"/>
                       <exclude name="**/Abstract*"/>
                   </fileset>
  
  
  
  1.5       +2 -0      jakarta-avalon-excalibur/cli/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/cli/default.properties,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- default.properties	13 Apr 2002 11:26:16 -0000	1.4
  +++ default.properties	16 Apr 2002 12:00:40 -0000	1.5
  @@ -21,6 +21,8 @@
   
   #  location of intermediate products
   build.dir = build
  +build.testsrc = ${build.dir}/testsrc
  +build.testclasses = ${build.dir}/testclasses
   build.lib = ${build.dir}/lib
   build.conf = ${build.dir}/conf
   build.classes = ${build.dir}/classes
  
  
  
  1.16      +22 -12    jakarta-avalon-excalibur/collections/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/collections/build.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- build.xml	16 Apr 2002 05:12:39 -0000	1.15
  +++ build.xml	16 Apr 2002 12:00:40 -0000	1.16
  @@ -14,10 +14,7 @@
           <pathelement path="${java.class.path}"/>
           <pathelement location="${build.classes}"/>
           <pathelement location="${checkstyle.jar}"/>
  -        <!-- Unit testing deps -->
  -        <pathelement location="${junit.jar}"/>
       </path>
  -    <property name="cp" refid="project.class.path"/>
   
       <path id="tools.class.path">
           <pathelement location="${junit.jar}"/>
  @@ -26,6 +23,13 @@
           <fileset dir="${tools.dir}/ext"/>
       </path>
   
  +    <path id="test.class.path">
  +        <pathelement location="${build.testclasses}"/>
  +        <pathelement location="${junit.jar}"/>
  +        <path refid="project.class.path"/>
  +    </path>
  +    <property name="cp" refid="test.class.path"/>
  +
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  @@ -69,21 +73,27 @@
   
       <!-- Compiles the unit test source code -->
       <target name="compile-test" depends="compile, dependencies-test" description="Compiles the source code">
  +        <mkdir dir="${build.testsrc}"/>
   
  -        <mkdir dir="${build.classes}"/>
  +        <!-- Copy over all of the tests applying test filters -->
  +        <copy todir="${build.testsrc}">
  +            <fileset dir="${test.dir}"/>
  +        </copy>
   
  -        <!-- Compile all classes including the tests. -->
  -        <javac srcdir="${test.dir}"
  -            destdir="${build.classes}"
  +        <mkdir dir="${build.testclasses}"/>
  +
  +        <!-- Compile all test classes. -->
  +        <javac srcdir="${build.testsrc}"
  +            destdir="${build.testclasses}"
               debug="${build.debug}"
               optimize="${build.optimize}"
               deprecation="${build.deprecation}"
               target="1.2">
  -            <classpath refid="project.class.path" />
  +            <classpath refid="test.class.path" />
               <include name="**/*.java"/>
           </javac>
   
  -        <copy todir="${build.classes}">
  +        <copy todir="${build.testclasses}">
               <fileset dir="${test.dir}">
                   <exclude name="**/*.java"/>
                   <exclude name="**/package.html"/>
  @@ -153,13 +163,13 @@
               haltonfailure="${junit.failonerror}"
               printsummary="yes"
               dir="${build.tests}">
  -            <classpath refid="project.class.path"/>
  +            <classpath refid="test.class.path"/>
   
               <formatter type="xml"/>    <!-- xml reports for junitreport -->
  -            <formatter type="plain"/>  <!-- text reports for humans     -->
  +            <formatter type="plain" usefile="false"/>  <!-- text reports for humans     -->
   
               <batchtest todir="${build.tests}">
  -                <fileset dir="${build.classes}">
  +                <fileset dir="${build.testclasses}">
                       <include name="**/test/*TestCase.class"/>
                       <exclude name="**/Abstract*"/>
                   </fileset>
  
  
  
  1.6       +2 -0      jakarta-avalon-excalibur/collections/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/collections/default.properties,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- default.properties	15 Apr 2002 03:48:37 -0000	1.5
  +++ default.properties	16 Apr 2002 12:00:40 -0000	1.6
  @@ -22,6 +22,8 @@
   
   #  location of intermediate products
   build.dir = build
  +build.testsrc = ${build.dir}/testsrc
  +build.testclasses = ${build.dir}/testclasses
   build.lib = ${build.dir}/lib
   build.conf = ${build.dir}/conf
   build.classes = ${build.dir}/classes
  
  
  
  1.14      +25 -15    jakarta-avalon-excalibur/component/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/component/build.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- build.xml	16 Apr 2002 05:12:39 -0000	1.13
  +++ build.xml	16 Apr 2002 12:00:40 -0000	1.14
  @@ -20,13 +20,7 @@
           <pathelement location="${excalibur-instrument.jar}"/>
           <pathelement location="${excalibur-pool.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"/>
   
       <path id="tools.class.path">
           <pathelement location="${junit.jar}"/>
  @@ -35,6 +29,16 @@
           <fileset dir="${tools.dir}/ext"/>
       </path>
   
  +    <path id="test.class.path">
  +        <pathelement location="${build.testclasses}"/>
  +        <pathelement location="${junit.jar}"/>
  +        <pathelement location="${excalibur-util.jar}"/>
  +        <pathelement location="${excalibur-testcase.jar}"/>
  +        <pathelement location="${excalibur-instrument.jar}"/>
  +        <path refid="project.class.path"/>
  +    </path>
  +    <property name="cp" refid="test.class.path"/>
  +
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  @@ -86,21 +90,27 @@
   
       <!-- Compiles the unit test source code -->
       <target name="compile-test" depends="compile, dependencies-test" description="Compiles the source code">
  +        <mkdir dir="${build.testsrc}"/>
   
  -        <mkdir dir="${build.classes}"/>
  +        <!-- Copy over all of the tests applying test filters -->
  +        <copy todir="${build.testsrc}">
  +            <fileset dir="${test.dir}"/>
  +        </copy>
   
  -        <!-- Compile all classes including the tests. -->
  -        <javac srcdir="${test.dir}"
  -            destdir="${build.classes}"
  +        <mkdir dir="${build.testclasses}"/>
  +
  +        <!-- Compile all test classes. -->
  +        <javac srcdir="${build.testsrc}"
  +            destdir="${build.testclasses}"
               debug="${build.debug}"
               optimize="${build.optimize}"
               deprecation="${build.deprecation}"
               target="1.2">
  -            <classpath refid="project.class.path" />
  +            <classpath refid="test.class.path" />
               <include name="**/*.java"/>
           </javac>
   
  -        <copy todir="${build.classes}">
  +        <copy todir="${build.testclasses}">
               <fileset dir="${test.dir}">
                   <exclude name="**/*.java"/>
                   <exclude name="**/package.html"/>
  @@ -170,13 +180,13 @@
               haltonfailure="${junit.failonerror}"
               printsummary="yes"
               dir="${build.tests}">
  -            <classpath refid="project.class.path"/>
  +            <classpath refid="test.class.path"/>
   
               <formatter type="xml"/>    <!-- xml reports for junitreport -->
  -            <formatter type="plain"/>  <!-- text reports for humans     -->
  +            <formatter type="plain" usefile="false"/>  <!-- text reports for humans     -->
   
               <batchtest todir="${build.tests}">
  -                <fileset dir="${build.classes}">
  +                <fileset dir="${build.testclasses}">
                       <include name="**/test/*TestCase.class"/>
                       <exclude name="**/Abstract*"/>
                   </fileset>
  
  
  
  1.5       +2 -0      jakarta-avalon-excalibur/component/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/component/default.properties,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- default.properties	13 Apr 2002 11:26:17 -0000	1.4
  +++ default.properties	16 Apr 2002 12:00:40 -0000	1.5
  @@ -79,6 +79,8 @@
   
   #  location of intermediate products
   build.dir = build
  +build.testsrc = ${build.dir}/testsrc
  +build.testclasses = ${build.dir}/testclasses
   build.lib = ${build.dir}/lib
   build.conf = ${build.dir}/conf
   build.classes = ${build.dir}/classes
  
  
  
  1.16      +22 -12    jakarta-avalon-excalibur/concurrent/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/concurrent/build.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- build.xml	16 Apr 2002 05:12:39 -0000	1.15
  +++ build.xml	16 Apr 2002 12:00:40 -0000	1.16
  @@ -14,10 +14,7 @@
           <pathelement path="${java.class.path}"/>
           <pathelement location="${build.classes}"/>
           <pathelement location="${checkstyle.jar}"/>
  -        <!-- Unit testing deps -->
  -        <pathelement location="${junit.jar}"/>
       </path>
  -    <property name="cp" refid="project.class.path"/>
   
       <path id="tools.class.path">
           <pathelement location="${junit.jar}"/>
  @@ -26,6 +23,13 @@
           <fileset dir="${tools.dir}/ext"/>
       </path>
   
  +    <path id="test.class.path">
  +        <pathelement location="${build.testclasses}"/>
  +        <pathelement location="${junit.jar}"/>
  +        <path refid="project.class.path"/>
  +    </path>
  +    <property name="cp" refid="test.class.path"/>
  +
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  @@ -69,21 +73,27 @@
   
       <!-- Compiles the unit test source code -->
       <target name="compile-test" depends="compile, dependencies-test" description="Compiles the source code">
  +        <mkdir dir="${build.testsrc}"/>
   
  -        <mkdir dir="${build.classes}"/>
  +        <!-- Copy over all of the tests applying test filters -->
  +        <copy todir="${build.testsrc}">
  +            <fileset dir="${test.dir}"/>
  +        </copy>
   
  -        <!-- Compile all classes including the tests. -->
  -        <javac srcdir="${test.dir}"
  -            destdir="${build.classes}"
  +        <mkdir dir="${build.testclasses}"/>
  +
  +        <!-- Compile all test classes. -->
  +        <javac srcdir="${build.testsrc}"
  +            destdir="${build.testclasses}"
               debug="${build.debug}"
               optimize="${build.optimize}"
               deprecation="${build.deprecation}"
               target="1.2">
  -            <classpath refid="project.class.path" />
  +            <classpath refid="test.class.path" />
               <include name="**/*.java"/>
           </javac>
   
  -        <copy todir="${build.classes}">
  +        <copy todir="${build.testclasses}">
               <fileset dir="${test.dir}">
                   <exclude name="**/*.java"/>
                   <exclude name="**/package.html"/>
  @@ -153,13 +163,13 @@
               haltonfailure="${junit.failonerror}"
               printsummary="yes"
               dir="${build.tests}">
  -            <classpath refid="project.class.path"/>
  +            <classpath refid="test.class.path"/>
   
               <formatter type="xml"/>    <!-- xml reports for junitreport -->
  -            <formatter type="plain"/>  <!-- text reports for humans     -->
  +            <formatter type="plain" usefile="false"/>  <!-- text reports for humans     -->
   
               <batchtest todir="${build.tests}">
  -                <fileset dir="${build.classes}">
  +                <fileset dir="${build.testclasses}">
                       <include name="**/test/*TestCase.class"/>
                       <exclude name="**/Abstract*"/>
                   </fileset>
  
  
  
  1.6       +2 -0      jakarta-avalon-excalibur/concurrent/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/concurrent/default.properties,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- default.properties	14 Apr 2002 10:19:38 -0000	1.5
  +++ default.properties	16 Apr 2002 12:00:40 -0000	1.6
  @@ -26,6 +26,8 @@
   
   #  location of intermediate products
   build.dir = build
  +build.testsrc = ${build.dir}/testsrc
  +build.testclasses = ${build.dir}/testclasses
   build.lib = ${build.dir}/lib
   build.conf = ${build.dir}/conf
   build.classes = ${build.dir}/classes
  
  
  
  1.4       +6 -2      jakarta-avalon-excalibur/datasource/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/datasource/ant.properties.sample,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ant.properties.sample	13 Apr 2002 08:30:05 -0000	1.3
  +++ ant.properties.sample	16 Apr 2002 12:00:40 -0000	1.4
  @@ -10,7 +10,7 @@
   # It is overridden by ../ant.properties and ~/build.properties
   # It overrides all default.properties files and ~/.ant.properties
   #
  -# $Id: ant.properties.sample,v 1.3 2002/04/13 08:30:05 jefft Exp $
  +# $Id: ant.properties.sample,v 1.4 2002/04/16 12:00:40 jefft Exp $
   # -----------------------------------------------------------------------------
   
   # ----- Compile Control Flags -----
  @@ -62,12 +62,16 @@
   #                OPTIONAL LIBRARIES
   # --------------------------------------------------
   
  +# For J2eeDataSource inclusion
  +jdbc.home=${base.path}/jdbc2_0
  +jdbc.lib=${jdbc.home}
  +jdbc.jar=${jdbc.lib}/jdbc2_0-stdext.jar
  +
   # ----- JUnit Unit Test Suite, version 3.7 or later. -----
   #  Not needed if junit.jar is in $ANT_HOME/lib 
   junit.home=${base.path}/junit3.7
   junit.lib=${junit.home}
   junit.jar=${junit.lib}/junit.jar
  -
   
   # ----- Checkstyle, version 2.1 or later -----
   # Uncomment the 'do.checkstyle' flag property to enable checkstyle
  
  
  
  1.13      +16 -15    jakarta-avalon-excalibur/datasource/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/datasource/build.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- build.xml	16 Apr 2002 05:12:39 -0000	1.12
  +++ build.xml	16 Apr 2002 12:00:40 -0000	1.13
  @@ -14,17 +14,11 @@
           <pathelement path="${java.class.path}"/>
           <pathelement location="${build.classes}"/>
           <pathelement location="${checkstyle.jar}"/>
  +        <pathelement location="${jdbc.jar}"/>
           <pathelement location="${avalon-framework.jar}"/>
           <pathelement location="${avalon-logkit.jar}"/>
           <pathelement location="${excalibur-pool.jar}"/>
  -        <!-- Unit testing deps -->
  -        <pathelement location="${junit.jar}"/>
  -        <pathelement location="${excalibur-testcase.jar}"/>
  -        <pathelement location="${excalibur-component.jar}"/>
  -        <pathelement location="${excalibur-logger.jar}"/>
  -        <pathelement location="${build.testclasses}"/>
       </path>
  -    <property name="cp" refid="project.class.path"/>
   
       <path id="tools.class.path">
           <pathelement location="${junit.jar}"/>
  @@ -34,9 +28,16 @@
       </path>
   
       <path id="test.class.path">
  -        <path refid="tools.class.path"/>
  +        <pathelement location="${build.testclasses}"/>
  +        <pathelement location="${junit.jar}"/>
  +        <pathelement location="${excalibur-testcase.jar}"/>
  +        <pathelement location="${excalibur-component.jar}"/>
  +        <pathelement location="${excalibur-logger.jar}"/>
  +        <pathelement location="${excalibur-concurrent.jar}"/>
  +        <pathelement location="${excalibur-collections.jar}"/>
           <path refid="project.class.path"/>
       </path>
  +    <property name="cp" refid="test.class.path"/>
   
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
  @@ -56,6 +57,8 @@
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkTestcase"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkComponent"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkLogger"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkConcurrent"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCollections"/>
       </target>
   
   
  @@ -153,8 +156,8 @@
   
       <!-- Compiles the unit test source code -->
       <target name="compile-test" depends="compile, dependencies-test" description="Compiles the source code">
  -        <!-- Copy over all of the tests applying test filters -->
           <mkdir dir="${build.testsrc}"/>
  +
           <copy todir="${build.testsrc}">
               <filterset>
                   <filter token="test.jdbc.driver"   value="${test.jdbc.driver}"/>
  @@ -164,10 +167,7 @@
               </filterset>
   
               <!-- All tests in the src/test directory -->
  -            <fileset dir="${test.dir}">
  -                <include name="**/test/**"/>
  -                <include name="*Test.java"/>
  -            </fileset>
  +            <fileset dir="${test.dir}"/>
           </copy>
   
           <mkdir dir="${build.testclasses}"/>
  @@ -180,6 +180,7 @@
               deprecation="${build.deprecation}"
               target="1.2">
               <classpath refid="test.class.path" />
  +            <include name="**/*.java"/>
           </javac>
    
           <!-- Copy all test resources -->
  @@ -290,10 +291,10 @@
               <sysproperty key="test.jdbc.password" value="${test.jdbc.password}"/>
   
   
  -            <classpath refid="project.class.path"/>
  +            <classpath refid="test.class.path"/>
   
               <formatter type="xml"/>    <!-- xml reports for junitreport -->
  -            <formatter type="plain"/>  <!-- text reports for humans     -->
  +            <formatter type="plain" usefile="false"/>  <!-- text reports for humans     -->
   
               <batchtest todir="${build.tests}">
                   <fileset dir="${build.testclasses}">
  
  
  
  1.6       +11 -0     jakarta-avalon-excalibur/datasource/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/datasource/default.properties,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- default.properties	13 Apr 2002 11:26:17 -0000	1.5
  +++ default.properties	16 Apr 2002 12:00:40 -0000	1.6
  @@ -52,6 +52,15 @@
   excalibur-logger.lib=${excalibur-logger.home}
   excalibur-logger.jar=${excalibur-logger.lib}/excalibur-logger-1.0.jar
   
  +# ----- Excalibur Concurrent, version 1.0 or later -----
  +excalibur-concurrent.home=${basedir}/../concurrent/dist
  +excalibur-concurrent.lib=${excalibur-concurrent.home}
  +excalibur-concurrent.jar=${excalibur-concurrent.lib}/excalibur-concurrent-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
   
   # --------------------------------------------------
   
  @@ -64,6 +73,8 @@
   
   #  location of intermediate products
   build.dir = build
  +build.testsrc = ${build.dir}/testsrc
  +build.testclasses = ${build.dir}/testclasses
   build.src = ${build.dir}/src
   build.testsrc = ${build.dir}/testsrc
   build.testclasses = ${build.dir}/testclasses
  
  
  
  1.20      +22 -12    jakarta-avalon-excalibur/event/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/event/build.xml,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- build.xml	16 Apr 2002 05:12:39 -0000	1.19
  +++ build.xml	16 Apr 2002 12:00:40 -0000	1.20
  @@ -23,10 +23,7 @@
           <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"/>
   
       <path id="tools.class.path">
           <pathelement location="${junit.jar}"/>
  @@ -35,6 +32,13 @@
           <fileset dir="${tools.dir}/ext"/>
       </path>
   
  +    <path id="test.class.path">
  +        <pathelement location="${build.testclasses}"/>
  +        <pathelement location="${junit.jar}"/>
  +        <path refid="project.class.path"/>
  +    </path>
  +    <property name="cp" refid="test.class.path"/>
  +
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  @@ -85,21 +89,27 @@
   
       <!-- Compiles the unit test source code -->
       <target name="compile-test" depends="compile, dependencies-test" description="Compiles the source code">
  +        <mkdir dir="${build.testsrc}"/>
   
  -        <mkdir dir="${build.classes}"/>
  +        <!-- Copy over all of the tests applying test filters -->
  +        <copy todir="${build.testsrc}">
  +            <fileset dir="${test.dir}"/>
  +        </copy>
   
  -        <!-- Compile all classes including the tests. -->
  -        <javac srcdir="${test.dir}"
  -            destdir="${build.classes}"
  +        <mkdir dir="${build.testclasses}"/>
  +
  +        <!-- Compile all test classes. -->
  +        <javac srcdir="${build.testsrc}"
  +            destdir="${build.testclasses}"
               debug="${build.debug}"
               optimize="${build.optimize}"
               deprecation="${build.deprecation}"
               target="1.2">
  -            <classpath refid="project.class.path" />
  +            <classpath refid="test.class.path" />
               <include name="**/*.java"/>
           </javac>
   
  -        <copy todir="${build.classes}">
  +        <copy todir="${build.testclasses}">
               <fileset dir="${test.dir}">
                   <exclude name="**/*.java"/>
                   <exclude name="**/package.html"/>
  @@ -169,13 +179,13 @@
               haltonfailure="${junit.failonerror}"
               printsummary="yes"
               dir="${build.tests}">
  -            <classpath refid="project.class.path"/>
  +            <classpath refid="test.class.path"/>
   
               <formatter type="xml"/>    <!-- xml reports for junitreport -->
  -            <formatter type="plain"/>  <!-- text reports for humans     -->
  +            <formatter type="plain" usefile="false"/>  <!-- text reports for humans     -->
   
               <batchtest todir="${build.tests}">
  -                <fileset dir="${build.classes}">
  +                <fileset dir="${build.testclasses}">
                       <include name="**/test/*TestCase.class"/>
                       <exclude name="**/Abstract*"/>
                   </fileset>
  
  
  
  1.7       +2 -0      jakarta-avalon-excalibur/event/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/event/default.properties,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- default.properties	13 Apr 2002 11:26:17 -0000	1.6
  +++ default.properties	16 Apr 2002 12:00:40 -0000	1.7
  @@ -77,6 +77,8 @@
   
   #  location of intermediate products
   build.dir = build
  +build.testsrc = ${build.dir}/testsrc
  +build.testclasses = ${build.dir}/testclasses
   build.lib = ${build.dir}/lib
   build.conf = ${build.dir}/conf
   build.classes = ${build.dir}/classes
  
  
  
  1.42      +22 -12    jakarta-avalon-excalibur/extension/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/extension/build.xml,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- build.xml	16 Apr 2002 05:12:39 -0000	1.41
  +++ build.xml	16 Apr 2002 12:00:40 -0000	1.42
  @@ -14,10 +14,7 @@
           <pathelement path="${java.class.path}"/>
           <pathelement location="${build.classes}"/>
           <pathelement location="${checkstyle.jar}"/>
  -        <!-- Unit testing deps -->
  -        <pathelement location="${junit.jar}"/>
       </path>
  -    <property name="cp" refid="project.class.path"/>
   
       <path id="tools.class.path">
           <pathelement location="${junit.jar}"/>
  @@ -26,6 +23,13 @@
           <fileset dir="${tools.dir}/ext"/>
       </path>
   
  +    <path id="test.class.path">
  +        <pathelement location="${build.testclasses}"/>
  +        <pathelement location="${junit.jar}"/>
  +        <path refid="project.class.path"/>
  +    </path>
  +    <property name="cp" refid="test.class.path"/>
  +
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  @@ -69,21 +73,27 @@
   
       <!-- Compiles the unit test source code -->
       <target name="compile-test" depends="compile, dependencies-test" description="Compiles the source code">
  +        <mkdir dir="${build.testsrc}"/>
   
  -        <mkdir dir="${build.classes}"/>
  +        <!-- Copy over all of the tests applying test filters -->
  +        <copy todir="${build.testsrc}">
  +            <fileset dir="${test.dir}"/>
  +        </copy>
   
  -        <!-- Compile all classes including the tests. -->
  -        <javac srcdir="${test.dir}"
  -            destdir="${build.classes}"
  +        <mkdir dir="${build.testclasses}"/>
  +
  +        <!-- Compile all test classes. -->
  +        <javac srcdir="${build.testsrc}"
  +            destdir="${build.testclasses}"
               debug="${build.debug}"
               optimize="${build.optimize}"
               deprecation="${build.deprecation}"
               target="1.2">
  -            <classpath refid="project.class.path" />
  +            <classpath refid="test.class.path" />
               <include name="**/*.java"/>
           </javac>
   
  -        <copy todir="${build.classes}">
  +        <copy todir="${build.testclasses}">
               <fileset dir="${test.dir}">
                   <exclude name="**/*.java"/>
                   <exclude name="**/package.html"/>
  @@ -153,13 +163,13 @@
               haltonfailure="${junit.failonerror}"
               printsummary="yes"
               dir="${build.tests}">
  -            <classpath refid="project.class.path"/>
  +            <classpath refid="test.class.path"/>
   
               <formatter type="xml"/>    <!-- xml reports for junitreport -->
  -            <formatter type="plain"/>  <!-- text reports for humans     -->
  +            <formatter type="plain" usefile="false"/>  <!-- text reports for humans     -->
   
               <batchtest todir="${build.tests}">
  -                <fileset dir="${build.classes}">
  +                <fileset dir="${build.testclasses}">
                       <include name="**/test/*TestCase.class"/>
                       <exclude name="**/Abstract*"/>
                   </fileset>
  
  
  
  1.5       +2 -0      jakarta-avalon-excalibur/extension/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/extension/default.properties,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- default.properties	13 Apr 2002 11:26:17 -0000	1.4
  +++ default.properties	16 Apr 2002 12:00:40 -0000	1.5
  @@ -21,6 +21,8 @@
   
   #  location of intermediate products
   build.dir = build
  +build.testsrc = ${build.dir}/testsrc
  +build.testclasses = ${build.dir}/testclasses
   build.lib = ${build.dir}/lib
   build.conf = ${build.dir}/conf
   build.classes = ${build.dir}/classes
  
  
  
  1.11      +30 -14    jakarta-avalon-excalibur/fortress/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/build.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- build.xml	16 Apr 2002 05:12:40 -0000	1.10
  +++ build.xml	16 Apr 2002 12:00:41 -0000	1.11
  @@ -21,16 +21,23 @@
           <pathelement location="${excalibur-instrument.jar}"/>
           <pathelement location="${excalibur-instrument-manager.jar}"/>
           <pathelement location="${excalibur-instrument-manager-interfaces.jar}"/>
  -        <pathelement location="${excalibur-testcase.jar}"/>
           <pathelement location="${excalibur-event.jar}"/>
           <pathelement location="${excalibur-util.jar}"/>
           <pathelement location="${excalibur-component.jar}"/>
           <pathelement location="${excalibur-logger.jar}"/>
           <pathelement location="${checkstyle.jar}"/>
  -        <!-- Unit testing deps -->
  +    </path>
  +
  +    <path id="test.class.path">
  +        <pathelement location="${build.testclasses}"/>
           <pathelement location="${junit.jar}"/>
  +        <pathelement location="${excalibur-testcase.jar}"/>
  +        <pathelement location="${excalibur-datasource.jar}"/>
  +        <pathelement location="${excalibur-pool.jar}"/>
  +        <pathelement location="${excalibur-cache.jar}"/>
  +        <path refid="project.class.path"/>
       </path>
  -    <property name="cp" refid="project.class.path"/>
  +    <property name="cp" refid="test.class.path"/>
   
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
  @@ -45,7 +52,6 @@
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkInstrument"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkManagerInterfaces"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkManager"/>
  -        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkTestcase"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkEvent"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkComponent"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkLogger"/>
  @@ -62,7 +68,11 @@
           <!-- Need the jar to prevent recursive deps. -->
   
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkJUnit"/>
  -    </target>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkTestcase"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkDatasource"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkPool"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCache"/>
  +     </target>
   
   
       <!-- Compiles the source code -->
  @@ -93,21 +103,27 @@
   
       <!-- Compiles the unit test source code -->
       <target name="compile-test" depends="compile, dependencies-test" description="Compiles the source code">
  +        <mkdir dir="${build.testsrc}"/>
   
  -        <mkdir dir="${build.classes}"/>
  +        <!-- Copy over all of the tests applying test filters -->
  +        <copy todir="${build.testsrc}">
  +            <fileset dir="${test.dir}"/>
  +        </copy>
   
  -        <!-- Compile all classes including the tests. -->
  -        <javac srcdir="${test.dir}"
  -            destdir="${build.classes}"
  +        <mkdir dir="${build.testclasses}"/>
  +
  +        <!-- Compile all test classes. -->
  +        <javac srcdir="${build.testsrc}"
  +            destdir="${build.testclasses}"
               debug="${build.debug}"
               optimize="${build.optimize}"
               deprecation="${build.deprecation}"
               target="1.2">
  -            <classpath refid="project.class.path" />
  +            <classpath refid="test.class.path" />
               <include name="**/*.java"/>
           </javac>
   
  -        <copy todir="${build.classes}">
  +        <copy todir="${build.testclasses}">
               <fileset dir="${test.dir}">
                   <exclude name="**/*.java"/>
                   <exclude name="**/package.html"/>
  @@ -177,13 +193,13 @@
               haltonfailure="${junit.failonerror}"
               printsummary="yes"
               dir="${build.tests}">
  -            <classpath refid="project.class.path"/>
  +            <classpath refid="test.class.path"/>
   
               <formatter type="xml"/>    <!-- xml reports for junitreport -->
  -            <formatter type="plain"/>  <!-- text reports for humans     -->
  +            <formatter type="plain" usefile="false"/>  <!-- text reports for humans     -->
   
               <batchtest todir="${build.tests}">
  -                <fileset dir="${build.classes}">
  +                <fileset dir="${build.testclasses}">
                       <include name="**/test/*TestCase.class"/>
                       <exclude name="**/Abstract*"/>
                   </fileset>
  
  
  
  1.6       +28 -5     jakarta-avalon-excalibur/fortress/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/default.properties,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- default.properties	13 Apr 2002 11:26:17 -0000	1.5
  +++ default.properties	16 Apr 2002 12:00:41 -0000	1.6
  @@ -38,11 +38,6 @@
   excalibur-instrument-manager.jar=${excalibur-instrument-manager.lib}/excalibur-instrument-manager-0.1.jar
   excalibur-instrument-manager-interfaces.jar=${excalibur-instrument-manager.lib}/excalibur-instrument-manager-interfaces-0.1.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 event, version 1.0 or later -----
   excalibur-event.home=${basedir}/../event/dist
   excalibur-event.lib=${excalibur-event.home}
  @@ -74,6 +69,32 @@
   avalon-logkit.jar=${avalon-logkit.lib}/logkit.jar
   
   # --------------------------------------------------
  +#                REQUIRED LIBRARIES
  +# --------------------------------------------------
  +
  +# For unit testing
  +
  +# ----- Excalibur datasource, version 1.0 or later -----
  +excalibur-datasource.home=${basedir}/../datasource/dist
  +excalibur-datasource.lib=${excalibur-datasource.home}
  +excalibur-datasource.jar=${excalibur-datasource.lib}/excalibur-datasource-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
  +
  +# ----- Excalibur cache, version 1.0 or later -----
  +excalibur-cache.home=${basedir}/../cache/dist
  +excalibur-cache.lib=${excalibur-cache.home}
  +excalibur-cache.jar=${excalibur-cache.lib}/excalibur-cache-1.0a.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
  +
  +# --------------------------------------------------
   
   #  Settings used to configure compile environment
   build.debug = on
  @@ -84,6 +105,8 @@
   
   #  location of intermediate products
   build.dir = build
  +build.testsrc = ${build.dir}/testsrc
  +build.testclasses = ${build.dir}/testclasses
   build.lib = ${build.dir}/lib
   build.conf = ${build.dir}/conf
   build.classes = ${build.dir}/classes
  
  
  
  1.40      +22 -12    jakarta-avalon-excalibur/i18n/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/i18n/build.xml,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- build.xml	16 Apr 2002 05:12:40 -0000	1.39
  +++ build.xml	16 Apr 2002 12:00:41 -0000	1.40
  @@ -14,10 +14,7 @@
           <pathelement path="${java.class.path}"/>
           <pathelement location="${build.classes}"/>
           <pathelement location="${checkstyle.jar}"/>
  -        <!-- Unit testing deps -->
  -        <pathelement location="${junit.jar}"/>
       </path>
  -    <property name="cp" refid="project.class.path"/>
   
       <path id="tools.class.path">
           <pathelement location="${junit.jar}"/>
  @@ -26,6 +23,13 @@
           <fileset dir="${tools.dir}/ext"/>
       </path>
   
  +    <path id="test.class.path">
  +        <pathelement location="${build.testclasses}"/>
  +        <pathelement location="${junit.jar}"/>
  +        <path refid="project.class.path"/>
  +    </path>
  +    <property name="cp" refid="test.class.path"/>
  +
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  @@ -69,21 +73,27 @@
   
       <!-- Compiles the unit test source code -->
       <target name="compile-test" depends="compile, dependencies-test" description="Compiles the source code">
  +        <mkdir dir="${build.testsrc}"/>
   
  -        <mkdir dir="${build.classes}"/>
  +        <!-- Copy over all of the tests applying test filters -->
  +        <copy todir="${build.testsrc}">
  +            <fileset dir="${test.dir}"/>
  +        </copy>
   
  -        <!-- Compile all classes including the tests. -->
  -        <javac srcdir="${test.dir}"
  -            destdir="${build.classes}"
  +        <mkdir dir="${build.testclasses}"/>
  +
  +        <!-- Compile all test classes. -->
  +        <javac srcdir="${build.testsrc}"
  +            destdir="${build.testclasses}"
               debug="${build.debug}"
               optimize="${build.optimize}"
               deprecation="${build.deprecation}"
               target="1.2">
  -            <classpath refid="project.class.path" />
  +            <classpath refid="test.class.path" />
               <include name="**/*.java"/>
           </javac>
   
  -        <copy todir="${build.classes}">
  +        <copy todir="${build.testclasses}">
               <fileset dir="${test.dir}">
                   <exclude name="**/*.java"/>
                   <exclude name="**/package.html"/>
  @@ -153,13 +163,13 @@
               haltonfailure="${junit.failonerror}"
               printsummary="yes"
               dir="${build.tests}">
  -            <classpath refid="project.class.path"/>
  +            <classpath refid="test.class.path"/>
   
               <formatter type="xml"/>    <!-- xml reports for junitreport -->
  -            <formatter type="plain"/>  <!-- text reports for humans     -->
  +            <formatter type="plain" usefile="false"/>  <!-- text reports for humans     -->
   
               <batchtest todir="${build.tests}">
  -                <fileset dir="${build.classes}">
  +                <fileset dir="${build.testclasses}">
                       <include name="**/test/*TestCase.class"/>
                       <exclude name="**/Abstract*"/>
                   </fileset>
  
  
  
  1.5       +2 -0      jakarta-avalon-excalibur/i18n/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/i18n/default.properties,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- default.properties	13 Apr 2002 11:26:17 -0000	1.4
  +++ default.properties	16 Apr 2002 12:00:41 -0000	1.5
  @@ -22,6 +22,8 @@
   
   #  location of intermediate products
   build.dir = build
  +build.testsrc = ${build.dir}/testsrc
  +build.testclasses = ${build.dir}/testclasses
   build.lib = ${build.dir}/lib
   build.conf = ${build.dir}/conf
   build.classes = ${build.dir}/classes
  
  
  
  1.18      +22 -12    jakarta-avalon-excalibur/instrument/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument/build.xml,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- build.xml	16 Apr 2002 05:12:40 -0000	1.17
  +++ build.xml	16 Apr 2002 12:00:41 -0000	1.18
  @@ -14,10 +14,7 @@
           <pathelement path="${java.class.path}"/>
           <pathelement location="${build.classes}"/>
           <pathelement location="${checkstyle.jar}"/>
  -        <!-- Unit testing deps -->
  -        <pathelement location="${junit.jar}"/>
       </path>
  -    <property name="cp" refid="project.class.path"/>
   
       <path id="tools.class.path">
           <pathelement location="${junit.jar}"/>
  @@ -26,6 +23,13 @@
           <fileset dir="${tools.dir}/ext"/>
       </path>
   
  +    <path id="test.class.path">
  +        <pathelement location="${build.testclasses}"/>
  +        <pathelement location="${junit.jar}"/>
  +        <path refid="project.class.path"/>
  +    </path>
  +    <property name="cp" refid="test.class.path"/>
  +
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  @@ -69,21 +73,27 @@
   
       <!-- Compiles the unit test source code -->
       <target name="compile-test" depends="compile, dependencies-test" description="Compiles the source code">
  +        <mkdir dir="${build.testsrc}"/>
   
  -        <mkdir dir="${build.classes}"/>
  +        <!-- Copy over all of the tests applying test filters -->
  +        <copy todir="${build.testsrc}">
  +            <fileset dir="${test.dir}"/>
  +        </copy>
   
  -        <!-- Compile all classes including the tests. -->
  -        <javac srcdir="${test.dir}"
  -            destdir="${build.classes}"
  +        <mkdir dir="${build.testclasses}"/>
  +
  +        <!-- Compile all test classes. -->
  +        <javac srcdir="${build.testsrc}"
  +            destdir="${build.testclasses}"
               debug="${build.debug}"
               optimize="${build.optimize}"
               deprecation="${build.deprecation}"
               target="1.2">
  -            <classpath refid="project.class.path" />
  +            <classpath refid="test.class.path" />
               <include name="**/*.java"/>
           </javac>
   
  -        <copy todir="${build.classes}">
  +        <copy todir="${build.testclasses}">
               <fileset dir="${test.dir}">
                   <exclude name="**/*.java"/>
               </fileset>
  @@ -152,13 +162,13 @@
               haltonfailure="${junit.failonerror}"
               printsummary="yes"
               dir="${build.tests}">
  -            <classpath refid="project.class.path"/>
  +            <classpath refid="test.class.path"/>
   
               <formatter type="xml"/>    <!-- xml reports for junitreport -->
  -            <formatter type="plain"/>  <!-- text reports for humans     -->
  +            <formatter type="plain" usefile="false"/>  <!-- text reports for humans     -->
   
               <batchtest todir="${build.tests}">
  -                <fileset dir="${build.classes}">
  +                <fileset dir="${build.testclasses}">
                       <include name="**/test/*TestCase.class"/>
                       <exclude name="**/Abstract*"/>
                   </fileset>
  
  
  
  1.5       +2 -0      jakarta-avalon-excalibur/instrument/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument/default.properties,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- default.properties	13 Apr 2002 11:26:17 -0000	1.4
  +++ default.properties	16 Apr 2002 12:00:41 -0000	1.5
  @@ -26,6 +26,8 @@
   
   #  location of intermediate products
   build.dir = ${basedir}/build
  +build.testsrc = ${build.dir}/testsrc
  +build.testclasses = ${build.dir}/testclasses
   build.lib = ${build.dir}/lib
   build.conf = ${build.dir}/conf
   build.classes = ${build.dir}/classes
  
  
  
  1.24      +22 -13    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.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- build.xml	16 Apr 2002 05:12:40 -0000	1.23
  +++ build.xml	16 Apr 2002 12:00:41 -0000	1.24
  @@ -19,11 +19,8 @@
           <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>
  -    <property name="cp" refid="project.class.path"/>
           
       <path id="tools.class.path">
           <pathelement location="${junit.jar}"/>
  @@ -31,7 +28,13 @@
           <fileset dir="${tools.dir}/lib"/>
           <fileset dir="${tools.dir}/ext"/>
       </path>        
  -        
  + 
  +    <path id="test.class.path">
  +        <pathelement location="${build.testclasses}"/>
  +        <pathelement location="${junit.jar}"/>
  +        <path refid="project.class.path"/>
  +    </path>
  +    <property name="cp" refid="test.class.path"/>
   
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
  @@ -84,21 +87,27 @@
   
       <!-- Compiles the unit test source code -->
       <target name="compile-test" depends="compile, dependencies-test" description="Compiles the source code">
  +        <mkdir dir="${build.testsrc}"/>
   
  -        <mkdir dir="${build.classes}"/>
  +        <!-- Copy over all of the tests applying test filters -->
  +        <copy todir="${build.testsrc}">
  +            <fileset dir="${test.dir}"/>
  +        </copy>
   
  -        <!-- Compile all classes including the tests. -->
  -        <javac srcdir="${test.dir}"
  -            destdir="${build.classes}"
  +        <mkdir dir="${build.testclasses}"/>
  +
  +        <!-- Compile all test classes. -->
  +        <javac srcdir="${build.testsrc}"
  +            destdir="${build.testclasses}"
               debug="${build.debug}"
               optimize="${build.optimize}"
               deprecation="${build.deprecation}"
               target="1.2">
  -            <classpath refid="project.class.path" />
  +            <classpath refid="test.class.path" />
               <include name="**/*.java"/>
           </javac>
   
  -        <copy todir="${build.classes}">
  +        <copy todir="${build.testclasses}">
               <fileset dir="${test.dir}">
                   <exclude name="**/*.java"/>
                   <exclude name="**/package.html"/>
  @@ -174,13 +183,13 @@
               haltonfailure="${junit.failonerror}"
               printsummary="yes"
               dir="${build.tests}">
  -            <classpath refid="project.class.path"/>
  +            <classpath refid="test.class.path"/>
   
               <formatter type="xml"/>    <!-- xml reports for junitreport -->
  -            <formatter type="plain"/>  <!-- text reports for humans     -->
  +            <formatter type="plain" usefile="false"/>  <!-- text reports for humans     -->
   
               <batchtest todir="${build.tests}">
  -                <fileset dir="${build.classes}">
  +                <fileset dir="${build.testclasses}">
                       <include name="**/test/*TestCase.class"/>
                       <exclude name="**/Abstract*"/>
                   </fileset>
  
  
  
  1.5       +2 -0      jakarta-avalon-excalibur/instrument-client/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-client/default.properties,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- default.properties	13 Apr 2002 11:26:17 -0000	1.4
  +++ default.properties	16 Apr 2002 12:00:41 -0000	1.5
  @@ -45,6 +45,8 @@
   
   #  location of intermediate products
   build.dir = ${basedir}/build
  +build.testsrc = ${build.dir}/testsrc
  +build.testclasses = ${build.dir}/testclasses
   build.lib = ${build.dir}/lib
   build.conf = ${build.dir}/conf
   build.classes = ${build.dir}/classes
  
  
  
  1.23      +22 -12    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.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- build.xml	16 Apr 2002 05:12:40 -0000	1.22
  +++ build.xml	16 Apr 2002 12:00:41 -0000	1.23
  @@ -25,10 +25,7 @@
           <pathelement location="${excalibur-altrmi-server-impl.jar}"/>
           <pathelement location="${excalibur-altrmi-server-interfaces.jar}"/>
           <pathelement location="${checkstyle.jar}"/>
  -        <!-- Unit testing deps -->
  -        <pathelement location="${junit.jar}"/>
       </path>
  -    <property name="cp" refid="project.class.path"/>
   
       <path id="tools.class.path">
           <pathelement location="${junit.jar}"/>
  @@ -37,6 +34,13 @@
           <fileset dir="${tools.dir}/ext"/>
       </path>
   
  +    <path id="test.class.path">
  +        <pathelement location="${build.testclasses}"/>
  +        <pathelement location="${junit.jar}"/>
  +        <path refid="project.class.path"/>
  +    </path>
  +    <property name="cp" refid="test.class.path"/>
  +
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  @@ -101,21 +105,27 @@
   
       <!-- Compiles the unit test source code -->
       <target name="compile-test" depends="compile, dependencies-test" description="Compiles the source code">
  +        <mkdir dir="${build.testsrc}"/>
   
  -        <mkdir dir="${build.classes}"/>
  +        <!-- Copy over all of the tests applying test filters -->
  +        <copy todir="${build.testsrc}">
  +            <fileset dir="${test.dir}"/>
  +        </copy>
   
  -        <!-- Compile all classes including the tests. -->
  -        <javac srcdir="${test.dir}"
  -            destdir="${build.classes}"
  +        <mkdir dir="${build.testclasses}"/>
  +
  +        <!-- Compile all test classes. -->
  +        <javac srcdir="${build.testsrc}"
  +            destdir="${build.testclasses}"
               debug="${build.debug}"
               optimize="${build.optimize}"
               deprecation="${build.deprecation}"
               target="1.2">
  -            <classpath refid="project.class.path" />
  +            <classpath refid="test.class.path" />
               <include name="**/*.java"/>
           </javac>
   
  -        <copy todir="${build.classes}">
  +        <copy todir="${build.testclasses}">
               <fileset dir="${test.dir}">
                   <exclude name="**/*.java"/>
                   <exclude name="**/package.html"/>
  @@ -195,13 +205,13 @@
               haltonfailure="${junit.failonerror}"
               printsummary="yes"
               dir="${build.tests}">
  -            <classpath refid="project.class.path"/>
  +            <classpath refid="test.class.path"/>
   
               <formatter type="xml"/>    <!-- xml reports for junitreport -->
  -            <formatter type="plain"/>  <!-- text reports for humans     -->
  +            <formatter type="plain" usefile="false"/>  <!-- text reports for humans     -->
   
               <batchtest todir="${build.tests}">
  -                <fileset dir="${build.classes}">
  +                <fileset dir="${build.testclasses}">
                       <include name="**/test/*TestCase.class"/>
                       <exclude name="**/Abstract*"/>
                   </fileset>
  
  
  
  1.5       +2 -0      jakarta-avalon-excalibur/instrument-manager/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-manager/default.properties,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- default.properties	13 Apr 2002 11:26:18 -0000	1.4
  +++ default.properties	16 Apr 2002 12:00:41 -0000	1.5
  @@ -75,6 +75,8 @@
   
   #  location of intermediate products
   build.dir = ${basedir}/build
  +build.testsrc = ${build.dir}/testsrc
  +build.testclasses = ${build.dir}/testclasses
   build.lib = ${build.dir}/lib
   build.conf = ${build.dir}/conf
   build.classes = ${build.dir}/classes
  
  
  
  1.45      +22 -12    jakarta-avalon-excalibur/io/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/io/build.xml,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- build.xml	16 Apr 2002 05:12:40 -0000	1.44
  +++ build.xml	16 Apr 2002 12:00:41 -0000	1.45
  @@ -14,10 +14,7 @@
           <pathelement path="${java.class.path}"/>
           <pathelement location="${build.classes}"/>
           <pathelement location="${checkstyle.jar}"/>
  -        <!-- Unit testing deps -->
  -        <pathelement location="${junit.jar}"/>
       </path>
  -    <property name="cp" refid="project.class.path"/>
   
       <path id="tools.class.path">
           <pathelement location="${junit.jar}"/>
  @@ -26,6 +23,13 @@
           <fileset dir="${tools.dir}/ext"/>
       </path>
   
  +    <path id="test.class.path">
  +        <pathelement location="${build.testclasses}"/>
  +        <pathelement location="${junit.jar}"/>
  +        <path refid="project.class.path"/>
  +    </path>
  +    <property name="cp" refid="test.class.path"/>
  +
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  @@ -69,21 +73,27 @@
   
       <!-- Compiles the unit test source code -->
       <target name="compile-test" depends="compile, dependencies-test" description="Compiles the source code">
  +        <mkdir dir="${build.testsrc}"/>
   
  -        <mkdir dir="${build.classes}"/>
  +        <!-- Copy over all of the tests applying test filters -->
  +        <copy todir="${build.testsrc}">
  +            <fileset dir="${test.dir}"/>
  +        </copy>
   
  -        <!-- Compile all classes including the tests. -->
  -        <javac srcdir="${test.dir}"
  -            destdir="${build.classes}"
  +        <mkdir dir="${build.testclasses}"/>
  +
  +        <!-- Compile all test classes. -->
  +        <javac srcdir="${build.testsrc}"
  +            destdir="${build.testclasses}"
               debug="${build.debug}"
               optimize="${build.optimize}"
               deprecation="${build.deprecation}"
               target="1.2">
  -            <classpath refid="project.class.path" />
  +            <classpath refid="test.class.path" />
               <include name="**/*.java"/>
           </javac>
   
  -        <copy todir="${build.classes}">
  +        <copy todir="${build.testclasses}">
               <fileset dir="${test.dir}">
                   <exclude name="**/*.java"/>
                   <exclude name="**/package.html"/>
  @@ -153,13 +163,13 @@
               haltonfailure="${junit.failonerror}"
               printsummary="yes"
               dir="${build.tests}">
  -            <classpath refid="project.class.path"/>
  +            <classpath refid="test.class.path"/>
   
               <formatter type="xml"/>    <!-- xml reports for junitreport -->
  -            <formatter type="plain"/>  <!-- text reports for humans     -->
  +            <formatter type="plain" usefile="false"/>  <!-- text reports for humans     -->
   
               <batchtest todir="${build.tests}">
  -                <fileset dir="${build.classes}">
  +                <fileset dir="${build.testclasses}">
                       <include name="**/test/*TestCase.class"/>
                       <exclude name="**/Abstract*"/>
                   </fileset>
  
  
  
  1.7       +2 -0      jakarta-avalon-excalibur/io/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/io/default.properties,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- default.properties	14 Apr 2002 11:11:29 -0000	1.6
  +++ default.properties	16 Apr 2002 12:00:41 -0000	1.7
  @@ -21,6 +21,8 @@
   
   #  location of intermediate products
   build.dir = build
  +build.testsrc = ${build.dir}/testsrc
  +build.testclasses = ${build.dir}/testclasses
   build.lib = ${build.dir}/lib
   build.conf = ${build.dir}/conf
   build.classes = ${build.dir}/classes
  
  
  
  1.12      +26 -16    jakarta-avalon-excalibur/logger/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/logger/build.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- build.xml	16 Apr 2002 05:12:40 -0000	1.11
  +++ build.xml	16 Apr 2002 12:00:41 -0000	1.12
  @@ -16,14 +16,7 @@
           <pathelement location="${avalon-logkit.jar}"/>
           <pathelement location="${avalon-framework.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"/>
   
       <path id="tools.class.path">
           <pathelement location="${junit.jar}"/>
  @@ -32,6 +25,17 @@
           <fileset dir="${tools.dir}/ext"/>
       </path>
   
  +    <path id="test.class.path">
  +        <pathelement location="${build.testclasses}"/>
  +        <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 refid="project.class.path"/>
  +    </path>
  +    <property name="cp" refid="test.class.path"/>
  +
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  @@ -105,21 +109,27 @@
   
       <!-- Compiles the unit test source code -->
       <target name="compile-test" depends="compile, dependencies-test" description="Compiles the source code">
  +        <mkdir dir="${build.testsrc}"/>
   
  -        <mkdir dir="${build.classes}"/>
  +        <!-- Copy over all of the tests applying test filters -->
  +        <copy todir="${build.testsrc}">
  +            <fileset dir="${test.dir}"/>
  +        </copy>
   
  -        <!-- Compile all classes including the tests. -->
  -        <javac srcdir="${test.dir}"
  -            destdir="${build.classes}"
  +        <mkdir dir="${build.testclasses}"/>
  +
  +        <!-- Compile all test classes. -->
  +        <javac srcdir="${build.testsrc}"
  +            destdir="${build.testclasses}"
               debug="${build.debug}"
               optimize="${build.optimize}"
               deprecation="${build.deprecation}"
               target="1.2">
  -            <classpath refid="project.class.path" />
  +            <classpath refid="test.class.path" />
               <include name="**/*.java"/>
           </javac>
   
  -        <copy todir="${build.classes}">
  +        <copy todir="${build.testclasses}">
               <fileset dir="${test.dir}">
                   <exclude name="**/*.java"/>
                   <exclude name="**/package.html"/>
  @@ -189,13 +199,13 @@
               haltonfailure="${junit.failonerror}"
               printsummary="yes"
               dir="${build.tests}">
  -            <classpath refid="project.class.path"/>
  +            <classpath refid="test.class.path"/>
   
               <formatter type="xml"/>    <!-- xml reports for junitreport -->
  -            <formatter type="plain"/>  <!-- text reports for humans     -->
  +            <formatter type="plain" usefile="false"/>  <!-- text reports for humans     -->
   
               <batchtest todir="${build.tests}">
  -                <fileset dir="${build.classes}">
  +                <fileset dir="${build.testclasses}">
                       <include name="**/test/*TestCase.class"/>
                       <exclude name="**/Abstract*"/>
                   </fileset>
  
  
  
  1.5       +2 -0      jakarta-avalon-excalibur/logger/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/logger/default.properties,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- default.properties	13 Apr 2002 11:26:18 -0000	1.4
  +++ default.properties	16 Apr 2002 12:00:41 -0000	1.5
  @@ -67,6 +67,8 @@
   
   #  location of intermediate products
   build.dir = build
  +build.testsrc = ${build.dir}/testsrc
  +build.testclasses = ${build.dir}/testclasses
   build.lib = ${build.dir}/lib
   build.conf = ${build.dir}/conf
   build.classes = ${build.dir}/classes
  
  
  
  1.11      +22 -12    jakarta-avalon-excalibur/monitor/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/monitor/build.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- build.xml	16 Apr 2002 05:12:40 -0000	1.10
  +++ build.xml	16 Apr 2002 12:00:41 -0000	1.11
  @@ -14,10 +14,7 @@
           <pathelement path="${java.class.path}"/>
           <pathelement location="${build.classes}"/>
           <pathelement location="${checkstyle.jar}"/>
  -        <!-- Unit testing deps -->
  -        <pathelement location="${junit.jar}"/>
       </path>
  -    <property name="cp" refid="project.class.path"/>
   
       <path id="tools.class.path">
           <pathelement location="${junit.jar}"/>
  @@ -26,6 +23,13 @@
           <fileset dir="${tools.dir}/ext"/>
       </path>
   
  +    <path id="test.class.path">
  +        <pathelement location="${build.testclasses}"/>
  +        <pathelement location="${junit.jar}"/>
  +        <path refid="project.class.path"/>
  +    </path>
  +    <property name="cp" refid="test.class.path"/>
  +
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  @@ -69,21 +73,27 @@
   
       <!-- Compiles the unit test source code -->
       <target name="compile-test" depends="compile, dependencies-test" description="Compiles the source code">
  +        <mkdir dir="${build.testsrc}"/>
   
  -        <mkdir dir="${build.classes}"/>
  +        <!-- Copy over all of the tests applying test filters -->
  +        <copy todir="${build.testsrc}">
  +            <fileset dir="${test.dir}"/>
  +        </copy>
   
  -        <!-- Compile all classes including the tests. -->
  -        <javac srcdir="${test.dir}"
  -            destdir="${build.classes}"
  +        <mkdir dir="${build.testclasses}"/>
  +
  +        <!-- Compile all test classes. -->
  +        <javac srcdir="${build.testsrc}"
  +            destdir="${build.testclasses}"
               debug="${build.debug}"
               optimize="${build.optimize}"
               deprecation="${build.deprecation}"
               target="1.2">
  -            <classpath refid="project.class.path" />
  +            <classpath refid="test.class.path" />
               <include name="**/*.java"/>
           </javac>
   
  -        <copy todir="${build.classes}">
  +        <copy todir="${build.testclasses}">
               <fileset dir="${test.dir}">
                   <exclude name="**/*.java"/>
                   <exclude name="**/package.html"/>
  @@ -153,13 +163,13 @@
               haltonfailure="${junit.failonerror}"
               printsummary="yes"
               dir="${build.tests}">
  -            <classpath refid="project.class.path"/>
  +            <classpath refid="test.class.path"/>
   
               <formatter type="xml"/>    <!-- xml reports for junitreport -->
  -            <formatter type="plain"/>  <!-- text reports for humans     -->
  +            <formatter type="plain" usefile="false"/>  <!-- text reports for humans     -->
   
               <batchtest todir="${build.tests}">
  -                <fileset dir="${build.classes}">
  +                <fileset dir="${build.testclasses}">
                       <include name="**/test/*TestCase.class"/>
                       <exclude name="**/Abstract*"/>
                   </fileset>
  
  
  
  1.4       +2 -0      jakarta-avalon-excalibur/monitor/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/monitor/default.properties,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- default.properties	13 Apr 2002 11:26:18 -0000	1.3
  +++ default.properties	16 Apr 2002 12:00:41 -0000	1.4
  @@ -21,6 +21,8 @@
   
   #  location of intermediate products
   build.dir = build
  +build.testsrc = ${build.dir}/testsrc
  +build.testclasses = ${build.dir}/testclasses
   build.lib = ${build.dir}/lib
   build.conf = ${build.dir}/conf
   build.classes = ${build.dir}/classes
  
  
  
  1.42      +22 -12    jakarta-avalon-excalibur/naming/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/naming/build.xml,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- build.xml	16 Apr 2002 05:12:40 -0000	1.41
  +++ build.xml	16 Apr 2002 12:00:42 -0000	1.42
  @@ -14,10 +14,7 @@
           <pathelement path="${java.class.path}"/>
           <pathelement location="${build.classes}"/>
           <pathelement location="${checkstyle.jar}"/>
  -        <!-- Unit testing deps -->
  -        <pathelement location="${junit.jar}"/>
       </path>
  -    <property name="cp" refid="project.class.path"/>
   
       <path id="tools.class.path">
           <pathelement location="${junit.jar}"/>
  @@ -26,6 +23,13 @@
           <fileset dir="${tools.dir}/ext"/>
       </path>
   
  +    <path id="test.class.path">
  +        <pathelement location="${build.testclasses}"/>
  +        <pathelement location="${junit.jar}"/>
  +        <path refid="project.class.path"/>
  +    </path>
  +    <property name="cp" refid="test.class.path"/>
  +
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  @@ -76,21 +80,27 @@
   
       <!-- Compiles the unit test source code -->
       <target name="compile-test" depends="compile, dependencies-test" description="Compiles the source code">
  +        <mkdir dir="${build.testsrc}"/>
   
  -        <mkdir dir="${build.classes}"/>
  +        <!-- Copy over all of the tests applying test filters -->
  +        <copy todir="${build.testsrc}">
  +            <fileset dir="${test.dir}"/>
  +        </copy>
   
  -        <!-- Compile all classes including the tests. -->
  -        <javac srcdir="${test.dir}"
  -            destdir="${build.classes}"
  +        <mkdir dir="${build.testclasses}"/>
  +
  +        <!-- Compile all test classes. -->
  +        <javac srcdir="${build.testsrc}"
  +            destdir="${build.testclasses}"
               debug="${build.debug}"
               optimize="${build.optimize}"
               deprecation="${build.deprecation}"
               target="1.2">
  -            <classpath refid="project.class.path" />
  +            <classpath refid="test.class.path" />
               <include name="**/*.java"/>
           </javac>
   
  -        <copy todir="${build.classes}">
  +        <copy todir="${build.testclasses}">
               <fileset dir="${test.dir}">
                   <exclude name="**/*.java"/>
                   <exclude name="**/package.html"/>
  @@ -160,13 +170,13 @@
               haltonfailure="${junit.failonerror}"
               printsummary="yes"
               dir="${build.tests}">
  -            <classpath refid="project.class.path"/>
  +            <classpath refid="test.class.path"/>
   
               <formatter type="xml"/>    <!-- xml reports for junitreport -->
  -            <formatter type="plain"/>  <!-- text reports for humans     -->
  +            <formatter type="plain" usefile="false"/>  <!-- text reports for humans     -->
   
               <batchtest todir="${build.tests}">
  -                <fileset dir="${build.classes}">
  +                <fileset dir="${build.testclasses}">
                       <include name="**/test/*TestCase.class"/>
                       <exclude name="**/Abstract*"/>
                   </fileset>
  
  
  
  1.5       +2 -0      jakarta-avalon-excalibur/naming/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/naming/default.properties,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- default.properties	13 Apr 2002 11:26:18 -0000	1.4
  +++ default.properties	16 Apr 2002 12:00:42 -0000	1.5
  @@ -21,6 +21,8 @@
   
   #  location of intermediate products
   build.dir = build
  +build.testsrc = ${build.dir}/testsrc
  +build.testclasses = ${build.dir}/testclasses
   build.lib = ${build.dir}/lib
   build.conf = ${build.dir}/conf
   build.classes = ${build.dir}/classes
  
  
  
  1.16      +24 -14    jakarta-avalon-excalibur/pool/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/pool/build.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- build.xml	16 Apr 2002 05:12:40 -0000	1.15
  +++ build.xml	16 Apr 2002 12:00:42 -0000	1.16
  @@ -18,12 +18,7 @@
           <pathelement location="${excalibur-collections.jar}"/>
           <pathelement location="${excalibur-instrument.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"/>
   
       <path id="tools.class.path">
           <pathelement location="${junit.jar}"/>
  @@ -32,6 +27,15 @@
           <fileset dir="${tools.dir}/ext"/>
       </path>
   
  +    <path id="test.class.path">
  +        <pathelement location="${build.testclasses}"/>
  +        <pathelement location="${junit.jar}"/>
  +        <pathelement location="${junitperf.jar}"/>
  +        <pathelement location="${excalibur-testcase.jar}"/>
  +        <path refid="project.class.path"/>
  +    </path>
  +    <property name="cp" refid="test.class.path"/>
  +
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  @@ -84,21 +88,27 @@
   
       <!-- Compiles the unit test source code -->
       <target name="compile-test" depends="compile, dependencies-test" description="Compiles the source code">
  +        <mkdir dir="${build.testsrc}"/>
   
  -        <mkdir dir="${build.classes}"/>
  +        <!-- Copy over all of the tests applying test filters -->
  +        <copy todir="${build.testsrc}">
  +            <fileset dir="${test.dir}"/>
  +        </copy>
   
  -        <!-- Compile all classes including the tests. -->
  -        <javac srcdir="${test.dir}"
  -            destdir="${build.classes}"
  +        <mkdir dir="${build.testclasses}"/>
  +
  +        <!-- Compile all test classes. -->
  +        <javac srcdir="${build.testsrc}"
  +            destdir="${build.testclasses}"
               debug="${build.debug}"
               optimize="${build.optimize}"
               deprecation="${build.deprecation}"
               target="1.2">
  -            <classpath refid="project.class.path" />
  +            <classpath refid="test.class.path" />
               <include name="**/*.java"/>
           </javac>
   
  -        <copy todir="${build.classes}">
  +        <copy todir="${build.testclasses}">
               <fileset dir="${test.dir}">
                   <exclude name="**/*.java"/>
                   <exclude name="**/package.html"/>
  @@ -168,13 +178,13 @@
               haltonfailure="${junit.failonerror}"
               printsummary="yes"
               dir="${build.tests}">
  -            <classpath refid="project.class.path"/>
  +            <classpath refid="test.class.path"/>
   
               <formatter type="xml"/>    <!-- xml reports for junitreport -->
  -            <formatter type="plain"/>  <!-- text reports for humans     -->
  +            <formatter type="plain" usefile="false"/>  <!-- text reports for humans     -->
   
               <batchtest todir="${build.tests}">
  -                <fileset dir="${build.classes}">
  +                <fileset dir="${build.testclasses}">
                       <include name="**/test/*TestCase.class"/>
                       <exclude name="**/Abstract*"/>
                   </fileset>
  
  
  
  1.7       +2 -0      jakarta-avalon-excalibur/pool/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/pool/default.properties,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- default.properties	13 Apr 2002 11:26:18 -0000	1.6
  +++ default.properties	16 Apr 2002 12:00:42 -0000	1.7
  @@ -66,6 +66,8 @@
   
   #  location of intermediate products
   build.dir = build
  +build.testsrc = ${build.dir}/testsrc
  +build.testclasses = ${build.dir}/testclasses
   build.lib = ${build.dir}/lib
   build.conf = ${build.dir}/conf
   build.classes = ${build.dir}/classes
  
  
  
  1.11      +22 -12    jakarta-avalon-excalibur/sourceresolve/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/sourceresolve/build.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- build.xml	16 Apr 2002 05:12:40 -0000	1.10
  +++ build.xml	16 Apr 2002 12:00:42 -0000	1.11
  @@ -14,10 +14,7 @@
           <pathelement path="${java.class.path}"/>
           <pathelement location="${build.classes}"/>
           <pathelement location="${checkstyle.jar}"/>
  -        <!-- Unit testing deps -->
  -        <pathelement location="${junit.jar}"/>
       </path>
  -    <property name="cp" refid="project.class.path"/>
   
       <path id="tools.class.path">
           <pathelement location="${junit.jar}"/>
  @@ -26,6 +23,13 @@
           <fileset dir="${tools.dir}/ext"/>
       </path>
   
  +    <path id="test.class.path">
  +        <pathelement location="${build.testclasses}"/>
  +        <pathelement location="${junit.jar}"/>
  +        <path refid="project.class.path"/>
  +    </path>
  +    <property name="cp" refid="test.class.path"/>
  +
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  @@ -69,21 +73,27 @@
   
       <!-- Compiles the unit test source code -->
       <target name="compile-test" depends="compile, dependencies-test" description="Compiles the source code">
  +        <mkdir dir="${build.testsrc}"/>
   
  -        <mkdir dir="${build.classes}"/>
  +        <!-- Copy over all of the tests applying test filters -->
  +        <copy todir="${build.testsrc}">
  +            <fileset dir="${test.dir}"/>
  +        </copy>
   
  -        <!-- Compile all classes including the tests. -->
  -        <javac srcdir="${test.dir}"
  -            destdir="${build.classes}"
  +        <mkdir dir="${build.testclasses}"/>
  +
  +        <!-- Compile all test classes. -->
  +        <javac srcdir="${build.testsrc}"
  +            destdir="${build.testclasses}"
               debug="${build.debug}"
               optimize="${build.optimize}"
               deprecation="${build.deprecation}"
               target="1.2">
  -            <classpath refid="project.class.path" />
  +            <classpath refid="test.class.path" />
               <include name="**/*.java"/>
           </javac>
   
  -        <copy todir="${build.classes}">
  +        <copy todir="${build.testclasses}">
               <fileset dir="${test.dir}">
                   <exclude name="**/*.java"/>
                   <exclude name="**/package.html"/>
  @@ -153,13 +163,13 @@
               haltonfailure="${junit.failonerror}"
               printsummary="yes"
               dir="${build.tests}">
  -            <classpath refid="project.class.path"/>
  +            <classpath refid="test.class.path"/>
   
               <formatter type="xml"/>    <!-- xml reports for junitreport -->
  -            <formatter type="plain"/>  <!-- text reports for humans     -->
  +            <formatter type="plain" usefile="false"/>  <!-- text reports for humans     -->
   
               <batchtest todir="${build.tests}">
  -                <fileset dir="${build.classes}">
  +                <fileset dir="${build.testclasses}">
                       <include name="**/test/*TestCase.class"/>
                       <exclude name="**/Abstract*"/>
                   </fileset>
  
  
  
  1.4       +2 -0      jakarta-avalon-excalibur/sourceresolve/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/sourceresolve/default.properties,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- default.properties	13 Apr 2002 11:26:19 -0000	1.3
  +++ default.properties	16 Apr 2002 12:00:42 -0000	1.4
  @@ -21,6 +21,8 @@
   
   #  location of intermediate products
   build.dir = build
  +build.testsrc = ${build.dir}/testsrc
  +build.testclasses = ${build.dir}/testclasses
   build.lib = ${build.dir}/lib
   build.conf = ${build.dir}/conf
   build.classes = ${build.dir}/classes
  
  
  
  1.21      +22 -12    jakarta-avalon-excalibur/tar/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/tar/build.xml,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- build.xml	16 Apr 2002 05:12:40 -0000	1.20
  +++ build.xml	16 Apr 2002 12:00:42 -0000	1.21
  @@ -14,10 +14,7 @@
           <pathelement path="${java.class.path}"/>
           <pathelement location="${build.classes}"/>
           <pathelement location="${checkstyle.jar}"/>
  -        <!-- Unit testing deps -->
  -        <pathelement location="${junit.jar}"/>
       </path>
  -    <property name="cp" refid="project.class.path"/>
   
       <path id="tools.class.path">
           <pathelement location="${junit.jar}"/>
  @@ -26,6 +23,13 @@
           <fileset dir="${tools.dir}/ext"/>
       </path>
   
  +    <path id="test.class.path">
  +        <pathelement location="${build.testclasses}"/>
  +        <pathelement location="${junit.jar}"/>
  +        <path refid="project.class.path"/>
  +    </path>
  +    <property name="cp" refid="test.class.path"/>
  +
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  @@ -69,21 +73,27 @@
   
       <!-- Compiles the unit test source code -->
       <target name="compile-test" depends="compile, dependencies-test" description="Compiles the source code">
  +        <mkdir dir="${build.testsrc}"/>
   
  -        <mkdir dir="${build.classes}"/>
  +        <!-- Copy over all of the tests applying test filters -->
  +        <copy todir="${build.testsrc}">
  +            <fileset dir="${test.dir}"/>
  +        </copy>
   
  -        <!-- Compile all classes including the tests. -->
  -        <javac srcdir="${test.dir}"
  -            destdir="${build.classes}"
  +        <mkdir dir="${build.testclasses}"/>
  +
  +        <!-- Compile all test classes. -->
  +        <javac srcdir="${build.testsrc}"
  +            destdir="${build.testclasses}"
               debug="${build.debug}"
               optimize="${build.optimize}"
               deprecation="${build.deprecation}"
               target="1.2">
  -            <classpath refid="project.class.path" />
  +            <classpath refid="test.class.path" />
               <include name="**/*.java"/>
           </javac>
   
  -        <copy todir="${build.classes}">
  +        <copy todir="${build.testclasses}">
               <fileset dir="${test.dir}">
                   <exclude name="**/*.java"/>
                   <exclude name="**/package.html"/>
  @@ -153,13 +163,13 @@
               haltonfailure="${junit.failonerror}"
               printsummary="yes"
               dir="${build.tests}">
  -            <classpath refid="project.class.path"/>
  +            <classpath refid="test.class.path"/>
   
               <formatter type="xml"/>    <!-- xml reports for junitreport -->
  -            <formatter type="plain"/>  <!-- text reports for humans     -->
  +            <formatter type="plain" usefile="false"/>  <!-- text reports for humans     -->
   
               <batchtest todir="${build.tests}">
  -                <fileset dir="${build.classes}">
  +                <fileset dir="${build.testclasses}">
                       <include name="**/test/*TestCase.class"/>
                       <exclude name="**/Abstract*"/>
                   </fileset>
  
  
  
  1.5       +2 -0      jakarta-avalon-excalibur/tar/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/tar/default.properties,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- default.properties	13 Apr 2002 11:26:19 -0000	1.4
  +++ default.properties	16 Apr 2002 12:00:42 -0000	1.5
  @@ -21,6 +21,8 @@
   
   #  location of intermediate products
   build.dir = build
  +build.testsrc = ${build.dir}/testsrc
  +build.testclasses = ${build.dir}/testclasses
   build.lib = ${build.dir}/lib
   build.conf = ${build.dir}/conf
   build.classes = ${build.dir}/classes
  
  
  
  1.19      +22 -12    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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- build.xml	16 Apr 2002 05:12:40 -0000	1.18
  +++ build.xml	16 Apr 2002 12:00:42 -0000	1.19
  @@ -14,10 +14,7 @@
           <pathelement path="${java.class.path}"/>
           <pathelement location="${build.classes}"/>
           <pathelement location="${checkstyle.jar}"/>
  -        <!-- Unit testing deps -->
  -        <pathelement location="${junit.jar}"/>
       </path>
  -    <property name="cp" refid="project.class.path"/>
   
       <path id="tools.class.path">
           <pathelement location="${junit.jar}"/>
  @@ -26,6 +23,13 @@
           <fileset dir="${tools.dir}/ext"/>
       </path>
   
  +    <path id="test.class.path">
  +        <pathelement location="${build.testclasses}"/>
  +        <pathelement location="${junit.jar}"/>
  +        <path refid="project.class.path"/>
  +    </path>
  +    <property name="cp" refid="test.class.path"/>
  +
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  @@ -69,21 +73,27 @@
   
       <!-- Compiles the unit test source code -->
       <target name="compile-test" depends="compile, dependencies-test" description="Compiles the source code">
  +        <mkdir dir="${build.testsrc}"/>
   
  -        <mkdir dir="${build.classes}"/>
  +        <!-- Copy over all of the tests applying test filters -->
  +        <copy todir="${build.testsrc}">
  +            <fileset dir="${test.dir}"/>
  +        </copy>
   
  -        <!-- Compile all classes including the tests. -->
  -        <javac srcdir="${test.dir}"
  -            destdir="${build.classes}"
  +        <mkdir dir="${build.testclasses}"/>
  +
  +        <!-- Compile all test classes. -->
  +        <javac srcdir="${build.testsrc}"
  +            destdir="${build.testclasses}"
               debug="${build.debug}"
               optimize="${build.optimize}"
               deprecation="${build.deprecation}"
               target="1.2">
  -            <classpath refid="project.class.path" />
  +            <classpath refid="test.class.path" />
               <include name="**/*.java"/>
           </javac>
   
  -        <copy todir="${build.classes}">
  +        <copy todir="${build.testclasses}">
               <fileset dir="${test.dir}">
                   <exclude name="**/*.java"/>
                   <exclude name="**/package.html"/>
  @@ -153,13 +163,13 @@
               haltonfailure="${junit.failonerror}"
               printsummary="yes"
               dir="${build.tests}">
  -            <classpath refid="project.class.path"/>
  +            <classpath refid="test.class.path"/>
   
               <formatter type="xml"/>    <!-- xml reports for junitreport -->
  -            <formatter type="plain"/>  <!-- text reports for humans     -->
  +            <formatter type="plain" usefile="false"/>  <!-- text reports for humans     -->
   
               <batchtest todir="${build.tests}">
  -                <fileset dir="${build.classes}">
  +                <fileset dir="${build.testclasses}">
                       <include name="**/test/*TestCase.class"/>
                       <exclude name="**/Abstract*"/>
                   </fileset>
  
  
  
  1.5       +2 -0      jakarta-avalon-excalibur/template-product/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/template-product/default.properties,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- default.properties	13 Apr 2002 11:26:19 -0000	1.4
  +++ default.properties	16 Apr 2002 12:00:42 -0000	1.5
  @@ -28,6 +28,8 @@
   
   #  location of intermediate products
   build.dir = build
  +build.testsrc = ${build.dir}/testsrc
  +build.testclasses = ${build.dir}/testclasses
   build.lib = ${build.dir}/lib
   build.conf = ${build.dir}/conf
   build.classes = ${build.dir}/classes
  
  
  
  1.12      +22 -12    jakarta-avalon-excalibur/testcase/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/testcase/build.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- build.xml	16 Apr 2002 05:12:40 -0000	1.11
  +++ build.xml	16 Apr 2002 12:00:42 -0000	1.12
  @@ -18,10 +18,7 @@
           <pathelement location="${excalibur-logger.jar}"/>
           <pathelement location="${excalibur-component.jar}"/>
           <pathelement location="${checkstyle.jar}"/>
  -        <!-- Unit testing deps -->
  -        <pathelement location="${junit.jar}"/>
       </path>
  -    <property name="cp" refid="project.class.path"/>
   
       <path id="tools.class.path">
           <pathelement location="${junit.jar}"/>
  @@ -30,6 +27,13 @@
           <fileset dir="${tools.dir}/ext"/>
       </path>
   
  +    <path id="test.class.path">
  +        <pathelement location="${build.testclasses}"/>
  +        <pathelement location="${junit.jar}"/>
  +        <path refid="project.class.path"/>
  +    </path>
  +    <property name="cp" refid="test.class.path"/>
  +
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  @@ -77,21 +81,27 @@
   
       <!-- Compiles the unit test source code -->
       <target name="compile-test" depends="compile, dependencies-test" description="Compiles the source code">
  +        <mkdir dir="${build.testsrc}"/>
   
  -        <mkdir dir="${build.classes}"/>
  +        <!-- Copy over all of the tests applying test filters -->
  +        <copy todir="${build.testsrc}">
  +            <fileset dir="${test.dir}"/>
  +        </copy>
   
  -        <!-- Compile all classes including the tests. -->
  -        <javac srcdir="${test.dir}"
  -            destdir="${build.classes}"
  +        <mkdir dir="${build.testclasses}"/>
  +
  +        <!-- Compile all test classes. -->
  +        <javac srcdir="${build.testsrc}"
  +            destdir="${build.testclasses}"
               debug="${build.debug}"
               optimize="${build.optimize}"
               deprecation="${build.deprecation}"
               target="1.2">
  -            <classpath refid="project.class.path" />
  +            <classpath refid="test.class.path" />
               <include name="**/*.java"/>
           </javac>
   
  -        <copy todir="${build.classes}">
  +        <copy todir="${build.testclasses}">
               <fileset dir="${test.dir}">
                   <exclude name="**/*.java"/>
                   <exclude name="**/package.html"/>
  @@ -161,13 +171,13 @@
               haltonfailure="${junit.failonerror}"
               printsummary="yes"
               dir="${build.tests}">
  -            <classpath refid="project.class.path"/>
  +            <classpath refid="test.class.path"/>
   
               <formatter type="xml"/>    <!-- xml reports for junitreport -->
  -            <formatter type="plain"/>  <!-- text reports for humans     -->
  +            <formatter type="plain" usefile="false"/>  <!-- text reports for humans     -->
   
               <batchtest todir="${build.tests}">
  -                <fileset dir="${build.classes}">
  +                <fileset dir="${build.testclasses}">
                       <include name="**/test/*TestCase.class"/>
                       <exclude name="**/Abstract*"/>
                   </fileset>
  
  
  
  1.4       +2 -0      jakarta-avalon-excalibur/testcase/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/testcase/default.properties,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- default.properties	13 Apr 2002 11:26:19 -0000	1.3
  +++ default.properties	16 Apr 2002 12:00:42 -0000	1.4
  @@ -49,6 +49,8 @@
   
   #  location of intermediate products
   build.dir = build
  +build.testsrc = ${build.dir}/testsrc
  +build.testclasses = ${build.dir}/testclasses
   build.lib = ${build.dir}/lib
   build.conf = ${build.dir}/conf
   build.classes = ${build.dir}/classes
  
  
  
  1.15      +22 -12    jakarta-avalon-excalibur/thread/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/thread/build.xml,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- build.xml	16 Apr 2002 05:12:41 -0000	1.14
  +++ build.xml	16 Apr 2002 12:00:42 -0000	1.15
  @@ -19,10 +19,7 @@
           <pathelement location="${excalibur-instrument.jar}"/>
           <pathelement location="${excalibur-pool.jar}"/>
           <pathelement location="${checkstyle.jar}"/>
  -        <!-- Unit testing deps -->
  -        <pathelement location="${junit.jar}"/>
       </path>
  -    <property name="cp" refid="project.class.path"/>
   
       <path id="tools.class.path">
           <pathelement location="${junit.jar}"/>
  @@ -31,6 +28,13 @@
           <fileset dir="${tools.dir}/ext"/>
       </path>
   
  +    <path id="test.class.path">
  +        <pathelement location="${build.testclasses}"/>
  +        <pathelement location="${junit.jar}"/>
  +        <path refid="project.class.path"/>
  +    </path>
  +    <property name="cp" refid="test.class.path"/>
  +
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  @@ -79,21 +83,27 @@
   
       <!-- Compiles the unit test source code -->
       <target name="compile-test" depends="compile, dependencies-test" description="Compiles the source code">
  +        <mkdir dir="${build.testsrc}"/>
   
  -        <mkdir dir="${build.classes}"/>
  +        <!-- Copy over all of the tests applying test filters -->
  +        <copy todir="${build.testsrc}">
  +            <fileset dir="${test.dir}"/>
  +        </copy>
   
  -        <!-- Compile all classes including the tests. -->
  -        <javac srcdir="${test.dir}"
  -            destdir="${build.classes}"
  +        <mkdir dir="${build.testclasses}"/>
  +
  +        <!-- Compile all test classes. -->
  +        <javac srcdir="${build.testsrc}"
  +            destdir="${build.testclasses}"
               debug="${build.debug}"
               optimize="${build.optimize}"
               deprecation="${build.deprecation}"
               target="1.2">
  -            <classpath refid="project.class.path" />
  +            <classpath refid="test.class.path" />
               <include name="**/*.java"/>
           </javac>
   
  -        <copy todir="${build.classes}">
  +        <copy todir="${build.testclasses}">
               <fileset dir="${test.dir}">
                   <exclude name="**/*.java"/>
                   <exclude name="**/package.html"/>
  @@ -163,13 +173,13 @@
               haltonfailure="${junit.failonerror}"
               printsummary="yes"
               dir="${build.tests}">
  -            <classpath refid="project.class.path"/>
  +            <classpath refid="test.class.path"/>
   
               <formatter type="xml"/>    <!-- xml reports for junitreport -->
  -            <formatter type="plain"/>  <!-- text reports for humans     -->
  +            <formatter type="plain" usefile="false"/>  <!-- text reports for humans     -->
   
               <batchtest todir="${build.tests}">
  -                <fileset dir="${build.classes}">
  +                <fileset dir="${build.testclasses}">
                       <include name="**/test/*TestCase.class"/>
                       <exclude name="**/Abstract*"/>
                   </fileset>
  
  
  
  1.7       +2 -0      jakarta-avalon-excalibur/thread/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/thread/default.properties,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- default.properties	13 Apr 2002 11:26:19 -0000	1.6
  +++ default.properties	16 Apr 2002 12:00:42 -0000	1.7
  @@ -54,6 +54,8 @@
   
   #  location of intermediate products
   build.dir = build
  +build.testsrc = ${build.dir}/testsrc
  +build.testclasses = ${build.dir}/testclasses
   build.lib = ${build.dir}/lib
   build.conf = ${build.dir}/conf
   build.classes = ${build.dir}/classes
  
  
  
  1.13      +22 -12    jakarta-avalon-excalibur/threadcontext/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/threadcontext/build.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- build.xml	16 Apr 2002 05:12:41 -0000	1.12
  +++ build.xml	16 Apr 2002 12:00:42 -0000	1.13
  @@ -14,10 +14,7 @@
           <pathelement path="${java.class.path}"/>
           <pathelement location="${build.classes}"/>
           <pathelement location="${checkstyle.jar}"/>
  -        <!-- Unit testing deps -->
  -        <pathelement location="${junit.jar}"/>
       </path>
  -    <property name="cp" refid="project.class.path"/>
   
       <path id="tools.class.path">
           <pathelement location="${junit.jar}"/>
  @@ -26,6 +23,13 @@
           <fileset dir="${tools.dir}/ext"/>
       </path>
   
  +    <path id="test.class.path">
  +        <pathelement location="${build.testclasses}"/>
  +        <pathelement location="${junit.jar}"/>
  +        <path refid="project.class.path"/>
  +    </path>
  +    <property name="cp" refid="test.class.path"/>
  +
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  @@ -69,21 +73,27 @@
   
       <!-- Compiles the unit test source code -->
       <target name="compile-test" depends="compile, dependencies-test" description="Compiles the source code">
  +        <mkdir dir="${build.testsrc}"/>
   
  -        <mkdir dir="${build.classes}"/>
  +        <!-- Copy over all of the tests applying test filters -->
  +        <copy todir="${build.testsrc}">
  +            <fileset dir="${test.dir}"/>
  +        </copy>
   
  -        <!-- Compile all classes including the tests. -->
  -        <javac srcdir="${test.dir}"
  -            destdir="${build.classes}"
  +        <mkdir dir="${build.testclasses}"/>
  +
  +        <!-- Compile all test classes. -->
  +        <javac srcdir="${build.testsrc}"
  +            destdir="${build.testclasses}"
               debug="${build.debug}"
               optimize="${build.optimize}"
               deprecation="${build.deprecation}"
               target="1.2">
  -            <classpath refid="project.class.path" />
  +            <classpath refid="test.class.path" />
               <include name="**/*.java"/>
           </javac>
   
  -        <copy todir="${build.classes}">
  +        <copy todir="${build.testclasses}">
               <fileset dir="${test.dir}">
                   <exclude name="**/*.java"/>
                   <exclude name="**/package.html"/>
  @@ -153,13 +163,13 @@
               haltonfailure="${junit.failonerror}"
               printsummary="yes"
               dir="${build.tests}">
  -            <classpath refid="project.class.path"/>
  +            <classpath refid="test.class.path"/>
   
               <formatter type="xml"/>    <!-- xml reports for junitreport -->
  -            <formatter type="plain"/>  <!-- text reports for humans     -->
  +            <formatter type="plain" usefile="false"/>  <!-- text reports for humans     -->
   
               <batchtest todir="${build.tests}">
  -                <fileset dir="${build.classes}">
  +                <fileset dir="${build.testclasses}">
                       <include name="**/test/*TestCase.class"/>
                       <exclude name="**/Abstract*"/>
                   </fileset>
  
  
  
  1.5       +2 -0      jakarta-avalon-excalibur/threadcontext/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/threadcontext/default.properties,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- default.properties	13 Apr 2002 11:26:19 -0000	1.4
  +++ default.properties	16 Apr 2002 12:00:42 -0000	1.5
  @@ -25,6 +25,8 @@
   
   #  location of intermediate products
   build.dir = build
  +build.testsrc = ${build.dir}/testsrc
  +build.testclasses = ${build.dir}/testclasses
   build.lib = ${build.dir}/lib
   build.conf = ${build.dir}/conf
   build.classes = ${build.dir}/classes
  
  
  
  1.12      +22 -12    jakarta-avalon-excalibur/util/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/util/build.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- build.xml	16 Apr 2002 05:12:41 -0000	1.11
  +++ build.xml	16 Apr 2002 12:00:42 -0000	1.12
  @@ -15,10 +15,7 @@
           <pathelement location="${build.classes}"/>
           <pathelement location="${avalon-framework.jar}"/>
           <pathelement location="${checkstyle.jar}"/>
  -        <!-- Unit testing deps -->
  -        <pathelement location="${junit.jar}"/>
       </path>
  -    <property name="cp" refid="project.class.path"/>
   
       <path id="tools.class.path">
           <pathelement location="${junit.jar}"/>
  @@ -27,6 +24,13 @@
           <fileset dir="${tools.dir}/ext"/>
       </path>
   
  +    <path id="test.class.path">
  +        <pathelement location="${build.testclasses}"/>
  +        <pathelement location="${junit.jar}"/>
  +        <path refid="project.class.path"/>
  +    </path>
  +    <property name="cp" refid="test.class.path"/>
  +
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  @@ -71,21 +75,27 @@
   
       <!-- Compiles the unit test source code -->
       <target name="compile-test" depends="compile, dependencies-test" description="Compiles the source code">
  +        <mkdir dir="${build.testsrc}"/>
   
  -        <mkdir dir="${build.classes}"/>
  +        <!-- Copy over all of the tests applying test filters -->
  +        <copy todir="${build.testsrc}">
  +            <fileset dir="${test.dir}"/>
  +        </copy>
   
  -        <!-- Compile all classes including the tests. -->
  -        <javac srcdir="${test.dir}"
  -            destdir="${build.classes}"
  +        <mkdir dir="${build.testclasses}"/>
  +
  +        <!-- Compile all test classes. -->
  +        <javac srcdir="${build.testsrc}"
  +            destdir="${build.testclasses}"
               debug="${build.debug}"
               optimize="${build.optimize}"
               deprecation="${build.deprecation}"
               target="1.2">
  -            <classpath refid="project.class.path" />
  +            <classpath refid="test.class.path" />
               <include name="**/*.java"/>
           </javac>
   
  -        <copy todir="${build.classes}">
  +        <copy todir="${build.testclasses}">
               <fileset dir="${test.dir}">
                   <exclude name="**/*.java"/>
                   <exclude name="**/package.html"/>
  @@ -155,13 +165,13 @@
               haltonfailure="${junit.failonerror}"
               printsummary="yes"
               dir="${build.tests}">
  -            <classpath refid="project.class.path"/>
  +            <classpath refid="test.class.path"/>
   
               <formatter type="xml"/>    <!-- xml reports for junitreport -->
  -            <formatter type="plain"/>  <!-- text reports for humans     -->
  +            <formatter type="plain" usefile="false"/>  <!-- text reports for humans     -->
   
               <batchtest todir="${build.tests}">
  -                <fileset dir="${build.classes}">
  +                <fileset dir="${build.testclasses}">
                       <include name="**/test/*TestCase.class"/>
                       <exclude name="**/Abstract*"/>
                   </fileset>
  
  
  
  1.4       +2 -0      jakarta-avalon-excalibur/util/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/util/default.properties,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- default.properties	13 Apr 2002 11:26:19 -0000	1.3
  +++ default.properties	16 Apr 2002 12:00:43 -0000	1.4
  @@ -32,6 +32,8 @@
   
   #  location of intermediate products
   build.dir = build
  +build.testsrc = ${build.dir}/testsrc
  +build.testclasses = ${build.dir}/testclasses
   build.lib = ${build.dir}/lib
   build.conf = ${build.dir}/conf
   build.classes = ${build.dir}/classes
  
  
  
  1.11      +22 -12    jakarta-avalon-excalibur/xmlbundle/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/xmlbundle/build.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- build.xml	16 Apr 2002 05:12:41 -0000	1.10
  +++ build.xml	16 Apr 2002 12:00:43 -0000	1.11
  @@ -14,10 +14,7 @@
           <pathelement path="${java.class.path}"/>
           <pathelement location="${build.classes}"/>
           <pathelement location="${checkstyle.jar}"/>
  -        <!-- Unit testing deps -->
  -        <pathelement location="${junit.jar}"/>
       </path>
  -    <property name="cp" refid="project.class.path"/>
   
       <path id="tools.class.path">
           <pathelement location="${junit.jar}"/>
  @@ -26,6 +23,13 @@
           <fileset dir="${tools.dir}/ext"/>
       </path>
   
  +    <path id="test.class.path">
  +        <pathelement location="${build.testclasses}"/>
  +        <pathelement location="${junit.jar}"/>
  +        <path refid="project.class.path"/>
  +    </path>
  +    <property name="cp" refid="test.class.path"/>
  +
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  @@ -69,21 +73,27 @@
   
       <!-- Compiles the unit test source code -->
       <target name="compile-test" depends="compile, dependencies-test" description="Compiles the source code">
  +        <mkdir dir="${build.testsrc}"/>
   
  -        <mkdir dir="${build.classes}"/>
  +        <!-- Copy over all of the tests applying test filters -->
  +        <copy todir="${build.testsrc}">
  +            <fileset dir="${test.dir}"/>
  +        </copy>
   
  -        <!-- Compile all classes including the tests. -->
  -        <javac srcdir="${test.dir}"
  -            destdir="${build.classes}"
  +        <mkdir dir="${build.testclasses}"/>
  +
  +        <!-- Compile all test classes. -->
  +        <javac srcdir="${build.testsrc}"
  +            destdir="${build.testclasses}"
               debug="${build.debug}"
               optimize="${build.optimize}"
               deprecation="${build.deprecation}"
               target="1.2">
  -            <classpath refid="project.class.path" />
  +            <classpath refid="test.class.path" />
               <include name="**/*.java"/>
           </javac>
   
  -        <copy todir="${build.classes}">
  +        <copy todir="${build.testclasses}">
               <fileset dir="${test.dir}">
                   <exclude name="**/*.java"/>
                   <exclude name="**/package.html"/>
  @@ -153,13 +163,13 @@
               haltonfailure="${junit.failonerror}"
               printsummary="yes"
               dir="${build.tests}">
  -            <classpath refid="project.class.path"/>
  +            <classpath refid="test.class.path"/>
   
               <formatter type="xml"/>    <!-- xml reports for junitreport -->
  -            <formatter type="plain"/>  <!-- text reports for humans     -->
  +            <formatter type="plain" usefile="false"/>  <!-- text reports for humans     -->
   
               <batchtest todir="${build.tests}">
  -                <fileset dir="${build.classes}">
  +                <fileset dir="${build.testclasses}">
                       <include name="**/test/*TestCase.class"/>
                       <exclude name="**/Abstract*"/>
                   </fileset>
  
  
  
  1.4       +2 -0      jakarta-avalon-excalibur/xmlbundle/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/xmlbundle/default.properties,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- default.properties	13 Apr 2002 11:26:20 -0000	1.3
  +++ default.properties	16 Apr 2002 12:00:43 -0000	1.4
  @@ -21,6 +21,8 @@
   
   #  location of intermediate products
   build.dir = build
  +build.testsrc = ${build.dir}/testsrc
  +build.testclasses = ${build.dir}/testclasses
   build.lib = ${build.dir}/lib
   build.conf = ${build.dir}/conf
   build.classes = ${build.dir}/classes
  
  
  
  1.21      +22 -12    jakarta-avalon-excalibur/zip/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/zip/build.xml,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- build.xml	16 Apr 2002 05:12:41 -0000	1.20
  +++ build.xml	16 Apr 2002 12:00:43 -0000	1.21
  @@ -14,10 +14,7 @@
           <pathelement path="${java.class.path}"/>
           <pathelement location="${build.classes}"/>
           <pathelement location="${checkstyle.jar}"/>
  -        <!-- Unit testing deps -->
  -        <pathelement location="${junit.jar}"/>
       </path>
  -    <property name="cp" refid="project.class.path"/>
   
       <path id="tools.class.path">
           <pathelement location="${junit.jar}"/>
  @@ -26,6 +23,13 @@
           <fileset dir="${tools.dir}/ext"/>
       </path>
   
  +    <path id="test.class.path">
  +        <pathelement location="${build.testclasses}"/>
  +        <pathelement location="${junit.jar}"/>
  +        <path refid="project.class.path"/>
  +    </path>
  +    <property name="cp" refid="test.class.path"/>
  +
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  @@ -69,21 +73,27 @@
   
       <!-- Compiles the unit test source code -->
       <target name="compile-test" depends="compile, dependencies-test" description="Compiles the source code">
  +        <mkdir dir="${build.testsrc}"/>
   
  -        <mkdir dir="${build.classes}"/>
  +        <!-- Copy over all of the tests applying test filters -->
  +        <copy todir="${build.testsrc}">
  +            <fileset dir="${test.dir}"/>
  +        </copy>
   
  -        <!-- Compile all classes including the tests. -->
  -        <javac srcdir="${test.dir}"
  -            destdir="${build.classes}"
  +        <mkdir dir="${build.testclasses}"/>
  +
  +        <!-- Compile all test classes. -->
  +        <javac srcdir="${build.testsrc}"
  +            destdir="${build.testclasses}"
               debug="${build.debug}"
               optimize="${build.optimize}"
               deprecation="${build.deprecation}"
               target="1.2">
  -            <classpath refid="project.class.path" />
  +            <classpath refid="test.class.path" />
               <include name="**/*.java"/>
           </javac>
   
  -        <copy todir="${build.classes}">
  +        <copy todir="${build.testclasses}">
               <fileset dir="${test.dir}">
                   <exclude name="**/*.java"/>
                   <exclude name="**/package.html"/>
  @@ -153,13 +163,13 @@
               haltonfailure="${junit.failonerror}"
               printsummary="yes"
               dir="${build.tests}">
  -            <classpath refid="project.class.path"/>
  +            <classpath refid="test.class.path"/>
   
               <formatter type="xml"/>    <!-- xml reports for junitreport -->
  -            <formatter type="plain"/>  <!-- text reports for humans     -->
  +            <formatter type="plain" usefile="false"/>  <!-- text reports for humans     -->
   
               <batchtest todir="${build.tests}">
  -                <fileset dir="${build.classes}">
  +                <fileset dir="${build.testclasses}">
                       <include name="**/test/*TestCase.class"/>
                       <exclude name="**/Abstract*"/>
                   </fileset>
  
  
  
  1.5       +2 -0      jakarta-avalon-excalibur/zip/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/zip/default.properties,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- default.properties	13 Apr 2002 11:26:20 -0000	1.4
  +++ default.properties	16 Apr 2002 12:00:43 -0000	1.5
  @@ -21,6 +21,8 @@
   
   #  location of intermediate products
   build.dir = build
  +build.testsrc = ${build.dir}/testsrc
  +build.testclasses = ${build.dir}/testclasses
   build.lib = ${build.dir}/lib
   build.conf = ${build.dir}/conf
   build.classes = ${build.dir}/classes
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>


Mime
View raw message