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 default.properties ant.properties.sample build.xml
Date Mon, 08 Apr 2002 10:32:16 GMT
jefft       02/04/08 03:32:14

  Modified:    .        README.txt build.xml gump.xml
               all      ant.properties.sample build.xml
               altrmi   ant.properties.sample build.xml
               baxter   ant.properties.sample build.xml
               bzip2    ant.properties.sample build.xml
               cache    ant.properties.sample build.xml
               cli      ant.properties.sample build.xml
               collections ant.properties.sample build.xml
               command  ant.properties.sample build.xml
               component ant.properties.sample build.xml
               concurrent ant.properties.sample build.xml
               datasource build.xml
               event    ant.properties.sample build.xml
               extension ant.properties.sample build.xml
               fortress ant.properties.sample build.xml default.properties
               i18n     ant.properties.sample build.xml
               instrument ant.properties.sample build.xml
               instrument-client ant.properties.sample build.xml
               instrument-manager ant.properties.sample build.xml
               io       ant.properties.sample build.xml
               lang     ant.properties.sample build.xml
               logger   ant.properties.sample build.xml
               monitor  ant.properties.sample build.xml
               naming   ant.properties.sample build.xml
               pool     ant.properties.sample build.xml
               sourceresolve ant.properties.sample build.xml
               tar      ant.properties.sample build.xml
               template-product ant.properties.sample build.xml
               testcase ant.properties.sample build.xml
               thread   ant.properties.sample build.xml
               util     ant.properties.sample build.xml
               xmlbundle ant.properties.sample build.xml
               zip      ant.properties.sample build.xml
  Added:       .        default.properties depchecker.xml dependencies.txt
               all      default.properties
               altrmi   default.properties
               baxter   default.properties
               bzip2    default.properties
               cache    default.properties
               cli      default.properties
               collections default.properties
               command  default.properties
               component default.properties
               concurrent default.properties
               datasource default.properties
               event    default.properties
               extension default.properties
               i18n     default.properties
               instrument default.properties
               instrument-client default.properties
               instrument-manager default.properties
               io       default.properties
               lang     default.properties
               logger   default.properties
               monitor  default.properties
               naming   default.properties
               pool     default.properties
               sourceresolve default.properties
               tar      default.properties
               template-product default.properties
               testcase default.properties
               thread   default.properties
               util     default.properties
               xmlbundle default.properties
               zip      default.properties
  Log:
  Adopt dependency checking system from 'depchecking' branch
  
  Revision  Changes    Path
  1.5       +20 -19    jakarta-avalon-excalibur/README.txt
  
  Index: README.txt
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/README.txt,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- README.txt	30 Mar 2002 08:49:55 -0000	1.4
  +++ README.txt	8 Apr 2002 10:32:05 -0000	1.5
  @@ -5,7 +5,8 @@
     -----------
   
     Excalibur is a collection of often-needed reusable components. It includes tools for
  -  threading, pooling, datasources, CLI option parsing and more.
  +  threading, pooling, datasources, command-line interface (CLI) option parsing
  +  and more.
   
     Where is it?
     ------------
  @@ -15,9 +16,14 @@
     Directory Layout
     ----------------
   
  -  Recently, Excalibur was broken up from a single monolithic jar, to a number
  -  of reusable components. These components are what you see in all the
  -  subdirectories.
  +  Excalibur is comprised of a number reusable components. These components are
  +  what you see in most of the subdirectories.
  +
  +  The all/ directory contains a core set of packages that cannot be
  +  componentized further (excalibur-core.jar). It is a legacy of a time before
  +  Excalibur was componentized, and as such, it's build system has much
  +  functionality not yet present elsewhere. In time, functionality in
  +  all/build.xml will migrate to ./build.xml.
   
     The avalon-excalibur.jar released in version 4.1 would now consist of the
     following jars:
  @@ -34,6 +40,9 @@
   
      instrument/build/lib/excalibur-instrument-0.1.jar
   
  +   Typing 'ant' in the root directory will build an avalon-excalibur.jar
  +   containing these components.
  +
   
     Component dependencies
     ----------------------
  @@ -44,23 +53,15 @@
     your local environment. See the text in ant.properties.sample for more
     information.
   
  -  [Update 2001-03-29]
  -
  -    To date, there remains a core set of packages which are too interrelated to
  -    break up further. These reside in the all/ directory. This core set should
  -    be regarded as a component in it's own right. Like any other component, it
  -    has dependencies on other Excalibur components, recorded in
  -    ant.properties.sample.
  -
  -    The documentation system for all components is still completely within the
  -    all/ directory. Type 'ant html-docs' in all/ to build the HTML
  -    documentation. This will be fixed in the near future.
  +  In general, it is safe to type 'ant', and if an external dependency is
  +  missing, you will be prompted on what to add to ant.properties
   
   
     General Building Requirements
     -----------------------------
   
     -JDK1.2 or above
  +  -Jakarta Ant 1.4.1 or higher, with optional.jar and junit.jar in $ANT_HOME/lib
     -To build from CVS you must set JAVA_HOME to the jdk dir (eg:/usr/bin/jdk1.2 or
      c:\jdk1.3)
     -To build Informix drivers you need version 2.2 of the JDBC driver
  @@ -71,10 +72,10 @@
     ---------------
   
     Generally, one would build individual components, not the whole of Excalibur.
  -  However, as noted above, there is a core set of packages, living in all/,
  -  that generally constitute what people call 'Excalibur'. To build this, you'll
  -  first need to build it's dependencies (listed in all/ant.properties.sample).
  -  Then running Ant in all/ should generate the core jar in build/lib/
  +  This can be done by typing 'ant' in any component's directory.
  +  However, if you type 'ant' in the project root, a file 'avalon-excalibur.jar'
  +  will be built, containing a set of components historically regarded as
  +  comprising 'Excalibur'.
   
   
     Problems?
  
  
  
  1.145     +38 -4     jakarta-avalon-excalibur/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/build.xml,v
  retrieving revision 1.144
  retrieving revision 1.145
  diff -u -r1.144 -r1.145
  --- build.xml	7 Apr 2002 10:20:15 -0000	1.144
  +++ build.xml	8 Apr 2002 10:32:06 -0000	1.145
  @@ -12,7 +12,7 @@
       <property name="build.reports" value="${build.dir}/reports"/>
       <property name="build.tests" value="${build.dir}/tests"/>
   
  -    <target name="main" depends="mega-jar"/>
  +    <target name="main" depends="jar"/>
   
       <!-- Build default targets of all subprojects. -->
       <target name="build-subprojects-dist">
  @@ -132,7 +132,38 @@
       <target name="dist" depends="test-reports"
           description="Create binary distributions of all the products"/>
   
  -    <!-- Generate one mega jar-ball -->   
  +    <!-- Generate one jar functionally equivalent to the old avalon-excalibur.jar -->
  +    <target name="jar" description="Generates avalon-excalibur.jar">
  +        <ant dir="all" target="all"/>
  +        <ant dir="cli" target="jar"/>
  +        <ant dir="collections" target="jar"/>
  +        <ant dir="concurrent" target="jar"/>
  +        <ant dir="i18n" target="jar"/>
  +        <ant dir="io" target="jar"/>
  +        <ant dir="naming" target="jar"/>
  +        <ant dir="instrument" target="jar"/>
  +        <jlink compress="false" outfile="avalon-excalibur-tmp.jar">
  +            <mergefiles>
  +                <fileset dir=".">
  +                    <include name="all/build/lib/excalibur-core.jar"/>
  +                    <include name="cli/build/lib/*.jar"/>
  +                    <include name="collections/build/lib/*.jar"/>
  +                    <include name="concurrent/build/lib/*.jar"/>
  +                    <include name="i18n/build/lib/*.jar"/>
  +                    <include name="io/build/lib/*.jar"/>
  +                    <include name="naming/build/lib/*.jar"/>
  +                    <include name="instrument/build/lib/*.jar"/>
  +                </fileset>
  +            </mergefiles>
  +        </jlink>
  +        <jar jarfile="avalon-excalibur.jar" compress="true">
  +            <zipfileset src="avalon-excalibur-tmp.jar" />
  +        </jar>
  +        <delete file="avalon-excalibur-tmp.jar"/>
  +
  +    </target>
  +
  +    <!-- Generate one mega jar-ball -->
       <target name="mega-jar" description="Generate one large jar for all the products">
           <!-- Sub projects which do not depend on any other excalibur sub projects. -->
           <ant dir="altrmi" target="jar"/>
  @@ -166,8 +197,7 @@
           <ant dir="tar" target="jar"/>
           <ant dir="zip" target="jar"/>
   
  -        <!-- I am not sure we should be putting new Jars in here - Paul H -->
  -        <jlink compress="false" outfile="excalibur-all.jar">
  +        <jlink compress="false" outfile="excalibur-all-tmp.jar">
               <mergefiles>
                   <fileset dir=".">
                       <include name="*/build/lib/*.jar"/>
  @@ -175,6 +205,10 @@
                   </fileset>
               </mergefiles>
           </jlink>
  +        <jar jarfile="excalibur-all.jar" compress="true">
  +            <zipfileset src="excalibur-all-tmp.jar" />
  +        </jar>
  +        <delete file="avalon-excalibur-tmp.jar"/>
       </target>
   
       <!-- Generate all docs -->
  
  
  
  1.32      +2 -2      jakarta-avalon-excalibur/gump.xml
  
  Index: gump.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/gump.xml,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- gump.xml	7 Apr 2002 06:54:59 -0000	1.31
  +++ gump.xml	8 Apr 2002 10:32:06 -0000	1.32
  @@ -40,8 +40,8 @@
           <work nested="all/build/scratchpad"/>
   
           <home nested="all/build/lib"/>
  -        <jar name="avalon-excalibur.jar" id="avalon-excalibur"/>
  -        <jar name="avalon-scratchpad.jar" id="avalon-scratchpad"/>
  +        <jar name="excalibur-core.jar" id="excalibur-core"/>
  +        <jar name="excalibur-scratchpad.jar" id="excalibur-scratchpad"/>
           <javadoc nested="build/javadocs" module="jakarta-avalon"/>
   
           <!-- doesn't work yet. Need to wait till next release of checkstyle
  
  
  
  1.3       +6 -1      jakarta-avalon-excalibur/default.properties
  
  
  
  
  1.3       +270 -66   jakarta-avalon-excalibur/depchecker.xml
  
  
  
  
  1.2       +33 -0     jakarta-avalon-excalibur/dependencies.txt
  
  
  
  
  1.11      +91 -52    jakarta-avalon-excalibur/all/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/all/ant.properties.sample,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ant.properties.sample	4 Apr 2002 12:14:01 -0000	1.10
  +++ ant.properties.sample	8 Apr 2002 10:32:06 -0000	1.11
  @@ -1,9 +1,96 @@
  -# This file is a sample .ant.properties file used for building Excalibur.
  -# Modify it for your own needs and copy it to .ant.properties 
  +# -----------------------------------------------------------------------------
  +# Component ant.properties.sample
   #
  -# <-- starts a comment
  +# This is an example "ant.properties" file, used to customize the building of
  +# the component for your local environment.  It defines the location of all
  +# external modules that this component depends on.  If the defaults in
  +# default.properties don't work for you, copy this file to "ant.properties" in
  +# the source directory, and customize it as needed.
  +#
  +# The ant.properties values in this directory apply only to this component.
  +# It is overridden by ../ant.properties and ~/build.properties
  +# It overrides all default.properties files.
  +#
  +# $Id: ant.properties.sample,v 1.11 2002/04/08 10:32:06 jefft Exp $
  +# -----------------------------------------------------------------------------
  +# --------------------------------------------------
  +#                REQUIRED LIBRARIES
  +# --------------------------------------------------
  +
  +# If you have a jar repository, uncomment these, fix the version numbers, and
  +# delete all subsequent jar sections
  +#
  +#avalon-framework.jar = ${lib.repo}/avalon-framework-${avalon-framework-ver}.jar
  +#avalon-logkit.jar = ${lib.repo}/avalon-logkit.jar
  +#excalibur-instrument.jar = ${lib.repo}/excalibur-instrument-${excalibur-instrument.ver}.jar
  +#excalibur-collections.jar = ${lib.repo}/excalibur-collections-${excalibur-collections.ver}.jar
  +#excalibur-concurrent.jar = ${lib.repo}/excalibur-concurrent-${excalibur-concurrent.ver}.jar
  +#xml-apis.jar=${lib.repo}/xmlParserAPIs-2.0.0.jar
  +#xerces.jar = ${lib.repo}/xercesImpl-2.0.0.jar
  +#xalan.jar = ${lib.repo}/xalan-2.1.0.jar
  +#bsf.jar = ${lib.rep}/bsf.jar
  +#junit.jar = ${lib.repo}/junit-3.7.jar
  +#junitperf.jar = ${lib.repo}/junitperf.jar
  +#jaxen.jar = ${lib.repo}/jaxen-full.jar
  +#saxpath.jar = ${lib.repo}/saxpath.jar
  +
  +# Otherwise, define these..
  +
  +base.path=${basedir}/../..
  +avalon-excalibur.home=${basedir}/..
  +
  +# ----- Avalon Framework -----
  +avalon-framework.home=../../jakarta-avalon
  +avalon-framework.lib=${avalon-framework.home}/build/lib
  +avalon-framework.jar=${avalon-framework.lib}/avalon-framework.jar
  +
  +# ----- Excalibur Instrument, version 0.1 or later -----
  +excalibur-instrument.home=${avalon-excalibur.home}/instrument/dist
  +excalibur-instrument.lib=${excalibur-instrument.home}
  +excalibur-instrument.jar=${excalibur-instrument.lib}/excalibur-instrument-0.1.jar
  +
  +# ----- Excalibur Collections, version 1.0 or later -----
  +excalibur-collections.home=${avalon-excalibur.home}/collections/dist
  +excalibur-collections.lib=${excalibur-collections.home}
  +excalibur-collections.jar=${excalibur-collections.lib}/excalibur-collections-1.0.jar
  +
  +# ----- Excalibur Concurrent, version 1.0 or later -----
  +excalibur-concurrent.home=${avalon-excalibur.home}/concurrent/dist
  +excalibur-concurrent.lib=${excalibur-concurrent.home}
  +excalibur-concurrent.jar=${excalibur-concurrent.lib}/excalibur-concurrent-1.0.jar
  +
  +# ----- Avalon Logkit -----
  +avalon-logkit.home=${base.path}/jakarta-avalon-logkit
  +avalon-logkit.lib=${avalon-logkit.home}/build/lib
  +avalon-logkit.jar=${avalon-logkit.lib}/logkit.jar
  +
  +tools.dir = ${avalon-framework.home}/tools
  +avalon-logkit.jar = ${tools.dir}/ext/logkit.jar
  +xml-apis.jar = ${tools.dir}/lib/xml-apis.jar
  +xerces.jar = ${tools.dir}/lib/xerces-1.4.4.jar
  +
  +# The following are needed for the documentation system, but not for building
  +# the jar
  +xalan.jar = ${tools.dir}/lib/xalan-2.2.0-D13.jar
  +bsf.jar = ${tools.dir}/lib/bsf.jar
  +junit.jar = ${tools.dir}/lib/junit-3.7.jar
  +junitperf.jar = ${tools.dir}/lib/junitperf.jar
  +tools.jar = ${java.home}/../lib/tools.jar
  +jaxen.jar = ${lib.dir}/jaxen-full.jar
  +saxpath.jar = ${lib.dir}/saxpath.jar
  +
  +# The path to tools.jar, required for building the docs. Most people won't need
  +# to set this, unless $JRE_HOME is not equal to $JAVA_HOME/jre. For example, on
  +# Debian, IBM's j2sdk1.3 .deb puts the JRE in /usr/lib/j2sdk1.3, # and the JDK
  +# in /usr/lib/j2re1.3, requiring the variable to be set. Note: ${java.home} is
  +# the JRE home, not $JAVA_HOME.
  +#tools.jar=${java.home}/../j2sdk1.3/lib/tools.jar
  +
   
  -# If you want to use the better than average jikes compiler, uncomment the next line
  +# ----- Compile Control Flags -----
  +build.debug=on
  +build.optimize=off
  +build.deprecation=off
   #build.compiler=jikes
   
   # To link to local documentation, run the "dist" target for each project and
  @@ -30,51 +117,3 @@
   # Username and password to use when connecting to the test database
   test.jdbc.user=test
   test.jdbc.password=test
  -
  -# The path to tools.jar, required for building the docs. Most people won't need
  -# to set this, unless $JRE_HOME is not equal to $JAVA_HOME/jre. For example, on
  -# Debian, IBM's j2sdk1.3 .deb puts the JRE in /usr/lib/j2sdk1.3, # and the JDK
  -# in /usr/lib/j2re1.3, requiring the variable to be set. Note: ${java.home} is
  -# the JRE home, not $JAVA_HOME.
  -#tools.jar=${java.home}/../j2sdk1.3/lib/tools.jar
  -
  -# --------------------------------------------------
  -#                REQUIRED LIBRARIES
  -# --------------------------------------------------
  -
  -# ----- Avalon Framework -----
  -avalon-framework.home=${basedir}/../../jakarta-avalon/build/lib
  -avalon-framework.jar=${avalon-framework.home}/avalon-framework.jar
  -
  -# ----- Excalibur Collections -----
  -excalibur-collections.home=../collections/build/lib
  -excalibur-collections.jar=${excalibur-collections.home}/excalibur-collections-1.0.jar
  -
  -# ----- Excalibur Command -----
  -excalibur-command.home=../command/build/lib
  -excalibur-command.jar=${excalibur-command.home}/excalibur-command-1.0a.jar
  -
  -# ----- Excalibur Concurrent -----
  -excalibur-concurrent.home=../concurrent/build/lib
  -excalibur-concurrent.jar=${excalibur-concurrent.home}/excalibur-concurrent-1.0.jar
  -
  -# ----- Excalibur Event -----
  -excalibur-event.home=../event/build/lib
  -excalibur-event.jar=${excalibur-event.home}/excalibur-event-1.0a.jar
  -
  -# ----- Excalibur Pool -----
  -excalibur-pool.home=../pool/build/lib
  -excalibur-pool.jar=${excalibur-pool.home}/excalibur-pool-1.0.jar
  -
  -# ----- Excalibur Logger -----
  -excalibur-logger.home=../logger/build/lib
  -excalibur-logger.jar=${excalibur-logger.home}/excalibur-logger-1.0.jar
  -
  -# ----- Excalibur component -----
  -excalibur-component.home=../component/build/lib
  -excalibur-component.jar=${excalibur-component.home}/excalibur-component-1.0.jar
  -
  -# ----- Excalibur Instrument -----
  -excalibur-instrument.home=../instrument/build/lib
  -excalibur-instrument.jar=${excalibur-instrument.home}/excalibur-instrument-0.1.jar
  -
  
  
  
  1.130     +127 -122  jakarta-avalon-excalibur/all/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/all/build.xml,v
  retrieving revision 1.129
  retrieving revision 1.130
  diff -u -r1.129 -r1.130
  --- build.xml	5 Apr 2002 07:11:34 -0000	1.129
  +++ build.xml	8 Apr 2002 10:32:06 -0000	1.130
  @@ -12,6 +12,7 @@
    Federico Barbieri <scoobie@apache.org>
    Berin Loritsch <bloritsch@apache.org>
    Peter Donald <peter@apache.org>
  + Peter Donald <peter@apache.org>
   
   Legal:
     Copyright (c) 1999-2002 The Apache Software Foundation. All Rights Reserved.
  @@ -21,122 +22,52 @@
   
   <project name="Avalon Excalibur" default="main" basedir=".">
   
  -  <!--
  -    Give user a chance to override without editing this file
  -    (and without typing -D each time he compiles it)
  -  -->
  -  <property file="build.properties"/>
  -  <property file="ant.properties"/> <!-- The build.properties version is preferred -->
  -  <property file="${user.home}/.ant.properties"/>
  -
  -  <property name="name" value="excalibur"/>
  -  <property name="Name" value="Excalibur"/>
  -  <property name="version" value="4.1"/>
  -  <property name="release" value="1st"/>
  -  <property name="status" value="final"/>
  -  <property name="short.version" value="4.1"/>
  -  <property name="year" value="1999-2002"/>
  -  <property name="compress.jars" value="true"/>
  -
  -  <property name="excalibur.name" value="avalon-${name}"/>
  -  <property name="scratchpad.name" value="avalon-scratchpad"/>
  -
  -  <property name="build.debug" value="on"/>
  -  <property name="build.optimize" value="off"/>
  -  <property name="build.deprecation" value="off"/>
  -
  -  <!-- Set the properties for intermediate directory -->
  -  <property name="build.dir" value="build"/>
  -  <property name="build.src" value="${build.dir}/src"/>
  -  <property name="build.lib" value="${build.dir}/lib"/>
  -  <property name="build.classes" value="${build.dir}/classes"/>
  -  <property name="build.scratchpad" value="${build.dir}/scratchpad"/>
  -  <property name="build.javadocs" value="${build.dir}/javadocs"/>
  -  <property name="build.javadocs-scratchpad" value="${build.dir}/javadocs-scratchpad"/>
  -  <property name="build.docs" value="${build.dir}/docs"/>
  -  <property name="build.testdocs" value="${build.docs}/test"/>
  -  <property name="build.testsrc" value="${build.dir}/testsrc"/>
  -  <property name="build.testclasses" value="${build.dir}/testclasses"/>
  -  <property name="build.reports" value="${build.dir}/reports"/>
  -  <property name="build.context" value="${build.dir}/documentation"/>
  -  <property name="build.xdocs" value="${build.context}/xdocs"/>
  -
  -  <!-- Set the properties for source directories -->
  -  <property name="src.dir" value="src"/>
  -  <property name="java.dir" value="${src.dir}/java"/>
  -  <property name="test.dir" value="${src.dir}/test"/>
  -  <property name="scratchpad.dir" value="${src.dir}/scratchpad"/>
  -  <property name="lib.dir" value="lib"/>
  -  <property name="tools.dir" value="../../jakarta-avalon/tools"/>
  -  <property name="docs.dir" value="docs"/>
  -  <property name="www.dir" value="../../jakarta-avalon-site/docs/${name}"/>
  -  <property name="javadocs.dir" value="${docs.dir}/api"/>
  -  <property name="javadocs-scratchpad.dir" value="${docs.dir}/api-scratchpad"/>
  -  <property name="xdocs.dir" value="${src.dir}/xdocs"/>
  -  <property name="context.dir" value="../../jakarta-avalon/src/documentation"/>
  -
  -  <property name="dist.name" value="${Name}-${version}"/>
  -  <property name="dist.base" value="distributions"/>
  -
  -  <property name="j2ee.jar" value="${cjan.lib}/j2ee.jar"/>
  -  <property name="avalon-framework.jar"
  -      value="${basedir}/../../jakarta-avalon/build/lib/avalon-framework.jar"/>
  -  <property name="excalibur-collections.jar"
  -      value="../collections/build/lib/excalibur-collections-1.0.jar"/>
  -  <property name="excalibur-command.jar"
  -      value="../command/build/lib/excalibur-command-1.0a.jar"/>
  -  <property name="excalibur-concurrent.jar"
  -      value="../concurrent/build/lib/excalibur-concurrent-1.0.jar"/>
  -  <property name="excalibur-event.jar"
  -      value="../event/build/lib/excalibur-event-1.0a.jar"/>
  -  <property name="excalibur-instrument.jar"
  -      value="../instrument/build/lib/excalibur-instrument-0.1.jar"/>
  -  <property name="logkit.jar" value="${tools.dir}/ext/logkit.jar"/>
  -  <property name="xerces.jar" value="${tools.dir}/lib/xerces-1.4.4.jar"/>
  -  <property name="xalan.jar" value="${tools.dir}/lib/xalan-2.2.0-D13.jar"/>
  -  <property name="bsf.jar" value="${tools.dir}/lib/bsf.jar"/>
  -  <property name="junit.jar" value="${tools.dir}/lib/junit-3.7.jar"/>
  -  <property name="junitperf.jar" value="${tools.dir}/lib/junitperf.jar"/>
  -  <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
  -  <property name="jaxen.jar" value="${lib.dir}/jaxen-full.jar"/>
  -  <property name="saxpath.jar" value="${lib.dir}/saxpath.jar"/>
  -
  -  <property name="announce2txt" value="${tools.dir}/announcement2txt.xsl"/>
  -  <property name="announce2header" value="${tools.dir}/announcement2header.xsl"/>
  -  <property name="announce2readme" value="${tools.dir}/announcement2readme.xsl"/>
  -  <property name="announce2site" value="${tools.dir}/announcement2site.xsl"/>
  -
  -  <path id="project.class.path">
  -    <pathelement location="${avalon-framework.jar}"/>
  -    <pathelement location="${excalibur-collections.jar}"/>
  -    <pathelement location="${excalibur-concurrent.jar}"/>
  -    <pathelement location="${excalibur-instrument.jar}"/>
  -    <pathelement location="${excalibur-logger.jar}"/>
  -    <pathelement location="${excalibur-pool.jar}"/>
  -    <pathelement location="${excalibur-component.jar}"/>
  -    <pathelement location="${excalibur-event.jar}"/>
  -    <pathelement location="${excalibur-command.jar}"/>
  -    <pathelement location="${j2ee.jar}"/>
  -    <pathelement location="${logkit.jar}"/>
  -    <pathelement location="${xalan.jar}"/>
  -    <pathelement location="${bsf.jar}"/>
  -    <pathelement location="${xerces.jar}"/>
  -    <pathelement location="${junit.jar}"/>
  -    <pathelement location="${junitperf.jar}"/>
  -    <pathelement location="${jaxen.jar}"/>
  -    <pathelement location="${saxpath.jar}"/>
  -    <pathelement path="${java.class.path}" />
  -    <fileset dir="${lib.dir}">
  -      <include name="*.jar" />
  -      <exclude name="logkit*.jar"/>
  -      <exclude name="avalon-framework*.jar"/>
  -    </fileset>
  -    <pathelement path="${build.classes}" />
  -    <pathelement path="${build.scratchpad}" />
  -  </path>
  +    <property file="${user.home}/build.properties"/>
  +    <property file="../ant.properties"/>
  +    <property file="ant.properties"/>
  +    <property file="${user.home}/.ant.properties"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
  +
  +    <!-- Classpath for product -->
  +    <path id="project.class.path">
  +        <pathelement location="${avalon-framework.jar}"/>
  +        <pathelement location="${excalibur-collections.jar}"/>
  +        <pathelement location="${excalibur-concurrent.jar}"/>
  +        <pathelement location="${excalibur-instrument.jar}"/>
  +        <pathelement location="${excalibur-component.jar}"/>
  +        <pathelement location="${excalibur-event.jar}"/>
  +        <pathelement location="${excalibur-pool.jar}"/>
  +        <pathelement location="${excalibur-logger.jar}"/>
  +        <!--
  +        for one class in scratchpad. Commented out as this is recursive
  +        <pathelement location="${excalibur-fortress.jar}"/>
  +        -->
  +        <pathelement location="${j2ee.jar}"/>
  +        <pathelement location="${avalon-logkit.jar}"/>
  +        <pathelement location="${bsf.jar}"/>
  +        <pathelement location="${xerces.jar}"/>
  +        <pathelement location="${xalan.jar}"/>
  +        <pathelement location="${xml-apis.jar}"/>
  +        <pathelement location="${junit.jar}"/>
  +        <pathelement location="${junitperf.jar}"/>
  +        <pathelement location="${jaxen.jar}"/>
  +        <pathelement location="${saxpath.jar}"/>
  +        <pathelement path="${java.class.path}" />
  +        <fileset dir="${lib.dir}">
  +            <include name="*.jar" />
  +            <exclude name="logkit*.jar"/>
  +            <exclude name="avalon-framework*.jar"/>
  +        </fileset>
  +        <pathelement path="${build.classes}" />
  +        <pathelement path="${build.scratchpad}" />
  +    </path>
  +  <property name="cp" refid="project.class.path"/>
   
     <path id="tools.class.path">
       <pathelement location="${xerces.jar}"/>
  +    <pathelement location="${xalan.jar}"/>
  +    <pathelement location="${xml-apis.jar}"/>
       <pathelement location="${junit.jar}"/>
       <pathelement location="${tools.jar}"/>
       <fileset dir="${tools.dir}/lib">
  @@ -231,8 +162,80 @@
       <mkdir dir="${build.dir}"/>
     </target>
   
  +  <target name="dependencies" description="Check dependencies">
  +    <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredClass">
  +      <property name="name" value="junit.jar"/>
  +      <property name="class" value="junit.framework.Test"/>
  +      <property name="classpath" value="${cp}"/>
  +  </ant>
  +    <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
  +      <property name="name" value="excalibur-collections.jar"/>
  +      <property name="path" value="${excalibur-collections.jar}"/>
  +      <property name="proj.home" value="${basedir}/../collections"/>
  +     </ant>
  +    <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
  +      <property name="name" value="excalibur-concurrent.jar"/>
  +      <property name="path" value="${excalibur-concurrent.jar}"/>
  +      <property name="proj.home" value="${basedir}/../concurrent"/>
  +  </ant>
  +    <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
  +      <property name="name" value="excalibur-instrument.jar"/>
  +      <property name="path" value="${excalibur-instrument.jar}"/>
  +      <property name="proj.home" value="${basedir}/../instrument"/>
  +    </ant>
  +    <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
  +      <property name="name" value="excalibur-component.jar"/>
  +      <property name="path" value="${excalibur-component.jar}"/>
  +      <property name="proj.home" value="${basedir}/../component"/>
  +    </ant>
  +    <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
  +      <property name="name" value="excalibur-event.jar"/>
  +      <property name="path" value="${excalibur-event.jar}"/>
  +      <property name="proj.home" value="${basedir}/../event"/>
  +    </ant>
  +    <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
  +      <property name="name" value="excalibur-pool.jar"/>
  +      <property name="path" value="${excalibur-pool.jar}"/>
  +      <property name="proj.home" value="${basedir}/../pool"/>
  +    </ant>
  +    <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
  +      <property name="name" value="excalibur-logger.jar"/>
  +      <property name="path" value="${excalibur-logger.jar}"/>
  +      <property name="proj.home" value="${basedir}/../logger"/>
  +    </ant>
  +  <!--
  +    <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
  +      <property name="name" value="excalibur-fortress.jar"/>
  +      <property name="path" value="${excalibur-fortress.jar}"/>
  +      <property name="proj.home" value="${basedir}/../fortress"/>
  +  </ant>
  +  -->
  +    <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
  +      <property name="name" value="avalon-framework.jar"/>
  +      <property name="path" value="${avalon-framework.jar}"/>
  +    </ant>
  +    <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
  +      <property name="name" value="xerces.jar"/>
  +      <property name="path" value="${xerces.jar}"/>
  +    </ant>
  +    <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
  +      <property name="name" value="xalan.jar"/>
  +      <property name="path" value="${xalan.jar}"/>
  +    </ant>
  +    <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredClass">
  +      <property name="name" value="logkit.jar"/>
  +      <property name="class" value="org.apache.log.Logger"/>
  +      <property name="classpath" value="${cp}"/>
  +    </ant>
  +    <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredClass">
  +      <property name="name" value="xml-apis.jar"/>
  +      <property name="class" value="javax.xml.parsers.SAXParser"/>
  +      <property name="classpath" value="${cp}"/>
  +  </ant>
  +  </target>
  +
     <!-- Compiles the source code -->
  -  <target name="compile" depends="prepare" description="compiles the source code">
  +  <target name="compile" depends="prepare, dependencies" description="Compiles the source code">
   
       <mkdir dir="${build.classes}"/>
       <mkdir dir="${build.scratchpad}"/>
  @@ -318,6 +321,8 @@
              deprecation="${build.deprecation}"
              target="1.2">
         <classpath refid="project.class.path" />
  +      <exclude name="**/mpool/**"/> <!-- Still has recursive dep on command -->
  +      <exclude name="org/apache/avalon/excalibur/source/SourceResolverImpl.java"/> <!-- Recursive dep on Fortress -->
         <exclude name="**/test/**"/>
       </javac>
     </target>
  @@ -605,7 +610,7 @@
         </fileset>
       </copy>
   
  -    <!-- Copy files from jakarta-avalon-excalibur src/xdocs -->
  +    <!-- Copy files from jakarta-excalibur-core src/xdocs -->
       <copy todir="${build.xdocs}" filtering="on">
         <fileset dir="${xdocs.dir}">
           <include name="announcement.xml" />
  @@ -630,7 +635,7 @@
   
       <mkdir dir="${build.lib}"/>
   
  -    <jar jarfile="${build.lib}/avalon-${name}.jar" basedir="${build.classes}" compress="${compress.jars}">
  +    <jar jarfile="${build.lib}/${excalibur.name}.jar" basedir="${build.classes}" compress="${compress.jars}">
         <include name="org/apache/avalon/excalibur/**"/>
         <exclude name="**/test/*"/>
         <exclude name="ListTest*"/>
  @@ -647,7 +652,7 @@
     <target name="install" depends="all,install-check-cjan">
   
       <mkdir dir="${cjan.lib}" />
  -    <copy file="${build.lib}/avalon-excalibur.jar" todir="${cjan.lib}"/>
  +    <copy file="${build.lib}/${excalibur.name}.jar" todir="${cjan.lib}"/>
       <copy file="${build.lib}/${scratchpad.name}.jar" todir="${cjan.lib}"/>
   
     </target>
  @@ -657,7 +662,7 @@
     </target>
   
     <target name="uninstall" depends="install-check-cjan">
  -    <delete file="${build.lib}/avalon-excalibur.jar" dir="${cjan.lib}"/>
  +      <delete file="${build.lib}/${excalibur.name}.jar" dir="${cjan.lib}"/>
       <delete file="${build.lib}/${scratchpad.name}.jar" dir="${cjan.lib}"/>
     </target>
   
  @@ -665,10 +670,10 @@
     <target name="dist-base" depends="all,javadocs,test-all">
   
       <mkdir dir="${dist.dir}"/>
  -    <copy file="${build.lib}/avalon-excalibur.jar" tofile="${dist.dir}/avalon-excalibur-${version}.jar"/>
  +    <copy file="${build.lib}/${excalibur.name}.jar" tofile="${dist.dir}/${excalibur.name}-${version}.jar"/>
   
       <copy file="${build.lib}/${scratchpad.name}.jar" tofile="${dist.dir}/${scratchpad.name}-${version}.jar"/>
  -    <copy file="${logkit.jar}" todir="${dist.dir}"/>
  +    <copy file="${avalon-logkit.jar}" todir="${dist.dir}"/>
       <copy file="${avalon-framework.jar}" todir="${dist.dir}"/>
   
       <mkdir dir="${dist.docs}"/>
  @@ -718,7 +723,7 @@
         </fileset>
       </copy>
   
  -    <copy file="${logkit.jar}" todir="${src.dist.lib}"/>
  +    <copy file="${avalon-logkit.jar}" todir="${src.dist.lib}"/>
       <copy file="${avalon-framework.jar}" todir="${src.dist.lib}"/>
   
       <copy todir="${src.dist.src}">
  @@ -757,7 +762,7 @@
         <param name="dist.dir" value="${dist.name}" />
       </antcall>
   
  -    <copy file="${build.lib}/avalon-excalibur.jar" tofile="${tools.dir}/ext/avalon-excalibur.jar"/>
  +    <copy file="${build.lib}/${excalibur.name}.jar" tofile="${tools.dir}/ext/${excalibur.name}.jar"/>
   
       <copy todir="${dist.name}/docs">
         <fileset dir="${docs.dir}"/>
  
  
  
  1.3       +28 -4     jakarta-avalon-excalibur/all/default.properties
  
  
  
  
  1.3       +17 -20    jakarta-avalon-excalibur/altrmi/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/ant.properties.sample,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ant.properties.sample	5 Apr 2002 14:14:25 -0000	1.2
  +++ ant.properties.sample	8 Apr 2002 10:32:07 -0000	1.3
  @@ -6,45 +6,42 @@
   # external modules that this component depend on.  Copy this file to
   # "ant.properties" in the source directory, and customize it as needed.
   #
  -# The ant.properties values in this directory apply only to this component, and
  -# override the defaults in ../ant.properties.
  +# The ant.properties values in this directory apply only to this component.
  +# It is overridden by ../ant.properties and ~/build.properties
  +# It overrides all default.properties files and ~/.ant.properties
   #
  -# $Id: ant.properties.sample,v 1.2 2002/04/05 14:14:25 bloritsch Exp $
  +# $Id: ant.properties.sample,v 1.3 2002/04/08 10:32:07 jefft Exp $
   # -----------------------------------------------------------------------------
   
  -# --------------------------------------------------
  -#      COMPONENT-SPECIFIC REQUIRED LIBRARIES
  -# --------------------------------------------------
  -
  -
   # ----- Compile Control Flags -----
   build.debug=on
   build.optimize=off
   build.deprecation=off
   
  -# ----- Base Directory in which all the packages are stored -----
  -base.path=../../
  -
   # --------------------------------------------------
   #                REQUIRED LIBRARIES
   # --------------------------------------------------
  +# ----- Base Directory in which all the packages are stored -----
  +base.path=${basedir}/../..
   
  -# ----- Avalon Framework -----
  -avalon-framework.home=../../jakarta-avalon/build/lib
  -avalon-framework.jar=${avalon-framework.home}/avalon-framework.jar
  -
  -# ----- JUnit Unit Test Suite, version 3.7 or later -----
  -junit.home=${base.path}/junit3.7
  -junit.lib=${junit.home}
  -junit.jar=${junit.lib}/junit.jar
  +# ----- Avalon Framework, version 4.1 or later -----
  +avalon-framework.home=${basedir}/../../jakarta-avalon
  +avalon-framework.lib=${avalon-framework.home}/build/lib
  +avalon-framework.jar=${avalon-framework.lib}/avalon-framework.jar
   
   
   # --------------------------------------------------
   #                OPTIONAL LIBRARIES
   # --------------------------------------------------
   
  -# ----- Checkstyle, version 2.1 or later -----
  +# ----- 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
   # do.checkstyle=
   checkstyle.home=${base.path}/checkstyle-2.1
  
  
  
  1.8       +31 -69    jakarta-avalon-excalibur/altrmi/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/build.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- build.xml	7 Apr 2002 10:20:14 -0000	1.7
  +++ build.xml	8 Apr 2002 10:32:07 -0000	1.8
  @@ -2,82 +2,40 @@
   
   <project name="Excalibur AltRMI" default="main" basedir=".">
   
  -    <!-- load per-project properties -->
  -    <property file="project.properties"/>
  -
  -    <!--
  -      Give user a chance to override without editing this file
  -      (and without typing -D each time he compiles it)
  -    -->
  -    <property file="ant.properties"/>
  +    <property file="${user.home}/build.properties"/>
       <property file="../ant.properties"/>
  +    <property file="ant.properties"/>
       <property file="${user.home}/.ant.properties"/>
  -
  -    <!-- Settings used to configure compile environment -->
  -    <property name="build.debug" value="on"/>
  -    <property name="build.optimize" value="off"/>
  -    <property name="build.deprecation" value="off"/>
  -    <property name="build.compress" value="false"/>
  -    <property name="junit.failonerror" value="false"/>
  -
  -    <!-- location of intermediate products -->
  -    <property name="build.dir" value="${basedir}/build"/>
  -    <property name="build.lib" value="${build.dir}/lib"/>
  -    <property name="build.conf" value="${build.dir}/conf"/>
  -    <property name="build.classes" value="${build.dir}/classes"/>
  -    <property name="build.genjava" value="${build.dir}/genjava"/>
  -    <property name="build.tests" value="${build.dir}/tests"/>
  -    <property name="build.reports" value="${build.dir}/reports"/>
  -
  -    <!-- Set the properties for source directories -->
  -    <property name="src.dir" value="${basedir}/src"/>
  -    <property name="java.dir" value="${src.dir}/java"/>
  -    <property name="conf.dir" value="${src.dir}/conf"/>
  -    <property name="test.dir" value="${src.dir}/test"/>
  -    <property name="xdocs.dir" value="${src.dir}/xdocs"/>  
  -    
  -    <!-- needed by Cocoon -->
  -    <property name="build.context" value="${build.dir}/documentation"/>
  -    <property name="build.docs" value="${build.dir}/docs"/>
  -    <property name="build.xdocs" value="${build.dir}/xdocs"/>
  -    <property name="context.dir" value="../../jakarta-avalon/src/documentation"/>
  -    <property name="tools.dir" value="../../jakarta-avalon/tools"/>
  -    <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
  -    <property name="docs.dir" value="dist/docs"/>
  -
  -    <!-- Set the properties for distribution directories -->
  -    <property name="dist.dir" value="${basedir}/dist"/>
  -    <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
  -
  -    <!-- Version of release -->
  -    <property name="version" value="0.6"/>
  -
  -    <!-- name of .zip/.tar.gz/.bz2 files and their top-level directory -->
  -    <property name="dist.name" value="${name}-${version}"/>
  -
  -    <!-- property indicating directory where all distribution archives are placed -->
  -    <property name="dist.base" value="distributions"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
           <pathelement path="${java.class.path}"/>
           <pathelement location="${build.classes}"/>
           <pathelement location="${avalon-framework.jar}"/>
  +        <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}"/>
           <pathelement location="${tools.jar}"/>
           <fileset dir="${tools.dir}/lib"/>
           <fileset dir="${tools.dir}/ext"/>
       </path>
  -        
  +
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  +    <target name="dependencies" description="Check dependencies">
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkFramework"/>
  +    </target>
  +
       <!-- Compiles the source code -->
  -    <target name="compile" description="Compiles the source code">
  +    <target name="compile" depends="dependencies" description="Compiles the source code">
   
           <mkdir dir="${build.classes}"/>
   
  @@ -113,35 +71,35 @@
   
           <mkdir dir="${build.lib}"/>
   
  -        <jar    jarfile="${build.lib}/excalibur-altrmi-common.jar"
  +        <jar jarfile="${build.lib}/excalibur-altrmi-common.jar"
               basedir="${build.classes}"
               compress="${build.compress}"
               manifest="src/conf/MANIFEST-common.MF">
             <include name="org/apache/excalibur/altrmi/common/**"/>
           </jar>
   
  -        <jar    jarfile="${build.lib}/excalibur-altrmi-client-interfaces.jar"
  +        <jar jarfile="${build.lib}/excalibur-altrmi-client-interfaces.jar"
               basedir="${build.classes}"
               compress="${build.compress}"
               manifest="src/conf/MANIFEST-client-interfaces.MF">
             <include name="org/apache/excalibur/altrmi/client/*"/>
           </jar>
   
  -        <jar    jarfile="${build.lib}/excalibur-altrmi-client-impl.jar"
  +        <jar jarfile="${build.lib}/excalibur-altrmi-client-impl.jar"
               basedir="${build.classes}"
               compress="${build.compress}"
               manifest="src/conf/MANIFEST-client-impl.MF">
             <include name="org/apache/excalibur/altrmi/client/impl/**"/>
           </jar>    
   
  -        <jar    jarfile="${build.lib}/excalibur-altrmi-server-interfaces.jar"
  +        <jar jarfile="${build.lib}/excalibur-altrmi-server-interfaces.jar"
               basedir="${build.classes}"
               compress="${build.compress}"
               manifest="src/conf/MANIFEST-server-interfaces.MF">
             <include name="org/apache/excalibur/altrmi/server/*"/>
           </jar>    
   
  -        <jar    jarfile="${build.lib}/excalibur-altrmi-server-impl.jar"
  +        <jar jarfile="${build.lib}/excalibur-altrmi-server-impl.jar"
               basedir="${build.classes}"
               compress="${build.compress}"
               manifest="src/conf/MANIFEST-server-impl.MF">
  @@ -149,7 +107,7 @@
           </jar>    
   
   
  -        <jar    jarfile="${build.lib}/excalibur-altrmi-generator.jar"
  +        <jar jarfile="${build.lib}/excalibur-altrmi-generator.jar"
               basedir="${build.classes}"
               manifest="src/conf/MANIFEST-generator.MF">
             <include name="org/apache/excalibur/altrmi/generator/**"/>
  @@ -159,7 +117,7 @@
       </target>
   
       <!-- Creates all the Javadocs -->
  -    <target name="javadocs" depends="compile" description="Generates the javadocs">
  +    <target name="javadocs" depends="compile" description="Generates the javadocs" unless="skip.javadocs">
   
           <mkdir dir="${dist.javadocs}"/>
           <javadoc packagenames="org.apache.*"
  @@ -179,7 +137,7 @@
           </javadoc>
       </target>
   
  -    <target name="test" depends="compile" description="Perform the unit tests">
  +    <target name="test" depends="compile" description="Perform the unit tests" unless="skip.tests">
   
           <echo message="Performing Unit Tests" />
   
  @@ -326,13 +284,17 @@
           description="Generates a minimal distribution (jar + javadocs)">
   
           <mkdir dir="${dist.dir}"/>
  -        <copy file="${build.lib}/${jar.name}" todir="${dist.dir}"/>
  +        <copy todir="${dist.dir}">
  +            <fileset dir="${build.lib}">
  +                <include name="*.jar"/>
  +            </fileset>
  +        </copy>
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
   
       </target>
  -    
  +
       <!-- Setup the filters -->
       <target name="setup-filters">
         <filter token="Name" value="Avalon ${Name}"/>
  @@ -407,7 +369,7 @@
             <include name="**"/>
           </fileset>
         </copy>    
  -      
  +
         <!-- hack for stupid transport on api link -->
         <replace file="${docs.dir}/index.html" token="index.html.xml" value="index.html"/>
        
  @@ -422,8 +384,8 @@
           </fileset>
         </copy>        
     
  -    </target>     
  -   
  +    </target>
  +
       <!-- Cleans up build and distribution directories -->
       <target name="clean" description="Cleans up the project">
           <delete file="checkstyle.cache"/>
  
  
  
  1.2       +70 -0     jakarta-avalon-excalibur/altrmi/default.properties
  
  
  
  
  1.3       +20 -15    jakarta-avalon-excalibur/baxter/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/baxter/ant.properties.sample,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ant.properties.sample	27 Mar 2002 11:09:59 -0000	1.2
  +++ ant.properties.sample	8 Apr 2002 10:32:07 -0000	1.3
  @@ -1,44 +1,49 @@
   # -----------------------------------------------------------------------------
  -# ant.properties.sample
  +# Component ant.properties.sample
   #
  -# This is an example "ant.properties" file, used to customize building component
  -# for your local environment.  It defines the location of all external
  -# modules that the component depends on.  Copy this file to "ant.properties"
  -# in the source directory, and customize it as needed.
  +# This is an example "ant.properties" file, used to customize the building of
  +# the component for your local environment.  It defines the location of all
  +# external modules that this component depend on.  Copy this file to
  +# "ant.properties" in the source directory, and customize it as needed.
   #
  -# $Id: ant.properties.sample,v 1.2 2002/03/27 11:09:59 donaldp Exp $
  +# The ant.properties values in this directory apply only to this component.
  +# 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/08 10:32:07 jefft Exp $
   # -----------------------------------------------------------------------------
   
  -
   # ----- Compile Control Flags -----
   build.debug=on
   build.optimize=off
   build.deprecation=off
  +#build.compiler=jikes
   
   # ----- Base Directory in which all the packages are stored -----
  -base.path=/opt
  +base.path=${basedir}/../..
   
   # --------------------------------------------------
   #                REQUIRED LIBRARIES
   # --------------------------------------------------
   
  -
  -# ----- JUnit Unit Test Suite, version 3.7 or later -----
  -junit.home=${base.path}/junit3.7
  -junit.lib=${junit.home}
  -junit.jar=${junit.lib}/junit.jar
  -
   # ----- Java Management Extensions (JMX) RI, version 1.0.1 or later -----
   jmx.home=${base.path}/jmx-1_0_1-ri_bin/jmx
   jmx.lib=${jmx.home}/lib
   jmx.jar=${jmx.lib}/jmxri.jar
   
  +
   # --------------------------------------------------
   #                OPTIONAL LIBRARIES
   # --------------------------------------------------
   
  -# ----- Checkstyle, version 2.1 or later -----
  +# ----- 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
   # do.checkstyle=
   checkstyle.home=${base.path}/checkstyle-2.1
  
  
  
  1.11      +26 -61    jakarta-avalon-excalibur/baxter/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/baxter/build.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- build.xml	7 Apr 2002 10:20:15 -0000	1.10
  +++ build.xml	8 Apr 2002 10:32:07 -0000	1.11
  @@ -2,60 +2,12 @@
   
   <project name="Excalibur Baxter" default="main" basedir=".">
   
  -    <!-- load per-project properties -->
  -    <property file="project.properties"/>
  -
  -    <!--
  -      Give user a chance to override without editing this file
  -      (and without typing -D each time he compiles it)
  -    -->
  -    <property file="ant.properties"/>
  +    <property file="${user.home}/build.properties"/>
       <property file="../ant.properties"/>
  +    <property file="ant.properties"/>
       <property file="${user.home}/.ant.properties"/>
  -
  -    <!-- Settings used to configure compile environment -->
  -    <property name="build.debug" value="on"/>
  -    <property name="build.optimize" value="off"/>
  -    <property name="build.deprecation" value="off"/>
  -    <property name="build.compress" value="false"/>
  -    <property name="junit.failonerror" value="false"/>
  -
  -    <!-- location of intermediate products -->
  -    <property name="build.dir" value="build"/>
  -    <property name="build.lib" value="${build.dir}/lib"/>
  -    <property name="build.conf" value="${build.dir}/conf"/>
  -    <property name="build.classes" value="${build.dir}/classes"/>
  -    <property name="build.tests" value="${build.dir}/tests"/>
  -    <property name="build.reports" value="${build.dir}/reports"/>
  -
  -    <!-- Set the properties for source directories -->
  -    <property name="src.dir" value="src"/>
  -    <property name="java.dir" value="${src.dir}/java"/>
  -    <property name="conf.dir" value="${src.dir}/conf"/>
  -    <property name="test.dir" value="${src.dir}/test"/>
  -
  -    <!-- needed by Cocoon -->
  -    <property name="build.context" value="${build.dir}/documentation"/>
  -    <property name="build.docs" value="${build.dir}/docs"/>
  -    <property name="build.xdocs" value="${build.dir}/xdocs"/>
  -    <property name="context.dir" value="../../jakarta-avalon/src/documentation"/>
  -    <property name="tools.dir" value="../../jakarta-avalon/tools"/>
  -    <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
  -    <property name="docs.dir" value="dist/docs"/>
  -    <property name="xdocs.dir" value="${src.dir}/xdocs"/>      
  -
  -    <!-- Set the properties for distribution directories -->
  -    <property name="dist.dir" value="dist"/>
  -    <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
  -
  -    <!-- name of .zip/.tar.gz/.bz2 files and their top-level directory -->
  -    <property name="dist.name" value="${name}-${version}"/>
  -
  -    <!-- name of jar file -->
  -    <property name="jar.name" value="${name}-${version}.jar"/>
  -
  -    <!-- property indicating directory where all distribution archives are placed -->
  -    <property name="dist.base" value="distributions"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
  @@ -65,19 +17,28 @@
           <pathelement location="${jmx.jar}"/>
           <pathelement location="${checkstyle.jar}"/>
       </path>
  -    
  +    <property name="cp" refid="project.class.path"/>
  +
       <path id="tools.class.path">
           <pathelement location="${junit.jar}"/>
           <pathelement location="${tools.jar}"/>
           <fileset dir="${tools.dir}/lib"/>
           <fileset dir="${tools.dir}/ext"/>
  -    </path>    
  +    </path>
   
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  +    <target name="dependencies" description="Check dependencies">
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
  +            <property name="name" value="jmx.jar"/>
  +            <property name="path" value="${jmx.jar}"/>
  +        </ant>
  +    </target>
  +
       <!-- Compiles the source code -->
  -    <target name="compile" description="Compiles the source code">
  +    <target name="compile" depends="dependencies" description="Compiles the source code">
   
           <mkdir dir="${build.classes}"/>
   
  @@ -115,7 +76,7 @@
               <fileset dir="../" includes="LICENSE.txt"/>
               <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
               <filterset>
  -                <filtersfile file="project.properties"/>
  +                <filtersfile file="default.properties"/>
               </filterset>
           </copy>
   
  @@ -138,7 +99,7 @@
       </target>
   
       <!-- Creates all the Javadocs -->
  -    <target name="javadocs" depends="compile" description="Generates the javadocs">
  +    <target name="javadocs" depends="compile" description="Generates the javadocs" unless="skip.javadocs">
   
           <mkdir dir="${dist.javadocs}"/>
           <javadoc packagenames="org.apache.*"
  @@ -159,7 +120,7 @@
           </javadoc>
       </target>
   
  -    <target name="test" depends="compile" description="Perform the unit tests">
  +    <target name="test" depends="compile" description="Perform the unit tests" unless="skip.tests">
   
           <echo message="Performing Unit Tests" />
   
  @@ -304,13 +265,17 @@
           description="Generates a minimal distribution (jar + javadocs)">
   
           <mkdir dir="${dist.dir}"/>
  -        <copy file="${build.lib}/${jar.name}" todir="${dist.dir}"/>
  +        <copy todir="${dist.dir}">
  +            <fileset dir="${build.lib}">
  +                <include name="*.jar"/>
  +            </fileset>
  +        </copy>
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
   
       </target>
  -    
  +
       <!-- Setup the filters -->
       <target name="setup-filters">
         <filter token="Name" value="Avalon ${Name}"/>
  @@ -400,7 +365,7 @@
           </fileset>
         </copy>        
     
  -    </target>        
  +    </target>
   
       <!-- Cleans up build and distribution directories -->
       <target name="clean" description="Cleans up the project">
  
  
  
  1.3       +18 -0     jakarta-avalon-excalibur/baxter/default.properties
  
  
  
  
  1.2       +12 -17    jakarta-avalon-excalibur/bzip2/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/bzip2/ant.properties.sample,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ant.properties.sample	24 Mar 2002 07:02:31 -0000	1.1
  +++ ant.properties.sample	8 Apr 2002 10:32:07 -0000	1.2
  @@ -6,43 +6,38 @@
   # external modules that this component depend on.  Copy this file to
   # "ant.properties" in the source directory, and customize it as needed.
   #
  -# The ant.properties values in this directory apply only to this component, and
  -# override the defaults in ../ant.properties.
  +# The ant.properties values in this directory apply only to this component.
  +# It is overridden by ../ant.properties and ~/build.properties
  +# It overrides all default.properties files and ~/.ant.properties
   #
  -# $Id: ant.properties.sample,v 1.1 2002/03/24 07:02:31 donaldp Exp $
  +# $Id: ant.properties.sample,v 1.2 2002/04/08 10:32:07 jefft Exp $
   # -----------------------------------------------------------------------------
   
  -# --------------------------------------------------
  -#      COMPONENT-SPECIFIC REQUIRED LIBRARIES
  -# --------------------------------------------------
  -
  -
   # ----- Compile Control Flags -----
   build.debug=on
   build.optimize=off
   build.deprecation=off
  +#build.compiler=jikes
   
   # ----- Base Directory in which all the packages are stored -----
  -base.path=/opt
  +base.path=${basedir}/../..
   
   # --------------------------------------------------
   #                REQUIRED LIBRARIES
   # --------------------------------------------------
  +# --------------------------------------------------
  +# --------------------------------------------------
  +#                OPTIONAL LIBRARIES
  +# --------------------------------------------------
   
  -
  -# ----- JUnit Unit Test Suite, version 3.7 or later -----
  +# ----- 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
   
   
  -
  -# --------------------------------------------------
  -#                OPTIONAL LIBRARIES
  -# --------------------------------------------------
  -
   # ----- Checkstyle, version 2.1 or later -----
  -
   # Uncomment the 'do.checkstyle' flag property to enable checkstyle
   # do.checkstyle=
   checkstyle.home=${base.path}/checkstyle-2.1
  
  
  
  1.11      +18 -57    jakarta-avalon-excalibur/bzip2/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/bzip2/build.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- build.xml	7 Apr 2002 10:20:15 -0000	1.10
  +++ build.xml	8 Apr 2002 10:32:07 -0000	1.11
  @@ -2,60 +2,12 @@
   
   <project name="Excalibur Bzip2" default="main" basedir=".">
   
  -    <!-- load per-project properties -->
  -    <property file="project.properties"/>
  -
  -    <!--
  -      Give user a chance to override without editing this file
  -      (and without typing -D each time he compiles it)
  -    -->
  -    <property file="ant.properties"/>
  +    <property file="${user.home}/build.properties"/>
       <property file="../ant.properties"/>
  +    <property file="ant.properties"/>
       <property file="${user.home}/.ant.properties"/>
  -
  -    <!-- Settings used to configure compile environment -->
  -    <property name="build.debug" value="on"/>
  -    <property name="build.optimize" value="off"/>
  -    <property name="build.deprecation" value="off"/>
  -    <property name="build.compress" value="false"/>
  -    <property name="junit.failonerror" value="false"/>
  -
  -    <!-- location of intermediate products -->
  -    <property name="build.dir" value="build"/>
  -    <property name="build.lib" value="${build.dir}/lib"/>
  -    <property name="build.conf" value="${build.dir}/conf"/>
  -    <property name="build.classes" value="${build.dir}/classes"/>
  -    <property name="build.tests" value="${build.dir}/tests"/>
  -    <property name="build.reports" value="${build.dir}/reports"/>
  -
  -    <!-- Set the properties for source directories -->
  -    <property name="src.dir" value="src"/>
  -    <property name="java.dir" value="${src.dir}/java"/>
  -    <property name="conf.dir" value="${src.dir}/conf"/>
  -    <property name="test.dir" value="${src.dir}/test"/>
  -
  -    <!-- needed by Cocoon -->
  -    <property name="build.context" value="${build.dir}/documentation"/>
  -    <property name="build.docs" value="${build.dir}/docs"/>
  -    <property name="build.xdocs" value="${build.dir}/xdocs"/>
  -    <property name="context.dir" value="../../jakarta-avalon/src/documentation"/>
  -    <property name="tools.dir" value="../../jakarta-avalon/tools"/>
  -    <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
  -    <property name="docs.dir" value="dist/docs"/>
  -    <property name="xdocs.dir" value="${src.dir}/xdocs"/>      
  -
  -    <!-- Set the properties for distribution directories -->
  -    <property name="dist.dir" value="dist"/>
  -    <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
  -
  -    <!-- name of .zip/.tar.gz/.bz2 files and their top-level directory -->
  -    <property name="dist.name" value="${name}-${version}"/>
  -
  -    <!-- name of jar file -->
  -    <property name="jar.name" value="${name}-${version}.jar"/>
  -
  -    <!-- property indicating directory where all distribution archives are placed -->
  -    <property name="dist.base" value="distributions"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
  @@ -64,6 +16,7 @@
           <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}"/>
  @@ -75,8 +28,12 @@
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  +    <target name="dependencies" description="Check dependencies">
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
  +    </target>
  +
       <!-- Compiles the source code -->
  -    <target name="compile" description="Compiles the source code">
  +    <target name="compile" depends="dependencies" description="Compiles the source code">
   
           <mkdir dir="${build.classes}"/>
   
  @@ -114,7 +71,7 @@
               <fileset dir="../" includes="LICENSE.txt"/>
               <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
               <filterset>
  -                <filtersfile file="project.properties"/>
  +                <filtersfile file="default.properties"/>
               </filterset>
           </copy>
   
  @@ -137,7 +94,7 @@
       </target>
   
       <!-- Creates all the Javadocs -->
  -    <target name="javadocs" depends="compile" description="Generates the javadocs">
  +    <target name="javadocs" depends="compile" description="Generates the javadocs" unless="skip.javadocs">
   
           <mkdir dir="${dist.javadocs}"/>
           <javadoc packagenames="org.apache.*"
  @@ -158,7 +115,7 @@
           </javadoc>
       </target>
   
  -    <target name="test" depends="compile" description="Perform the unit tests">
  +    <target name="test" depends="compile" description="Perform the unit tests" unless="skip.tests">
   
           <echo message="Performing Unit Tests" />
   
  @@ -303,7 +260,11 @@
           description="Generates a minimal distribution (jar + javadocs)">
   
           <mkdir dir="${dist.dir}"/>
  -        <copy file="${build.lib}/${jar.name}" todir="${dist.dir}"/>
  +        <copy todir="${dist.dir}">
  +            <fileset dir="${build.lib}">
  +                <include name="*.jar"/>
  +            </fileset>
  +        </copy>
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
  
  
  
  1.3       +13 -0     jakarta-avalon-excalibur/bzip2/default.properties
  
  
  
  
  1.5       +17 -17    jakarta-avalon-excalibur/cache/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/cache/ant.properties.sample,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ant.properties.sample	30 Mar 2002 08:46:04 -0000	1.4
  +++ ant.properties.sample	8 Apr 2002 10:32:07 -0000	1.5
  @@ -6,44 +6,44 @@
   # external modules that this component depend on.  Copy this file to
   # "ant.properties" in the source directory, and customize it as needed.
   #
  -# The ant.properties values in this directory apply only to this component, and
  -# override the defaults in ../ant.properties.
  +# The ant.properties values in this directory apply only to this component.
  +# It is overridden by ../ant.properties and ~/build.properties
  +# It overrides all default.properties files and ~/.ant.properties
   #
  -# $Id: ant.properties.sample,v 1.4 2002/03/30 08:46:04 jefft Exp $
  +# $Id: ant.properties.sample,v 1.5 2002/04/08 10:32:07 jefft Exp $
   # -----------------------------------------------------------------------------
   
  -# --------------------------------------------------
  -#      COMPONENT-SPECIFIC REQUIRED LIBRARIES
  -# --------------------------------------------------
  -# Avalon framework jar. Defaulted in build.xml
  -avalon-framework.jar=${basedir}/../../jakarta-avalon/build/lib/avalon-framework.jar
  -
  -
   # ----- Compile Control Flags -----
   build.debug=on
   build.optimize=off
   build.deprecation=off
  +#build.compiler=jikes
   
   # ----- Base Directory in which all the packages are stored -----
  -base.path=/opt
  +base.path=${basedir}/../..
   
   # --------------------------------------------------
   #                REQUIRED LIBRARIES
   # --------------------------------------------------
   
  -
  -# ----- JUnit Unit Test Suite, version 3.7 or later -----
  -junit.home=${base.path}/junit3.7
  -junit.lib=${junit.home}
  -junit.jar=${junit.lib}/junit.jar
  +# ----- Avalon Framework, version 4.1 or later -----
  +avalon-framework.home=${basedir}/../../jakarta-avalon
  +avalon-framework.lib=${avalon-framework.home}/build/lib
  +avalon-framework.jar=${avalon-framework.lib}/avalon-framework.jar
   
   
   # --------------------------------------------------
   #                OPTIONAL LIBRARIES
   # --------------------------------------------------
   
  -# ----- Checkstyle, version 2.1 or later -----
  +# ----- 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
   # do.checkstyle=
   checkstyle.home=${base.path}/checkstyle-2.1
  
  
  
  1.20      +19 -62    jakarta-avalon-excalibur/cache/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/cache/build.xml,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- build.xml	7 Apr 2002 10:20:15 -0000	1.19
  +++ build.xml	8 Apr 2002 10:32:07 -0000	1.20
  @@ -2,73 +2,22 @@
   
   <project name="Excalibur Cache" default="main" basedir=".">
   
  -    <!-- load per-project properties -->
  -    <property file="project.properties"/>
  -
  -    <!--
  -      Give user a chance to override without editing this file
  -      (and without typing -D each time he compiles it)
  -    -->
  -    <property file="ant.properties"/>
  +    <property file="${user.home}/build.properties"/>
       <property file="../ant.properties"/>
  +    <property file="ant.properties"/>
       <property file="${user.home}/.ant.properties"/>
  -
  -    <!-- Default property values -->
  -    <property name="avalon-framework.jar"
  -        value="${basedir}/../../jakarta-avalon/build/lib/avalon-framework.jar"/>
  -
  -    <!-- Settings used to configure compile environment -->
  -    <property name="build.debug" value="on"/>
  -    <property name="build.optimize" value="off"/>
  -    <property name="build.deprecation" value="off"/>
  -    <property name="build.compress" value="false"/>
  -    <property name="junit.failonerror" value="false"/>
  -
  -    <!-- location of intermediate products -->
  -    <property name="build.dir" value="build"/>
  -    <property name="build.lib" value="${build.dir}/lib"/>
  -    <property name="build.conf" value="${build.dir}/conf"/>
  -    <property name="build.classes" value="${build.dir}/classes"/>
  -    <property name="build.tests" value="${build.dir}/tests"/>
  -    <property name="build.reports" value="${build.dir}/reports"/>
  -
  -    <!-- Set the properties for source directories -->
  -    <property name="src.dir" value="src"/>
  -    <property name="java.dir" value="${src.dir}/java"/>
  -    <property name="conf.dir" value="${src.dir}/conf"/>
  -    <property name="test.dir" value="${src.dir}/test"/>
  -
  -    <!-- needed by Cocoon -->
  -    <property name="build.context" value="${build.dir}/documentation"/>
  -    <property name="build.docs" value="${build.dir}/docs"/>
  -    <property name="build.xdocs" value="${build.dir}/xdocs"/>
  -    <property name="context.dir" value="../../jakarta-avalon/src/documentation"/>
  -    <property name="tools.dir" value="../../jakarta-avalon/tools"/>
  -    <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
  -    <property name="docs.dir" value="dist/docs"/>
  -    <property name="xdocs.dir" value="${src.dir}/xdocs"/>      
  -
  -    <!-- Set the properties for distribution directories -->
  -    <property name="dist.dir" value="dist"/>
  -    <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
  -
  -    <!-- name of .zip/.tar.gz/.bz2 files and their top-level directory -->
  -    <property name="dist.name" value="${name}-${version}"/>
  -
  -    <!-- name of jar file -->
  -    <property name="jar.name" value="${name}-${version}.jar"/>
  -
  -    <!-- property indicating directory where all distribution archives are placed -->
  -    <property name="dist.base" value="distributions"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
           <pathelement path="${java.class.path}"/>
  -        <pathelement location="${avalon-framework.jar}"/>
           <pathelement location="${build.classes}"/>
  +        <pathelement location="${avalon-framework.jar}"/>
           <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}"/>
  @@ -80,8 +29,12 @@
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  +    <target name="dependencies" description="Check dependencies">
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
  +    </target>
  +
       <!-- Compiles the source code -->
  -    <target name="compile" description="Compiles the source code">
  +    <target name="compile" depends="dependencies" description="Compiles the source code">
   
           <mkdir dir="${build.classes}"/>
   
  @@ -119,7 +72,7 @@
               <fileset dir="../" includes="LICENSE.txt"/>
               <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
               <filterset>
  -                <filtersfile file="project.properties"/>
  +                <filtersfile file="default.properties"/>
               </filterset>
           </copy>
   
  @@ -142,7 +95,7 @@
       </target>
   
       <!-- Creates all the Javadocs -->
  -    <target name="javadocs" depends="compile" description="Generates the javadocs">
  +    <target name="javadocs" depends="compile" description="Generates the javadocs" unless="skip.javadocs">
   
           <mkdir dir="${dist.javadocs}"/>
           <javadoc packagenames="org.apache.*"
  @@ -163,7 +116,7 @@
           </javadoc>
       </target>
   
  -    <target name="test" depends="compile" description="Perform the unit tests">
  +    <target name="test" depends="compile" description="Perform the unit tests" unless="skip.tests">
   
           <echo message="Performing Unit Tests" />
   
  @@ -308,7 +261,11 @@
           description="Generates a minimal distribution (jar + javadocs)">
   
           <mkdir dir="${dist.dir}"/>
  -        <copy file="${build.lib}/${jar.name}" todir="${dist.dir}"/>
  +        <copy todir="${dist.dir}">
  +            <fileset dir="${build.lib}">
  +                <include name="*.jar"/>
  +            </fileset>
  +        </copy>
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
  
  
  
  1.3       +13 -0     jakarta-avalon-excalibur/cache/default.properties
  
  
  
  
  1.4       +13 -11    jakarta-avalon-excalibur/cli/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/cli/ant.properties.sample,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ant.properties.sample	24 Mar 2002 00:26:11 -0000	1.3
  +++ ant.properties.sample	8 Apr 2002 10:32:08 -0000	1.4
  @@ -6,10 +6,11 @@
   # external modules that this component depend on.  Copy this file to
   # "ant.properties" in the source directory, and customize it as needed.
   #
  -# The ant.properties values in this directory apply only to this component, and
  -# override the defaults in ../ant.properties.
  +# The ant.properties values in this directory apply only to this component.
  +# 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/03/24 00:26:11 jefft Exp $
  +# $Id: ant.properties.sample,v 1.4 2002/04/08 10:32:08 jefft Exp $
   # -----------------------------------------------------------------------------
   
   # --------------------------------------------------
  @@ -21,28 +22,29 @@
   build.debug=on
   build.optimize=off
   build.deprecation=off
  +#build.compiler=jikes
   
   # ----- Base Directory in which all the packages are stored -----
  -base.path=/opt
  +base.path=${basedir}/../..
   
   # --------------------------------------------------
   #                REQUIRED LIBRARIES
   # --------------------------------------------------
   
   
  -# ----- JUnit Unit Test Suite, version 3.7 or later -----
  -junit.home=${base.path}/junit3.7
  -junit.lib=${junit.home}
  -junit.jar=${junit.lib}/junit.jar
  -
  -
   
   # --------------------------------------------------
   #                OPTIONAL LIBRARIES
   # --------------------------------------------------
   
  -# ----- Checkstyle, version 2.1 or later -----
  +# ----- 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
   # do.checkstyle=
   checkstyle.home=${base.path}/checkstyle-2.1
  
  
  
  1.31      +18 -57    jakarta-avalon-excalibur/cli/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/cli/build.xml,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- build.xml	7 Apr 2002 10:20:15 -0000	1.30
  +++ build.xml	8 Apr 2002 10:32:08 -0000	1.31
  @@ -2,60 +2,12 @@
   
   <project name="Excalibur CLI" default="main" basedir=".">
   
  -    <!-- load per-project properties -->
  -    <property file="project.properties"/>
  -
  -    <!--
  -      Give user a chance to override without editing this file
  -      (and without typing -D each time he compiles it)
  -    -->
  -    <property file="ant.properties"/>
  +    <property file="${user.home}/build.properties"/>
       <property file="../ant.properties"/>
  +    <property file="ant.properties"/>
       <property file="${user.home}/.ant.properties"/>
  -
  -    <!-- Settings used to configure compile environment -->
  -    <property name="build.debug" value="on"/>
  -    <property name="build.optimize" value="off"/>
  -    <property name="build.deprecation" value="off"/>
  -    <property name="build.compress" value="false"/>
  -    <property name="junit.failonerror" value="false"/>
  -
  -    <!-- location of intermediate products -->
  -    <property name="build.dir" value="build"/>
  -    <property name="build.lib" value="${build.dir}/lib"/>
  -    <property name="build.conf" value="${build.dir}/conf"/>
  -    <property name="build.classes" value="${build.dir}/classes"/>
  -    <property name="build.tests" value="${build.dir}/tests"/>
  -    <property name="build.reports" value="${build.dir}/reports"/>
  -
  -    <!-- Set the properties for source directories -->
  -    <property name="src.dir" value="src"/>
  -    <property name="java.dir" value="${src.dir}/java"/>
  -    <property name="conf.dir" value="${src.dir}/conf"/>
  -    <property name="test.dir" value="${src.dir}/test"/>
  -
  -    <!-- needed by Cocoon -->
  -    <property name="build.context" value="${build.dir}/documentation"/>
  -    <property name="build.docs" value="${build.dir}/docs"/>
  -    <property name="build.xdocs" value="${build.dir}/xdocs"/>
  -    <property name="context.dir" value="../../jakarta-avalon/src/documentation"/>
  -    <property name="tools.dir" value="../../jakarta-avalon/tools"/>
  -    <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
  -    <property name="docs.dir" value="dist/docs"/>
  -    <property name="xdocs.dir" value="${src.dir}/xdocs"/>      
  -
  -    <!-- Set the properties for distribution directories -->
  -    <property name="dist.dir" value="dist"/>
  -    <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
  -
  -    <!-- name of .zip/.tar.gz/.bz2 files and their top-level directory -->
  -    <property name="dist.name" value="${name}-${version}"/>
  -
  -    <!-- name of jar file -->
  -    <property name="jar.name" value="${name}-${version}.jar"/>
  -
  -    <!-- property indicating directory where all distribution archives are placed -->
  -    <property name="dist.base" value="distributions"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
  @@ -64,6 +16,7 @@
           <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}"/>
  @@ -75,8 +28,12 @@
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  +    <target name="dependencies" description="Check dependencies">
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
  +    </target>
  +
       <!-- Compiles the source code -->
  -    <target name="compile" description="Compiles the source code">
  +    <target name="compile" depends="dependencies" description="Compiles the source code">
   
           <mkdir dir="${build.classes}"/>
   
  @@ -114,7 +71,7 @@
               <fileset dir="../" includes="LICENSE.txt"/>
               <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
               <filterset>
  -                <filtersfile file="project.properties"/>
  +                <filtersfile file="default.properties"/>
               </filterset>
           </copy>
   
  @@ -137,7 +94,7 @@
       </target>
   
       <!-- Creates all the Javadocs -->
  -    <target name="javadocs" depends="compile" description="Generates the javadocs">
  +    <target name="javadocs" depends="compile" description="Generates the javadocs" unless="skip.javadocs">
   
           <mkdir dir="${dist.javadocs}"/>
           <javadoc packagenames="org.apache.*"
  @@ -158,7 +115,7 @@
           </javadoc>
       </target>
   
  -    <target name="test" depends="compile" description="Perform the unit tests">
  +    <target name="test" depends="compile" description="Perform the unit tests" unless="skip.tests">
   
           <echo message="Performing Unit Tests" />
   
  @@ -303,7 +260,11 @@
           description="Generates a minimal distribution (jar + javadocs)">
   
           <mkdir dir="${dist.dir}"/>
  -        <copy file="${build.lib}/${jar.name}" todir="${dist.dir}"/>
  +        <copy todir="${dist.dir}">
  +            <fileset dir="${build.lib}">
  +                <include name="*.jar"/>
  +            </fileset>
  +        </copy>
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
  
  
  
  1.3       +13 -0     jakarta-avalon-excalibur/cli/default.properties
  
  
  
  
  1.2       +13 -11    jakarta-avalon-excalibur/collections/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/collections/ant.properties.sample,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ant.properties.sample	29 Mar 2002 07:19:38 -0000	1.1
  +++ ant.properties.sample	8 Apr 2002 10:32:08 -0000	1.2
  @@ -6,10 +6,11 @@
   # external modules that this component depend on.  Copy this file to
   # "ant.properties" in the source directory, and customize it as needed.
   #
  -# The ant.properties values in this directory apply only to this component, and
  -# override the defaults in ../ant.properties.
  +# The ant.properties values in this directory apply only to this component.
  +# It is overridden by ../ant.properties and ~/build.properties
  +# It overrides all default.properties files and ~/.ant.properties
   #
  -# $Id: ant.properties.sample,v 1.1 2002/03/29 07:19:38 jefft Exp $
  +# $Id: ant.properties.sample,v 1.2 2002/04/08 10:32:08 jefft Exp $
   # -----------------------------------------------------------------------------
   
   # --------------------------------------------------
  @@ -21,28 +22,29 @@
   build.debug=on
   build.optimize=off
   build.deprecation=off
  +#build.compiler=jikes
   
   # ----- Base Directory in which all the packages are stored -----
  -base.path=/opt
  +base.path=${basedir}/../..
   
   # --------------------------------------------------
   #                REQUIRED LIBRARIES
   # --------------------------------------------------
   
   
  -# ----- JUnit Unit Test Suite, version 3.7 or later -----
  -junit.home=${base.path}/junit3.7
  -junit.lib=${junit.home}
  -junit.jar=${junit.lib}/junit.jar
  -
  -
   
   # --------------------------------------------------
   #                OPTIONAL LIBRARIES
   # --------------------------------------------------
   
  -# ----- Checkstyle, version 2.1 or later -----
  +# ----- 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
   # do.checkstyle=
   checkstyle.home=${base.path}/checkstyle-2.1
  
  
  
  1.9       +21 -60    jakarta-avalon-excalibur/collections/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/collections/build.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- build.xml	7 Apr 2002 10:20:15 -0000	1.8
  +++ build.xml	8 Apr 2002 10:32:08 -0000	1.9
  @@ -2,60 +2,12 @@
   
   <project name="Excalibur Collections" default="main" basedir=".">
   
  -    <!-- load per-project properties -->
  -    <property file="project.properties"/>
  -
  -    <!--
  -      Give user a chance to override without editing this file
  -      (and without typing -D each time he compiles it)
  -    -->
  -    <property file="ant.properties"/>
  +    <property file="${user.home}/build.properties"/>
       <property file="../ant.properties"/>
  +    <property file="ant.properties"/>
       <property file="${user.home}/.ant.properties"/>
  -
  -    <!-- Settings used to configure compile environment -->
  -    <property name="build.debug" value="on"/>
  -    <property name="build.optimize" value="off"/>
  -    <property name="build.deprecation" value="off"/>
  -    <property name="build.compress" value="false"/>
  -    <property name="junit.failonerror" value="false"/>
  -
  -    <!-- location of intermediate products -->
  -    <property name="build.dir" value="build"/>
  -    <property name="build.lib" value="${build.dir}/lib"/>
  -    <property name="build.conf" value="${build.dir}/conf"/>
  -    <property name="build.classes" value="${build.dir}/classes"/>
  -    <property name="build.tests" value="${build.dir}/tests"/>
  -    <property name="build.reports" value="${build.dir}/reports"/>
  -
  -    <!-- Set the properties for source directories -->
  -    <property name="src.dir" value="src"/>
  -    <property name="java.dir" value="${src.dir}/java"/>
  -    <property name="conf.dir" value="${src.dir}/conf"/>
  -    <property name="test.dir" value="${src.dir}/test"/>
  -    
  -    <!-- needed by Cocoon -->
  -    <property name="build.context" value="${build.dir}/documentation"/>
  -    <property name="build.docs" value="${build.dir}/docs"/>
  -    <property name="build.xdocs" value="${build.dir}/xdocs"/>
  -    <property name="context.dir" value="../../jakarta-avalon/src/documentation"/>
  -    <property name="tools.dir" value="../../jakarta-avalon/tools"/>
  -    <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
  -    <property name="docs.dir" value="dist/docs"/>
  -    <property name="xdocs.dir" value="${src.dir}/xdocs"/>  
  -
  -    <!-- Set the properties for distribution directories -->
  -    <property name="dist.dir" value="dist"/>
  -    <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
  -
  -    <!-- name of .zip/.tar.gz/.bz2 files and their top-level directory -->
  -    <property name="dist.name" value="${name}-${version}"/>
  -
  -    <!-- name of jar file -->
  -    <property name="jar.name" value="${name}-${version}.jar"/>
  -
  -    <!-- property indicating directory where all distribution archives are placed -->
  -    <property name="dist.base" value="distributions"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
  @@ -64,7 +16,8 @@
           <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}"/>
           <pathelement location="${tools.jar}"/>
  @@ -75,8 +28,12 @@
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  +    <target name="dependencies" description="Check dependencies">
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
  +    </target>
  +
       <!-- Compiles the source code -->
  -    <target name="compile" description="Compiles the source code">
  +    <target name="compile" depends="dependencies" description="Compiles the source code">
   
           <mkdir dir="${build.classes}"/>
   
  @@ -114,7 +71,7 @@
               <fileset dir="../" includes="LICENSE.txt"/>
               <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
               <filterset>
  -                <filtersfile file="project.properties"/>
  +                <filtersfile file="default.properties"/>
               </filterset>
           </copy>
   
  @@ -137,7 +94,7 @@
       </target>
   
       <!-- Creates all the Javadocs -->
  -    <target name="javadocs" depends="compile" description="Generates the javadocs">
  +    <target name="javadocs" depends="compile" description="Generates the javadocs" unless="skip.javadocs">
   
           <mkdir dir="${dist.javadocs}"/>
           <javadoc packagenames="org.apache.*"
  @@ -158,7 +115,7 @@
           </javadoc>
       </target>
   
  -    <target name="test" depends="compile" description="Perform the unit tests">
  +    <target name="test" depends="compile" description="Perform the unit tests" unless="skip.tests">
   
           <echo message="Performing Unit Tests" />
   
  @@ -303,13 +260,17 @@
           description="Generates a minimal distribution (jar + javadocs)">
   
           <mkdir dir="${dist.dir}"/>
  -        <copy file="${build.lib}/${jar.name}" todir="${dist.dir}"/>
  +        <copy todir="${dist.dir}">
  +            <fileset dir="${build.lib}">
  +                <include name="*.jar"/>
  +            </fileset>
  +        </copy>
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
   
       </target>
  -    
  +
       <!-- Setup the filters -->
       <target name="setup-filters">
         <filter token="Name" value="Avalon Excalibur - Collections"/>
  @@ -399,7 +360,7 @@
           </fileset>
         </copy>        
     
  -    </target>      
  +    </target>
   
       <!-- Cleans up build and distribution directories -->
       <target name="clean" description="Cleans up the project">
  
  
  
  1.3       +13 -0     jakarta-avalon-excalibur/collections/default.properties
  
  
  
  
  1.5       +12 -15    jakarta-avalon-excalibur/command/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/command/ant.properties.sample,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ant.properties.sample	4 Apr 2002 08:34:52 -0000	1.4
  +++ ant.properties.sample	8 Apr 2002 10:32:08 -0000	1.5
  @@ -6,24 +6,21 @@
   # external modules that this component depend on.  Copy this file to
   # "ant.properties" in the source directory, and customize it as needed.
   #
  -# The ant.properties values in this directory apply only to this component, and
  -# override the defaults in ../ant.properties.
  +# The ant.properties values in this directory apply only to this component.
  +# It is overridden by ../ant.properties and ~/build.properties
  +# It overrides all default.properties files and ~/.ant.properties
   #
  -# $Id: ant.properties.sample,v 1.4 2002/04/04 08:34:52 hammant Exp $
  +# $Id: ant.properties.sample,v 1.5 2002/04/08 10:32:08 jefft Exp $
   # -----------------------------------------------------------------------------
   
  -# --------------------------------------------------
  -#      COMPONENT-SPECIFIC REQUIRED LIBRARIES
  -# --------------------------------------------------
  -
  -
   # ----- Compile Control Flags -----
   build.debug=on
   build.optimize=off
   build.deprecation=off
  +#build.compiler=jikes
   
   # ----- Base Directory in which all the packages are stored -----
  -base.path=/opt
  +base.path=${basedir}/../..
   
   # --------------------------------------------------
   #                REQUIRED LIBRARIES
  @@ -67,18 +64,18 @@
   excalibur-util.lib=${excalibur-util.home}
   excalibur-util.jar=${excalibur-util.lib}/excalibur-util-1.0.jar
   
  -# ----- JUnit Unit Test Suite, version 3.7 or later -----
  -junit.home=${base.path}/junit3.7
  -junit.lib=${junit.home}
  -junit.jar=${junit.lib}/junit.jar
  -
   
   # --------------------------------------------------
   #                OPTIONAL LIBRARIES
   # --------------------------------------------------
   
  -# ----- Checkstyle, version 2.1 or later -----
  +# ----- 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
   # do.checkstyle=
   checkstyle.home=${base.path}/checkstyle-2.1
  
  
  
  1.10      +33 -64    jakarta-avalon-excalibur/command/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/command/build.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- build.xml	7 Apr 2002 10:20:15 -0000	1.9
  +++ build.xml	8 Apr 2002 10:32:08 -0000	1.10
  @@ -2,89 +2,54 @@
   
   <project name="Excalibur Command" default="main" basedir=".">
   
  -    <!-- load per-project properties -->
  -    <property file="project.properties"/>
  -
  -    <!--
  -      Give user a chance to override without editing this file
  -      (and without typing -D each time he compiles it)
  -    -->
  -    <property file="ant.properties"/>
  +    <property file="${user.home}/build.properties"/>
       <property file="../ant.properties"/>
  +    <property file="ant.properties"/>
       <property file="${user.home}/.ant.properties"/>
  -
  -    <!-- Settings used to configure compile environment -->
  -    <property name="build.debug" value="on"/>
  -    <property name="build.optimize" value="off"/>
  -    <property name="build.deprecation" value="off"/>
  -    <property name="build.compress" value="false"/>
  -    <property name="junit.failonerror" value="false"/>
  -
  -    <!-- location of intermediate products -->
  -    <property name="build.dir" value="build"/>
  -    <property name="build.lib" value="${build.dir}/lib"/>
  -    <property name="build.conf" value="${build.dir}/conf"/>
  -    <property name="build.classes" value="${build.dir}/classes"/>
  -    <property name="build.tests" value="${build.dir}/tests"/>
  -    <property name="build.reports" value="${build.dir}/reports"/>
  -
  -    <!-- Set the properties for source directories -->
  -    <property name="src.dir" value="src"/>
  -    <property name="java.dir" value="${src.dir}/java"/>
  -    <property name="conf.dir" value="${src.dir}/conf"/>
  -    <property name="test.dir" value="${src.dir}/test"/>
  -
  -    <!-- needed by Cocoon -->
  -    <property name="build.context" value="${build.dir}/documentation"/>
  -    <property name="build.docs" value="${build.dir}/docs"/>
  -    <property name="build.xdocs" value="${build.dir}/xdocs"/>
  -    <property name="context.dir" value="../../jakarta-avalon/src/documentation"/>
  -    <property name="tools.dir" value="../../jakarta-avalon/tools"/>
  -    <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
  -    <property name="docs.dir" value="dist/docs"/>
  -    <property name="xdocs.dir" value="${src.dir}/xdocs"/>      
  -
  -    <!-- Set the properties for distribution directories -->
  -    <property name="dist.dir" value="dist"/>
  -    <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
  -
  -    <!-- name of .zip/.tar.gz/.bz2 files and their top-level directory -->
  -    <property name="dist.name" value="${name}-${version}"/>
  -
  -    <!-- name of jar file -->
  -    <property name="jar.name" value="${name}-${version}.jar"/>
  -
  -    <!-- property indicating directory where all distribution archives are placed -->
  -    <property name="dist.base" value="distributions"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
           <pathelement path="${java.class.path}"/>
           <pathelement location="${build.classes}"/>
  -        <pathelement location="${avalon-framework.jar}"/>
  +        <pathelement location="${excalibur-event.jar}"/>
  +        <pathelement location="${excalibur-util.jar}"/>
  +        <pathelement location="${excalibur-thread.jar}"/>
           <pathelement location="${excalibur-collections.jar}"/>
           <pathelement location="${excalibur-concurrent.jar}"/>
  -        <pathelement location="${excalibur-lang.jar}"/>
           <pathelement location="${excalibur-pool.jar}"/>
  -        <pathelement location="${excalibur-thread.jar}"/>
  -        <pathelement location="${excalibur-util.jar}"/>
  -        <pathelement location="${excalibur-event.jar}"/>
  +        <pathelement location="${excalibur-core.jar}"/>
  +        <pathelement location="${excalibur-scratchpad.jar}"/>
  +        <pathelement location="${avalon-framework.jar}"/>
           <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}"/>
           <pathelement location="${tools.jar}"/>
           <fileset dir="${tools.dir}/lib"/>
           <fileset dir="${tools.dir}/ext"/>
  -    </path>    
  +    </path>
   
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  +    <target name="dependencies" description="Check dependencies">
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkEvent"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkUtil"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkThread"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCollections"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkConcurrent"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkPool"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkFramework"/>
  +    </target>
  +
       <!-- Compiles the source code -->
  -    <target name="compile" description="Compiles the source code">
  +    <target name="compile" depends="dependencies" description="Compiles the source code">
   
           <mkdir dir="${build.classes}"/>
   
  @@ -122,7 +87,7 @@
               <fileset dir="../" includes="LICENSE.txt"/>
               <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
               <filterset>
  -                <filtersfile file="project.properties"/>
  +                <filtersfile file="default.properties"/>
               </filterset>
           </copy>
   
  @@ -145,7 +110,7 @@
       </target>
   
       <!-- Creates all the Javadocs -->
  -    <target name="javadocs" depends="compile" description="Generates the javadocs">
  +    <target name="javadocs" depends="compile" description="Generates the javadocs" unless="skip.javadocs">
   
           <mkdir dir="${dist.javadocs}"/>
           <javadoc packagenames="org.apache.*"
  @@ -166,7 +131,7 @@
           </javadoc>
       </target>
   
  -    <target name="test" depends="compile" description="Perform the unit tests">
  +    <target name="test" depends="compile" description="Perform the unit tests" unless="skip.tests">
   
           <echo message="Performing Unit Tests" />
   
  @@ -311,7 +276,11 @@
           description="Generates a minimal distribution (jar + javadocs)">
   
           <mkdir dir="${dist.dir}"/>
  -        <copy file="${build.lib}/${jar.name}" todir="${dist.dir}"/>
  +        <copy todir="${dist.dir}">
  +            <fileset dir="${build.lib}">
  +                <include name="*.jar"/>
  +            </fileset>
  +        </copy>
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
  
  
  
  1.3       +34 -1     jakarta-avalon-excalibur/command/default.properties
  
  
  
  
  1.3       +26 -25    jakarta-avalon-excalibur/component/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/component/ant.properties.sample,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ant.properties.sample	4 Apr 2002 08:09:17 -0000	1.2
  +++ ant.properties.sample	8 Apr 2002 10:32:08 -0000	1.3
  @@ -6,58 +6,59 @@
   # external modules that this component depend on.  Copy this file to
   # "ant.properties" in the source directory, and customize it as needed.
   #
  -# The ant.properties values in this directory apply only to this component, and
  -# override the defaults in ../ant.properties.
  +# The ant.properties values in this directory apply only to this component.
  +# It is overridden by ../ant.properties and ~/build.properties
  +# It overrides all default.properties files and ~/.ant.properties
   #
  -# $Id: ant.properties.sample,v 1.2 2002/04/04 08:09:17 hammant Exp $
  +# $Id: ant.properties.sample,v 1.3 2002/04/08 10:32:08 jefft Exp $
   # -----------------------------------------------------------------------------
   
  -# --------------------------------------------------
  -#      COMPONENT-SPECIFIC REQUIRED LIBRARIES
  -# --------------------------------------------------
  -
  -
   # ----- Compile Control Flags -----
   build.debug=on
   build.optimize=off
   build.deprecation=off
  +#build.compiler=jikes
   
   # ----- Base Directory in which all the packages are stored -----
  -base.path=/opt
  +base.path=${basedir}/../..
   
   # --------------------------------------------------
   #                REQUIRED LIBRARIES
   # --------------------------------------------------
  -
  -# ----- Logkit -----
  -logkit.home=../../jakarta-avalon-logkit/build/lib
  -logkit.jar=${logkit.home}/logkit.jar
  -
  -# ----- Avalon Framework -----
  -avalon-framework.home=../../jakarta-avalon/build/lib
  -avalon-framework.jar=${avalon-framework.home}/avalon-framework.jar
  +# ----- Avalon Logkit -----
  +avalon-logkit.home=${base.path}/jakarta-avalon-logkit
  +avalon-logkit.lib=${avalon-logkit.home}/build/lib
  +avalon-logkit.jar=${avalon-logkit.lib}/logkit.jar
  +
  +# ----- Avalon Framework, version 4.1 or later -----
  +avalon-framework.home=${base.path}/jakarta-avalon
  +avalon-framework.lib=${avalon-framework.home}/build/lib
  +avalon-framework.jar=${avalon-framework.lib}/avalon-framework.jar
   
   # ----- Excalibur Logger -----
  -excalibur-logger.home=../logger/build/lib
  +excalibur-logger.home=${avalon-excalibur.home}/logger
  +excalibur-logger.lib=${excalibur-logger.home}/build/lib
   excalibur-logger.jar=${excalibur-logger.home}/excalibur-logger-1.0.jar
   
   # ----- Excalibur Pool -----
  -excalibur-pool.home=../pool/build/lib
  +excalibur-pool.home=${avalon-excalibur.home}/pool
  +excalibur-pool.lib=${excalibur-pool.home}/build/lib
   excalibur-pool.jar=${excalibur-pool.home}/excalibur-pool-1.0.jar
   
  -# ----- JUnit Unit Test Suite, version 3.7 or later -----
  -junit.home=${base.path}/junit3.7
  -junit.lib=${junit.home}
  -junit.jar=${junit.lib}/junit.jar
  -
   
   
   # --------------------------------------------------
   #                OPTIONAL LIBRARIES
   # --------------------------------------------------
   
  -# ----- Checkstyle, version 2.1 or later -----
  +# ----- 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
   # do.checkstyle=
   checkstyle.home=${base.path}/checkstyle-2.1
  
  
  
  1.5       +24 -58    jakarta-avalon-excalibur/component/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/component/build.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- build.xml	7 Apr 2002 10:20:15 -0000	1.4
  +++ build.xml	8 Apr 2002 10:32:08 -0000	1.5
  @@ -2,66 +2,18 @@
   
   <project name="Excalibur Component" default="main" basedir=".">
   
  -    <!-- load per-project properties -->
  -    <property file="project.properties"/>
  -
  -    <!--
  -      Give user a chance to override without editing this file
  -      (and without typing -D each time he compiles it)
  -    -->
  -    <property file="ant.properties"/>
  +    <property file="${user.home}/build.properties"/>
       <property file="../ant.properties"/>
  +    <property file="ant.properties"/>
       <property file="${user.home}/.ant.properties"/>
  -
  -    <!-- Settings used to configure compile environment -->
  -    <property name="build.debug" value="on"/>
  -    <property name="build.optimize" value="off"/>
  -    <property name="build.deprecation" value="off"/>
  -    <property name="build.compress" value="false"/>
  -    <property name="junit.failonerror" value="false"/>
  -
  -    <!-- location of intermediate products -->
  -    <property name="build.dir" value="build"/>
  -    <property name="build.lib" value="${build.dir}/lib"/>
  -    <property name="build.conf" value="${build.dir}/conf"/>
  -    <property name="build.classes" value="${build.dir}/classes"/>
  -    <property name="build.tests" value="${build.dir}/tests"/>
  -    <property name="build.reports" value="${build.dir}/reports"/>
  -
  -    <!-- Set the properties for source directories -->
  -    <property name="src.dir" value="src"/>
  -    <property name="java.dir" value="${src.dir}/java"/>
  -    <property name="conf.dir" value="${src.dir}/conf"/>
  -    <property name="test.dir" value="${src.dir}/test"/>
  -
  -    <!-- needed by Cocoon -->
  -    <property name="build.context" value="${build.dir}/documentation"/>
  -    <property name="build.docs" value="${build.dir}/docs"/>
  -    <property name="build.xdocs" value="${build.dir}/xdocs"/>
  -    <property name="context.dir" value="../../jakarta-avalon/src/documentation"/>
  -    <property name="tools.dir" value="../../jakarta-avalon/tools"/>
  -    <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
  -    <property name="docs.dir" value="dist/docs"/>
  -    <property name="xdocs.dir" value="${src.dir}/xdocs"/>      
  -
  -    <!-- Set the properties for distribution directories -->
  -    <property name="dist.dir" value="dist"/>
  -    <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
  -
  -    <!-- name of .zip/.tar.gz/.bz2 files and their top-level directory -->
  -    <property name="dist.name" value="${name}-${version}"/>
  -
  -    <!-- name of jar file -->
  -    <property name="jar.name" value="${name}-${version}.jar"/>
  -
  -    <!-- property indicating directory where all distribution archives are placed -->
  -    <property name="dist.base" value="distributions"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
           <pathelement path="${java.class.path}"/>
           <pathelement location="${build.classes}"/>
  -        <pathelement location="${logkit.jar}"/>
  +        <pathelement location="${avalon-logkit.jar}"/>
           <pathelement location="${avalon-framework.jar}"/>
           <pathelement location="${excalibur-collections.jar}"/>
           <pathelement location="${excalibur-logger.jar}"/>
  @@ -69,6 +21,7 @@
           <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}"/>
  @@ -80,8 +33,17 @@
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  +    <target name="dependencies" description="Check dependencies">
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkLogkit"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkFramework"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCollections"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkLogger"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkPool"/>
  +    </target>
  +
       <!-- Compiles the source code -->
  -    <target name="compile" description="Compiles the source code">
  +    <target name="compile" depends="dependencies" description="Compiles the source code">
   
           <mkdir dir="${build.classes}"/>
   
  @@ -122,7 +84,7 @@
               <fileset dir="../" includes="LICENSE.txt"/>
               <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
               <filterset>
  -                <filtersfile file="project.properties"/>
  +                <filtersfile file="default.properties"/>
               </filterset>
           </copy>
   
  @@ -145,7 +107,7 @@
       </target>
   
       <!-- Creates all the Javadocs -->
  -    <target name="javadocs" depends="compile" description="Generates the javadocs">
  +    <target name="javadocs" depends="compile" description="Generates the javadocs" unless="skip.javadocs">
   
           <mkdir dir="${dist.javadocs}"/>
           <javadoc packagenames="org.apache.*"
  @@ -166,7 +128,7 @@
           </javadoc>
       </target>
   
  -    <target name="test" depends="compile" description="Perform the unit tests">
  +    <target name="test" depends="compile" description="Perform the unit tests" unless="skip.tests">
   
           <echo message="Performing Unit Tests" />
   
  @@ -311,7 +273,11 @@
           description="Generates a minimal distribution (jar + javadocs)">
   
           <mkdir dir="${dist.dir}"/>
  -        <copy file="${build.lib}/${jar.name}" todir="${dist.dir}"/>
  +        <copy todir="${dist.dir}">
  +            <fileset dir="${build.lib}">
  +                <include name="*.jar"/>
  +            </fileset>
  +        </copy>
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
  
  
  
  1.2       +98 -0     jakarta-avalon-excalibur/component/default.properties
  
  
  
  
  1.2       +11 -16    jakarta-avalon-excalibur/concurrent/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/concurrent/ant.properties.sample,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ant.properties.sample	29 Mar 2002 09:41:42 -0000	1.1
  +++ ant.properties.sample	8 Apr 2002 10:32:09 -0000	1.2
  @@ -6,43 +6,38 @@
   # external modules that this component depend on.  Copy this file to
   # "ant.properties" in the source directory, and customize it as needed.
   #
  -# The ant.properties values in this directory apply only to this component, and
  -# override the defaults in ../ant.properties.
  +# The ant.properties values in this directory apply only to this component.
  +# It is overridden by ../ant.properties and ~/build.properties
  +# It overrides all default.properties files and ~/.ant.properties
   #
  -# $Id: ant.properties.sample,v 1.1 2002/03/29 09:41:42 jefft Exp $
  +# $Id: ant.properties.sample,v 1.2 2002/04/08 10:32:09 jefft Exp $
   # -----------------------------------------------------------------------------
   
  -# --------------------------------------------------
  -#      COMPONENT-SPECIFIC REQUIRED LIBRARIES
  -# --------------------------------------------------
  -
  -
   # ----- Compile Control Flags -----
   build.debug=on
   build.optimize=off
   build.deprecation=off
  +#build.compiler=jikes
   
   # ----- Base Directory in which all the packages are stored -----
  -base.path=/opt
  +base.path=${basedir}/../..
   
   # --------------------------------------------------
   #                REQUIRED LIBRARIES
   # --------------------------------------------------
   
  +# --------------------------------------------------
  +#                OPTIONAL LIBRARIES
  +# --------------------------------------------------
   
  -# ----- JUnit Unit Test Suite, version 3.7 or later -----
  +# ----- 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
   
   
  -
  -# --------------------------------------------------
  -#                OPTIONAL LIBRARIES
  -# --------------------------------------------------
  -
   # ----- Checkstyle, version 2.1 or later -----
  -
   # Uncomment the 'do.checkstyle' flag property to enable checkstyle
   # do.checkstyle=
   checkstyle.home=${base.path}/checkstyle-2.1
  
  
  
  1.9       +18 -57    jakarta-avalon-excalibur/concurrent/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/concurrent/build.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- build.xml	7 Apr 2002 10:20:15 -0000	1.8
  +++ build.xml	8 Apr 2002 10:32:09 -0000	1.9
  @@ -2,60 +2,12 @@
   
   <project name="Excalibur Concurrent" default="main" basedir=".">
   
  -    <!-- load per-project properties -->
  -    <property file="project.properties"/>
  -
  -    <!--
  -      Give user a chance to override without editing this file
  -      (and without typing -D each time he compiles it)
  -    -->
  -    <property file="ant.properties"/>
  +    <property file="${user.home}/build.properties"/>
       <property file="../ant.properties"/>
  +    <property file="ant.properties"/>
       <property file="${user.home}/.ant.properties"/>
  -
  -    <!-- Settings used to configure compile environment -->
  -    <property name="build.debug" value="on"/>
  -    <property name="build.optimize" value="off"/>
  -    <property name="build.deprecation" value="off"/>
  -    <property name="build.compress" value="false"/>
  -    <property name="junit.failonerror" value="false"/>
  -
  -    <!-- location of intermediate products -->
  -    <property name="build.dir" value="build"/>
  -    <property name="build.lib" value="${build.dir}/lib"/>
  -    <property name="build.conf" value="${build.dir}/conf"/>
  -    <property name="build.classes" value="${build.dir}/classes"/>
  -    <property name="build.tests" value="${build.dir}/tests"/>
  -    <property name="build.reports" value="${build.dir}/reports"/>
  -
  -    <!-- Set the properties for source directories -->
  -    <property name="src.dir" value="src"/>
  -    <property name="java.dir" value="${src.dir}/java"/>
  -    <property name="conf.dir" value="${src.dir}/conf"/>
  -    <property name="test.dir" value="${src.dir}/test"/>
  -
  -    <!-- needed by Cocoon -->
  -    <property name="build.context" value="${build.dir}/documentation"/>
  -    <property name="build.docs" value="${build.dir}/docs"/>
  -    <property name="build.xdocs" value="${build.dir}/xdocs"/>
  -    <property name="context.dir" value="../../jakarta-avalon/src/documentation"/>
  -    <property name="tools.dir" value="../../jakarta-avalon/tools"/>
  -    <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
  -    <property name="docs.dir" value="dist/docs"/>
  -    <property name="xdocs.dir" value="${src.dir}/xdocs"/>      
  -
  -    <!-- Set the properties for distribution directories -->
  -    <property name="dist.dir" value="dist"/>
  -    <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
  -
  -    <!-- name of .zip/.tar.gz/.bz2 files and their top-level directory -->
  -    <property name="dist.name" value="${name}-${version}"/>
  -
  -    <!-- name of jar file -->
  -    <property name="jar.name" value="${name}-${version}.jar"/>
  -
  -    <!-- property indicating directory where all distribution archives are placed -->
  -    <property name="dist.base" value="distributions"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
  @@ -64,6 +16,7 @@
           <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}"/>
  @@ -75,8 +28,12 @@
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  +    <target name="dependencies" description="Check dependencies">
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
  +    </target>
  +
       <!-- Compiles the source code -->
  -    <target name="compile" description="Compiles the source code">
  +    <target name="compile" depends="dependencies" description="Compiles the source code">
   
           <mkdir dir="${build.classes}"/>
   
  @@ -114,7 +71,7 @@
               <fileset dir="../" includes="LICENSE.txt"/>
               <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
               <filterset>
  -                <filtersfile file="project.properties"/>
  +                <filtersfile file="default.properties"/>
               </filterset>
           </copy>
   
  @@ -137,7 +94,7 @@
       </target>
   
       <!-- Creates all the Javadocs -->
  -    <target name="javadocs" depends="compile" description="Generates the javadocs">
  +    <target name="javadocs" depends="compile" description="Generates the javadocs" unless="skip.javadocs">
   
           <mkdir dir="${dist.javadocs}"/>
           <javadoc packagenames="org.apache.*"
  @@ -158,7 +115,7 @@
           </javadoc>
       </target>
   
  -    <target name="test" depends="compile" description="Perform the unit tests">
  +    <target name="test" depends="compile" description="Perform the unit tests" unless="skip.tests">
   
           <echo message="Performing Unit Tests" />
   
  @@ -303,7 +260,11 @@
           description="Generates a minimal distribution (jar + javadocs)">
   
           <mkdir dir="${dist.dir}"/>
  -        <copy file="${build.lib}/${jar.name}" todir="${dist.dir}"/>
  +        <copy todir="${dist.dir}">
  +            <fileset dir="${build.lib}">
  +                <include name="*.jar"/>
  +            </fileset>
  +        </copy>
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
  
  
  
  1.3       +13 -0     jakarta-avalon-excalibur/concurrent/default.properties
  
  
  
  
  1.4       +18 -57    jakarta-avalon-excalibur/datasource/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/datasource/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	7 Apr 2002 10:20:16 -0000	1.3
  +++ build.xml	8 Apr 2002 10:32:09 -0000	1.4
  @@ -2,60 +2,12 @@
   
   <project name="Excalibur Datasource" default="main" basedir=".">
   
  -    <!-- load per-project properties -->
  -    <property file="project.properties"/>
  -
  -    <!--
  -      Give user a chance to override without editing this file
  -      (and without typing -D each time he compiles it)
  -    -->
  -    <property file="ant.properties"/>
  +    <property file="${user.home}/build.properties"/>
       <property file="../ant.properties"/>
  +    <property file="ant.properties"/>
       <property file="${user.home}/.ant.properties"/>
  -
  -    <!-- Settings used to configure compile environment -->
  -    <property name="build.debug" value="on"/>
  -    <property name="build.optimize" value="off"/>
  -    <property name="build.deprecation" value="off"/>
  -    <property name="build.compress" value="false"/>
  -    <property name="junit.failonerror" value="false"/>
  -
  -    <!-- location of intermediate products -->
  -    <property name="build.dir" value="build"/>
  -    <property name="build.lib" value="${build.dir}/lib"/>
  -    <property name="build.conf" value="${build.dir}/conf"/>
  -    <property name="build.classes" value="${build.dir}/classes"/>
  -    <property name="build.tests" value="${build.dir}/tests"/>
  -    <property name="build.reports" value="${build.dir}/reports"/>
  -
  -    <!-- Set the properties for source directories -->
  -    <property name="src.dir" value="src"/>
  -    <property name="java.dir" value="${src.dir}/java"/>
  -    <property name="conf.dir" value="${src.dir}/conf"/>
  -    <property name="test.dir" value="${src.dir}/test"/>
  -
  -    <!-- needed by Cocoon -->
  -    <property name="build.context" value="${build.dir}/documentation"/>
  -    <property name="build.docs" value="${build.dir}/docs"/>
  -    <property name="build.xdocs" value="${build.dir}/xdocs"/>
  -    <property name="context.dir" value="../../jakarta-avalon/src/documentation"/>
  -    <property name="tools.dir" value="../../jakarta-avalon/tools"/>
  -    <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
  -    <property name="docs.dir" value="dist/docs"/>
  -    <property name="xdocs.dir" value="${src.dir}/xdocs"/>      
  -
  -    <!-- Set the properties for distribution directories -->
  -    <property name="dist.dir" value="dist"/>
  -    <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
  -
  -    <!-- name of .zip/.tar.gz/.bz2 files and their top-level directory -->
  -    <property name="dist.name" value="${name}-${version}"/>
  -
  -    <!-- name of jar file -->
  -    <property name="jar.name" value="${name}-${version}.jar"/>
  -
  -    <!-- property indicating directory where all distribution archives are placed -->
  -    <property name="dist.base" value="distributions"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
  @@ -64,6 +16,7 @@
           <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}"/>
  @@ -75,8 +28,12 @@
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  +    <target name="dependencies" description="Check dependencies">
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
  +    </target>
  +
       <!-- Compiles the source code -->
  -    <target name="compile" description="Compiles the source code">
  +    <target name="compile" depends="dependencies" description="Compiles the source code">
   
           <mkdir dir="${build.classes}"/>
   
  @@ -114,7 +71,7 @@
               <fileset dir="../" includes="LICENSE.txt"/>
               <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
               <filterset>
  -                <filtersfile file="project.properties"/>
  +                <filtersfile file="default.properties"/>
               </filterset>
           </copy>
   
  @@ -137,7 +94,7 @@
       </target>
   
       <!-- Creates all the Javadocs -->
  -    <target name="javadocs" depends="compile" description="Generates the javadocs">
  +    <target name="javadocs" depends="compile" description="Generates the javadocs" unless="skip.javadocs">
   
           <mkdir dir="${dist.javadocs}"/>
           <javadoc packagenames="org.apache.*"
  @@ -158,7 +115,7 @@
           </javadoc>
       </target>
   
  -    <target name="test" depends="compile" description="Perform the unit tests">
  +    <target name="test" depends="compile" description="Perform the unit tests" unless="skip.tests">
   
           <echo message="Performing Unit Tests" />
   
  @@ -303,7 +260,11 @@
           description="Generates a minimal distribution (jar + javadocs)">
   
           <mkdir dir="${dist.dir}"/>
  -        <copy file="${build.lib}/${jar.name}" todir="${dist.dir}"/>
  +        <copy todir="${dist.dir}">
  +            <fileset dir="${build.lib}">
  +                <include name="*.jar"/>
  +            </fileset>
  +        </copy>
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
  
  
  
  1.2       +59 -0     jakarta-avalon-excalibur/datasource/default.properties
  
  
  
  
  1.5       +13 -16    jakarta-avalon-excalibur/event/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/event/ant.properties.sample,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ant.properties.sample	4 Apr 2002 08:25:09 -0000	1.4
  +++ ant.properties.sample	8 Apr 2002 10:32:09 -0000	1.5
  @@ -6,35 +6,26 @@
   # external modules that this component depend on.  Copy this file to
   # "ant.properties" in the source directory, and customize it as needed.
   #
  -# The ant.properties values in this directory apply only to this component, and
  -# override the defaults in ../ant.properties.
  +# The ant.properties values in this directory apply only to this component.
  +# It is overridden by ../ant.properties and ~/build.properties
  +# It overrides all default.properties files and ~/.ant.properties
   #
  -# $Id: ant.properties.sample,v 1.4 2002/04/04 08:25:09 hammant Exp $
  +# $Id: ant.properties.sample,v 1.5 2002/04/08 10:32:09 jefft Exp $
   # -----------------------------------------------------------------------------
   
  -# --------------------------------------------------
  -#      COMPONENT-SPECIFIC REQUIRED LIBRARIES
  -# --------------------------------------------------
  -
  -
   # ----- Compile Control Flags -----
   build.debug=on
   build.optimize=off
   build.deprecation=off
  +#build.compiler=jikes
   
   # ----- Base Directory in which all the packages are stored -----
  -base.path=/opt
  +base.path=${basedir}/../..
   
   # --------------------------------------------------
   #                REQUIRED LIBRARIES
   # --------------------------------------------------
   
  -
  -# ----- JUnit Unit Test Suite, version 3.7 or later -----
  -junit.home=${base.path}/junit3.7
  -junit.lib=${junit.home}
  -junit.jar=${junit.lib}/junit.jar
  -
   # ----- Excalibur Collections, version 1.0 or later -----
   excalibur-collections.home=../collections/build/lib
   excalibur-collections.lib=${excalibur-collections.home}
  @@ -50,8 +41,14 @@
   #                OPTIONAL LIBRARIES
   # --------------------------------------------------
   
  -# ----- Checkstyle, version 2.1 or later -----
  +# ----- 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
   # do.checkstyle=
   checkstyle.home=${base.path}/checkstyle-2.1
  
  
  
  1.11      +20 -57    jakarta-avalon-excalibur/event/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/event/build.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- build.xml	7 Apr 2002 10:20:16 -0000	1.10
  +++ build.xml	8 Apr 2002 10:32:09 -0000	1.11
  @@ -2,60 +2,12 @@
   
   <project name="Excalibur Event" default="main" basedir=".">
   
  -    <!-- load per-project properties -->
  -    <property file="project.properties"/>
  -
  -    <!--
  -      Give user a chance to override without editing this file
  -      (and without typing -D each time he compiles it)
  -    -->
  -    <property file="ant.properties"/>
  +    <property file="${user.home}/build.properties"/>
       <property file="../ant.properties"/>
  +    <property file="ant.properties"/>
       <property file="${user.home}/.ant.properties"/>
  -
  -    <!-- Settings used to configure compile environment -->
  -    <property name="build.debug" value="on"/>
  -    <property name="build.optimize" value="off"/>
  -    <property name="build.deprecation" value="off"/>
  -    <property name="build.compress" value="false"/>
  -    <property name="junit.failonerror" value="false"/>
  -
  -    <!-- location of intermediate products -->
  -    <property name="build.dir" value="build"/>
  -    <property name="build.lib" value="${build.dir}/lib"/>
  -    <property name="build.conf" value="${build.dir}/conf"/>
  -    <property name="build.classes" value="${build.dir}/classes"/>
  -    <property name="build.tests" value="${build.dir}/tests"/>
  -    <property name="build.reports" value="${build.dir}/reports"/>
  -
  -    <!-- Set the properties for source directories -->
  -    <property name="src.dir" value="src"/>
  -    <property name="java.dir" value="${src.dir}/java"/>
  -    <property name="conf.dir" value="${src.dir}/conf"/>
  -    <property name="test.dir" value="${src.dir}/test"/>
  -
  -    <!-- needed by Cocoon -->
  -    <property name="build.context" value="${build.dir}/documentation"/>
  -    <property name="build.docs" value="${build.dir}/docs"/>
  -    <property name="build.xdocs" value="${build.dir}/xdocs"/>
  -    <property name="context.dir" value="../../jakarta-avalon/src/documentation"/>
  -    <property name="tools.dir" value="../../jakarta-avalon/tools"/>
  -    <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
  -    <property name="docs.dir" value="dist/docs"/>
  -    <property name="xdocs.dir" value="${src.dir}/xdocs"/>      
  -
  -    <!-- Set the properties for distribution directories -->
  -    <property name="dist.dir" value="dist"/>
  -    <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
  -
  -    <!-- name of .zip/.tar.gz/.bz2 files and their top-level directory -->
  -    <property name="dist.name" value="${name}-${version}"/>
  -
  -    <!-- name of jar file -->
  -    <property name="jar.name" value="${name}-${version}.jar"/>
  -
  -    <!-- property indicating directory where all distribution archives are placed -->
  -    <property name="dist.base" value="distributions"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
  @@ -66,6 +18,7 @@
           <pathelement location="${excalibur-concurrent.jar}"/>
           <pathelement location="${checkstyle.jar}"/>
       </path>
  +    <property name="cp" refid="project.class.path"/>
   
       <path id="tools.class.path">
           <pathelement location="${junit.jar}"/>
  @@ -77,8 +30,14 @@
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  +    <target name="dependencies" description="Check dependencies">
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCollections"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkConcurrent"/>
  +    </target>
  +
       <!-- Compiles the source code -->
  -    <target name="compile" description="Compiles the source code">
  +    <target name="compile" depends="dependencies" description="Compiles the source code">
   
           <mkdir dir="${build.classes}"/>
   
  @@ -116,7 +75,7 @@
               <fileset dir="../" includes="LICENSE.txt"/>
               <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
               <filterset>
  -                <filtersfile file="project.properties"/>
  +                <filtersfile file="default.properties"/>
               </filterset>
           </copy>
   
  @@ -139,7 +98,7 @@
       </target>
   
       <!-- Creates all the Javadocs -->
  -    <target name="javadocs" depends="compile" description="Generates the javadocs">
  +    <target name="javadocs" depends="compile" description="Generates the javadocs" unless="skip.javadocs">
   
           <mkdir dir="${dist.javadocs}"/>
           <javadoc packagenames="org.apache.*"
  @@ -160,7 +119,7 @@
           </javadoc>
       </target>
   
  -    <target name="test" depends="compile" description="Perform the unit tests">
  +    <target name="test" depends="compile" description="Perform the unit tests" unless="skip.tests">
   
           <echo message="Performing Unit Tests" />
   
  @@ -305,7 +264,11 @@
           description="Generates a minimal distribution (jar + javadocs)">
   
           <mkdir dir="${dist.dir}"/>
  -        <copy file="${build.lib}/${jar.name}" todir="${dist.dir}"/>
  +        <copy todir="${dist.dir}">
  +            <fileset dir="${build.lib}">
  +                <include name="*.jar"/>
  +            </fileset>
  +        </copy>
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
  
  
  
  1.3       +13 -0     jakarta-avalon-excalibur/event/default.properties
  
  
  
  
  1.4       +13 -16    jakarta-avalon-excalibur/extension/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/extension/ant.properties.sample,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ant.properties.sample	24 Mar 2002 00:26:12 -0000	1.3
  +++ ant.properties.sample	8 Apr 2002 10:32:09 -0000	1.4
  @@ -6,43 +6,40 @@
   # external modules that this component depend on.  Copy this file to
   # "ant.properties" in the source directory, and customize it as needed.
   #
  -# The ant.properties values in this directory apply only to this component, and
  -# override the defaults in ../ant.properties.
  +# The ant.properties values in this directory apply only to this component.
  +# 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/03/24 00:26:12 jefft Exp $
  +# $Id: ant.properties.sample,v 1.4 2002/04/08 10:32:09 jefft Exp $
   # -----------------------------------------------------------------------------
   
  -# --------------------------------------------------
  -#      COMPONENT-SPECIFIC REQUIRED LIBRARIES
  -# --------------------------------------------------
  -
  -
   # ----- Compile Control Flags -----
   build.debug=on
   build.optimize=off
   build.deprecation=off
  +#build.compiler=jikes
   
   # ----- Base Directory in which all the packages are stored -----
  -base.path=/opt
  +base.path=${basedir}/../..
   
   # --------------------------------------------------
   #                REQUIRED LIBRARIES
   # --------------------------------------------------
  +# --------------------------------------------------
   
   
  -# ----- JUnit Unit Test Suite, version 3.7 or later -----
  +# --------------------------------------------------
  +#                OPTIONAL LIBRARIES
  +# --------------------------------------------------
  +
  +# ----- 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
   
   
  -
  -# --------------------------------------------------
  -#                OPTIONAL LIBRARIES
  -# --------------------------------------------------
  -
   # ----- Checkstyle, version 2.1 or later -----
  -
   # Uncomment the 'do.checkstyle' flag property to enable checkstyle
   # do.checkstyle=
   checkstyle.home=${base.path}/checkstyle-2.1
  
  
  
  1.35      +18 -57    jakarta-avalon-excalibur/extension/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/extension/build.xml,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- build.xml	7 Apr 2002 10:20:16 -0000	1.34
  +++ build.xml	8 Apr 2002 10:32:09 -0000	1.35
  @@ -2,60 +2,12 @@
   
   <project name="Excalibur Extension" default="main" basedir=".">
   
  -    <!-- load per-project properties -->
  -    <property file="project.properties"/>
  -
  -    <!--
  -      Give user a chance to override without editing this file
  -      (and without typing -D each time he compiles it)
  -    -->
  -    <property file="ant.properties"/>
  +    <property file="${user.home}/build.properties"/>
       <property file="../ant.properties"/>
  +    <property file="ant.properties"/>
       <property file="${user.home}/.ant.properties"/>
  -
  -    <!-- Settings used to configure compile environment -->
  -    <property name="build.debug" value="on"/>
  -    <property name="build.optimize" value="off"/>
  -    <property name="build.deprecation" value="off"/>
  -    <property name="build.compress" value="false"/>
  -    <property name="junit.failonerror" value="false"/>
  -
  -    <!-- location of intermediate products -->
  -    <property name="build.dir" value="build"/>
  -    <property name="build.lib" value="${build.dir}/lib"/>
  -    <property name="build.conf" value="${build.dir}/conf"/>
  -    <property name="build.classes" value="${build.dir}/classes"/>
  -    <property name="build.tests" value="${build.dir}/tests"/>
  -    <property name="build.reports" value="${build.dir}/reports"/>
  -
  -    <!-- Set the properties for source directories -->
  -    <property name="src.dir" value="src"/>
  -    <property name="java.dir" value="${src.dir}/java"/>
  -    <property name="conf.dir" value="${src.dir}/conf"/>
  -    <property name="test.dir" value="${src.dir}/test"/>
  -
  -    <!-- needed by Cocoon -->
  -    <property name="build.context" value="${build.dir}/documentation"/>
  -    <property name="build.docs" value="${build.dir}/docs"/>
  -    <property name="build.xdocs" value="${build.dir}/xdocs"/>
  -    <property name="context.dir" value="../../jakarta-avalon/src/documentation"/>
  -    <property name="tools.dir" value="../../jakarta-avalon/tools"/>
  -    <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
  -    <property name="docs.dir" value="dist/docs"/>
  -    <property name="xdocs.dir" value="${src.dir}/xdocs"/>      
  -
  -    <!-- Set the properties for distribution directories -->
  -    <property name="dist.dir" value="dist"/>
  -    <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
  -
  -    <!-- name of .zip/.tar.gz/.bz2 files and their top-level directory -->
  -    <property name="dist.name" value="${name}-${version}"/>
  -
  -    <!-- name of jar file -->
  -    <property name="jar.name" value="${name}-${version}.jar"/>
  -
  -    <!-- property indicating directory where all distribution archives are placed -->
  -    <property name="dist.base" value="distributions"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
  @@ -64,6 +16,7 @@
           <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}"/>
  @@ -75,8 +28,12 @@
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  +    <target name="dependencies" description="Check dependencies">
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
  +    </target>
  +
       <!-- Compiles the source code -->
  -    <target name="compile" description="Compiles the source code">
  +    <target name="compile" depends="dependencies" description="Compiles the source code">
   
           <mkdir dir="${build.classes}"/>
   
  @@ -114,7 +71,7 @@
               <fileset dir="../" includes="LICENSE.txt"/>
               <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
               <filterset>
  -                <filtersfile file="project.properties"/>
  +                <filtersfile file="default.properties"/>
               </filterset>
           </copy>
   
  @@ -137,7 +94,7 @@
       </target>
   
       <!-- Creates all the Javadocs -->
  -    <target name="javadocs" depends="compile" description="Generates the javadocs">
  +    <target name="javadocs" depends="compile" description="Generates the javadocs" unless="skip.javadocs">
   
           <mkdir dir="${dist.javadocs}"/>
           <javadoc packagenames="org.apache.*"
  @@ -158,7 +115,7 @@
           </javadoc>
       </target>
   
  -    <target name="test" depends="compile" description="Perform the unit tests">
  +    <target name="test" depends="compile" description="Perform the unit tests" unless="skip.tests">
   
           <echo message="Performing Unit Tests" />
   
  @@ -303,7 +260,11 @@
           description="Generates a minimal distribution (jar + javadocs)">
   
           <mkdir dir="${dist.dir}"/>
  -        <copy file="${build.lib}/${jar.name}" todir="${dist.dir}"/>
  +        <copy todir="${dist.dir}">
  +            <fileset dir="${build.lib}">
  +                <include name="*.jar"/>
  +            </fileset>
  +        </copy>
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
  
  
  
  1.3       +13 -0     jakarta-avalon-excalibur/extension/default.properties
  
  
  
  
  1.2       +12 -16    jakarta-avalon-excalibur/fortress/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/ant.properties.sample,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ant.properties.sample	3 Apr 2002 22:51:34 -0000	1.1
  +++ ant.properties.sample	8 Apr 2002 10:32:09 -0000	1.2
  @@ -6,43 +6,39 @@
   # external modules that this component depend on.  Copy this file to
   # "ant.properties" in the source directory, and customize it as needed.
   #
  -# The property values in ant.properties are overridden by
  -# ${user.home}/.ant.properties and ../ant.properties
  +# The ant.properties values in this directory apply only to this component.
  +# It is overridden by ../ant.properties and ~/build.properties
  +# It overrides all default.properties files and ~/.ant.properties
   #
  -# $Id: ant.properties.sample,v 1.1 2002/04/03 22:51:34 bloritsch Exp $
  +# $Id: ant.properties.sample,v 1.2 2002/04/08 10:32:09 jefft Exp $
   # -----------------------------------------------------------------------------
   
  -# --------------------------------------------------
  -#      COMPONENT-SPECIFIC REQUIRED LIBRARIES
  -# --------------------------------------------------
  -
  -
   # ----- Compile Control Flags -----
   build.debug=on
   build.optimize=off
   build.deprecation=off
  +#build.compiler=jikes
   
   # ----- Base Directory in which all the packages are stored -----
  -base.path=/opt
  +base.path=${basedir}/../..
   
   # --------------------------------------------------
   #                REQUIRED LIBRARIES
   # --------------------------------------------------
   
   
  -# ----- JUnit Unit Test Suite, version 3.7 or later -----
  +# --------------------------------------------------
  +#                OPTIONAL LIBRARIES
  +# --------------------------------------------------
  +
  +# ----- 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
   
   
  -
  -# --------------------------------------------------
  -#                OPTIONAL LIBRARIES
  -# --------------------------------------------------
  -
   # ----- Checkstyle, version 2.1 or later -----
  -
   # Uncomment the 'do.checkstyle' flag property to enable checkstyle
   # do.checkstyle=
   checkstyle.home=${base.path}/checkstyle-2.1
  
  
  
  1.3       +38 -29    jakarta-avalon-excalibur/fortress/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/build.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build.xml	4 Apr 2002 00:42:29 -0000	1.2
  +++ build.xml	8 Apr 2002 10:32:09 -0000	1.3
  @@ -2,14 +2,10 @@
   
   <project name="Excalibur template" default="main" basedir=".">
   
  -
  -    <!--
  -      Give user a chance to override without editing this file
  -      (and without typing -D each time he compiles it)
  -    -->
  -    <property file="${user.home}/.ant.properties"/>
  +    <property file="${user.home}/build.properties"/>
       <property file="../ant.properties"/>
       <property file="ant.properties"/>
  +    <property file="${user.home}/.ant.properties"/>
       <property file="../default.properties"/>
       <property file="default.properties"/>
   
  @@ -17,6 +13,19 @@
       <path id="project.class.path">
           <pathelement path="${java.class.path}"/>
           <pathelement location="${build.classes}"/>
  +        <pathelement location="${avalon-framework.jar}"/>
  +        <pathelement location="${avalon-logkit.jar}"/>
  +        <pathelement location="${excalibur-core.jar}"/>
  +        <pathelement location="${excalibur-scratchpad.jar}"/>
  +        <pathelement location="${excalibur-collections.jar}"/>
  +        <pathelement location="${excalibur-instrument.jar}"/>
  +        <pathelement location="${excalibur-instrument-manager-interfaces.jar}"/>
  +        <pathelement location="${excalibur-testcase.jar}"/>
  +        <pathelement location="${excalibur-command.jar}"/>
  +        <pathelement location="${excalibur-event.jar}"/>
  +        <pathelement location="${excalibur-util.jar}"/>
  +        <pathelement location="${excalibur-component.jar}"/>
  +        <pathelement location="${excalibur-logger.jar}"/>
           <pathelement location="${junit.jar}"/>
           <pathelement location="${checkstyle.jar}"/>
       </path>
  @@ -26,31 +35,27 @@
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
       <target name="dependencies" description="Check dependencies">
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkFramework"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkLogkit"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCore"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkScratchpad"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCollections"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkInstrument"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkManagerInterfaces"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkTestcase"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommand"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkEvent"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkComponent"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkLogger"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredClass">
  -            <property name="name" value="junit.jar"/>
  -            <property name="class" value="junit.framework.Test"/>
  -            <property name="classpath" value="${cp}"/>
  -        </ant>
  -        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
  -            <property name="name" value="excalibur-instrument-manager-interfaces.jar"/>
  -            <property name="path" value="${excalibur-instrument-manager-interfaces.jar}"/>
  -            <property name="proj.home" value="${basedir}/../instrument-manager"/>
  -        </ant>
  -        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
  -            <property name="name" value="avalon-framework.jar"/>
  -            <property name="path" value="${avalon-framework.jar}"/>
  -            <property name="proj.home" value="${basedir}/../../jakarta-avalon"/>
  -       </ant>
  -       <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
  -            <property name="name" value="commons-altrmi-client-impl.jar"/>
  -            <property name="path" value="${commons-altrmi-client-impl.jar}"/>
  -        </ant>
  -       <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredClass">
  -            <property name="name" value="excalibur-instrument-manager-0.1.jar"/>
  -            <property name="class" value="org.apache.avalon.excalibur.instrument.manager.interfaces.InstrumentManagerClient"/>
  +            <property name="name" value="excalibur-scratchpad.jar"/>
  +            <property name="class" value="org.apache.avalon.excalibur.mpool.PoolManager"/>
               <property name="classpath" value="${cp}"/>
  +            <property name="message" value="This class is defined in Excalibur's scratchpad, and due to a recursive dependency with Fortress, may be commented out in the scratchpad jar's build"/>
           </ant>
       </target>
  +
       <!-- Compiles the source code -->
       <target name="compile" depends="dependencies" description="Compiles the source code">
   
  @@ -113,7 +118,7 @@
       </target>
   
       <!-- Creates all the Javadocs -->
  -    <target name="javadocs" depends="compile" description="Generates the javadocs">
  +    <target name="javadocs" depends="compile" description="Generates the javadocs" unless="skip.javadocs">
   
           <mkdir dir="${dist.javadocs}"/>
           <javadoc packagenames="org.apache.*"
  @@ -279,7 +284,11 @@
           description="Generates a minimal distribution (jar + javadocs)">
   
           <mkdir dir="${dist.dir}"/>
  -        <copy file="${build.lib}/${jar.name}" todir="${dist.dir}"/>
  +        <copy todir="${dist.dir}">
  +            <fileset dir="${build.lib}">
  +                <include name="*.jar"/>
  +            </fileset>
  +        </copy>
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
  
  
  
  1.3       +71 -0     jakarta-avalon-excalibur/fortress/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/default.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- default.properties	4 Apr 2002 00:42:29 -0000	1.2
  +++ default.properties	8 Apr 2002 10:32:09 -0000	1.3
  @@ -14,6 +14,67 @@
   #                REQUIRED LIBRARIES
   # --------------------------------------------------
   
  +# ----- Excalibur Core -----
  +excalibur-core.home=${basedir}/../all
  +excalibur-core.lib=${excalibur-core.home}/build/lib
  +excalibur-core.jar=${excalibur-core.lib}/excalibur-core.jar
  +excalibur-scratchpad.jar=${excalibur-core.lib}/excalibur-scratchpad.jar
  +
  +# ----- Excalibur collections, version 1.0 or later -----
  +excalibur-collections.home=${basedir}/../collections/dist
  +excalibur-collections.lib=${excalibur-collections.home}
  +excalibur-collections.jar=${excalibur-collections.lib}/excalibur-collections-1.0.jar
  +
  +# ----- Excalibur instrument, version 1.0 or later -----
  +excalibur-instrument.home=${basedir}/../instrument/dist
  +excalibur-instrument.lib=${excalibur-instrument.home}
  +excalibur-instrument.jar=${excalibur-instrument.lib}/excalibur-instrument-0.1.jar
  +
  +# ----- Excalibur Instrument Manager, version 0.1 or later -----
  +excalibur-instrument-manager.home=${basedir}/../instrument-manager/dist
  +excalibur-instrument-manager.lib=${excalibur-instrument-manager.home}
  +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 command, version 1.0 or later -----
  +excalibur-command.home=${basedir}/../command/dist
  +excalibur-command.lib=${excalibur-command.home}
  +excalibur-command.jar=${excalibur-command.lib}/excalibur-command-1.0a.jar
  +
  +# ----- Excalibur event, version 1.0 or later -----
  +excalibur-event.home=${basedir}/../event/dist
  +excalibur-event.lib=${excalibur-event.home}
  +excalibur-event.jar=${excalibur-event.lib}/excalibur-event-1.0a.jar
  +
  +# ----- Excalibur util, version 1.0 or later -----
  +excalibur-util.home=${basedir}/../util/dist
  +excalibur-util.lib=${excalibur-util.home}
  +excalibur-util.jar=${excalibur-util.lib}/excalibur-util-1.0.jar
  +
  +# ----- Excalibur component, version 1.0 or later -----
  +excalibur-component.home=${basedir}/../component/dist
  +excalibur-component.lib=${excalibur-component.home}
  +excalibur-component.jar=${excalibur-component.lib}/excalibur-component-1.0.jar
  +
  +# ----- Excalibur logger, version 1.0 or later -----
  +excalibur-logger.home=${basedir}/../logger/dist
  +excalibur-logger.lib=${excalibur-logger.home}
  +excalibur-logger.jar=${excalibur-logger.lib}/excalibur-logger-1.0.jar
  +
  +# ----- Avalon Framework, version 4.1 or later -----
  +avalon-framework.home=${basedir}/../../jakarta-avalon
  +avalon-framework.lib=${avalon-framework.home}/build/lib
  +avalon-framework.jar=${avalon-framework.lib}/avalon-framework.jar
  +
  +# ----- Logkit -----
  +avalon-logkit.home=${basedir}/../../jakarta-avalon-logkit
  +avalon-logkit.lib=${avalon-logkit.home}/build/lib
  +avalon-logkit.jar=${avalon-logkit.lib}/logkit.jar
   
   # --------------------------------------------------
   
  @@ -37,6 +98,16 @@
   java.dir = ${src.dir}/java
   conf.dir = ${src.dir}/conf
   test.dir = ${src.dir}/test
  +
  +#  needed by Cocoon
  +build.context = ${build.dir}/documentation
  +build.docs = ${build.dir}/docs
  +build.xdocs = ${build.dir}/xdocs
  +context.dir = ../../jakarta-avalon/src/documentation
  +tools.dir = ../../jakarta-avalon/tools
  +tools.jar = ${java.home}/../lib/tools.jar
  +docs.dir = docs
  +xdocs.dir = ${src.dir}/xdocs
   
   #  Set the properties for distribution directories
   dist.dir = dist
  
  
  
  1.4       +12 -16    jakarta-avalon-excalibur/i18n/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/i18n/ant.properties.sample,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ant.properties.sample	24 Mar 2002 00:26:12 -0000	1.3
  +++ ant.properties.sample	8 Apr 2002 10:32:10 -0000	1.4
  @@ -6,43 +6,39 @@
   # external modules that this component depend on.  Copy this file to
   # "ant.properties" in the source directory, and customize it as needed.
   #
  -# The ant.properties values in this directory apply only to this component, and
  -# override the defaults in ../ant.properties.
  +# The ant.properties values in this directory apply only to this component.
  +# 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/03/24 00:26:12 jefft Exp $
  +# $Id: ant.properties.sample,v 1.4 2002/04/08 10:32:10 jefft Exp $
   # -----------------------------------------------------------------------------
   
  -# --------------------------------------------------
  -#      COMPONENT-SPECIFIC REQUIRED LIBRARIES
  -# --------------------------------------------------
  -
  -
   # ----- Compile Control Flags -----
   build.debug=on
   build.optimize=off
   build.deprecation=off
  +#build.compiler=jikes
   
   # ----- Base Directory in which all the packages are stored -----
  -base.path=/opt
  +base.path=${basedir}/../..
   
   # --------------------------------------------------
   #                REQUIRED LIBRARIES
   # --------------------------------------------------
   
   
  -# ----- JUnit Unit Test Suite, version 3.7 or later -----
  +# --------------------------------------------------
  +#                OPTIONAL LIBRARIES
  +# --------------------------------------------------
  +
  +# ----- 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
   
   
  -
  -# --------------------------------------------------
  -#                OPTIONAL LIBRARIES
  -# --------------------------------------------------
  -
   # ----- Checkstyle, version 2.1 or later -----
  -
   # Uncomment the 'do.checkstyle' flag property to enable checkstyle
   # do.checkstyle=
   checkstyle.home=${base.path}/checkstyle-2.1
  
  
  
  1.33      +18 -57    jakarta-avalon-excalibur/i18n/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/i18n/build.xml,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- build.xml	7 Apr 2002 10:20:16 -0000	1.32
  +++ build.xml	8 Apr 2002 10:32:10 -0000	1.33
  @@ -2,60 +2,12 @@
   
   <project name="Excalibur i18n" default="main" basedir=".">
   
  -    <!-- load per-project properties -->
  -    <property file="project.properties"/>
  -
  -    <!--
  -      Give user a chance to override without editing this file
  -      (and without typing -D each time he compiles it)
  -    -->
  -    <property file="ant.properties"/>
  +    <property file="${user.home}/build.properties"/>
       <property file="../ant.properties"/>
  +    <property file="ant.properties"/>
       <property file="${user.home}/.ant.properties"/>
  -
  -    <!-- Settings used to configure compile environment -->
  -    <property name="build.debug" value="on"/>
  -    <property name="build.optimize" value="off"/>
  -    <property name="build.deprecation" value="off"/>
  -    <property name="build.compress" value="false"/>
  -    <property name="junit.failonerror" value="false"/>
  -
  -    <!-- location of intermediate products -->
  -    <property name="build.dir" value="build"/>
  -    <property name="build.lib" value="${build.dir}/lib"/>
  -    <property name="build.conf" value="${build.dir}/conf"/>
  -    <property name="build.classes" value="${build.dir}/classes"/>
  -    <property name="build.tests" value="${build.dir}/tests"/>
  -    <property name="build.reports" value="${build.dir}/reports"/>
  -
  -    <!-- Set the properties for source directories -->
  -    <property name="src.dir" value="src"/>
  -    <property name="java.dir" value="${src.dir}/java"/>
  -    <property name="conf.dir" value="${src.dir}/conf"/>
  -    <property name="test.dir" value="${src.dir}/test"/>
  -
  -    <!-- needed by Cocoon -->
  -    <property name="build.context" value="${build.dir}/documentation"/>
  -    <property name="build.docs" value="${build.dir}/docs"/>
  -    <property name="build.xdocs" value="${build.dir}/xdocs"/>
  -    <property name="context.dir" value="../../jakarta-avalon/src/documentation"/>
  -    <property name="tools.dir" value="../../jakarta-avalon/tools"/>
  -    <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
  -    <property name="docs.dir" value="dist/docs"/>
  -    <property name="xdocs.dir" value="${src.dir}/xdocs"/>      
  -
  -    <!-- Set the properties for distribution directories -->
  -    <property name="dist.dir" value="dist"/>
  -    <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
  -
  -    <!-- name of .zip/.tar.gz/.bz2 files and their top-level directory -->
  -    <property name="dist.name" value="${name}-${version}"/>
  -
  -    <!-- name of jar file -->
  -    <property name="jar.name" value="${name}-${version}.jar"/>
  -
  -    <!-- property indicating directory where all distribution archives are placed -->
  -    <property name="dist.base" value="distributions"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
  @@ -64,6 +16,7 @@
           <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}"/>
  @@ -75,8 +28,12 @@
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  +    <target name="dependencies" description="Check dependencies">
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
  +    </target>
  +
       <!-- Compiles the source code -->
  -    <target name="compile" description="Compiles the source code">
  +    <target name="compile" depends="dependencies" description="Compiles the source code">
   
           <mkdir dir="${build.classes}"/>
   
  @@ -114,7 +71,7 @@
               <fileset dir="../" includes="LICENSE.txt"/>
               <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
               <filterset>
  -                <filtersfile file="project.properties"/>
  +                <filtersfile file="default.properties"/>
               </filterset>
           </copy>
   
  @@ -137,7 +94,7 @@
       </target>
   
       <!-- Creates all the Javadocs -->
  -    <target name="javadocs" depends="compile" description="Generates the javadocs">
  +    <target name="javadocs" depends="compile" description="Generates the javadocs" unless="skip.javadocs">
   
           <mkdir dir="${dist.javadocs}"/>
           <javadoc packagenames="org.apache.*"
  @@ -158,7 +115,7 @@
           </javadoc>
       </target>
   
  -    <target name="test" depends="compile" description="Perform the unit tests">
  +    <target name="test" depends="compile" description="Perform the unit tests" unless="skip.tests">
   
           <echo message="Performing Unit Tests" />
   
  @@ -303,7 +260,11 @@
           description="Generates a minimal distribution (jar + javadocs)">
   
           <mkdir dir="${dist.dir}"/>
  -        <copy file="${build.lib}/${jar.name}" todir="${dist.dir}"/>
  +        <copy todir="${dist.dir}">
  +            <fileset dir="${build.lib}">
  +                <include name="*.jar"/>
  +            </fileset>
  +        </copy>
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
  
  
  
  1.3       +13 -0     jakarta-avalon-excalibur/i18n/default.properties
  
  
  
  
  1.2       +13 -16    jakarta-avalon-excalibur/instrument/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument/ant.properties.sample,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ant.properties.sample	26 Mar 2002 11:17:21 -0000	1.1
  +++ ant.properties.sample	8 Apr 2002 10:32:10 -0000	1.2
  @@ -6,42 +6,39 @@
   # external modules that this component depend on.  Copy this file to
   # "ant.properties" in the source directory, and customize it as needed.
   #
  -# The ant.properties values in this directory apply only to this component, and
  -# override the defaults in ../ant.properties.
  +# The ant.properties values in this directory apply only to this component.
  +# It is overridden by ../ant.properties and ~/build.properties
  +# It overrides all default.properties files and ~/.ant.properties
   #
  -# $Id: ant.properties.sample,v 1.1 2002/03/26 11:17:21 leif Exp $
  +# $Id: ant.properties.sample,v 1.2 2002/04/08 10:32:10 jefft Exp $
   # -----------------------------------------------------------------------------
   
  -# --------------------------------------------------
  -#      COMPONENT-SPECIFIC REQUIRED LIBRARIES
  -# --------------------------------------------------
  -
  -
   # ----- Compile Control Flags -----
   build.debug=on
   build.optimize=off
   build.deprecation=off
  +#build.compiler=jikes
   
   # ----- Base Directory in which all the packages are stored -----
  -base.path=/opt
  +base.path=${basedir}/../..
   
   # --------------------------------------------------
   #                REQUIRED LIBRARIES
   # --------------------------------------------------
   
  -# ----- JUnit Unit Test Suite, version 3.7 or later -----
  -junit.home=${base.path}/junit3.7
  -junit.lib=${junit.home}
  -junit.jar=${junit.lib}/junit.jar
  -
  -
   
   # --------------------------------------------------
   #                OPTIONAL LIBRARIES
   # --------------------------------------------------
   
  -# ----- Checkstyle, version 2.1 or later -----
  +# ----- 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
   # do.checkstyle=
   checkstyle.home=${base.path}/checkstyle-2.1
  
  
  
  1.11      +18 -57    jakarta-avalon-excalibur/instrument/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument/build.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- build.xml	7 Apr 2002 10:20:16 -0000	1.10
  +++ build.xml	8 Apr 2002 10:32:10 -0000	1.11
  @@ -2,60 +2,12 @@
   
   <project name="Excalibur Instrument" default="main" basedir=".">
   
  -    <!-- load per-project properties -->
  -    <property file="project.properties"/>
  -
  -    <!--
  -      Give user a chance to override without editing this file
  -      (and without typing -D each time he compiles it)
  -    -->
  -    <property file="ant.properties"/>
  +    <property file="${user.home}/build.properties"/>
       <property file="../ant.properties"/>
  +    <property file="ant.properties"/>
       <property file="${user.home}/.ant.properties"/>
  -
  -    <!-- Settings used to configure compile environment -->
  -    <property name="build.debug" value="on"/>
  -    <property name="build.optimize" value="off"/>
  -    <property name="build.deprecation" value="off"/>
  -    <property name="build.compress" value="false"/>
  -    <property name="junit.failonerror" value="false"/>
  -
  -    <!-- location of intermediate products -->
  -    <property name="build.dir" value="${basedir}/build"/>
  -    <property name="build.lib" value="${build.dir}/lib"/>
  -    <property name="build.conf" value="${build.dir}/conf"/>
  -    <property name="build.classes" value="${build.dir}/classes"/>
  -    <property name="build.tests" value="${build.dir}/tests"/>
  -    <property name="build.reports" value="${build.dir}/reports"/>
  -
  -    <!-- Set the properties for source directories -->
  -    <property name="src.dir" value="${basedir}/src"/>
  -    <property name="java.dir" value="${src.dir}/java"/>
  -    <property name="conf.dir" value="${src.dir}/conf"/>
  -    <property name="test.dir" value="${src.dir}/test"/>
  -
  -    <!-- needed by Cocoon -->
  -    <property name="build.context" value="${build.dir}/documentation"/>
  -    <property name="build.docs" value="${build.dir}/docs"/>
  -    <property name="build.xdocs" value="${build.dir}/xdocs"/>
  -    <property name="context.dir" value="../../jakarta-avalon/src/documentation"/>
  -    <property name="tools.dir" value="../../jakarta-avalon/tools"/>
  -    <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
  -    <property name="docs.dir" value="dist/docs"/>
  -    <property name="xdocs.dir" value="${src.dir}/xdocs"/>      
  -
  -    <!-- Set the properties for distribution directories -->
  -    <property name="dist.dir" value="${basedir}/dist"/>
  -    <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
  -
  -    <!-- name of .zip/.tar.gz/.bz2 files and their top-level directory -->
  -    <property name="dist.name" value="${name}-${version}"/>
  -
  -    <!-- name of jar file -->
  -    <property name="jar.name" value="${name}-${version}.jar"/>
  -
  -    <!-- property indicating directory where all distribution archives are placed -->
  -    <property name="dist.base" value="distributions"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
  @@ -64,6 +16,7 @@
           <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}"/>
  @@ -75,8 +28,12 @@
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  +    <target name="dependencies" description="Check dependencies">
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
  +    </target>
  +
       <!-- Compiles the source code -->
  -    <target name="compile" description="Compiles the source code">
  +    <target name="compile" depends="dependencies" description="Compiles the source code">
   
           <mkdir dir="${build.classes}"/>
   
  @@ -114,7 +71,7 @@
               <fileset dir="../" includes="LICENSE.txt"/>
               <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
               <filterset>
  -                <filtersfile file="project.properties"/>
  +                <filtersfile file="default.properties"/>
               </filterset>
           </copy>
   
  @@ -137,7 +94,7 @@
       </target>
   
       <!-- Creates all the Javadocs -->
  -    <target name="javadocs" depends="compile" description="Generates the javadocs">
  +    <target name="javadocs" depends="compile" description="Generates the javadocs" unless="skip.javadocs">
   
           <mkdir dir="${dist.javadocs}"/>
           <javadoc packagenames="org.apache.*"
  @@ -158,7 +115,7 @@
           </javadoc>
       </target>
   
  -    <target name="test" depends="compile" description="Perform the unit tests">
  +    <target name="test" depends="compile" description="Perform the unit tests" unless="skip.tests">
   
           <echo message="Performing Unit Tests" />
   
  @@ -301,7 +258,11 @@
           description="Generates a minimal distribution (jar + javadocs)">
   
           <mkdir dir="${dist.dir}"/>
  -        <copy file="${build.lib}/${jar.name}" todir="${dist.dir}"/>
  +        <copy todir="${dist.dir}">
  +            <fileset dir="${build.lib}">
  +                <include name="*.jar"/>
  +            </fileset>
  +        </copy>
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
  
  
  
  1.3       +18 -0     jakarta-avalon-excalibur/instrument/default.properties
  
  
  
  
  1.5       +12 -17    jakarta-avalon-excalibur/instrument-client/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-client/ant.properties.sample,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ant.properties.sample	4 Apr 2002 09:09:40 -0000	1.4
  +++ ant.properties.sample	8 Apr 2002 10:32:10 -0000	1.5
  @@ -6,24 +6,21 @@
   # external modules that this component depend on.  Copy this file to
   # "ant.properties" in the source directory, and customize it as needed.
   #
  -# The ant.properties values in this directory apply only to this component, and
  -# override the defaults in ../ant.properties.
  +# The ant.properties values in this directory apply only to this component.
  +# It is overridden by ../ant.properties and ~/build.properties
  +# It overrides all default.properties files and ~/.ant.properties
   #
  -# $Id: ant.properties.sample,v 1.4 2002/04/04 09:09:40 hammant Exp $
  +# $Id: ant.properties.sample,v 1.5 2002/04/08 10:32:10 jefft Exp $
   # -----------------------------------------------------------------------------
   
  -# --------------------------------------------------
  -#      COMPONENT-SPECIFIC REQUIRED LIBRARIES
  -# --------------------------------------------------
  -
  -
   # ----- Compile Control Flags -----
   build.debug=on
   build.optimize=off
   build.deprecation=off
  +#build.compiler=jikes
   
   # ----- Base Directory in which all the packages are stored -----
  -base.path=/opt
  +base.path=${basedir}/../..
   
   # --------------------------------------------------
   #                REQUIRED LIBRARIES
  @@ -44,19 +41,17 @@
   excalibur-altrmi-common.jar=${excalibur-altrmi.home}/excalibur-altrmi-common.jar
   excalibur-altrmi-generator.jar=${excalibur-altrmi.home}/excalibur-altrmi-generator.jar
   
  -# ----- JUnit Unit Test Suite, version 3.7 or later -----
  -junit.home=${base.path}/junit3.7
  -junit.lib=${junit.home}
  -junit.jar=${junit.lib}/junit.jar
  -
  -
  -
   # --------------------------------------------------
   #                OPTIONAL LIBRARIES
   # --------------------------------------------------
   
  -# ----- Checkstyle, version 2.1 or later -----
  +# ----- 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
   # do.checkstyle=
   checkstyle.home=${base.path}/checkstyle-2.1
  
  
  
  1.17      +27 -58    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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- build.xml	8 Apr 2002 07:41:34 -0000	1.16
  +++ build.xml	8 Apr 2002 10:32:10 -0000	1.17
  @@ -2,61 +2,12 @@
   
   <project name="Excalibur Instrument Client" default="main" basedir=".">
   
  -    <!-- load per-project properties -->
  -    <property file="project.properties"/>
  -
  -    <!--
  -      Give user a chance to override without editing this file
  -      (and without typing -D each time he compiles it)
  -    -->
  -    <property file="ant.properties"/>
  +    <property file="${user.home}/build.properties"/>
       <property file="../ant.properties"/>
  +    <property file="ant.properties"/>
       <property file="${user.home}/.ant.properties"/>
  -
  -    <!-- Settings used to configure compile environment -->
  -    <property name="build.debug" value="on"/>
  -    <property name="build.optimize" value="off"/>
  -    <property name="build.deprecation" value="off"/>
  -    <property name="build.compress" value="false"/>
  -    <property name="junit.failonerror" value="false"/>
  -
  -    <!-- location of intermediate products -->
  -    <property name="build.dir" value="${basedir}/build"/>
  -    <property name="build.lib" value="${build.dir}/lib"/>
  -    <property name="build.conf" value="${build.dir}/conf"/>
  -    <property name="build.classes" value="${build.dir}/classes"/>
  -    <property name="build.genjava" value="${build.dir}/genjava"/>
  -    <property name="build.tests" value="${build.dir}/tests"/>
  -    <property name="build.reports" value="${build.dir}/reports"/>
  -
  -    <!-- Set the properties for source directories -->
  -    <property name="src.dir" value="${basedir}/src"/>
  -    <property name="java.dir" value="${src.dir}/java"/>
  -    <property name="conf.dir" value="${src.dir}/conf"/>
  -    <property name="test.dir" value="${src.dir}/test"/>
  -
  -    <!-- needed by Cocoon -->
  -    <property name="build.context" value="${build.dir}/documentation"/>
  -    <property name="build.docs" value="${build.dir}/docs"/>
  -    <property name="build.xdocs" value="${build.dir}/xdocs"/>
  -    <property name="context.dir" value="../../jakarta-avalon/src/documentation"/>
  -    <property name="tools.dir" value="../../jakarta-avalon/tools"/>
  -    <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
  -    <property name="docs.dir" value="dist/docs"/>
  -    <property name="xdocs.dir" value="${src.dir}/xdocs"/>      
  -
  -    <!-- Set the properties for distribution directories -->
  -    <property name="dist.dir" value="${basedir}/dist"/>
  -    <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
  -
  -    <!-- name of .zip/.tar.gz/.bz2 files and their top-level directory -->
  -    <property name="dist.name" value="${name}-${version}"/>
  -
  -    <!-- name of jar file -->
  -    <property name="jar.name" value="${name}-${version}.jar"/>
  -
  -    <!-- property indicating directory where all distribution archives are placed -->
  -    <property name="dist.base" value="distributions"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
  @@ -71,6 +22,7 @@
           <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}"/>
  @@ -79,11 +31,24 @@
           <fileset dir="${tools.dir}/ext"/>
       </path>        
           
  +
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  +    <target name="dependencies" description="Check dependencies">
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkManagerInterfaces"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkFramework"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkFramework"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkInstrumentManager"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
  +            <property name="name" value="excalibur-altrmi-client-impl.jar"/>
  +            <property name="path" value="${excalibur-altrmi-client-impl.jar}"/>
  +        </ant>
  +    </target>
  +
       <!-- Compiles the source code -->
  -    <target name="compile" description="Compiles the source code">
  +    <target name="compile" depends="dependencies" description="Compiles the source code">
   
           <mkdir dir="${build.classes}"/>
   
  @@ -121,7 +86,7 @@
               <fileset dir="../" includes="LICENSE.txt"/>
               <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
               <filterset>
  -                <filtersfile file="project.properties"/>
  +                <filtersfile file="default.properties"/>
               </filterset>
           </copy>
       </target>
  @@ -150,7 +115,7 @@
       </target>
   
       <!-- Creates all the Javadocs -->
  -    <target name="javadocs" depends="compile" description="Generates the javadocs">
  +    <target name="javadocs" depends="compile" description="Generates the javadocs" unless="skip.javadocs">
   
           <mkdir dir="${dist.javadocs}"/>
           <javadoc packagenames="org.apache.*"
  @@ -171,7 +136,7 @@
           </javadoc>
       </target>
   
  -    <target name="test" depends="compile" description="Perform the unit tests">
  +    <target name="test" depends="compile" description="Perform the unit tests" unless="skip.tests">
   
           <echo message="Performing Unit Tests" />
   
  @@ -314,7 +279,11 @@
           description="Generates a minimal distribution (jar + javadocs)">
   
           <mkdir dir="${dist.dir}"/>
  -        <copy file="${build.lib}/${jar.name}" todir="${dist.dir}"/>
  +        <copy todir="${dist.dir}">
  +            <fileset dir="${build.lib}">
  +                <include name="*.jar"/>
  +            </fileset>
  +        </copy>
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
  
  
  
  1.3       +18 -6     jakarta-avalon-excalibur/instrument-client/default.properties
  
  
  
  
  1.5       +30 -30    jakarta-avalon-excalibur/instrument-manager/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-manager/ant.properties.sample,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ant.properties.sample	4 Apr 2002 05:09:03 -0000	1.4
  +++ ant.properties.sample	8 Apr 2002 10:32:10 -0000	1.5
  @@ -1,4 +1,4 @@
  -#-----------------------------------------------------------------------------
  +# -----------------------------------------------------------------------------
   # Component ant.properties.sample
   #
   # This is an example "ant.properties" file, used to customize the building of
  @@ -6,49 +6,46 @@
   # external modules that this component depend on.  Copy this file to
   # "ant.properties" in the source directory, and customize it as needed.
   #
  -# The ant.properties values in this directory apply only to this component, and
  -# override the defaults in ../ant.properties.
  +# The ant.properties values in this directory apply only to this component.
  +# It is overridden by ../ant.properties and ~/build.properties
  +# It overrides all default.properties files and ~/.ant.properties
   #
  -# $Id: ant.properties.sample,v 1.4 2002/04/04 05:09:03 leif Exp $
  +# $Id: ant.properties.sample,v 1.5 2002/04/08 10:32:10 jefft Exp $
   # -----------------------------------------------------------------------------
   
  -# --------------------------------------------------
  -#      COMPONENT-SPECIFIC REQUIRED LIBRARIES
  -# --------------------------------------------------
  -
  -
   # ----- Compile Control Flags -----
   build.debug=on
   build.optimize=off
   build.deprecation=off
  +#build.compiler=jikes
   
   # ----- Base Directory in which all the packages are stored -----
  -base.path=/opt
  +base.path=${basedir}/../..
   
   # --------------------------------------------------
   #                REQUIRED LIBRARIES
   # --------------------------------------------------
   
   # ----- Logkit -----
  -logkit.home=../../jakarta-avalon-logkit/build/lib
  -logkit.jar=${logkit.home}/logkit.jar
  +avalon-logkit.home=${basedir}/../../jakarta-avalon-logkit
  +avalon-logkit.lib=${avalon-logkit.home}/build/lib
  +avalon-logkit.jar=${avalon-logkit.lib}/logkit.jar
   
   # ----- Avalon Framework -----
  -avalon-framework.home=../../jakarta-avalon/build/lib
  -avalon-framework.jar=${avalon-framework.home}/avalon-framework.jar
  -
  -# ----- Altrmi -----
  -excalibur-altrmi.home=../altrmi/build/lib
  -excalibur-altrmi-common.jar=${excalibur-altrmi.home}/excalibur-altrmi-common.jar
  -excalibur-altrmi-server-impl.jar=${excalibur-altrmi.home}/excalibur-altrmi-server-impl.jar
  -excalibur-altrmi-server-interfaces.jar=${excalibur-altrmi.home}/excalibur-altrmi-server-interfaces.jar
  +avalon-framework.home=${basedir}/../../jakarta-avalon
  +avalon-framework.lib=${avalon-framework.home}/build/lib
  +avalon-framework.jar=${avalon-framework.lib}/avalon-framework.jar
  +
  +# ----- Avalon Excalibur -----
  +excalibur-core.home=${basedir}/../all/build/lib
  +excalibur-core.jar=${excalibur-core.home}/excalibur-core.jar
   
   # ----- Excalibur Collections -----
  -excalibur-collections.home=../collections/build/lib
  +excalibur-collections.home=${basedir}/../collections/build/lib
   excalibur-collections.jar=${excalibur-collections.home}/excalibur-collections-1.0.jar
   
   # ----- Excalibur Instrument -----
  -excalibur-instrument.home=../instrument/build/lib
  +excalibur-instrument.home=${basedir}/../instrument/build/lib
   excalibur-instrument.jar=${excalibur-instrument.home}/excalibur-instrument-0.1.jar
   
   # ----- Excalibur Logger -----
  @@ -63,19 +60,22 @@
   excalibur-component.home=../component/build/lib
   excalibur-component.jar=${excalibur-component.home}/excalibur-component-1.0.jar
   
  -# ----- JUnit Unit Test Suite, version 3.7 or later -----
  -junit.home=${base.path}/junit3.7
  -junit.lib=${junit.home}
  -junit.jar=${junit.lib}/junit.jar
  -
  -
  -
  +# ----- Altrmi -----
  +excalibur-altrmi.home=${basedir}/../../jakarta-commons-sandbox/altrmi/dist
  +excalibur-altrmi-common.jar=${excalibur-altrmi.home}/excalibur-altrmi-common.jar
  +excalibur-altrmi-server-impl.jar=${excalibur-altrmi.home}/excalibur-altrmi-server-impl.jar
  +excalibur-altrmi-server-interfaces.jar=${excalibur-altrmi.home}/excalibur-altrmi-server-interfaces.jar
   # --------------------------------------------------
   #                OPTIONAL LIBRARIES
   # --------------------------------------------------
   
  -# ----- Checkstyle, version 2.1 or later -----
  +# ----- 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
   # do.checkstyle=
   checkstyle.home=${base.path}/checkstyle-2.1
  
  
  
  1.16      +44 -61    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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- build.xml	7 Apr 2002 10:20:16 -0000	1.15
  +++ build.xml	8 Apr 2002 10:32:10 -0000	1.16
  @@ -2,78 +2,32 @@
   
   <project name="Excalibur Instrument Manager" default="main" basedir=".">
   
  -    <!-- load per-project properties -->
  -    <property file="project.properties"/>
  -
  -    <!--
  -      Give user a chance to override without editing this file
  -      (and without typing -D each time he compiles it)
  -    -->
  -    <property file="ant.properties"/>
  +    <property file="${user.home}/build.properties"/>
       <property file="../ant.properties"/>
  +    <property file="ant.properties"/>
       <property file="${user.home}/.ant.properties"/>
  -
  -    <!-- Settings used to configure compile environment -->
  -    <property name="build.debug" value="on"/>
  -    <property name="build.optimize" value="off"/>
  -    <property name="build.deprecation" value="off"/>
  -    <property name="build.compress" value="false"/>
  -    <property name="junit.failonerror" value="false"/>
  -
  -    <!-- location of intermediate products -->
  -    <property name="build.dir" value="${basedir}/build"/>
  -    <property name="build.lib" value="${build.dir}/lib"/>
  -    <property name="build.conf" value="${build.dir}/conf"/>
  -    <property name="build.classes" value="${build.dir}/classes"/>
  -    <property name="build.tests" value="${build.dir}/tests"/>
  -    <property name="build.reports" value="${build.dir}/reports"/>
  -
  -    <!-- Set the properties for source directories -->
  -    <property name="src.dir" value="${basedir}/src"/>
  -    <property name="java.dir" value="${src.dir}/java"/>
  -    <property name="conf.dir" value="${src.dir}/conf"/>
  -    <property name="test.dir" value="${src.dir}/test"/>
  -
  -    <!-- needed by Cocoon -->
  -    <property name="build.context" value="${build.dir}/documentation"/>
  -    <property name="build.docs" value="${build.dir}/docs"/>
  -    <property name="build.xdocs" value="${build.dir}/xdocs"/>
  -    <property name="context.dir" value="../../jakarta-avalon/src/documentation"/>
  -    <property name="tools.dir" value="../../jakarta-avalon/tools"/>
  -    <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
  -    <property name="docs.dir" value="dist/docs"/>
  -    <property name="xdocs.dir" value="${src.dir}/xdocs"/>      
  -
  -    <!-- Set the properties for distribution directories -->
  -    <property name="dist.dir" value="${basedir}/dist"/>
  -    <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
  -
  -    <!-- name of .zip/.tar.gz/.bz2 files and their top-level directory -->
  -    <property name="dist.name" value="${name}-${version}"/>
  -    <property name="dist-interfaces.name" value="${name}-interfaces-${version}"/>
  -    <!-- name of jar file -->
  -    <property name="jar.name" value="${name}-${version}.jar"/>
  -
  -    <!-- property indicating directory where all distribution archives are placed -->
  -    <property name="dist.base" value="distributions"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
           <pathelement path="${java.class.path}"/>
           <pathelement location="${build.classes}"/>
  -        <pathelement location="${logkit.jar}"/>
  +        <pathelement location="${avalon-logkit.jar}"/>
           <pathelement location="${avalon-framework.jar}"/>
  -        <pathelement location="${excalibur-altrmi-common.jar}"/>
  -        <pathelement location="${excalibur-altrmi-server-impl.jar}"/>
  -        <pathelement location="${excalibur-altrmi-server-interfaces.jar}"/>
  +        <pathelement location="${excalibur-core.jar}"/>
           <pathelement location="${excalibur-collections.jar}"/>
           <pathelement location="${excalibur-instrument.jar}"/>
           <pathelement location="${excalibur-logger.jar}"/>
           <pathelement location="${excalibur-pool.jar}"/>
           <pathelement location="${excalibur-component.jar}"/>
  +        <pathelement location="${excalibur-altrmi-common.jar}"/>
  +        <pathelement location="${excalibur-altrmi-server-impl.jar}"/>
  +        <pathelement location="${excalibur-altrmi-server-interfaces.jar}"/>
           <pathelement location="${junit.jar}"/>
           <pathelement location="${checkstyle.jar}"/>
       </path>
  +    <property name="cp" refid="project.class.path"/>
   
       <path id="tools.class.path">
           <pathelement location="${junit.jar}"/>
  @@ -85,8 +39,33 @@
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  +    <target name="dependencies" description="Check dependencies">
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCollections"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkInstrument"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkLogger"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkPool"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkComponent"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkFramework"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCore"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkLogkit"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
  +            <property name="name" value="excalibur-altrmi-common.jar"/>
  +            <property name="path" value="${excalibur-altrmi-common.jar}"/>
  +            <property name="proj.home" value="${basedir}/../altrmi"/>
  +        </ant>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
  +            <property name="name" value="excalibur-altrmi-server-impl.jar"/>
  +            <property name="path" value="${excalibur-altrmi-server-impl.jar}"/>
  +        </ant>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
  +            <property name="name" value="excalibur-altrmi-server-interfaces.jar"/>
  +            <property name="path" value="${excalibur-altrmi-server-interfaces.jar}"/>
  +        </ant>
  +    </target>
  +
       <!-- Compiles the source code -->
  -    <target name="compile" description="Compiles the source code">
  +    <target name="compile" depends="dependencies" description="Compiles the source code">
   
           <mkdir dir="${build.classes}"/>
   
  @@ -124,7 +103,7 @@
               <fileset dir="../" includes="LICENSE.txt"/>
               <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
               <filterset>
  -                <filtersfile file="project.properties"/>
  +                <filtersfile file="default.properties"/>
               </filterset>
           </copy>
   
  @@ -157,7 +136,7 @@
       </target>
   
       <!-- Creates all the Javadocs -->
  -    <target name="javadocs" depends="compile" description="Generates the javadocs">
  +    <target name="javadocs" depends="compile" description="Generates the javadocs" unless="skip.javadocs">
   
           <mkdir dir="${dist.javadocs}"/>
           <javadoc packagenames="org.apache.*"
  @@ -178,7 +157,7 @@
           </javadoc>
       </target>
   
  -    <target name="test" depends="compile" description="Perform the unit tests">
  +    <target name="test" depends="compile" description="Perform the unit tests" unless="skip.tests">
   
           <echo message="Performing Unit Tests" />
   
  @@ -322,7 +301,11 @@
           description="Generates a minimal distribution (jar + javadocs)">
   
           <mkdir dir="${dist.dir}"/>
  -        <copy file="${build.lib}/${jar.name}" todir="${dist.dir}"/>
  +        <copy todir="${dist.dir}">
  +            <fileset dir="${build.lib}">
  +                <include name="*.jar"/>
  +            </fileset>
  +        </copy>
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
  
  
  
  1.3       +37 -9     jakarta-avalon-excalibur/instrument-manager/default.properties
  
  
  
  
  1.4       +12 -16    jakarta-avalon-excalibur/io/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/io/ant.properties.sample,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ant.properties.sample	24 Mar 2002 00:26:12 -0000	1.3
  +++ ant.properties.sample	8 Apr 2002 10:32:11 -0000	1.4
  @@ -6,43 +6,39 @@
   # external modules that this component depend on.  Copy this file to
   # "ant.properties" in the source directory, and customize it as needed.
   #
  -# The ant.properties values in this directory apply only to this component, and
  -# override the defaults in ../ant.properties.
  +# The ant.properties values in this directory apply only to this component.
  +# 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/03/24 00:26:12 jefft Exp $
  +# $Id: ant.properties.sample,v 1.4 2002/04/08 10:32:11 jefft Exp $
   # -----------------------------------------------------------------------------
   
  -# --------------------------------------------------
  -#      COMPONENT-SPECIFIC REQUIRED LIBRARIES
  -# --------------------------------------------------
  -
  -
   # ----- Compile Control Flags -----
   build.debug=on
   build.optimize=off
   build.deprecation=off
  +#build.compiler=jikes
   
   # ----- Base Directory in which all the packages are stored -----
  -base.path=/opt
  +base.path=${basedir}/../..
   
   # --------------------------------------------------
   #                REQUIRED LIBRARIES
   # --------------------------------------------------
   
   
  -# ----- JUnit Unit Test Suite, version 3.7 or later -----
  +# --------------------------------------------------
  +#                OPTIONAL LIBRARIES
  +# --------------------------------------------------
  +
  +# ----- 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
   
   
  -
  -# --------------------------------------------------
  -#                OPTIONAL LIBRARIES
  -# --------------------------------------------------
  -
   # ----- Checkstyle, version 2.1 or later -----
  -
   # Uncomment the 'do.checkstyle' flag property to enable checkstyle
   # do.checkstyle=
   checkstyle.home=${base.path}/checkstyle-2.1
  
  
  
  1.35      +18 -57    jakarta-avalon-excalibur/io/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/io/build.xml,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- build.xml	7 Apr 2002 10:20:16 -0000	1.34
  +++ build.xml	8 Apr 2002 10:32:11 -0000	1.35
  @@ -2,60 +2,12 @@
   
   <project name="Excalibur IO" default="main" basedir=".">
   
  -    <!-- load per-project properties -->
  -    <property file="project.properties"/>
  -
  -    <!--
  -      Give user a chance to override without editing this file
  -      (and without typing -D each time he compiles it)
  -    -->
  -    <property file="ant.properties"/>
  +    <property file="${user.home}/build.properties"/>
       <property file="../ant.properties"/>
  +    <property file="ant.properties"/>
       <property file="${user.home}/.ant.properties"/>
  -
  -    <!-- Settings used to configure compile environment -->
  -    <property name="build.debug" value="on"/>
  -    <property name="build.optimize" value="off"/>
  -    <property name="build.deprecation" value="off"/>
  -    <property name="build.compress" value="false"/>
  -    <property name="junit.failonerror" value="false"/>
  -
  -    <!-- location of intermediate products -->
  -    <property name="build.dir" value="build"/>
  -    <property name="build.lib" value="${build.dir}/lib"/>
  -    <property name="build.conf" value="${build.dir}/conf"/>
  -    <property name="build.classes" value="${build.dir}/classes"/>
  -    <property name="build.tests" value="${build.dir}/tests"/>
  -    <property name="build.reports" value="${build.dir}/reports"/>
  -
  -    <!-- Set the properties for source directories -->
  -    <property name="src.dir" value="src"/>
  -    <property name="java.dir" value="${src.dir}/java"/>
  -    <property name="conf.dir" value="${src.dir}/conf"/>
  -    <property name="test.dir" value="${src.dir}/test"/>
  -
  -    <!-- needed by Cocoon -->
  -    <property name="build.context" value="${build.dir}/documentation"/>
  -    <property name="build.docs" value="${build.dir}/docs"/>
  -    <property name="build.xdocs" value="${build.dir}/xdocs"/>
  -    <property name="context.dir" value="../../jakarta-avalon/src/documentation"/>
  -    <property name="tools.dir" value="../../jakarta-avalon/tools"/>
  -    <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
  -    <property name="docs.dir" value="dist/docs"/>
  -    <property name="xdocs.dir" value="${src.dir}/xdocs"/>      
  -
  -    <!-- Set the properties for distribution directories -->
  -    <property name="dist.dir" value="dist"/>
  -    <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
  -
  -    <!-- name of .zip/.tar.gz/.bz2 files and their top-level directory -->
  -    <property name="dist.name" value="${name}-${version}"/>
  -
  -    <!-- name of jar file -->
  -    <property name="jar.name" value="${name}-${version}.jar"/>
  -
  -    <!-- property indicating directory where all distribution archives are placed -->
  -    <property name="dist.base" value="distributions"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
  @@ -64,6 +16,7 @@
           <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}"/>
  @@ -75,8 +28,12 @@
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  +    <target name="dependencies" description="Check dependencies">
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
  +    </target>
  +
       <!-- Compiles the source code -->
  -    <target name="compile" description="Compiles the source code">
  +    <target name="compile" depends="dependencies" description="Compiles the source code">
   
           <mkdir dir="${build.classes}"/>
   
  @@ -114,7 +71,7 @@
               <fileset dir="../" includes="LICENSE.txt"/>
               <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
               <filterset>
  -                <filtersfile file="project.properties"/>
  +                <filtersfile file="default.properties"/>
               </filterset>
           </copy>
   
  @@ -137,7 +94,7 @@
       </target>
   
       <!-- Creates all the Javadocs -->
  -    <target name="javadocs" depends="compile" description="Generates the javadocs">
  +    <target name="javadocs" depends="compile" description="Generates the javadocs" unless="skip.javadocs">
   
           <mkdir dir="${dist.javadocs}"/>
           <javadoc packagenames="org.apache.*"
  @@ -158,7 +115,7 @@
           </javadoc>
       </target>
   
  -    <target name="test" depends="compile" description="Perform the unit tests">
  +    <target name="test" depends="compile" description="Perform the unit tests" unless="skip.tests">
   
           <echo message="Performing Unit Tests" />
   
  @@ -303,7 +260,11 @@
           description="Generates a minimal distribution (jar + javadocs)">
   
           <mkdir dir="${dist.dir}"/>
  -        <copy file="${build.lib}/${jar.name}" todir="${dist.dir}"/>
  +        <copy todir="${dist.dir}">
  +            <fileset dir="${build.lib}">
  +                <include name="*.jar"/>
  +            </fileset>
  +        </copy>
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
  
  
  
  1.3       +13 -0     jakarta-avalon-excalibur/io/default.properties
  
  
  
  
  1.2       +13 -16    jakarta-avalon-excalibur/lang/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/lang/ant.properties.sample,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ant.properties.sample	4 Apr 2002 05:09:03 -0000	1.1
  +++ ant.properties.sample	8 Apr 2002 10:32:11 -0000	1.2
  @@ -6,42 +6,39 @@
   # external modules that this component depend on.  Copy this file to
   # "ant.properties" in the source directory, and customize it as needed.
   #
  -# The ant.properties values in this directory apply only to this component, and
  -# override the defaults in ../ant.properties.
  +# The ant.properties values in this directory apply only to this component.
  +# It is overridden by ../ant.properties and ~/build.properties
  +# It overrides all default.properties files and ~/.ant.properties
   #
  -# $Id: ant.properties.sample,v 1.1 2002/04/04 05:09:03 leif Exp $
  +# $Id: ant.properties.sample,v 1.2 2002/04/08 10:32:11 jefft Exp $
   # -----------------------------------------------------------------------------
   
  -# --------------------------------------------------
  -#      COMPONENT-SPECIFIC REQUIRED LIBRARIES
  -# --------------------------------------------------
  -
  -
   # ----- Compile Control Flags -----
   build.debug=on
   build.optimize=off
   build.deprecation=off
  +#build.compiler=jikes
   
   # ----- Base Directory in which all the packages are stored -----
  -base.path=/opt
  +base.path=${basedir}/../..
   
   # --------------------------------------------------
   #                REQUIRED LIBRARIES
   # --------------------------------------------------
   
  -# ----- JUnit Unit Test Suite, version 3.7 or later -----
  -junit.home=${base.path}/junit3.7
  -junit.lib=${junit.home}
  -junit.jar=${junit.lib}/junit.jar
  -
  -
   
   # --------------------------------------------------
   #                OPTIONAL LIBRARIES
   # --------------------------------------------------
   
  -# ----- Checkstyle, version 2.1 or later -----
  +# ----- 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
   # do.checkstyle=
   checkstyle.home=${base.path}/checkstyle-2.1
  
  
  
  1.5       +18 -57    jakarta-avalon-excalibur/lang/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/lang/build.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- build.xml	7 Apr 2002 10:20:16 -0000	1.4
  +++ build.xml	8 Apr 2002 10:32:11 -0000	1.5
  @@ -2,60 +2,12 @@
   
   <project name="Excalibur Lang" default="main" basedir=".">
   
  -    <!-- load per-project properties -->
  -    <property file="project.properties"/>
  -
  -    <!--
  -      Give user a chance to override without editing this file
  -      (and without typing -D each time he compiles it)
  -    -->
  -    <property file="ant.properties"/>
  +    <property file="${user.home}/build.properties"/>
       <property file="../ant.properties"/>
  +    <property file="ant.properties"/>
       <property file="${user.home}/.ant.properties"/>
  -
  -    <!-- Settings used to configure compile environment -->
  -    <property name="build.debug" value="on"/>
  -    <property name="build.optimize" value="off"/>
  -    <property name="build.deprecation" value="off"/>
  -    <property name="build.compress" value="false"/>
  -    <property name="junit.failonerror" value="false"/>
  -
  -    <!-- location of intermediate products -->
  -    <property name="build.dir" value="build"/>
  -    <property name="build.lib" value="${build.dir}/lib"/>
  -    <property name="build.conf" value="${build.dir}/conf"/>
  -    <property name="build.classes" value="${build.dir}/classes"/>
  -    <property name="build.tests" value="${build.dir}/tests"/>
  -    <property name="build.reports" value="${build.dir}/reports"/>
  -
  -    <!-- Set the properties for source directories -->
  -    <property name="src.dir" value="src"/>
  -    <property name="java.dir" value="${src.dir}/java"/>
  -    <property name="conf.dir" value="${src.dir}/conf"/>
  -    <property name="test.dir" value="${src.dir}/test"/>
  -
  -    <!-- needed by Cocoon -->
  -    <property name="build.context" value="${build.dir}/documentation"/>
  -    <property name="build.docs" value="${build.dir}/docs"/>
  -    <property name="build.xdocs" value="${build.dir}/xdocs"/>
  -    <property name="context.dir" value="../../jakarta-avalon/src/documentation"/>
  -    <property name="tools.dir" value="../../jakarta-avalon/tools"/>
  -    <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
  -    <property name="docs.dir" value="dist/docs"/>
  -    <property name="xdocs.dir" value="${src.dir}/xdocs"/>      
  -
  -    <!-- Set the properties for distribution directories -->
  -    <property name="dist.dir" value="dist"/>
  -    <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
  -
  -    <!-- name of .zip/.tar.gz/.bz2 files and their top-level directory -->
  -    <property name="dist.name" value="${name}-${version}"/>
  -
  -    <!-- name of jar file -->
  -    <property name="jar.name" value="${name}-${version}.jar"/>
  -
  -    <!-- property indicating directory where all distribution archives are placed -->
  -    <property name="dist.base" value="distributions"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
  @@ -64,6 +16,7 @@
           <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}"/>
  @@ -75,8 +28,12 @@
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  +    <target name="dependencies" description="Check dependencies">
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
  +    </target>
  +
       <!-- Compiles the source code -->
  -    <target name="compile" description="Compiles the source code">
  +    <target name="compile" depends="dependencies" description="Compiles the source code">
   
           <mkdir dir="${build.classes}"/>
   
  @@ -114,7 +71,7 @@
               <fileset dir="../" includes="LICENSE.txt"/>
               <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
               <filterset>
  -                <filtersfile file="project.properties"/>
  +                <filtersfile file="default.properties"/>
               </filterset>
           </copy>
   
  @@ -137,7 +94,7 @@
       </target>
   
       <!-- Creates all the Javadocs -->
  -    <target name="javadocs" depends="compile" description="Generates the javadocs">
  +    <target name="javadocs" depends="compile" description="Generates the javadocs" unless="skip.javadocs">
   
           <mkdir dir="${dist.javadocs}"/>
           <javadoc packagenames="org.apache.*"
  @@ -158,7 +115,7 @@
           </javadoc>
       </target>
   
  -    <target name="test" depends="compile" description="Perform the unit tests">
  +    <target name="test" depends="compile" description="Perform the unit tests" unless="skip.tests">
   
           <echo message="Performing Unit Tests" />
   
  @@ -303,7 +260,11 @@
           description="Generates a minimal distribution (jar + javadocs)">
   
           <mkdir dir="${dist.dir}"/>
  -        <copy file="${build.lib}/${jar.name}" todir="${dist.dir}"/>
  +        <copy todir="${dist.dir}">
  +            <fileset dir="${build.lib}">
  +                <include name="*.jar"/>
  +            </fileset>
  +        </copy>
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
  
  
  
  1.2       +62 -0     jakarta-avalon-excalibur/lang/default.properties
  
  
  
  
  1.2       +12 -16    jakarta-avalon-excalibur/logger/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/logger/ant.properties.sample,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ant.properties.sample	4 Apr 2002 02:34:13 -0000	1.1
  +++ ant.properties.sample	8 Apr 2002 10:32:11 -0000	1.2
  @@ -6,24 +6,21 @@
   # external modules that this component depend on.  Copy this file to
   # "ant.properties" in the source directory, and customize it as needed.
   #
  -# The ant.properties values in this directory apply only to this component, and
  -# override the defaults in ../ant.properties.
  +# The ant.properties values in this directory apply only to this component.
  +# It is overridden by ../ant.properties and ~/build.properties
  +# It overrides all default.properties files and ~/.ant.properties
   #
  -# $Id: ant.properties.sample,v 1.1 2002/04/04 02:34:13 leif Exp $
  +# $Id: ant.properties.sample,v 1.2 2002/04/08 10:32:11 jefft Exp $
   # -----------------------------------------------------------------------------
   
  -# --------------------------------------------------
  -#      COMPONENT-SPECIFIC REQUIRED LIBRARIES
  -# --------------------------------------------------
  -
  -
   # ----- Compile Control Flags -----
   build.debug=on
   build.optimize=off
   build.deprecation=off
  +#build.compiler=jikes
   
   # ----- Base Directory in which all the packages are stored -----
  -base.path=/opt
  +base.path=${basedir}/../..
   
   # --------------------------------------------------
   #                REQUIRED LIBRARIES
  @@ -37,19 +34,18 @@
   avalon-framework.home=../../jakarta-avalon/build/lib
   avalon-framework.jar=${avalon-framework.home}/avalon-framework.jar
   
  -# ----- JUnit Unit Test Suite, version 3.7 or later -----
  +# --------------------------------------------------
  +#                OPTIONAL LIBRARIES
  +# --------------------------------------------------
  +
  +# ----- 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
   
   
  -
  -# --------------------------------------------------
  -#                OPTIONAL LIBRARIES
  -# --------------------------------------------------
  -
   # ----- Checkstyle, version 2.1 or later -----
  -
   # Uncomment the 'do.checkstyle' flag property to enable checkstyle
   # do.checkstyle=
   checkstyle.home=${base.path}/checkstyle-2.1
  
  
  
  1.5       +21 -58    jakarta-avalon-excalibur/logger/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/logger/build.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- build.xml	7 Apr 2002 10:20:17 -0000	1.4
  +++ build.xml	8 Apr 2002 10:32:11 -0000	1.5
  @@ -2,70 +2,23 @@
   
   <project name="Excalibur Logger" default="main" basedir=".">
   
  -    <!-- load per-project properties -->
  -    <property file="project.properties"/>
  -
  -    <!--
  -      Give user a chance to override without editing this file
  -      (and without typing -D each time he compiles it)
  -    -->
  -    <property file="ant.properties"/>
  +    <property file="${user.home}/build.properties"/>
       <property file="../ant.properties"/>
  +    <property file="ant.properties"/>
       <property file="${user.home}/.ant.properties"/>
  -
  -    <!-- Settings used to configure compile environment -->
  -    <property name="build.debug" value="on"/>
  -    <property name="build.optimize" value="off"/>
  -    <property name="build.deprecation" value="off"/>
  -    <property name="build.compress" value="false"/>
  -    <property name="junit.failonerror" value="false"/>
  -
  -    <!-- location of intermediate products -->
  -    <property name="build.dir" value="build"/>
  -    <property name="build.lib" value="${build.dir}/lib"/>
  -    <property name="build.conf" value="${build.dir}/conf"/>
  -    <property name="build.classes" value="${build.dir}/classes"/>
  -    <property name="build.tests" value="${build.dir}/tests"/>
  -    <property name="build.reports" value="${build.dir}/reports"/>
  -
  -    <!-- Set the properties for source directories -->
  -    <property name="src.dir" value="src"/>
  -    <property name="java.dir" value="${src.dir}/java"/>
  -    <property name="conf.dir" value="${src.dir}/conf"/>
  -    <property name="test.dir" value="${src.dir}/test"/>
  -
  -    <!-- needed by Cocoon -->
  -    <property name="build.context" value="${build.dir}/documentation"/>
  -    <property name="build.docs" value="${build.dir}/docs"/>
  -    <property name="build.xdocs" value="${build.dir}/xdocs"/>
  -    <property name="context.dir" value="../../jakarta-avalon/src/documentation"/>
  -    <property name="tools.dir" value="../../jakarta-avalon/tools"/>
  -    <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
  -    <property name="docs.dir" value="dist/docs"/>
  -    <property name="xdocs.dir" value="${src.dir}/xdocs"/>      
  -
  -    <!-- Set the properties for distribution directories -->
  -    <property name="dist.dir" value="dist"/>
  -    <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
  -
  -    <!-- name of .zip/.tar.gz/.bz2 files and their top-level directory -->
  -    <property name="dist.name" value="${name}-${version}"/>
  -
  -    <!-- name of jar file -->
  -    <property name="jar.name" value="${name}-${version}.jar"/>
  -
  -    <!-- property indicating directory where all distribution archives are placed -->
  -    <property name="dist.base" value="distributions"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
           <pathelement path="${java.class.path}"/>
           <pathelement location="${build.classes}"/>
  -        <pathelement location="${logkit.jar}"/>
  +        <pathelement location="${avalon-logkit.jar}"/>
           <pathelement location="${avalon-framework.jar}"/>
           <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}"/>
  @@ -93,8 +46,14 @@
           </available>
       </target>
       
  +    <target name="dependencies" description="Check dependencies">
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkFramework"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkLogkit"/>
  +    </target>
  +
       <!-- Compiles the source code -->
  -    <target name="compile" depends="check-environment" description="Compiles the source code">
  +    <target name="compile" depends="dependencies, check-environment" description="Compiles the source code">
   
           <mkdir dir="${build.classes}"/>
   
  @@ -145,7 +104,7 @@
               <fileset dir="../" includes="LICENSE.txt"/>
               <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
               <filterset>
  -                <filtersfile file="project.properties"/>
  +                <filtersfile file="default.properties"/>
               </filterset>
           </copy>
   
  @@ -168,7 +127,7 @@
       </target>
   
       <!-- Creates all the Javadocs -->
  -    <target name="javadocs" depends="compile" description="Generates the javadocs">
  +    <target name="javadocs" depends="compile" description="Generates the javadocs" unless="skip.javadocs">
   
           <mkdir dir="${dist.javadocs}"/>
           <javadoc packagenames="org.apache.*"
  @@ -189,7 +148,7 @@
           </javadoc>
       </target>
   
  -    <target name="test" depends="compile" description="Perform the unit tests">
  +    <target name="test" depends="compile" description="Perform the unit tests" unless="skip.tests">
   
           <echo message="Performing Unit Tests" />
   
  @@ -334,7 +293,11 @@
           description="Generates a minimal distribution (jar + javadocs)">
   
           <mkdir dir="${dist.dir}"/>
  -        <copy file="${build.lib}/${jar.name}" todir="${dist.dir}"/>
  +        <copy todir="${dist.dir}">
  +            <fileset dir="${build.lib}">
  +                <include name="*.jar"/>
  +            </fileset>
  +        </copy>
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
  
  
  
  1.2       +77 -0     jakarta-avalon-excalibur/logger/default.properties
  
  
  
  
  1.2       +11 -16    jakarta-avalon-excalibur/monitor/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/monitor/ant.properties.sample,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ant.properties.sample	5 Apr 2002 06:36:50 -0000	1.1
  +++ ant.properties.sample	8 Apr 2002 10:32:11 -0000	1.2
  @@ -6,43 +6,38 @@
   # external modules that this component depend on.  Copy this file to
   # "ant.properties" in the source directory, and customize it as needed.
   #
  -# The ant.properties values in this directory apply only to this component, and
  -# override the defaults in ../ant.properties.
  +# The ant.properties values in this directory apply only to this component.
  +# It is overridden by ../ant.properties and ~/build.properties
  +# It overrides all default.properties files and ~/.ant.properties
   #
  -# $Id: ant.properties.sample,v 1.1 2002/04/05 06:36:50 hammant Exp $
  +# $Id: ant.properties.sample,v 1.2 2002/04/08 10:32:11 jefft Exp $
   # -----------------------------------------------------------------------------
   
  -# --------------------------------------------------
  -#      COMPONENT-SPECIFIC REQUIRED LIBRARIES
  -# --------------------------------------------------
  -
  -
   # ----- Compile Control Flags -----
   build.debug=on
   build.optimize=off
   build.deprecation=off
  +#build.compiler=jikes
   
   # ----- Base Directory in which all the packages are stored -----
  -base.path=/opt
  +base.path=${basedir}/../..
   
   # --------------------------------------------------
   #                REQUIRED LIBRARIES
   # --------------------------------------------------
   
  +# --------------------------------------------------
  +#                OPTIONAL LIBRARIES
  +# --------------------------------------------------
   
  -# ----- JUnit Unit Test Suite, version 3.7 or later -----
  +# ----- 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
   
   
  -
  -# --------------------------------------------------
  -#                OPTIONAL LIBRARIES
  -# --------------------------------------------------
  -
   # ----- Checkstyle, version 2.1 or later -----
  -
   # Uncomment the 'do.checkstyle' flag property to enable checkstyle
   # do.checkstyle=
   checkstyle.home=${base.path}/checkstyle-2.1
  
  
  
  1.4       +19 -58    jakarta-avalon-excalibur/monitor/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/monitor/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	7 Apr 2002 10:20:17 -0000	1.3
  +++ build.xml	8 Apr 2002 10:32:11 -0000	1.4
  @@ -1,61 +1,13 @@
   <?xml version="1.0"?>
   
  -<project name="Excalibur template" default="main" basedir=".">
  +<project name="Excalibur Monitor" default="main" basedir=".">
   
  -    <!-- load per-project properties -->
  -    <property file="project.properties"/>
  -
  -    <!--
  -      Give user a chance to override without editing this file
  -      (and without typing -D each time he compiles it)
  -    -->
  -    <property file="ant.properties"/>
  +    <property file="${user.home}/build.properties"/>
       <property file="../ant.properties"/>
  +    <property file="ant.properties"/>
       <property file="${user.home}/.ant.properties"/>
  -
  -    <!-- Settings used to configure compile environment -->
  -    <property name="build.debug" value="on"/>
  -    <property name="build.optimize" value="off"/>
  -    <property name="build.deprecation" value="off"/>
  -    <property name="build.compress" value="false"/>
  -    <property name="junit.failonerror" value="false"/>
  -
  -    <!-- location of intermediate products -->
  -    <property name="build.dir" value="build"/>
  -    <property name="build.lib" value="${build.dir}/lib"/>
  -    <property name="build.conf" value="${build.dir}/conf"/>
  -    <property name="build.classes" value="${build.dir}/classes"/>
  -    <property name="build.tests" value="${build.dir}/tests"/>
  -    <property name="build.reports" value="${build.dir}/reports"/>
  -
  -    <!-- Set the properties for source directories -->
  -    <property name="src.dir" value="src"/>
  -    <property name="java.dir" value="${src.dir}/java"/>
  -    <property name="conf.dir" value="${src.dir}/conf"/>
  -    <property name="test.dir" value="${src.dir}/test"/>
  -
  -    <!-- needed by Cocoon -->
  -    <property name="build.context" value="${build.dir}/documentation"/>
  -    <property name="build.docs" value="${build.dir}/docs"/>
  -    <property name="build.xdocs" value="${build.dir}/xdocs"/>
  -    <property name="context.dir" value="../../jakarta-avalon/src/documentation"/>
  -    <property name="tools.dir" value="../../jakarta-avalon/tools"/>
  -    <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
  -    <property name="docs.dir" value="dist/docs"/>
  -    <property name="xdocs.dir" value="${src.dir}/xdocs"/>      
  -
  -    <!-- Set the properties for distribution directories -->
  -    <property name="dist.dir" value="dist"/>
  -    <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
  -
  -    <!-- name of .zip/.tar.gz/.bz2 files and their top-level directory -->
  -    <property name="dist.name" value="${name}-${version}"/>
  -
  -    <!-- name of jar file -->
  -    <property name="jar.name" value="${name}-${version}.jar"/>
  -
  -    <!-- property indicating directory where all distribution archives are placed -->
  -    <property name="dist.base" value="distributions"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
  @@ -64,6 +16,7 @@
           <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}"/>
  @@ -75,8 +28,12 @@
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  +    <target name="dependencies" description="Check dependencies">
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
  +    </target>
  +
       <!-- Compiles the source code -->
  -    <target name="compile" description="Compiles the source code">
  +    <target name="compile" depends="dependencies" description="Compiles the source code">
   
           <mkdir dir="${build.classes}"/>
   
  @@ -114,7 +71,7 @@
               <fileset dir="../" includes="LICENSE.txt"/>
               <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
               <filterset>
  -                <filtersfile file="project.properties"/>
  +                <filtersfile file="default.properties"/>
               </filterset>
           </copy>
   
  @@ -137,7 +94,7 @@
       </target>
   
       <!-- Creates all the Javadocs -->
  -    <target name="javadocs" depends="compile" description="Generates the javadocs">
  +    <target name="javadocs" depends="compile" description="Generates the javadocs" unless="skip.javadocs">
   
           <mkdir dir="${dist.javadocs}"/>
           <javadoc packagenames="org.apache.*"
  @@ -158,7 +115,7 @@
           </javadoc>
       </target>
   
  -    <target name="test" depends="compile" description="Perform the unit tests">
  +    <target name="test" depends="compile" description="Perform the unit tests" unless="skip.tests">
   
           <echo message="Performing Unit Tests" />
   
  @@ -303,7 +260,11 @@
           description="Generates a minimal distribution (jar + javadocs)">
   
           <mkdir dir="${dist.dir}"/>
  -        <copy file="${build.lib}/${jar.name}" todir="${dist.dir}"/>
  +        <copy todir="${dist.dir}">
  +            <fileset dir="${build.lib}">
  +                <include name="*.jar"/>
  +            </fileset>
  +        </copy>
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
  
  
  
  1.2       +59 -0     jakarta-avalon-excalibur/monitor/default.properties
  
  
  
  
  1.4       +11 -16    jakarta-avalon-excalibur/naming/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/naming/ant.properties.sample,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ant.properties.sample	24 Mar 2002 00:26:12 -0000	1.3
  +++ ant.properties.sample	8 Apr 2002 10:32:12 -0000	1.4
  @@ -6,43 +6,38 @@
   # external modules that this component depend on.  Copy this file to
   # "ant.properties" in the source directory, and customize it as needed.
   #
  -# The ant.properties values in this directory apply only to this component, and
  -# override the defaults in ../ant.properties.
  +# The ant.properties values in this directory apply only to this component.
  +# 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/03/24 00:26:12 jefft Exp $
  +# $Id: ant.properties.sample,v 1.4 2002/04/08 10:32:12 jefft Exp $
   # -----------------------------------------------------------------------------
   
  -# --------------------------------------------------
  -#      COMPONENT-SPECIFIC REQUIRED LIBRARIES
  -# --------------------------------------------------
  -
  -
   # ----- Compile Control Flags -----
   build.debug=on
   build.optimize=off
   build.deprecation=off
  +#build.compiler=jikes
   
   # ----- Base Directory in which all the packages are stored -----
  -base.path=/opt
  +base.path=${basedir}/../..
   
   # --------------------------------------------------
   #                REQUIRED LIBRARIES
   # --------------------------------------------------
   
  +# --------------------------------------------------
  +#                OPTIONAL LIBRARIES
  +# --------------------------------------------------
   
  -# ----- JUnit Unit Test Suite, version 3.7 or later -----
  +# ----- 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
   
   
  -
  -# --------------------------------------------------
  -#                OPTIONAL LIBRARIES
  -# --------------------------------------------------
  -
   # ----- Checkstyle, version 2.1 or later -----
  -
   # Uncomment the 'do.checkstyle' flag property to enable checkstyle
   # do.checkstyle=
   checkstyle.home=${base.path}/checkstyle-2.1
  
  
  
  1.35      +18 -57    jakarta-avalon-excalibur/naming/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/naming/build.xml,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- build.xml	7 Apr 2002 10:20:17 -0000	1.34
  +++ build.xml	8 Apr 2002 10:32:12 -0000	1.35
  @@ -2,60 +2,12 @@
   
   <project name="Excalibur Naming" default="main" basedir=".">
   
  -    <!-- load per-project properties -->
  -    <property file="project.properties"/>
  -
  -    <!--
  -      Give user a chance to override without editing this file
  -      (and without typing -D each time he compiles it)
  -    -->
  -    <property file="ant.properties"/>
  +    <property file="${user.home}/build.properties"/>
       <property file="../ant.properties"/>
  +    <property file="ant.properties"/>
       <property file="${user.home}/.ant.properties"/>
  -
  -    <!-- Settings used to configure compile environment -->
  -    <property name="build.debug" value="on"/>
  -    <property name="build.optimize" value="off"/>
  -    <property name="build.deprecation" value="off"/>
  -    <property name="build.compress" value="false"/>
  -    <property name="junit.failonerror" value="false"/>
  -
  -    <!-- location of intermediate products -->
  -    <property name="build.dir" value="build"/>
  -    <property name="build.lib" value="${build.dir}/lib"/>
  -    <property name="build.conf" value="${build.dir}/conf"/>
  -    <property name="build.classes" value="${build.dir}/classes"/>
  -    <property name="build.tests" value="${build.dir}/tests"/>
  -    <property name="build.reports" value="${build.dir}/reports"/>
  -
  -    <!-- Set the properties for source directories -->
  -    <property name="src.dir" value="src"/>
  -    <property name="java.dir" value="${src.dir}/java"/>
  -    <property name="conf.dir" value="${src.dir}/conf"/>
  -    <property name="test.dir" value="${src.dir}/test"/>
  -
  -    <!-- needed by Cocoon -->
  -    <property name="build.context" value="${build.dir}/documentation"/>
  -    <property name="build.docs" value="${build.dir}/docs"/>
  -    <property name="build.xdocs" value="${build.dir}/xdocs"/>
  -    <property name="context.dir" value="../../jakarta-avalon/src/documentation"/>
  -    <property name="tools.dir" value="../../jakarta-avalon/tools"/>
  -    <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
  -    <property name="docs.dir" value="dist/docs"/>
  -    <property name="xdocs.dir" value="${src.dir}/xdocs"/>      
  -
  -    <!-- Set the properties for distribution directories -->
  -    <property name="dist.dir" value="dist"/>
  -    <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
  -
  -    <!-- name of .zip/.tar.gz/.bz2 files and their top-level directory -->
  -    <property name="dist.name" value="${name}-${version}"/>
  -
  -    <!-- name of jar file -->
  -    <property name="jar.name" value="${name}-${version}.jar"/>
  -
  -    <!-- property indicating directory where all distribution archives are placed -->
  -    <property name="dist.base" value="distributions"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
  @@ -64,6 +16,7 @@
           <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}"/>
  @@ -75,8 +28,12 @@
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  +    <target name="dependencies" description="Check dependencies">
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
  +    </target>
  +
       <!-- Compiles the source code -->
  -    <target name="compile" description="Compiles the source code">
  +    <target name="compile" depends="dependencies" description="Compiles the source code">
   
           <mkdir dir="${build.classes}"/>
   
  @@ -121,7 +78,7 @@
               <fileset dir="../" includes="LICENSE.txt"/>
               <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
               <filterset>
  -                <filtersfile file="project.properties"/>
  +                <filtersfile file="default.properties"/>
               </filterset>
           </copy>
   
  @@ -144,7 +101,7 @@
       </target>
   
       <!-- Creates all the Javadocs -->
  -    <target name="javadocs" depends="compile" description="Generates the javadocs">
  +    <target name="javadocs" depends="compile" description="Generates the javadocs" unless="skip.javadocs">
   
           <mkdir dir="${dist.javadocs}"/>
           <javadoc packagenames="org.apache.*"
  @@ -165,7 +122,7 @@
           </javadoc>
       </target>
   
  -    <target name="test" depends="compile" description="Perform the unit tests">
  +    <target name="test" depends="compile" description="Perform the unit tests" unless="skip.tests">
   
           <echo message="Performing Unit Tests" />
   
  @@ -310,7 +267,11 @@
           description="Generates a minimal distribution (jar + javadocs)">
   
           <mkdir dir="${dist.dir}"/>
  -        <copy file="${build.lib}/${jar.name}" todir="${dist.dir}"/>
  +        <copy todir="${dist.dir}">
  +            <fileset dir="${build.lib}">
  +                <include name="*.jar"/>
  +            </fileset>
  +        </copy>
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
  
  
  
  1.3       +13 -1     jakarta-avalon-excalibur/naming/default.properties
  
  
  
  
  1.3       +16 -15    jakarta-avalon-excalibur/pool/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/pool/ant.properties.sample,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ant.properties.sample	7 Apr 2002 06:05:43 -0000	1.2
  +++ ant.properties.sample	8 Apr 2002 10:32:12 -0000	1.3
  @@ -6,24 +6,21 @@
   # external modules that this component depend on.  Copy this file to
   # "ant.properties" in the source directory, and customize it as needed.
   #
  -# The ant.properties values in this directory apply only to this component, and
  -# override the defaults in ../ant.properties.
  +# The ant.properties values in this directory apply only to this component.
  +# It is overridden by ../ant.properties and ~/build.properties
  +# It overrides all default.properties files and ~/.ant.properties
   #
  -# $Id: ant.properties.sample,v 1.2 2002/04/07 06:05:43 donaldp Exp $
  +# $Id: ant.properties.sample,v 1.3 2002/04/08 10:32:12 jefft Exp $
   # -----------------------------------------------------------------------------
   
  -# --------------------------------------------------
  -#      COMPONENT-SPECIFIC REQUIRED LIBRARIES
  -# --------------------------------------------------
  -
  -
   # ----- Compile Control Flags -----
   build.debug=on
   build.optimize=off
   build.deprecation=off
  +#build.compiler=jikes
   
   # ----- Base Directory in which all the packages are stored -----
  -base.path=/opt
  +base.path=${basedir}/../..
   
   # --------------------------------------------------
   #                REQUIRED LIBRARIES
  @@ -41,19 +38,23 @@
   excalibur-collections.home=../collections/build/lib
   excalibur-collections.jar=${excalibur-collections.home}/excalibur-collections-1.0.jar
   
  -# ----- JUnit Unit Test Suite, version 3.7 or later -----
  -junit.home=${base.path}/junit3.7
  -junit.lib=${junit.home}
  -junit.jar=${junit.lib}/junit.jar
  -
  +# ----- Excalibur Concurrent -----
  +excalibur-concurrent.home=../concurrent/build/lib
  +excalibur-concurrent.jar=${excalibur-concurrent.home}/excalibur-concurrent-1.0.jar
   
   
   # --------------------------------------------------
   #                OPTIONAL LIBRARIES
   # --------------------------------------------------
   
  -# ----- Checkstyle, version 2.1 or later -----
  +# ----- 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
   # do.checkstyle=
   checkstyle.home=${base.path}/checkstyle-2.1
  
  
  
  1.6       +23 -58    jakarta-avalon-excalibur/pool/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/pool/build.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build.xml	7 Apr 2002 10:20:17 -0000	1.5
  +++ build.xml	8 Apr 2002 10:32:12 -0000	1.6
  @@ -2,71 +2,24 @@
   
   <project name="Excalibur Pool" default="main" basedir=".">
   
  -    <!-- load per-project properties -->
  -    <property file="project.properties"/>
  -
  -    <!--
  -      Give user a chance to override without editing this file
  -      (and without typing -D each time he compiles it)
  -    -->
  -    <property file="ant.properties"/>
  +    <property file="${user.home}/build.properties"/>
       <property file="../ant.properties"/>
  +    <property file="ant.properties"/>
       <property file="${user.home}/.ant.properties"/>
  -
  -    <!-- Settings used to configure compile environment -->
  -    <property name="build.debug" value="on"/>
  -    <property name="build.optimize" value="off"/>
  -    <property name="build.deprecation" value="off"/>
  -    <property name="build.compress" value="false"/>
  -    <property name="junit.failonerror" value="false"/>
  -
  -    <!-- location of intermediate products -->
  -    <property name="build.dir" value="build"/>
  -    <property name="build.lib" value="${build.dir}/lib"/>
  -    <property name="build.conf" value="${build.dir}/conf"/>
  -    <property name="build.classes" value="${build.dir}/classes"/>
  -    <property name="build.tests" value="${build.dir}/tests"/>
  -    <property name="build.reports" value="${build.dir}/reports"/>
  -
  -    <!-- Set the properties for source directories -->
  -    <property name="src.dir" value="src"/>
  -    <property name="java.dir" value="${src.dir}/java"/>
  -    <property name="conf.dir" value="${src.dir}/conf"/>
  -    <property name="test.dir" value="${src.dir}/test"/>
  -
  -    <!-- needed by Cocoon -->
  -    <property name="build.context" value="${build.dir}/documentation"/>
  -    <property name="build.docs" value="${build.dir}/docs"/>
  -    <property name="build.xdocs" value="${build.dir}/xdocs"/>
  -    <property name="context.dir" value="../../jakarta-avalon/src/documentation"/>
  -    <property name="tools.dir" value="../../jakarta-avalon/tools"/>
  -    <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
  -    <property name="docs.dir" value="dist/docs"/>
  -    <property name="xdocs.dir" value="${src.dir}/xdocs"/>      
  -
  -    <!-- Set the properties for distribution directories -->
  -    <property name="dist.dir" value="dist"/>
  -    <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
  -
  -    <!-- name of .zip/.tar.gz/.bz2 files and their top-level directory -->
  -    <property name="dist.name" value="${name}-${version}"/>
  -
  -    <!-- name of jar file -->
  -    <property name="jar.name" value="${name}-${version}.jar"/>
  -
  -    <!-- property indicating directory where all distribution archives are placed -->
  -    <property name="dist.base" value="distributions"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
           <pathelement path="${java.class.path}"/>
           <pathelement location="${build.classes}"/>
  -        <pathelement location="${logkit.jar}"/>
  +        <pathelement location="${avalon-logkit.jar}"/>
           <pathelement location="${avalon-framework.jar}"/>
           <pathelement location="${excalibur-collections.jar}"/>
           <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}"/>
  @@ -78,8 +31,16 @@
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  +    <target name="dependencies" description="Check dependencies">
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkFramework"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkLogkit"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCollections"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkConcurrent"/>
  +    </target>
  +
       <!-- Compiles the source code -->
  -    <target name="compile" description="Compiles the source code">
  +    <target name="compile" depends="dependencies" description="Compiles the source code">
   
           <mkdir dir="${build.classes}"/>
   
  @@ -120,7 +81,7 @@
               <fileset dir="../" includes="LICENSE.txt"/>
               <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
               <filterset>
  -                <filtersfile file="project.properties"/>
  +                <filtersfile file="default.properties"/>
               </filterset>
           </copy>
   
  @@ -143,7 +104,7 @@
       </target>
   
       <!-- Creates all the Javadocs -->
  -    <target name="javadocs" depends="compile" description="Generates the javadocs">
  +    <target name="javadocs" depends="compile" description="Generates the javadocs" unless="skip.javadocs">
   
           <mkdir dir="${dist.javadocs}"/>
           <javadoc packagenames="org.apache.*"
  @@ -164,7 +125,7 @@
           </javadoc>
       </target>
   
  -    <target name="test" depends="compile" description="Perform the unit tests">
  +    <target name="test" depends="compile" description="Perform the unit tests" unless="skip.tests">
   
           <echo message="Performing Unit Tests" />
   
  @@ -309,7 +270,11 @@
           description="Generates a minimal distribution (jar + javadocs)">
   
           <mkdir dir="${dist.dir}"/>
  -        <copy file="${build.lib}/${jar.name}" todir="${dist.dir}"/>
  +        <copy todir="${dist.dir}">
  +            <fileset dir="${build.lib}">
  +                <include name="*.jar"/>
  +            </fileset>
  +        </copy>
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
  
  
  
  1.2       +85 -0     jakarta-avalon-excalibur/pool/default.properties
  
  
  
  
  1.2       +13 -16    jakarta-avalon-excalibur/sourceresolve/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/sourceresolve/ant.properties.sample,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ant.properties.sample	5 Apr 2002 06:54:57 -0000	1.1
  +++ ant.properties.sample	8 Apr 2002 10:32:12 -0000	1.2
  @@ -6,43 +6,40 @@
   # external modules that this component depend on.  Copy this file to
   # "ant.properties" in the source directory, and customize it as needed.
   #
  -# The ant.properties values in this directory apply only to this component, and
  -# override the defaults in ../ant.properties.
  +# The ant.properties values in this directory apply only to this component.
  +# It is overridden by ../ant.properties and ~/build.properties
  +# It overrides all default.properties files and ~/.ant.properties
   #
  -# $Id: ant.properties.sample,v 1.1 2002/04/05 06:54:57 hammant Exp $
  +# $Id: ant.properties.sample,v 1.2 2002/04/08 10:32:12 jefft Exp $
   # -----------------------------------------------------------------------------
   
  -# --------------------------------------------------
  -#      COMPONENT-SPECIFIC REQUIRED LIBRARIES
  -# --------------------------------------------------
  -
  -
   # ----- Compile Control Flags -----
   build.debug=on
   build.optimize=off
   build.deprecation=off
  +#build.compiler=jikes
   
   # ----- Base Directory in which all the packages are stored -----
  -base.path=/opt
  +base.path=${basedir}/../..
   
   # --------------------------------------------------
   #                REQUIRED LIBRARIES
   # --------------------------------------------------
   
   
  -# ----- JUnit Unit Test Suite, version 3.7 or later -----
  -junit.home=${base.path}/junit3.7
  -junit.lib=${junit.home}
  -junit.jar=${junit.lib}/junit.jar
  -
  -
   
   # --------------------------------------------------
   #                OPTIONAL LIBRARIES
   # --------------------------------------------------
   
  -# ----- Checkstyle, version 2.1 or later -----
  +# ----- 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
   # do.checkstyle=
   checkstyle.home=${base.path}/checkstyle-2.1
  
  
  
  1.4       +18 -57    jakarta-avalon-excalibur/sourceresolve/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/sourceresolve/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	7 Apr 2002 10:20:17 -0000	1.3
  +++ build.xml	8 Apr 2002 10:32:12 -0000	1.4
  @@ -2,60 +2,12 @@
   
   <project name="Excalibur template" default="main" basedir=".">
   
  -    <!-- load per-project properties -->
  -    <property file="project.properties"/>
  -
  -    <!--
  -      Give user a chance to override without editing this file
  -      (and without typing -D each time he compiles it)
  -    -->
  -    <property file="ant.properties"/>
  +    <property file="${user.home}/build.properties"/>
       <property file="../ant.properties"/>
  +    <property file="ant.properties"/>
       <property file="${user.home}/.ant.properties"/>
  -
  -    <!-- Settings used to configure compile environment -->
  -    <property name="build.debug" value="on"/>
  -    <property name="build.optimize" value="off"/>
  -    <property name="build.deprecation" value="off"/>
  -    <property name="build.compress" value="false"/>
  -    <property name="junit.failonerror" value="false"/>
  -
  -    <!-- location of intermediate products -->
  -    <property name="build.dir" value="build"/>
  -    <property name="build.lib" value="${build.dir}/lib"/>
  -    <property name="build.conf" value="${build.dir}/conf"/>
  -    <property name="build.classes" value="${build.dir}/classes"/>
  -    <property name="build.tests" value="${build.dir}/tests"/>
  -    <property name="build.reports" value="${build.dir}/reports"/>
  -
  -    <!-- Set the properties for source directories -->
  -    <property name="src.dir" value="src"/>
  -    <property name="java.dir" value="${src.dir}/java"/>
  -    <property name="conf.dir" value="${src.dir}/conf"/>
  -    <property name="test.dir" value="${src.dir}/test"/>
  -
  -    <!-- needed by Cocoon -->
  -    <property name="build.context" value="${build.dir}/documentation"/>
  -    <property name="build.docs" value="${build.dir}/docs"/>
  -    <property name="build.xdocs" value="${build.dir}/xdocs"/>
  -    <property name="context.dir" value="../../jakarta-avalon/src/documentation"/>
  -    <property name="tools.dir" value="../../jakarta-avalon/tools"/>
  -    <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
  -    <property name="docs.dir" value="dist/docs"/>
  -    <property name="xdocs.dir" value="${src.dir}/xdocs"/>      
  -
  -    <!-- Set the properties for distribution directories -->
  -    <property name="dist.dir" value="dist"/>
  -    <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
  -
  -    <!-- name of .zip/.tar.gz/.bz2 files and their top-level directory -->
  -    <property name="dist.name" value="${name}-${version}"/>
  -
  -    <!-- name of jar file -->
  -    <property name="jar.name" value="${name}-${version}.jar"/>
  -
  -    <!-- property indicating directory where all distribution archives are placed -->
  -    <property name="dist.base" value="distributions"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
  @@ -64,6 +16,7 @@
           <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}"/>
  @@ -75,8 +28,12 @@
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  +    <target name="dependencies" description="Check dependencies">
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
  +    </target>
  +
       <!-- Compiles the source code -->
  -    <target name="compile" description="Compiles the source code">
  +    <target name="compile" depends="dependencies" description="Compiles the source code">
   
           <mkdir dir="${build.classes}"/>
   
  @@ -114,7 +71,7 @@
               <fileset dir="../" includes="LICENSE.txt"/>
               <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
               <filterset>
  -                <filtersfile file="project.properties"/>
  +                <filtersfile file="default.properties"/>
               </filterset>
           </copy>
   
  @@ -137,7 +94,7 @@
       </target>
   
       <!-- Creates all the Javadocs -->
  -    <target name="javadocs" depends="compile" description="Generates the javadocs">
  +    <target name="javadocs" depends="compile" description="Generates the javadocs" unless="skip.javadocs">
   
           <mkdir dir="${dist.javadocs}"/>
           <javadoc packagenames="org.apache.*"
  @@ -158,7 +115,7 @@
           </javadoc>
       </target>
   
  -    <target name="test" depends="compile" description="Perform the unit tests">
  +    <target name="test" depends="compile" description="Perform the unit tests" unless="skip.tests">
   
           <echo message="Performing Unit Tests" />
   
  @@ -303,7 +260,11 @@
           description="Generates a minimal distribution (jar + javadocs)">
   
           <mkdir dir="${dist.dir}"/>
  -        <copy file="${build.lib}/${jar.name}" todir="${dist.dir}"/>
  +        <copy todir="${dist.dir}">
  +            <fileset dir="${build.lib}">
  +                <include name="*.jar"/>
  +            </fileset>
  +        </copy>
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
  
  
  
  1.2       +59 -0     jakarta-avalon-excalibur/sourceresolve/default.properties
  
  
  
  
  1.3       +13 -16    jakarta-avalon-excalibur/tar/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/tar/ant.properties.sample,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ant.properties.sample	24 Mar 2002 00:26:12 -0000	1.2
  +++ ant.properties.sample	8 Apr 2002 10:32:12 -0000	1.3
  @@ -6,43 +6,40 @@
   # external modules that this component depend on.  Copy this file to
   # "ant.properties" in the source directory, and customize it as needed.
   #
  -# The ant.properties values in this directory apply only to this component, and
  -# override the defaults in ../ant.properties.
  +# The ant.properties values in this directory apply only to this component.
  +# It is overridden by ../ant.properties and ~/build.properties
  +# It overrides all default.properties files and ~/.ant.properties
   #
  -# $Id: ant.properties.sample,v 1.2 2002/03/24 00:26:12 jefft Exp $
  +# $Id: ant.properties.sample,v 1.3 2002/04/08 10:32:12 jefft Exp $
   # -----------------------------------------------------------------------------
   
  -# --------------------------------------------------
  -#      COMPONENT-SPECIFIC REQUIRED LIBRARIES
  -# --------------------------------------------------
  -
  -
   # ----- Compile Control Flags -----
   build.debug=on
   build.optimize=off
   build.deprecation=off
  +#build.compiler=jikes
   
   # ----- Base Directory in which all the packages are stored -----
  -base.path=/opt
  +base.path=${basedir}/../..
   
   # --------------------------------------------------
   #                REQUIRED LIBRARIES
   # --------------------------------------------------
   
   
  -# ----- JUnit Unit Test Suite, version 3.7 or later -----
  -junit.home=${base.path}/junit3.7
  -junit.lib=${junit.home}
  -junit.jar=${junit.lib}/junit.jar
  -
  -
   
   # --------------------------------------------------
   #                OPTIONAL LIBRARIES
   # --------------------------------------------------
   
  -# ----- Checkstyle, version 2.1 or later -----
  +# ----- 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
   # do.checkstyle=
   checkstyle.home=${base.path}/checkstyle-2.1
  
  
  
  1.14      +18 -57    jakarta-avalon-excalibur/tar/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/tar/build.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- build.xml	7 Apr 2002 10:20:17 -0000	1.13
  +++ build.xml	8 Apr 2002 10:32:12 -0000	1.14
  @@ -2,60 +2,12 @@
   
   <project name="Excalibur tar" default="main" basedir=".">
   
  -    <!-- load per-project properties -->
  -    <property file="project.properties"/>
  -
  -    <!--
  -      Give user a chance to override without editing this file
  -      (and without typing -D each time he compiles it)
  -    -->
  -    <property file="ant.properties"/>
  +    <property file="${user.home}/build.properties"/>
       <property file="../ant.properties"/>
  +    <property file="ant.properties"/>
       <property file="${user.home}/.ant.properties"/>
  -
  -    <!-- Settings used to configure compile environment -->
  -    <property name="build.debug" value="on"/>
  -    <property name="build.optimize" value="off"/>
  -    <property name="build.deprecation" value="off"/>
  -    <property name="build.compress" value="false"/>
  -    <property name="junit.failonerror" value="false"/>
  -
  -    <!-- location of intermediate products -->
  -    <property name="build.dir" value="build"/>
  -    <property name="build.lib" value="${build.dir}/lib"/>
  -    <property name="build.conf" value="${build.dir}/conf"/>
  -    <property name="build.classes" value="${build.dir}/classes"/>
  -    <property name="build.tests" value="${build.dir}/tests"/>
  -    <property name="build.reports" value="${build.dir}/reports"/>
  -
  -    <!-- Set the properties for source directories -->
  -    <property name="src.dir" value="src"/>
  -    <property name="java.dir" value="${src.dir}/java"/>
  -    <property name="conf.dir" value="${src.dir}/conf"/>
  -    <property name="test.dir" value="${src.dir}/test"/>
  -
  -    <!-- needed by Cocoon -->
  -    <property name="build.context" value="${build.dir}/documentation"/>
  -    <property name="build.docs" value="${build.dir}/docs"/>
  -    <property name="build.xdocs" value="${build.dir}/xdocs"/>
  -    <property name="context.dir" value="../../jakarta-avalon/src/documentation"/>
  -    <property name="tools.dir" value="../../jakarta-avalon/tools"/>
  -    <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
  -    <property name="docs.dir" value="dist/docs"/>
  -    <property name="xdocs.dir" value="${src.dir}/xdocs"/>      
  -
  -    <!-- Set the properties for distribution directories -->
  -    <property name="dist.dir" value="dist"/>
  -    <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
  -
  -    <!-- name of .zip/.tar.gz/.bz2 files and their top-level directory -->
  -    <property name="dist.name" value="${name}-${version}"/>
  -
  -    <!-- name of jar file -->
  -    <property name="jar.name" value="${name}-${version}.jar"/>
  -
  -    <!-- property indicating directory where all distribution archives are placed -->
  -    <property name="dist.base" value="distributions"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
  @@ -64,6 +16,7 @@
           <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}"/>
  @@ -75,8 +28,12 @@
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  +    <target name="dependencies" description="Check dependencies">
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
  +    </target>
  +
       <!-- Compiles the source code -->
  -    <target name="compile" description="Compiles the source code">
  +    <target name="compile" depends="dependencies" description="Compiles the source code">
   
           <mkdir dir="${build.classes}"/>
   
  @@ -114,7 +71,7 @@
               <fileset dir="../" includes="LICENSE.txt"/>
               <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
               <filterset>
  -                <filtersfile file="project.properties"/>
  +                <filtersfile file="default.properties"/>
               </filterset>
           </copy>
   
  @@ -137,7 +94,7 @@
       </target>
   
       <!-- Creates all the Javadocs -->
  -    <target name="javadocs" depends="compile" description="Generates the javadocs">
  +    <target name="javadocs" depends="compile" description="Generates the javadocs" unless="skip.javadocs">
   
           <mkdir dir="${dist.javadocs}"/>
           <javadoc packagenames="org.apache.*"
  @@ -158,7 +115,7 @@
           </javadoc>
       </target>
   
  -    <target name="test" depends="compile" description="Perform the unit tests">
  +    <target name="test" depends="compile" description="Perform the unit tests" unless="skip.tests">
   
           <echo message="Performing Unit Tests" />
   
  @@ -303,7 +260,11 @@
           description="Generates a minimal distribution (jar + javadocs)">
   
           <mkdir dir="${dist.dir}"/>
  -        <copy file="${build.lib}/${jar.name}" todir="${dist.dir}"/>
  +        <copy todir="${dist.dir}">
  +            <fileset dir="${build.lib}">
  +                <include name="*.jar"/>
  +            </fileset>
  +        </copy>
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
  
  
  
  1.3       +13 -0     jakarta-avalon-excalibur/tar/default.properties
  
  
  
  
  1.4       +13 -16    jakarta-avalon-excalibur/template-product/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/template-product/ant.properties.sample,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ant.properties.sample	24 Mar 2002 00:26:12 -0000	1.3
  +++ ant.properties.sample	8 Apr 2002 10:32:12 -0000	1.4
  @@ -6,43 +6,40 @@
   # external modules that this component depend on.  Copy this file to
   # "ant.properties" in the source directory, and customize it as needed.
   #
  -# The ant.properties values in this directory apply only to this component, and
  -# override the defaults in ../ant.properties.
  +# The ant.properties values in this directory apply only to this component.
  +# 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/03/24 00:26:12 jefft Exp $
  +# $Id: ant.properties.sample,v 1.4 2002/04/08 10:32:12 jefft Exp $
   # -----------------------------------------------------------------------------
   
  -# --------------------------------------------------
  -#      COMPONENT-SPECIFIC REQUIRED LIBRARIES
  -# --------------------------------------------------
  -
  -
   # ----- Compile Control Flags -----
   build.debug=on
   build.optimize=off
   build.deprecation=off
  +#build.compiler=jikes
   
   # ----- Base Directory in which all the packages are stored -----
  -base.path=/opt
  +base.path=${basedir}/../..
   
   # --------------------------------------------------
   #                REQUIRED LIBRARIES
   # --------------------------------------------------
   
   
  -# ----- JUnit Unit Test Suite, version 3.7 or later -----
  -junit.home=${base.path}/junit3.7
  -junit.lib=${junit.home}
  -junit.jar=${junit.lib}/junit.jar
  -
  -
   
   # --------------------------------------------------
   #                OPTIONAL LIBRARIES
   # --------------------------------------------------
   
  -# ----- Checkstyle, version 2.1 or later -----
  +# ----- 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
   # do.checkstyle=
   checkstyle.home=${base.path}/checkstyle-2.1
  
  
  
  1.12      +18 -57    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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- build.xml	7 Apr 2002 10:20:17 -0000	1.11
  +++ build.xml	8 Apr 2002 10:32:12 -0000	1.12
  @@ -2,60 +2,12 @@
   
   <project name="Excalibur template" default="main" basedir=".">
   
  -    <!-- load per-project properties -->
  -    <property file="project.properties"/>
  -
  -    <!--
  -      Give user a chance to override without editing this file
  -      (and without typing -D each time he compiles it)
  -    -->
  -    <property file="ant.properties"/>
  +    <property file="${user.home}/build.properties"/>
       <property file="../ant.properties"/>
  +    <property file="ant.properties"/>
       <property file="${user.home}/.ant.properties"/>
  -
  -    <!-- Settings used to configure compile environment -->
  -    <property name="build.debug" value="on"/>
  -    <property name="build.optimize" value="off"/>
  -    <property name="build.deprecation" value="off"/>
  -    <property name="build.compress" value="false"/>
  -    <property name="junit.failonerror" value="false"/>
  -
  -    <!-- location of intermediate products -->
  -    <property name="build.dir" value="build"/>
  -    <property name="build.lib" value="${build.dir}/lib"/>
  -    <property name="build.conf" value="${build.dir}/conf"/>
  -    <property name="build.classes" value="${build.dir}/classes"/>
  -    <property name="build.tests" value="${build.dir}/tests"/>
  -    <property name="build.reports" value="${build.dir}/reports"/>
  -
  -    <!-- Set the properties for source directories -->
  -    <property name="src.dir" value="src"/>
  -    <property name="java.dir" value="${src.dir}/java"/>
  -    <property name="conf.dir" value="${src.dir}/conf"/>
  -    <property name="test.dir" value="${src.dir}/test"/>
  -
  -    <!-- needed by Cocoon -->
  -    <property name="build.context" value="${build.dir}/documentation"/>
  -    <property name="build.docs" value="${build.dir}/docs"/>
  -    <property name="build.xdocs" value="${build.dir}/xdocs"/>
  -    <property name="context.dir" value="../../jakarta-avalon/src/documentation"/>
  -    <property name="tools.dir" value="../../jakarta-avalon/tools"/>
  -    <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
  -    <property name="docs.dir" value="dist/docs"/>
  -    <property name="xdocs.dir" value="${src.dir}/xdocs"/>      
  -
  -    <!-- Set the properties for distribution directories -->
  -    <property name="dist.dir" value="dist"/>
  -    <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
  -
  -    <!-- name of .zip/.tar.gz/.bz2 files and their top-level directory -->
  -    <property name="dist.name" value="${name}-${version}"/>
  -
  -    <!-- name of jar file -->
  -    <property name="jar.name" value="${name}-${version}.jar"/>
  -
  -    <!-- property indicating directory where all distribution archives are placed -->
  -    <property name="dist.base" value="distributions"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
  @@ -64,6 +16,7 @@
           <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}"/>
  @@ -75,8 +28,12 @@
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  +    <target name="dependencies" description="Check dependencies">
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
  +    </target>
  +
       <!-- Compiles the source code -->
  -    <target name="compile" description="Compiles the source code">
  +    <target name="compile" depends="dependencies" description="Compiles the source code">
   
           <mkdir dir="${build.classes}"/>
   
  @@ -114,7 +71,7 @@
               <fileset dir="../" includes="LICENSE.txt"/>
               <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
               <filterset>
  -                <filtersfile file="project.properties"/>
  +                <filtersfile file="default.properties"/>
               </filterset>
           </copy>
   
  @@ -137,7 +94,7 @@
       </target>
   
       <!-- Creates all the Javadocs -->
  -    <target name="javadocs" depends="compile" description="Generates the javadocs">
  +    <target name="javadocs" depends="compile" description="Generates the javadocs" unless="skip.javadocs">
   
           <mkdir dir="${dist.javadocs}"/>
           <javadoc packagenames="org.apache.*"
  @@ -158,7 +115,7 @@
           </javadoc>
       </target>
   
  -    <target name="test" depends="compile" description="Perform the unit tests">
  +    <target name="test" depends="compile" description="Perform the unit tests" unless="skip.tests">
   
           <echo message="Performing Unit Tests" />
   
  @@ -303,7 +260,11 @@
           description="Generates a minimal distribution (jar + javadocs)">
   
           <mkdir dir="${dist.dir}"/>
  -        <copy file="${build.lib}/${jar.name}" todir="${dist.dir}"/>
  +        <copy todir="${dist.dir}">
  +            <fileset dir="${build.lib}">
  +                <include name="*.jar"/>
  +            </fileset>
  +        </copy>
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
  
  
  
  1.3       +3 -0      jakarta-avalon-excalibur/template-product/default.properties
  
  
  
  
  1.2       +13 -16    jakarta-avalon-excalibur/testcase/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/testcase/ant.properties.sample,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ant.properties.sample	4 Apr 2002 05:09:05 -0000	1.1
  +++ ant.properties.sample	8 Apr 2002 10:32:13 -0000	1.2
  @@ -6,24 +6,21 @@
   # external modules that this component depend on.  Copy this file to
   # "ant.properties" in the source directory, and customize it as needed.
   #
  -# The ant.properties values in this directory apply only to this component, and
  -# override the defaults in ../ant.properties.
  +# The ant.properties values in this directory apply only to this component.
  +# It is overridden by ../ant.properties and ~/build.properties
  +# It overrides all default.properties files and ~/.ant.properties
   #
  -# $Id: ant.properties.sample,v 1.1 2002/04/04 05:09:05 leif Exp $
  +# $Id: ant.properties.sample,v 1.2 2002/04/08 10:32:13 jefft Exp $
   # -----------------------------------------------------------------------------
   
  -# --------------------------------------------------
  -#      COMPONENT-SPECIFIC REQUIRED LIBRARIES
  -# --------------------------------------------------
  -
  -
   # ----- Compile Control Flags -----
   build.debug=on
   build.optimize=off
   build.deprecation=off
  +#build.compiler=jikes
   
   # ----- Base Directory in which all the packages are stored -----
  -base.path=/opt
  +base.path=${basedir}/../..
   
   # --------------------------------------------------
   #                REQUIRED LIBRARIES
  @@ -45,19 +42,19 @@
   excalibur-component.home=../component/build/lib
   excalibur-component.jar=${excalibur-component.home}/excalibur-component-1.0.jar
   
  -# ----- JUnit Unit Test Suite, version 3.7 or later -----
  -junit.home=${base.path}/junit3.7
  -junit.lib=${junit.home}
  -junit.jar=${junit.lib}/junit.jar
  -
  -
   
   # --------------------------------------------------
   #                OPTIONAL LIBRARIES
   # --------------------------------------------------
   
  -# ----- Checkstyle, version 2.1 or later -----
  +# ----- 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
   # do.checkstyle=
   checkstyle.home=${base.path}/checkstyle-2.1
  
  
  
  1.5       +23 -58    jakarta-avalon-excalibur/testcase/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/testcase/build.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- build.xml	7 Apr 2002 10:20:17 -0000	1.4
  +++ build.xml	8 Apr 2002 10:32:13 -0000	1.5
  @@ -2,72 +2,25 @@
   
   <project name="Excalibur Pool" default="main" basedir=".">
   
  -    <!-- load per-project properties -->
  -    <property file="project.properties"/>
  -
  -    <!--
  -      Give user a chance to override without editing this file
  -      (and without typing -D each time he compiles it)
  -    -->
  -    <property file="ant.properties"/>
  +    <property file="${user.home}/build.properties"/>
       <property file="../ant.properties"/>
  +    <property file="ant.properties"/>
       <property file="${user.home}/.ant.properties"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
  -    <!-- Settings used to configure compile environment -->
  -    <property name="build.debug" value="on"/>
  -    <property name="build.optimize" value="off"/>
  -    <property name="build.deprecation" value="off"/>
  -    <property name="build.compress" value="false"/>
  -    <property name="junit.failonerror" value="false"/>
  -
  -    <!-- location of intermediate products -->
  -    <property name="build.dir" value="build"/>
  -    <property name="build.lib" value="${build.dir}/lib"/>
  -    <property name="build.conf" value="${build.dir}/conf"/>
  -    <property name="build.classes" value="${build.dir}/classes"/>
  -    <property name="build.tests" value="${build.dir}/tests"/>
  -    <property name="build.reports" value="${build.dir}/reports"/>
  -
  -    <!-- Set the properties for source directories -->
  -    <property name="src.dir" value="src"/>
  -    <property name="java.dir" value="${src.dir}/java"/>
  -    <property name="conf.dir" value="${src.dir}/conf"/>
  -    <property name="test.dir" value="${src.dir}/test"/>
  -
  -    <!-- needed by Cocoon -->
  -    <property name="build.context" value="${build.dir}/documentation"/>
  -    <property name="build.docs" value="${build.dir}/docs"/>
  -    <property name="build.xdocs" value="${build.dir}/xdocs"/>
  -    <property name="context.dir" value="../../jakarta-avalon/src/documentation"/>
  -    <property name="tools.dir" value="../../jakarta-avalon/tools"/>
  -    <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
  -    <property name="docs.dir" value="dist/docs"/>
  -    <property name="xdocs.dir" value="${src.dir}/xdocs"/>      
  -
  -    <!-- Set the properties for distribution directories -->
  -    <property name="dist.dir" value="dist"/>
  -    <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
  -
  -    <!-- name of .zip/.tar.gz/.bz2 files and their top-level directory -->
  -    <property name="dist.name" value="${name}-${version}"/>
  -
  -    <!-- name of jar file -->
  -    <property name="jar.name" value="${name}-${version}.jar"/>
  -
  -    <!-- property indicating directory where all distribution archives are placed -->
  -    <property name="dist.base" value="distributions"/>
  -    
       <!-- Classpath for product -->
       <path id="project.class.path">
           <pathelement path="${java.class.path}"/>
           <pathelement location="${build.classes}"/>
  -        <pathelement location="${logkit.jar}"/>
  +        <pathelement location="${avalon-logkit.jar}"/>
           <pathelement location="${avalon-framework.jar}"/>
           <pathelement location="${excalibur-logger.jar}"/>
           <pathelement location="${excalibur-component.jar}"/>
           <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}"/>
  @@ -79,8 +32,16 @@
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  +    <target name="dependencies" description="Check dependencies">
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkLogkit"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkFramework"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkLogger"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkComponent"/>
  +    </target>
  +
       <!-- Compiles the source code -->
  -    <target name="compile" description="Compiles the source code">
  +    <target name="compile" depends="dependencies" description="Compiles the source code">
   
           <mkdir dir="${build.classes}"/>
   
  @@ -118,7 +79,7 @@
               <fileset dir="../" includes="LICENSE.txt"/>
               <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
               <filterset>
  -                <filtersfile file="project.properties"/>
  +                <filtersfile file="default.properties"/>
               </filterset>
           </copy>
   
  @@ -141,7 +102,7 @@
       </target>
   
       <!-- Creates all the Javadocs -->
  -    <target name="javadocs" depends="compile" description="Generates the javadocs">
  +    <target name="javadocs" depends="compile" description="Generates the javadocs" unless="skip.javadocs">
   
           <mkdir dir="${dist.javadocs}"/>
           <javadoc packagenames="org.apache.*"
  @@ -162,7 +123,7 @@
           </javadoc>
       </target>
   
  -    <target name="test" depends="compile" description="Perform the unit tests">
  +    <target name="test" depends="compile" description="Perform the unit tests" unless="skip.tests">
   
           <echo message="Performing Unit Tests" />
   
  @@ -307,7 +268,11 @@
           description="Generates a minimal distribution (jar + javadocs)">
   
           <mkdir dir="${dist.dir}"/>
  -        <copy file="${build.lib}/${jar.name}" todir="${dist.dir}"/>
  +        <copy todir="${dist.dir}">
  +            <fileset dir="${build.lib}">
  +                <include name="*.jar"/>
  +            </fileset>
  +        </copy>
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
  
  
  
  1.2       +86 -0     jakarta-avalon-excalibur/testcase/default.properties
  
  
  
  
  1.2       +13 -16    jakarta-avalon-excalibur/thread/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/thread/ant.properties.sample,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ant.properties.sample	4 Apr 2002 05:09:05 -0000	1.1
  +++ ant.properties.sample	8 Apr 2002 10:32:13 -0000	1.2
  @@ -6,24 +6,21 @@
   # external modules that this component depend on.  Copy this file to
   # "ant.properties" in the source directory, and customize it as needed.
   #
  -# The ant.properties values in this directory apply only to this component, and
  -# override the defaults in ../ant.properties.
  +# The ant.properties values in this directory apply only to this component.
  +# It is overridden by ../ant.properties and ~/build.properties
  +# It overrides all default.properties files and ~/.ant.properties
   #
  -# $Id: ant.properties.sample,v 1.1 2002/04/04 05:09:05 leif Exp $
  +# $Id: ant.properties.sample,v 1.2 2002/04/08 10:32:13 jefft Exp $
   # -----------------------------------------------------------------------------
   
  -# --------------------------------------------------
  -#      COMPONENT-SPECIFIC REQUIRED LIBRARIES
  -# --------------------------------------------------
  -
  -
   # ----- Compile Control Flags -----
   build.debug=on
   build.optimize=off
   build.deprecation=off
  +#build.compiler=jikes
   
   # ----- Base Directory in which all the packages are stored -----
  -base.path=/opt
  +base.path=${basedir}/../..
   
   # --------------------------------------------------
   #                REQUIRED LIBRARIES
  @@ -53,19 +50,19 @@
   excalibur-util.home=../util/build/lib
   excalibur-util.jar=${excalibur-util.home}/excalibur-util-1.0.jar
   
  -# ----- JUnit Unit Test Suite, version 3.7 or later -----
  -junit.home=${base.path}/junit3.7
  -junit.lib=${junit.home}
  -junit.jar=${junit.lib}/junit.jar
  -
  -
   
   # --------------------------------------------------
   #                OPTIONAL LIBRARIES
   # --------------------------------------------------
   
  -# ----- Checkstyle, version 2.1 or later -----
  +# ----- 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
   # do.checkstyle=
   checkstyle.home=${base.path}/checkstyle-2.1
  
  
  
  1.5       +23 -58    jakarta-avalon-excalibur/thread/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/thread/build.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- build.xml	7 Apr 2002 10:20:17 -0000	1.4
  +++ build.xml	8 Apr 2002 10:32:13 -0000	1.5
  @@ -2,72 +2,25 @@
   
   <project name="Excalibur Thread" default="main" basedir=".">
   
  -    <!-- load per-project properties -->
  -    <property file="project.properties"/>
  -
  -    <!--
  -      Give user a chance to override without editing this file
  -      (and without typing -D each time he compiles it)
  -    -->
  -    <property file="ant.properties"/>
  +    <property file="${user.home}/build.properties"/>
       <property file="../ant.properties"/>
  +    <property file="ant.properties"/>
       <property file="${user.home}/.ant.properties"/>
  -
  -    <!-- Settings used to configure compile environment -->
  -    <property name="build.debug" value="on"/>
  -    <property name="build.optimize" value="off"/>
  -    <property name="build.deprecation" value="off"/>
  -    <property name="build.compress" value="false"/>
  -    <property name="junit.failonerror" value="false"/>
  -
  -    <!-- location of intermediate products -->
  -    <property name="build.dir" value="build"/>
  -    <property name="build.lib" value="${build.dir}/lib"/>
  -    <property name="build.conf" value="${build.dir}/conf"/>
  -    <property name="build.classes" value="${build.dir}/classes"/>
  -    <property name="build.tests" value="${build.dir}/tests"/>
  -    <property name="build.reports" value="${build.dir}/reports"/>
  -
  -    <!-- Set the properties for source directories -->
  -    <property name="src.dir" value="src"/>
  -    <property name="java.dir" value="${src.dir}/java"/>
  -    <property name="conf.dir" value="${src.dir}/conf"/>
  -    <property name="test.dir" value="${src.dir}/test"/>
  -
  -    <!-- needed by Cocoon -->
  -    <property name="build.context" value="${build.dir}/documentation"/>
  -    <property name="build.docs" value="${build.dir}/docs"/>
  -    <property name="build.xdocs" value="${build.dir}/xdocs"/>
  -    <property name="context.dir" value="../../jakarta-avalon/src/documentation"/>
  -    <property name="tools.dir" value="../../jakarta-avalon/tools"/>
  -    <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
  -    <property name="docs.dir" value="dist/docs"/>
  -    <property name="xdocs.dir" value="${src.dir}/xdocs"/>      
  -
  -    <!-- Set the properties for distribution directories -->
  -    <property name="dist.dir" value="dist"/>
  -    <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
  -
  -    <!-- name of .zip/.tar.gz/.bz2 files and their top-level directory -->
  -    <property name="dist.name" value="${name}-${version}"/>
  -
  -    <!-- name of jar file -->
  -    <property name="jar.name" value="${name}-${version}.jar"/>
  -
  -    <!-- property indicating directory where all distribution archives are placed -->
  -    <property name="dist.base" value="distributions"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
           <pathelement path="${java.class.path}"/>
           <pathelement location="${build.classes}"/>
  -        <pathelement location="${logkit.jar}"/>
  +        <pathelement location="${avalon-logkit.jar}"/>
           <pathelement location="${avalon-framework.jar}"/>
           <pathelement location="${excalibur-lang.jar}"/>
           <pathelement location="${excalibur-pool.jar}"/>
           <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}"/>
  @@ -79,8 +32,16 @@
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  +    <target name="dependencies" description="Check dependencies">
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkLogkit"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkLang"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkPool"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkFramework"/>
  +    </target>
  +
       <!-- Compiles the source code -->
  -    <target name="compile" description="Compiles the source code">
  +    <target name="compile" depends="dependencies" description="Compiles the source code">
   
           <mkdir dir="${build.classes}"/>
   
  @@ -118,7 +79,7 @@
               <fileset dir="../" includes="LICENSE.txt"/>
               <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
               <filterset>
  -                <filtersfile file="project.properties"/>
  +                <filtersfile file="default.properties"/>
               </filterset>
           </copy>
   
  @@ -141,7 +102,7 @@
       </target>
   
       <!-- Creates all the Javadocs -->
  -    <target name="javadocs" depends="compile" description="Generates the javadocs">
  +    <target name="javadocs" depends="compile" description="Generates the javadocs" unless="skip.javadocs">
   
           <mkdir dir="${dist.javadocs}"/>
           <javadoc packagenames="org.apache.*"
  @@ -162,7 +123,7 @@
           </javadoc>
       </target>
   
  -    <target name="test" depends="compile" description="Perform the unit tests">
  +    <target name="test" depends="compile" description="Perform the unit tests" unless="skip.tests">
   
           <echo message="Performing Unit Tests" />
   
  @@ -307,7 +268,11 @@
           description="Generates a minimal distribution (jar + javadocs)">
   
           <mkdir dir="${dist.dir}"/>
  -        <copy file="${build.lib}/${jar.name}" todir="${dist.dir}"/>
  +        <copy todir="${dist.dir}">
  +            <fileset dir="${build.lib}">
  +                <include name="*.jar"/>
  +            </fileset>
  +        </copy>
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
  
  
  
  1.2       +86 -0     jakarta-avalon-excalibur/thread/default.properties
  
  
  
  
  1.2       +12 -19    jakarta-avalon-excalibur/util/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/util/ant.properties.sample,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ant.properties.sample	4 Apr 2002 05:09:06 -0000	1.1
  +++ ant.properties.sample	8 Apr 2002 10:32:13 -0000	1.2
  @@ -6,24 +6,21 @@
   # external modules that this component depend on.  Copy this file to
   # "ant.properties" in the source directory, and customize it as needed.
   #
  -# The ant.properties values in this directory apply only to this component, and
  -# override the defaults in ../ant.properties.
  +# The ant.properties values in this directory apply only to this component.
  +# It is overridden by ../ant.properties and ~/build.properties
  +# It overrides all default.properties files and ~/.ant.properties
   #
  -# $Id: ant.properties.sample,v 1.1 2002/04/04 05:09:06 leif Exp $
  +# $Id: ant.properties.sample,v 1.2 2002/04/08 10:32:13 jefft Exp $
   # -----------------------------------------------------------------------------
   
  -# --------------------------------------------------
  -#      COMPONENT-SPECIFIC REQUIRED LIBRARIES
  -# --------------------------------------------------
  -
  -
   # ----- Compile Control Flags -----
   build.debug=on
   build.optimize=off
   build.deprecation=off
  +#build.compiler=jikes
   
   # ----- Base Directory in which all the packages are stored -----
  -base.path=/opt
  +base.path=${basedir}/../..
   
   # --------------------------------------------------
   #                REQUIRED LIBRARIES
  @@ -33,23 +30,19 @@
   avalon-framework.home=../../jakarta-avalon/build/lib
   avalon-framework.jar=${avalon-framework.home}/avalon-framework.jar
   
  -# ----- Excalibur Component -----
  -excalibur-component.home=../component/build/lib
  -excalibur-component.jar=${excalibur-component.home}/excalibur-component-1.0.jar
   
  -# ----- JUnit Unit Test Suite, version 3.7 or later -----
  +# --------------------------------------------------
  +#                OPTIONAL LIBRARIES
  +# --------------------------------------------------
  +
  +# ----- 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
   
   
  -
  -# --------------------------------------------------
  -#                OPTIONAL LIBRARIES
  -# --------------------------------------------------
  -
   # ----- Checkstyle, version 2.1 or later -----
  -
   # Uncomment the 'do.checkstyle' flag property to enable checkstyle
   # do.checkstyle=
   checkstyle.home=${base.path}/checkstyle-2.1
  
  
  
  1.5       +19 -58    jakarta-avalon-excalibur/util/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/util/build.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- build.xml	7 Apr 2002 10:20:17 -0000	1.4
  +++ build.xml	8 Apr 2002 10:32:13 -0000	1.5
  @@ -2,70 +2,22 @@
   
   <project name="Excalibur Pool" default="main" basedir=".">
   
  -    <!-- load per-project properties -->
  -    <property file="project.properties"/>
  -
  -    <!--
  -      Give user a chance to override without editing this file
  -      (and without typing -D each time he compiles it)
  -    -->
  -    <property file="ant.properties"/>
  +    <property file="${user.home}/build.properties"/>
       <property file="../ant.properties"/>
  +    <property file="ant.properties"/>
       <property file="${user.home}/.ant.properties"/>
  -
  -    <!-- Settings used to configure compile environment -->
  -    <property name="build.debug" value="on"/>
  -    <property name="build.optimize" value="off"/>
  -    <property name="build.deprecation" value="off"/>
  -    <property name="build.compress" value="false"/>
  -    <property name="junit.failonerror" value="false"/>
  -
  -    <!-- location of intermediate products -->
  -    <property name="build.dir" value="build"/>
  -    <property name="build.lib" value="${build.dir}/lib"/>
  -    <property name="build.conf" value="${build.dir}/conf"/>
  -    <property name="build.classes" value="${build.dir}/classes"/>
  -    <property name="build.tests" value="${build.dir}/tests"/>
  -    <property name="build.reports" value="${build.dir}/reports"/>
  -
  -    <!-- Set the properties for source directories -->
  -    <property name="src.dir" value="src"/>
  -    <property name="java.dir" value="${src.dir}/java"/>
  -    <property name="conf.dir" value="${src.dir}/conf"/>
  -    <property name="test.dir" value="${src.dir}/test"/>
  -
  -    <!-- needed by Cocoon -->
  -    <property name="build.context" value="${build.dir}/documentation"/>
  -    <property name="build.docs" value="${build.dir}/docs"/>
  -    <property name="build.xdocs" value="${build.dir}/xdocs"/>
  -    <property name="context.dir" value="../../jakarta-avalon/src/documentation"/>
  -    <property name="tools.dir" value="../../jakarta-avalon/tools"/>
  -    <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
  -    <property name="docs.dir" value="dist/docs"/>
  -    <property name="xdocs.dir" value="${src.dir}/xdocs"/>      
  -
  -    <!-- Set the properties for distribution directories -->
  -    <property name="dist.dir" value="dist"/>
  -    <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
  -
  -    <!-- name of .zip/.tar.gz/.bz2 files and their top-level directory -->
  -    <property name="dist.name" value="${name}-${version}"/>
  -
  -    <!-- name of jar file -->
  -    <property name="jar.name" value="${name}-${version}.jar"/>
  -
  -    <!-- property indicating directory where all distribution archives are placed -->
  -    <property name="dist.base" value="distributions"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
           <pathelement path="${java.class.path}"/>
           <pathelement location="${build.classes}"/>
           <pathelement location="${avalon-framework.jar}"/>
  -        <pathelement location="${excalibur-component.jar}"/>
           <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}"/>
  @@ -77,8 +29,13 @@
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  +    <target name="dependencies" description="Check dependencies">
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkFramework"/>
  +    </target>
  +
       <!-- Compiles the source code -->
  -    <target name="compile" description="Compiles the source code">
  +    <target name="compile" depends="dependencies" description="Compiles the source code">
   
           <mkdir dir="${build.classes}"/>
   
  @@ -116,7 +73,7 @@
               <fileset dir="../" includes="LICENSE.txt"/>
               <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
               <filterset>
  -                <filtersfile file="project.properties"/>
  +                <filtersfile file="default.properties"/>
               </filterset>
           </copy>
   
  @@ -139,7 +96,7 @@
       </target>
   
       <!-- Creates all the Javadocs -->
  -    <target name="javadocs" depends="compile" description="Generates the javadocs">
  +    <target name="javadocs" depends="compile" description="Generates the javadocs" unless="skip.javadocs">
   
           <mkdir dir="${dist.javadocs}"/>
           <javadoc packagenames="org.apache.*"
  @@ -160,7 +117,7 @@
           </javadoc>
       </target>
   
  -    <target name="test" depends="compile" description="Perform the unit tests">
  +    <target name="test" depends="compile" description="Perform the unit tests" unless="skip.tests">
   
           <echo message="Performing Unit Tests" />
   
  @@ -305,7 +262,11 @@
           description="Generates a minimal distribution (jar + javadocs)">
   
           <mkdir dir="${dist.dir}"/>
  -        <copy file="${build.lib}/${jar.name}" todir="${dist.dir}"/>
  +        <copy todir="${dist.dir}">
  +            <fileset dir="${build.lib}">
  +                <include name="*.jar"/>
  +            </fileset>
  +        </copy>
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
  
  
  
  1.2       +69 -0     jakarta-avalon-excalibur/util/default.properties
  
  
  
  
  1.3       +13 -16    jakarta-avalon-excalibur/xmlbundle/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/xmlbundle/ant.properties.sample,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ant.properties.sample	5 Apr 2002 14:14:25 -0000	1.2
  +++ ant.properties.sample	8 Apr 2002 10:32:13 -0000	1.3
  @@ -6,43 +6,40 @@
   # external modules that this component depend on.  Copy this file to
   # "ant.properties" in the source directory, and customize it as needed.
   #
  -# The ant.properties values in this directory apply only to this component, and
  -# override the defaults in ../ant.properties.
  +# The ant.properties values in this directory apply only to this component.
  +# It is overridden by ../ant.properties and ~/build.properties
  +# It overrides all default.properties files and ~/.ant.properties
   #
  -# $Id: ant.properties.sample,v 1.2 2002/04/05 14:14:25 bloritsch Exp $
  +# $Id: ant.properties.sample,v 1.3 2002/04/08 10:32:13 jefft Exp $
   # -----------------------------------------------------------------------------
   
  -# --------------------------------------------------
  -#      COMPONENT-SPECIFIC REQUIRED LIBRARIES
  -# --------------------------------------------------
  -
  -
   # ----- Compile Control Flags -----
   build.debug=on
   build.optimize=off
   build.deprecation=off
  +#build.compiler=jikes
   
   # ----- Base Directory in which all the packages are stored -----
  -base.path=../../
  +base.path=${basedir}/../..
   
   # --------------------------------------------------
   #                REQUIRED LIBRARIES
   # --------------------------------------------------
   
   
  -# ----- JUnit Unit Test Suite, version 3.7 or later -----
  -junit.home=${base.path}/junit3.7
  -junit.lib=${junit.home}
  -junit.jar=${junit.lib}/junit.jar
  -
  -
   
   # --------------------------------------------------
   #                OPTIONAL LIBRARIES
   # --------------------------------------------------
   
  -# ----- Checkstyle, version 2.1 or later -----
  +# ----- 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
   # do.checkstyle=
   checkstyle.home=${base.path}/checkstyle-2.1
  
  
  
  1.4       +19 -58    jakarta-avalon-excalibur/xmlbundle/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/xmlbundle/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	7 Apr 2002 10:20:17 -0000	1.3
  +++ build.xml	8 Apr 2002 10:32:13 -0000	1.4
  @@ -2,60 +2,12 @@
   
   <project name="Excalibur XMLBundle" default="main" basedir=".">
   
  -    <!-- load per-project properties -->
  -    <property file="project.properties"/>
  -
  -    <!--
  -      Give user a chance to override without editing this file
  -      (and without typing -D each time he compiles it)
  -    -->
  -    <property file="ant.properties"/>
  +    <property file="${user.home}/build.properties"/>
       <property file="../ant.properties"/>
  +    <property file="ant.properties"/>
       <property file="${user.home}/.ant.properties"/>
  -
  -    <!-- Settings used to configure compile environment -->
  -    <property name="build.debug" value="on"/>
  -    <property name="build.optimize" value="off"/>
  -    <property name="build.deprecation" value="off"/>
  -    <property name="build.compress" value="false"/>
  -    <property name="junit.failonerror" value="false"/>
  -
  -    <!-- location of intermediate products -->
  -    <property name="build.dir" value="build"/>
  -    <property name="build.lib" value="${build.dir}/lib"/>
  -    <property name="build.conf" value="${build.dir}/conf"/>
  -    <property name="build.classes" value="${build.dir}/classes"/>
  -    <property name="build.tests" value="${build.dir}/tests"/>
  -    <property name="build.reports" value="${build.dir}/reports"/>
  -
  -    <!-- Set the properties for source directories -->
  -    <property name="src.dir" value="src"/>
  -    <property name="java.dir" value="${src.dir}/java"/>
  -    <property name="conf.dir" value="${src.dir}/conf"/>
  -    <property name="test.dir" value="${src.dir}/test"/>
  -
  -    <!-- needed by Cocoon -->
  -    <property name="build.context" value="${build.dir}/documentation"/>
  -    <property name="build.docs" value="${build.dir}/docs"/>
  -    <property name="build.xdocs" value="${build.dir}/xdocs"/>
  -    <property name="context.dir" value="../../jakarta-avalon/src/documentation"/>
  -    <property name="tools.dir" value="../../jakarta-avalon/tools"/>
  -    <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
  -    <property name="docs.dir" value="dist/docs"/>
  -    <property name="xdocs.dir" value="${src.dir}/xdocs"/>      
  -
  -    <!-- Set the properties for distribution directories -->
  -    <property name="dist.dir" value="dist"/>
  -    <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
  -
  -    <!-- name of .zip/.tar.gz/.bz2 files and their top-level directory -->
  -    <property name="dist.name" value="${name}-${version}"/>
  -
  -    <!-- name of jar file -->
  -    <property name="jar.name" value="${name}-${version}.jar"/>
  -
  -    <!-- property indicating directory where all distribution archives are placed -->
  -    <property name="dist.base" value="distributions"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
  @@ -64,6 +16,7 @@
           <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}"/>
  @@ -75,8 +28,12 @@
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  +    <target name="dependencies" description="Check dependencies">
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
  +    </target>
  +
       <!-- Compiles the source code -->
  -    <target name="compile" description="Compiles the source code">
  +    <target name="compile" depends="dependencies" description="Compiles the source code">
   
           <mkdir dir="${build.classes}"/>
   
  @@ -114,7 +71,7 @@
               <fileset dir="../" includes="LICENSE.txt"/>
               <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
               <filterset>
  -                <filtersfile file="project.properties"/>
  +                <filtersfile file="default.properties"/>
               </filterset>
           </copy>
   
  @@ -137,7 +94,7 @@
       </target>
   
       <!-- Creates all the Javadocs -->
  -    <target name="javadocs" depends="compile" description="Generates the javadocs">
  +    <target name="javadocs" depends="compile" description="Generates the javadocs" unless="skip.javadocs">
   
           <mkdir dir="${dist.javadocs}"/>
           <javadoc packagenames="org.apache.*"
  @@ -158,7 +115,7 @@
           </javadoc>
       </target>
   
  -    <target name="test" depends="compile" description="Perform the unit tests">
  +    <target name="test" depends="compile" description="Perform the unit tests" unless="skip.tests">
   
           <echo message="Performing Unit Tests" />
   
  @@ -303,7 +260,11 @@
           description="Generates a minimal distribution (jar + javadocs)">
   
           <mkdir dir="${dist.dir}"/>
  -        <copy file="${build.lib}/${jar.name}" todir="${dist.dir}"/>
  +        <copy todir="${dist.dir}">
  +            <fileset dir="${build.lib}">
  +                <include name="*.jar"/>
  +            </fileset>
  +        </copy>
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
  @@ -384,7 +345,7 @@
             <include name="**"/>
           </fileset>
         </copy>    
  -     
  +
         <!-- hack for stupid transport on api link -->
         <replace file="${docs.dir}/index.html" token="index.html.xml" value="index.html"/>
        
  
  
  
  1.2       +59 -0     jakarta-avalon-excalibur/xmlbundle/default.properties
  
  
  
  
  1.3       +13 -16    jakarta-avalon-excalibur/zip/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/zip/ant.properties.sample,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ant.properties.sample	24 Mar 2002 00:26:12 -0000	1.2
  +++ ant.properties.sample	8 Apr 2002 10:32:14 -0000	1.3
  @@ -6,43 +6,40 @@
   # external modules that this component depend on.  Copy this file to
   # "ant.properties" in the source directory, and customize it as needed.
   #
  -# The ant.properties values in this directory apply only to this component, and
  -# override the defaults in ../ant.properties.
  +# The ant.properties values in this directory apply only to this component.
  +# It is overridden by ../ant.properties and ~/build.properties
  +# It overrides all default.properties files and ~/.ant.properties
   #
  -# $Id: ant.properties.sample,v 1.2 2002/03/24 00:26:12 jefft Exp $
  +# $Id: ant.properties.sample,v 1.3 2002/04/08 10:32:14 jefft Exp $
   # -----------------------------------------------------------------------------
   
  -# --------------------------------------------------
  -#      COMPONENT-SPECIFIC REQUIRED LIBRARIES
  -# --------------------------------------------------
  -
  -
   # ----- Compile Control Flags -----
   build.debug=on
   build.optimize=off
   build.deprecation=off
  +#build.compiler=jikes
   
   # ----- Base Directory in which all the packages are stored -----
  -base.path=/opt
  +base.path=${basedir}/../..
   
   # --------------------------------------------------
   #                REQUIRED LIBRARIES
   # --------------------------------------------------
   
   
  -# ----- JUnit Unit Test Suite, version 3.7 or later -----
  -junit.home=${base.path}/junit3.7
  -junit.lib=${junit.home}
  -junit.jar=${junit.lib}/junit.jar
  -
  -
   
   # --------------------------------------------------
   #                OPTIONAL LIBRARIES
   # --------------------------------------------------
   
  -# ----- Checkstyle, version 2.1 or later -----
  +# ----- 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
   # do.checkstyle=
   checkstyle.home=${base.path}/checkstyle-2.1
  
  
  
  1.14      +18 -57    jakarta-avalon-excalibur/zip/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/zip/build.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- build.xml	7 Apr 2002 10:20:18 -0000	1.13
  +++ build.xml	8 Apr 2002 10:32:14 -0000	1.14
  @@ -2,60 +2,12 @@
   
   <project name="Excalibur Zip" default="main" basedir=".">
   
  -    <!-- load per-project properties -->
  -    <property file="project.properties"/>
  -
  -    <!--
  -      Give user a chance to override without editing this file
  -      (and without typing -D each time he compiles it)
  -    -->
  -    <property file="ant.properties"/>
  +    <property file="${user.home}/build.properties"/>
       <property file="../ant.properties"/>
  +    <property file="ant.properties"/>
       <property file="${user.home}/.ant.properties"/>
  -
  -    <!-- Settings used to configure compile environment -->
  -    <property name="build.debug" value="on"/>
  -    <property name="build.optimize" value="off"/>
  -    <property name="build.deprecation" value="off"/>
  -    <property name="build.compress" value="false"/>
  -    <property name="junit.failonerror" value="false"/>
  -
  -    <!-- location of intermediate products -->
  -    <property name="build.dir" value="build"/>
  -    <property name="build.lib" value="${build.dir}/lib"/>
  -    <property name="build.conf" value="${build.dir}/conf"/>
  -    <property name="build.classes" value="${build.dir}/classes"/>
  -    <property name="build.tests" value="${build.dir}/tests"/>
  -    <property name="build.reports" value="${build.dir}/reports"/>
  -
  -    <!-- Set the properties for source directories -->
  -    <property name="src.dir" value="src"/>
  -    <property name="java.dir" value="${src.dir}/java"/>
  -    <property name="conf.dir" value="${src.dir}/conf"/>
  -    <property name="test.dir" value="${src.dir}/test"/>
  -
  -    <!-- needed by Cocoon -->
  -    <property name="build.context" value="${build.dir}/documentation"/>
  -    <property name="build.docs" value="${build.dir}/docs"/>
  -    <property name="build.xdocs" value="${build.dir}/xdocs"/>
  -    <property name="context.dir" value="../../jakarta-avalon/src/documentation"/>
  -    <property name="tools.dir" value="../../jakarta-avalon/tools"/>
  -    <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
  -    <property name="docs.dir" value="dist/docs"/>
  -    <property name="xdocs.dir" value="${src.dir}/xdocs"/>      
  -
  -    <!-- Set the properties for distribution directories -->
  -    <property name="dist.dir" value="dist"/>
  -    <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
  -
  -    <!-- name of .zip/.tar.gz/.bz2 files and their top-level directory -->
  -    <property name="dist.name" value="${name}-${version}"/>
  -
  -    <!-- name of jar file -->
  -    <property name="jar.name" value="${name}-${version}.jar"/>
  -
  -    <!-- property indicating directory where all distribution archives are placed -->
  -    <property name="dist.base" value="distributions"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
  @@ -64,6 +16,7 @@
           <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}"/>
  @@ -75,8 +28,12 @@
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  +    <target name="dependencies" description="Check dependencies">
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
  +    </target>
  +
       <!-- Compiles the source code -->
  -    <target name="compile" description="Compiles the source code">
  +    <target name="compile" depends="dependencies" description="Compiles the source code">
   
           <mkdir dir="${build.classes}"/>
   
  @@ -114,7 +71,7 @@
               <fileset dir="../" includes="LICENSE.txt"/>
               <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
               <filterset>
  -                <filtersfile file="project.properties"/>
  +                <filtersfile file="default.properties"/>
               </filterset>
           </copy>
   
  @@ -137,7 +94,7 @@
       </target>
   
       <!-- Creates all the Javadocs -->
  -    <target name="javadocs" depends="compile" description="Generates the javadocs">
  +    <target name="javadocs" depends="compile" description="Generates the javadocs" unless="skip.javadocs">
   
           <mkdir dir="${dist.javadocs}"/>
           <javadoc packagenames="org.apache.*"
  @@ -158,7 +115,7 @@
           </javadoc>
       </target>
   
  -    <target name="test" depends="compile" description="Perform the unit tests">
  +    <target name="test" depends="compile" description="Perform the unit tests" unless="skip.tests">
   
           <echo message="Performing Unit Tests" />
   
  @@ -303,7 +260,11 @@
           description="Generates a minimal distribution (jar + javadocs)">
   
           <mkdir dir="${dist.dir}"/>
  -        <copy file="${build.lib}/${jar.name}" todir="${dist.dir}"/>
  +        <copy todir="${dist.dir}">
  +            <fileset dir="${build.lib}">
  +                <include name="*.jar"/>
  +            </fileset>
  +        </copy>
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../KEYS" todir="${dist.dir}"/>
           <copy file="README.txt" todir="${dist.dir}"/>
  
  
  
  1.3       +13 -1     jakarta-avalon-excalibur/zip/default.properties
  
  
  
  

--
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