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 build.xml project.properties
Date Mon, 01 Apr 2002 05:46:13 GMT
jefft       02/03/31 21:46:13

  Modified:    .        Tag: depchecking README.txt ant.properties.sample
                        gump.xml
               all      Tag: depchecking build.xml
               all/examples Tag: depchecking build.xml
               all/examples/commonlib Tag: depchecking .cvsignore
               baxter   Tag: depchecking build.xml
               bzip2    Tag: depchecking build.xml
               cache    Tag: depchecking build.xml
               cli      Tag: depchecking build.xml
               collections Tag: depchecking build.xml
               command  Tag: depchecking ant.properties.sample build.xml
               concurrent Tag: depchecking build.xml
               event    Tag: depchecking build.xml
               extension Tag: depchecking build.xml
               i18n     Tag: depchecking build.xml
               instrument Tag: depchecking build.xml
               instrument-client Tag: depchecking build.xml
               instrument-manager Tag: depchecking BUILDING.txt
                        ant.properties.sample build.xml
               instrument-manager/example Tag: depchecking
                        ant.properties.sample build.xml
               io       Tag: depchecking build.xml
               naming   Tag: depchecking build.xml
               tar      Tag: depchecking build.xml
               template-product Tag: depchecking build.xml
               zip      Tag: depchecking build.xml
  Added:       .        default.properties depchecker.xml
               all      default.properties
               baxter   default.properties
               bzip2    default.properties
               cache    default.properties
               cli      default.properties
               collections default.properties
               command  default.properties
               concurrent 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
               naming   default.properties
               tar      default.properties
               template-product default.properties
               zip      default.properties
  Removed:     baxter   Tag: depchecking project.properties
               bzip2    Tag: depchecking project.properties
               cache    Tag: depchecking project.properties
               cli      Tag: depchecking project.properties
               collections Tag: depchecking project.properties
               command  Tag: depchecking project.properties
               concurrent Tag: depchecking project.properties
               event    Tag: depchecking project.properties
               extension Tag: depchecking project.properties
               i18n     Tag: depchecking project.properties
               instrument Tag: depchecking project.properties
               instrument-client Tag: depchecking project.properties
               instrument-manager Tag: depchecking project.properties
               io       Tag: depchecking project.properties
               naming   Tag: depchecking project.properties
               tar      Tag: depchecking project.properties
               template-product Tag: depchecking project.properties
               zip      Tag: depchecking project.properties
  Log:
  Dependency checking system. Still a bit rough, but basically works
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.4.2.1   +1 -1      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.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- README.txt	30 Mar 2002 08:49:55 -0000	1.4
  +++ README.txt	1 Apr 2002 05:46:10 -0000	1.4.2.1
  @@ -22,7 +22,7 @@
     The avalon-excalibur.jar released in version 4.1 would now consist of the
     following jars:
   
  -   all/build/lib/avalon-excalibur.jar
  +   all/build/lib/excalibur-core.jar
      cli/build/lib/excalibur-cli-1.0.jar
      collections/build/lib/excalibur-collections-1.0.jar
      concurrent/build/lib/excalibur-concurrent-1.0.jar
  
  
  
  1.8.2.1   +9 -8      jakarta-avalon-excalibur/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/ant.properties.sample,v
  retrieving revision 1.8
  retrieving revision 1.8.2.1
  diff -u -r1.8 -r1.8.2.1
  --- ant.properties.sample	30 Mar 2002 15:29:13 -0000	1.8
  +++ ant.properties.sample	1 Apr 2002 05:46:10 -0000	1.8.2.1
  @@ -10,7 +10,7 @@
   # building all components. These values are overridable in component-specific
   # ant.properties files.
   #
  -# $Id: ant.properties.sample,v 1.8 2002/03/30 15:29:13 leif Exp $
  +# $Id: ant.properties.sample,v 1.8.2.1 2002/04/01 05:46:10 jefft Exp $
   # -----------------------------------------------------------------------------
   
   
  @@ -39,27 +39,28 @@
   xalan.jar=${xalan.home}/xalan-2.2.0-D13.jar
   
   # ----- Logkit -----
  -logkit.home=${base.path}/jakarta-avalon-logkit/build/lib
  -logkit.jar=${logkit.home}/logkit.jar
  +logkit.home=${base.path}/jakarta-avalon-logkit
  +logkit.lib=${logkit.home}/build/lib
  +logkit.jar=${logkit.lib}/logkit.jar
   
   # ----- Avalon Framework -----
   avalon-framework.home=${base.path}/jakarta-avalon/build/lib
   avalon-framework.jar=${avalon-framework.home}/avalon-framework.jar
   
   # ----- Avalon Excalibur -----
  -avalon-excalibur.home=${base.path}/jakarta-avalon-excalibur/all/build/lib
  -avalon-excalibur.jar=${avalon-excalibur.home}/avalon-excalibur.jar
  +excalibur-core.home=${base.path}/jakarta-excalibur-core/all/build/lib
  +excalibur-core.jar=${excalibur-core.home}/excalibur-core.jar
   
   # ----- Excalibur Collections -----
  -excalibur-collections.home=${base.path}/jakarta-avalon-excalibur/collections/build/lib
  +excalibur-collections.home=${base.path}/jakarta-excalibur-core/collections/build/lib
   excalibur-collections.jar=${excalibur-collections.home}/excalibur-collections-1.0.jar
   
   # ----- Excalibur Instrument -----
  -excalibur-instrument.home=${base.path}/jakarta-avalon-excalibur/instrument/build/lib
  +excalibur-instrument.home=${base.path}/jakarta-excalibur-core/instrument/build/lib
   excalibur-instrument.jar=${excalibur-instrument.home}/excalibur-instrument-0.1.jar
   
   # ----- Excalibur Instrument Manager -----
  -excalibur-instrument-manager.home=${base.path}/jakarta-avalon-excalibur/instrument-manager/build/lib
  +excalibur-instrument-manager.home=${base.path}/jakarta-excalibur-core/instrument-manager/build/lib
   excalibur-instrument-manager-interfaces.jar=${excalibur-instrument-manager.home}/excalibur-instrument-manager-interfaces-0.1.jar
   
   # ----- Altrmi -----
  
  
  
  1.22.2.1  +2 -2      jakarta-avalon-excalibur/gump.xml
  
  Index: gump.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/gump.xml,v
  retrieving revision 1.22
  retrieving revision 1.22.2.1
  diff -u -r1.22 -r1.22.2.1
  --- gump.xml	30 Mar 2002 21:48:31 -0000	1.22
  +++ gump.xml	1 Apr 2002 05:46:10 -0000	1.22.2.1
  @@ -33,8 +33,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.1                  jakarta-avalon-excalibur/default.properties
  
  Index: default.properties
  ===================================================================
  # -------------------------------------------------------------------
  # B U I L D  P R O P E R T I E S
  # -------------------------------------------------------------------
  
  # This is used in components to determine the path to depchecker.xml.
  depchecker.prefix=../
  
  
  
  1.1                  jakarta-avalon-excalibur/depchecker.xml
  
  Index: depchecker.xml
  ===================================================================
  <?xml version="1.0"?>
  
  <!--
                                 Dependency updater
                                    Version 2.2
                                  jefft@apache.org
  
                       This Ant script will recursively check 
                 if all the dependencies for this project are met.
                     To use it, type 'ant -f dependencies.xml'
  -->
  
  
  <!--
  Algorithm is as follows:
  
  There are three parameters per requirement check:
  
  name:
      Name of the jar. Eg 'avalon-collections.jar'
  path:
      Path to named jar. Eg ${avalon-collections.jar}
  dependency:
      Path to local project which builds the jar. Only set if the jar could be
      local, eg another component.
  
  IF the directory ${dependency} exists THEN:
      // The dependency is local; if the jar doesn't exist, we can build it 
      IF file ${path} does not exist THEN:
         call ${dependency}/build.xml's 'dist.lite' target to build that
         project's jar, which will then build it's own dependencies if necessary
      ELSE we're fine
  ELSE
      // The dependency is remote; we can't build it,
      IF file ${path} does not exist THEN:
          print an error saying "Can't find file ${path}"
          // Or we could do a HTTP GET to retrieve the jar
      ELSE we're fine
  -->
  
  <project name="dependencies" default="main" basedir=".">
      <!-- The target to call if ${target} isn't specified -->
      <property name="default.target" value="dist.lite"/>
  
      <target name="main" depends="usage"/>
      <target name="usage">
          <echo><![CDATA[
              =======================================================
              This is Excalibur's dependency updater script.
              Which has been called incorrectly :)
  
              To use it, you must call the checkRequiredFile or
              checkRequiredClass targets from your Ant script.
  
              For example:
  
              <ant antfile="dependencies.xml" target="checkRequiredFile">
                  <properties name="name" value="excalibur-concurrent.jar"/>
                  <properties name="path" value="${excalibur-concurrent.jar}"/>
                  <properties name="dependency" value="../concurrent"/>
              </ant>
              
              The properties are as follows:
  
              name:
                  Name of the jar. Eg 'avalon-collections.jar'
              path:
                  Path to named jar. Eg ${avalon-collections.jar}
              dependency (optional):
                  Path to local project which builds the jar. Only set if
                  the jar could be local, eg another component.
              target (optional):
                  Ant script target to run in local project to build the jar
              =======================================================
              ]]></echo>
      </target>
  
      <!-- ====================================================== -->
      <!-- Call to ensure a class is present in the classpath     -->
      <!-- ====================================================== -->
      <target name="checkRequiredClass">
          <available classname="${class}" classpath="${classpath}" property="requirement.satisfied"/>
          <antcall target="checkRequiredClass.fail"/>
      </target>
  
  
      <!-- ====================================================== -->
      <!-- Call to ensure a file (usu. jar) is present. If not,   -->
      <!-- either build it (if local), or print an error (remote) -->
      <!-- ====================================================== -->
      <target name="checkRequiredFile" depends="checkIfLocal, checkRequiredFileLocal, checkRequiredFileRemote"/>
  
      <target name="checkIfLocal" if="dependency">
          <available type="dir" file="${dependency}" property="local"/>
      </target>
  
      <!--
      Check for a local requirement (another component). If not found,
      update_dependency will build it
      -->
      <target name="checkRequiredFileLocal" if="local">
          <available type="file" file="${path}" property="requirement.satisfied"/>
          <antcall target="update_dependency"/>
          <available type="file" file="${path}" property="build.succeeded"/>
          <antcall target="build.fail"/>
      </target>
  
      <!--
      Check for a remote requirement. If not found, checkRequiredFile.fail will
      print an error. Alternatively, we could do a HTTP get to retrieve the file
      -->
      <target name="checkRequiredFileRemote" unless="local">
          <available type="file" file="${path}" property="requirement.satisfied"/>
          <antcall target="checkRequiredFile.fail"/>
      </target>
  
       <!-- =================================================================== -->
      <!-- Script called to recursively call another depencency.xml file in    -->
      <!-- another project, and then run the 'dist.lite' target.               -->
      <!-- =================================================================== -->
      <target name="update_dependency" description="Update files for one dependency" unless="requirement.satisfied">
          <echo message="Updating files from dependency ${dependency}"/>
          <!-- Set target if it wasn't previously set -->
          <property name="target" value="${default.target}"/>
          <ant dir="${dependency}" target="${target}" inheritAll="false">
              <property name="skip.tests" value="${skip.tests}"/>
          </ant>
      </target>
  
     <target name="checkRequiredFile.fail" unless="requirement.satisfied">
          <echo>
              +----------------------------------------------------------------+
              | FILE NOT FOUND:                                                |
              | ${path}
              +----------------------------------------------------------------+
              | You must define the following property in order                |
              | to build:                                                      |
              |                                                                |
              | ${name} (currently "${path}")
              |                                                                |
              | Usually this is done by copying ant.properties.sample to       |
              | ant.properties and defining the property there. This may also  |
              | be done in ${user.home}/.ant.properties.                       |
              +----------------------------------------------------------------+
          </echo>
          <fail message="Failed requirement: file not found"/>
      </target>
  
      <target name="checkRequiredClass.fail" unless="requirement.satisfied">
          <echo>
              +----------------------------------------------------------------+
              | CLASS NOT FOUND:                                               |
              | ${class}
              +----------------------------------------------------------------+
              | A jar containing class:                                        |
              |   ${class}
              | must be in your classpath or Ant lib directory                 |
              |   ${ant.home}/lib
              | Typically it is in a jar called:                               |
              |   ${name}                                                      
              +----------------------------------------------------------------+
          </echo>
          <fail message="Failed requirement: class not found"/>
      </target>
  
      <target name="build.fail" unless="build.succeeded">
          <echo>
              +-----------------------------------------------------------------+
              + BUILD FAILURE                                                   |
              +-----------------------------------------------------------------+
              |                                                                 |
              | The dependency-checking system tried to build the project:      |
              |   ${dependency}
              | which should have provided the property:                        |
              |   ${name} = ${path}
              | However, after the build, no such file exists.                  |
              |                                                                 |
              | Typically this is because the required project changed the name |
              | of the jar it produces. If so, please correct this in           |
              | default.properties, ant.properties.sample or ant.properties     |
              +-----------------------------------------------------------------+
          </echo>
          <fail message="Failed Requirement"/>
      </target>
  
  </project>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.122.2.1 +38 -83    jakarta-avalon-excalibur/all/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/all/build.xml,v
  retrieving revision 1.122
  retrieving revision 1.122.2.1
  diff -u -r1.122 -r1.122.2.1
  --- build.xml	31 Mar 2002 03:47:00 -0000	1.122
  +++ build.xml	1 Apr 2002 05:46:10 -0000	1.122.2.1
  @@ -25,88 +25,18 @@
       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="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-concurrent.jar"
  -      value="../concurrent/build/lib/excalibur-concurrent-1.0.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"/>
  +  <property file="../default.properties"/>
  +  <property file="default.properties"/>
   
  -  <path id="project.class.path">
  +    <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-event.jar}"/>
       <pathelement location="${j2ee.jar}"/>
       <pathelement location="${logkit.jar}"/>
       <pathelement location="${xalan.jar}"/>
  @@ -222,8 +152,33 @@
       <mkdir dir="${build.dir}"/>
     </target>
   
  +  <target name="dependencies" description="Check dependencies">
  +    <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
  +      <property name="name" value="excalibur-collections.jar"/>
  +      <property name="path" value="${excalibur-collections.jar}"/>
  +      <property name="dependency" 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="dependency" 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="dependency" value="${basedir}/../instrument"/>
  +    </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="dependency" value="${basedir}/../../jakarta-avalon"/>
  +      -->
  +    </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}"/>
  @@ -588,7 +543,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" />
  @@ -613,7 +568,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*"/>
  @@ -630,7 +585,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>
  @@ -640,7 +595,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>
   
  @@ -648,7 +603,7 @@
     <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}"/>
  @@ -731,7 +686,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" overwrite="yes">
         <fileset dir="${xdocs.dir}">
           <exclude name="**/*.dia" />
  @@ -812,7 +767,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.1                  jakarta-avalon-excalibur/all/default.properties
  
  Index: default.properties
  ===================================================================
  # -------------------------------------------------------------------
  # B U I L D  P R O P E R T I E S
  # -------------------------------------------------------------------
  
  name = core
  Name = Excalibur Core
  version = 4.1
  release = 1st
  status = final
  short.version = 4.1
  year = 1999-2002
  compress.jars = true
  
  excalibur.name = excalibur-${name}
  scratchpad.name = excalibur-scratchpad
  
  
  # --------------------------------------------------
  #                REQUIRED LIBRARIES
  # --------------------------------------------------
  
  # ----- 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 Concurrent, version 1.0 or later -----
  excalibur-concurrent.home=${basedir}/../concurrent/dist
  excalibur-concurrent.lib=${excalibur-concurrent.home}
  excalibur-concurrent.jar=${excalibur-concurrent.lib}/excalibur-concurrent-1.0.jar
  
  # ----- Excalibur 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 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
  
  # ----- 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.jar = ${tools.dir}/ext/logkit.jar
  xerces.jar = ${tools.dir}/lib/xerces-1.4.4.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
  
  # --------------------------------------------------
  #                OPTIONAL LIBRARIES
  # --------------------------------------------------
  j2ee.jar = ${cjan.lib}/j2ee.jar
  
  
  build.debug = on
  build.optimize = off
  build.deprecation = off
  
  #  Set the properties for intermediate directory
  build.dir = build
  build.src = ${build.dir}/src
  build.lib = ${build.dir}/lib
  build.classes = ${build.dir}/classes
  build.scratchpad = ${build.dir}/scratchpad
  build.javadocs = ${build.dir}/javadocs
  build.javadocs-scratchpad = ${build.dir}/javadocs-scratchpad
  build.docs = ${build.dir}/docs
  build.testdocs = ${build.docs}/test
  build.testsrc = ${build.dir}/testsrc
  build.testclasses = ${build.dir}/testclasses
  build.reports = ${build.dir}/reports
  build.context = ${build.dir}/documentation
  build.xdocs = ${build.context}/xdocs
  
  #  Set the properties for source directories
  src.dir = src
  java.dir = ${src.dir}/java
  test.dir = ${src.dir}/test
  scratchpad.dir = ${src.dir}/scratchpad
  lib.dir = lib
  tools.dir = ../../jakarta-avalon/tools
  docs.dir = docs
  www.dir = ../../jakarta-avalon-site/docs/${name}
  javadocs.dir = ${docs.dir}/api
  javadocs-scratchpad.dir = ${docs.dir}/api-scratchpad
  xdocs.dir = ${src.dir}/xdocs
  context.dir = ../../jakarta-avalon/src/documentation
  
  dist.name = ${Name}-${version}
  dist.base = distributions
  
  announce2txt = ${tools.dir}/announcement2txt.xsl
  announce2header = ${tools.dir}/announcement2header.xsl
  announce2readme = ${tools.dir}/announcement2readme.xsl
  announce2site = ${tools.dir}/announcement2site.xsl
  
  depchecker.prefix=.
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.6.2.1   +15 -15    jakarta-avalon-excalibur/all/examples/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/all/examples/build.xml,v
  retrieving revision 1.6
  retrieving revision 1.6.2.1
  diff -u -r1.6 -r1.6.2.1
  --- build.xml	30 Mar 2002 08:46:04 -0000	1.6
  +++ build.xml	1 Apr 2002 05:46:11 -0000	1.6.2.1
  @@ -8,8 +8,8 @@
       <!-- external projects -->
       <property name="avalon.proj"
           value="${basedir}/../../../jakarta-avalon"/>
  -    <property name="avalon-excalibur.proj"
  -        value="${basedir}/../../../jakarta-avalon-excalibur/all"/>
  +    <property name="excalibur-core.proj"
  +        value="${basedir}/../../../jakarta-excalibur-core/all"/>
       <property name="avalon-logkit.proj"
           value="${basedir}/../../../jakarta-avalon-logkit"/>
       
  @@ -42,19 +42,19 @@
           </condition>
           
           <!-- Avalon Excalibur jars -->
  -        <condition property="avalon-excalibur.jar.present">
  +        <condition property="excalibur-core.jar.present">
               <and>
  -                <available file="${avalon-excalibur.proj}/build/lib/avalon-excalibur.jar"/>
  -                <available file="${avalon-excalibur.proj}/build/lib/avalon-scratchpad.jar"/>
  +                <available file="${excalibur-core.proj}/build/lib/excalibur-core.jar"/>
  +                <available file="${excalibur-core.proj}/build/lib/excalibur-scratchpad.jar"/>
               </and>
           </condition>
  -        <condition property="avalon-excalibur.jar.needbuild">
  +        <condition property="excalibur-core.jar.needbuild">
               <and>
  -                <available file="${avalon-excalibur.proj}"/>
  +                <available file="${excalibur-core.proj}"/>
                   <not>
                       <and>
  -                        <available file="${avalon-excalibur.proj}/build/lib/avalon-excalibur.jar"/>
  -                        <available file="${avalon-excalibur.proj}/build/lib/avalon-scratchpad.jar"/>
  +                        <available file="${excalibur-core.proj}/build/lib/excalibur-core.jar"/>
  +                        <available file="${excalibur-core.proj}/build/lib/excalibur-scratchpad.jar"/>
                       </and>
                   </not>
               </and>
  @@ -81,7 +81,7 @@
           <!-- Try getting the jars from the tools/ext directory -->
           <copy file="${avalon.proj}/build/lib/avalon-framework.jar"
               todir="${commonlib.dir}" preservelastmodified="yes"/>
  -        <copy file="${avalon.proj}/tools/ext/avalon-excalibur.jar"
  +        <copy file="${avalon.proj}/tools/ext/excalibur-core.jar"
               todir="${commonlib.dir}" preservelastmodified="yes"/>
           <copy file="${avalon.proj}/tools/ext/logkit.jar"
               todir="${commonlib.dir}" preservelastmodified="yes"/>
  @@ -114,15 +114,15 @@
       <!-- Collect Avalon Excalibur build/lib Jars                             -->
       <!-- =================================================================== -->
       <target name="collect-excalibur-build-jars-present"
  -        depends="find-projects" if="avalon-excalibur.jar.present">
  -        <copy file="${avalon-excalibur.proj}/build/lib/avalon-excalibur.jar"
  +        depends="find-projects" if="excalibur-core.jar.present">
  +        <copy file="${excalibur-core.proj}/build/lib/excalibur-core.jar"
               todir="${commonlib.dir}" preservelastmodified="yes"/>
  -        <copy file="${avalon-excalibur.proj}/build/lib/avalon-scratchpad.jar"
  +        <copy file="${excalibur-core.proj}/build/lib/excalibur-scratchpad.jar"
               todir="${commonlib.dir}" preservelastmodified="yes"/>
       </target>
       <target name="collect-excalibur-build-jars-needbuild"
  -        depends="find-projects" if="avalon-excalibur.jar.needbuild">
  -        <fail message="Please go to ${avalon-excalibur.proj} and run build first."/>
  +        depends="find-projects" if="excalibur-core.jar.needbuild">
  +        <fail message="Please go to ${excalibur-core.proj} and run build first."/>
       </target>
       <target name="collect-excalibur-build-jars"
           depends="collect-excalibur-build-jars-present, collect-excalibur-build-jars-needbuild"/>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.1   +2 -2      jakarta-avalon-excalibur/all/examples/commonlib/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/all/examples/commonlib/.cvsignore,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- .cvsignore	5 Mar 2002 12:39:16 -0000	1.2
  +++ .cvsignore	1 Apr 2002 05:46:11 -0000	1.2.2.1
  @@ -1,6 +1,6 @@
  -avalon-excalibur.jar
  +excalibur-core.jar
   avalon-framework.jar
  -avalon-scratchpad.jar
  +excalibur-scratchpad.jar
   logkit.jar
   xalan-2.2.0-D13.jar
   xerces-1.4.4.jar
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.7.2.1   +13 -41    jakarta-avalon-excalibur/baxter/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/baxter/build.xml,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- build.xml	31 Mar 2002 08:36:44 -0000	1.7
  +++ build.xml	1 Apr 2002 05:46:11 -0000	1.7.2.1
  @@ -2,50 +2,15 @@
   
   <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="../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"/>
  -
  -    <!-- 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="../ant.properties"/>
  +    <property file="ant.properties"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
  @@ -59,8 +24,15 @@
       <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="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}"/>
   
  @@ -98,7 +70,7 @@
               <fileset dir="../" includes="LICENSE.txt"/>
               <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
               <filterset>
  -                <filtersfile file="project.properties"/>
  +                <filtersfile file="default.properties"/>
               </filterset>
           </copy>
   
  
  
  
  1.1                  jakarta-avalon-excalibur/baxter/default.properties
  
  Index: default.properties
  ===================================================================
  # -------------------------------------------------------------------
  # B U I L D  P R O P E R T I E S
  # -------------------------------------------------------------------
  
  name=excalibur-baxter
  Name=Excalibur Baxter
  version=1.0a
  year=2000-2002
  
  #  Settings used to configure compile environment
  build.debug = on
  build.optimize = off
  build.deprecation = off
  build.compress = false
  junit.failonerror = false
  
  #  location of intermediate products
  build.dir = build
  build.lib = ${build.dir}/lib
  build.conf = ${build.dir}/conf
  build.classes = ${build.dir}/classes
  build.tests = ${build.dir}/tests
  build.reports = ${build.dir}/reports
  
  #  Set the properties for source directories
  src.dir = src
  java.dir = ${src.dir}/java
  conf.dir = ${src.dir}/conf
  test.dir = ${src.dir}/test
  
  #  Set the properties for distribution directories
  dist.dir = dist
  dist.javadocs = ${dist.dir}/docs/api
  
  #  name of .zip/.tar.gz/.bz2 files and their top-level directory
  dist.name = ${name}-${version}
  
  #  name of jar file
  jar.name = ${name}-${version}.jar
  
  #  property indicating directory where all distribution archives are placed
  dist.base = distributions
  
  depchecker.prefix=.
  
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.7.2.1   +5 -40     jakarta-avalon-excalibur/bzip2/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/bzip2/build.xml,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- build.xml	31 Mar 2002 08:36:44 -0000	1.7
  +++ build.xml	1 Apr 2002 05:46:11 -0000	1.7.2.1
  @@ -2,50 +2,15 @@
   
   <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="../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"/>
  -
  -    <!-- 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="../ant.properties"/>
  +    <property file="ant.properties"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
  @@ -97,7 +62,7 @@
               <fileset dir="../" includes="LICENSE.txt"/>
               <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
               <filterset>
  -                <filtersfile file="project.properties"/>
  +                <filtersfile file="default.properties"/>
               </filterset>
           </copy>
   
  
  
  
  1.1                  jakarta-avalon-excalibur/bzip2/default.properties
  
  Index: default.properties
  ===================================================================
  # -------------------------------------------------------------------
  # B U I L D  P R O P E R T I E S
  # -------------------------------------------------------------------
  
  name=excalibur-bzip2
  Name=Excalibur BZip2
  version=1.0a
  year=2000-2002
  
  #  Settings used to configure compile environment
  build.debug = on
  build.optimize = off
  build.deprecation = off
  build.compress = false
  junit.failonerror = false
  
  #  location of intermediate products
  build.dir = build
  build.lib = ${build.dir}/lib
  build.conf = ${build.dir}/conf
  build.classes = ${build.dir}/classes
  build.tests = ${build.dir}/tests
  build.reports = ${build.dir}/reports
  
  #  Set the properties for source directories
  src.dir = src
  java.dir = ${src.dir}/java
  conf.dir = ${src.dir}/conf
  test.dir = ${src.dir}/test
  
  #  Set the properties for distribution directories
  dist.dir = dist
  dist.javadocs = ${dist.dir}/docs/api
  
  #  name of .zip/.tar.gz/.bz2 files and their top-level directory
  dist.name = ${name}-${version}
  
  #  name of jar file
  jar.name = ${name}-${version}.jar
  
  #  property indicating directory where all distribution archives are placed
  dist.base = distributions
  
  depchecker.prefix=.
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.16.2.1  +5 -43     jakarta-avalon-excalibur/cache/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/cache/build.xml,v
  retrieving revision 1.16
  retrieving revision 1.16.2.1
  diff -u -r1.16 -r1.16.2.1
  --- build.xml	31 Mar 2002 08:36:44 -0000	1.16
  +++ build.xml	1 Apr 2002 05:46:11 -0000	1.16.2.1
  @@ -2,54 +2,16 @@
   
   <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="../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"/>
  -
  -    <!-- 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="../ant.properties"/>
  +    <property file="ant.properties"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
  @@ -102,7 +64,7 @@
               <fileset dir="../" includes="LICENSE.txt"/>
               <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
               <filterset>
  -                <filtersfile file="project.properties"/>
  +                <filtersfile file="default.properties"/>
               </filterset>
           </copy>
   
  
  
  
  1.1                  jakarta-avalon-excalibur/cache/default.properties
  
  Index: default.properties
  ===================================================================
  # -------------------------------------------------------------------
  # B U I L D  P R O P E R T I E S
  # -------------------------------------------------------------------
  
  name=excalibur-cache
  Name=Excalibur Cache
  version=1.0a
  year=2001-2002
  
  # --------------------------------------------------
  #                REQUIRED LIBRARIES
  # --------------------------------------------------
  
  # ----- Avalon Framework -----
  avalon-framework.home=${basedir}/../../jakarta-avalon
  avalon-framework.lib=${avalon-framework.home}/build/lib
  avalon-framework.jar=${avalon-framework.lib}/avalon-framework.jar
  
  # --------------------------------------------------
  
  #  Settings used to configure compile environment
  build.debug = on
  build.optimize = off
  build.deprecation = off
  build.compress = false
  junit.failonerror = false
  
  #  location of intermediate products
  build.dir = build
  build.lib = ${build.dir}/lib
  build.conf = ${build.dir}/conf
  build.classes = ${build.dir}/classes
  build.tests = ${build.dir}/tests
  build.reports = ${build.dir}/reports
  
  #  Set the properties for source directories
  src.dir = src
  java.dir = ${src.dir}/java
  conf.dir = ${src.dir}/conf
  test.dir = ${src.dir}/test
  
  #  Set the properties for distribution directories
  dist.dir = dist
  dist.javadocs = ${dist.dir}/docs/api
  
  #  name of .zip/.tar.gz/.bz2 files and their top-level directory
  dist.name = ${name}-${version}
  
  #  name of jar file
  jar.name = ${name}-${version}.jar
  
  #  property indicating directory where all distribution archives are placed
  dist.base = distributions
  
  depchecker.prefix=.
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.27.2.1  +6 -41     jakarta-avalon-excalibur/cli/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/cli/build.xml,v
  retrieving revision 1.27
  retrieving revision 1.27.2.1
  diff -u -r1.27 -r1.27.2.1
  --- build.xml	31 Mar 2002 08:36:44 -0000	1.27
  +++ build.xml	1 Apr 2002 05:46:11 -0000	1.27.2.1
  @@ -2,50 +2,15 @@
   
   <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="../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"/>
  -
  -    <!-- 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="../ant.properties"/>
  +    <property file="ant.properties"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
  @@ -97,7 +62,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 +106,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" />
   
  
  
  
  1.1                  jakarta-avalon-excalibur/cli/default.properties
  
  Index: default.properties
  ===================================================================
  # -------------------------------------------------------------------
  # B U I L D  P R O P E R T I E S
  # -------------------------------------------------------------------
  
  name=excalibur-cli
  Name=Excalibur CLI
  version=1.0
  year=2000-2002
  
  #  Settings used to configure compile environment
  build.debug = on
  build.optimize = off
  build.deprecation = off
  build.compress = false
  junit.failonerror = false
  
  #  location of intermediate products
  build.dir = build
  build.lib = ${build.dir}/lib
  build.conf = ${build.dir}/conf
  build.classes = ${build.dir}/classes
  build.tests = ${build.dir}/tests
  build.reports = ${build.dir}/reports
  
  #  Set the properties for source directories
  src.dir = src
  java.dir = ${src.dir}/java
  conf.dir = ${src.dir}/conf
  test.dir = ${src.dir}/test
  
  #  Set the properties for distribution directories
  dist.dir = dist
  dist.javadocs = ${dist.dir}/docs/api
  
  #  name of .zip/.tar.gz/.bz2 files and their top-level directory
  dist.name = ${name}-${version}
  
  #  name of jar file
  jar.name = ${name}-${version}.jar
  
  #  property indicating directory where all distribution archives are placed
  dist.base = distributions
  
  depchecker.prefix=.
  
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.5.2.1   +6 -41     jakarta-avalon-excalibur/collections/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/collections/build.xml,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- build.xml	31 Mar 2002 08:36:44 -0000	1.5
  +++ build.xml	1 Apr 2002 05:46:11 -0000	1.5.2.1
  @@ -2,50 +2,15 @@
   
   <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="../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"/>
  -
  -    <!-- 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="../ant.properties"/>
  +    <property file="ant.properties"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
  @@ -97,7 +62,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 +106,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" />
   
  
  
  
  1.1                  jakarta-avalon-excalibur/collections/default.properties
  
  Index: default.properties
  ===================================================================
  # -------------------------------------------------------------------
  # B U I L D  P R O P E R T I E S
  # -------------------------------------------------------------------
  
  name=excalibur-collections
  Name=Excalibur Collections
  version=1.0
  year=2000-2002
  
  
  #  Settings used to configure compile environment
  build.debug = on
  build.optimize = off
  build.deprecation = off
  build.compress = false
  junit.failonerror = false
  
  #  location of intermediate products
  build.dir = build
  build.lib = ${build.dir}/lib
  build.conf = ${build.dir}/conf
  build.classes = ${build.dir}/classes
  build.tests = ${build.dir}/tests
  build.reports = ${build.dir}/reports
  
  #  Set the properties for source directories
  src.dir = src
  java.dir = ${src.dir}/java
  conf.dir = ${src.dir}/conf
  test.dir = ${src.dir}/test
  
  #  Set the properties for distribution directories
  dist.dir = dist
  dist.javadocs = ${dist.dir}/docs/api
  
  #  name of .zip/.tar.gz/.bz2 files and their top-level directory
  dist.name = ${name}-${version}
  
  #  name of jar file
  jar.name = ${name}-${version}.jar
  
  #  property indicating directory where all distribution archives are placed
  dist.base = distributions
  
  depchecker.prefix=.
  
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.1   +2 -2      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.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- ant.properties.sample	30 Mar 2002 22:10:39 -0000	1.2
  +++ ant.properties.sample	1 Apr 2002 05:46:12 -0000	1.2.2.1
  @@ -9,7 +9,7 @@
   # The ant.properties values in this directory apply only to this component, and
   # override the defaults in ../ant.properties.
   #
  -# $Id: ant.properties.sample,v 1.2 2002/03/30 22:10:39 donaldp Exp $
  +# $Id: ant.properties.sample,v 1.2.2.1 2002/04/01 05:46:12 jefft Exp $
   # -----------------------------------------------------------------------------
   
   # --------------------------------------------------
  @@ -38,7 +38,7 @@
   # ----- Excalibur Event, version 1.0 or later -----
   excalibur-event.home=${base.path}/excalibur-event-1.0
   excalibur-event.lib=${excalibur-event.home}
  -excalibur-event.jar=${excalibur-event.lib}/excalibur-event-1.0.jar
  +excalibur-event.jar=${excalibur-event.lib}/excalibur-event-1.0a.jar
   
   # ----- Excalibur Collections, version 1.0 or later -----
   excalibur-collections.home=${base.path}/excalibur-collections-1.0
  
  
  
  1.5.2.1   +46 -41    jakarta-avalon-excalibur/command/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/command/build.xml,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- build.xml	31 Mar 2002 08:36:44 -0000	1.5
  +++ build.xml	1 Apr 2002 05:46:12 -0000	1.5.2.1
  @@ -2,50 +2,18 @@
   
   <project name="Excalibur Command" default="main" basedir=".">
   
  -    <!-- load per-project properties -->
  -    <property file="project.properties"/>
  +    <!-- load per-default.properties -->
  +    <property file="default.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="../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"/>
  -
  -    <!-- 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="../ant.properties"/>
  +    <property file="ant.properties"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
  @@ -54,6 +22,8 @@
           <pathelement location="${excalibur-event.jar}"/>
           <pathelement location="${excalibur-collections.jar}"/>
           <pathelement location="${excalibur-concurrent.jar}"/>
  +        <pathelement location="${excalibur-core.jar}"/>
  +        <pathelement location="${excalibur-scratchpad.jar}"/>
           <pathelement location="${avalon-framework.jar}"/>
           <pathelement location="${junit.jar}"/>
           <pathelement location="${checkstyle.jar}"/>
  @@ -62,8 +32,43 @@
       <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="checkRequiredFile">
  +            <property name="name" value="excalibur-event.jar"/>
  +            <property name="path" value="${excalibur-event.jar}"/>
  +            <property name="dependency" value="${basedir}/../event"/>
  +        </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="dependency" 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="dependency" value="${basedir}/../concurrent"/>
  +        </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="dependency" value="${basedir}/../../jakarta-avalon"/>
  +        </ant>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
  +            <property name="name" value="excalibur-core.jar"/>
  +            <property name="path" value="${excalibur-core.jar}"/>
  +            <property name="dependency" value="${basedir}/../all"/>
  +            <property name="target" value="all"/>
  +        </ant>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
  +            <property name="name" value="excalibur-scratchpad.jar"/>
  +            <property name="path" value="${excalibur-scratchpad.jar}"/>
  +            <property name="dependency" value="${basedir}/../all"/>
  +            <property name="target" value="compile"/>
  +        </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}"/>
   
  @@ -101,7 +106,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 +150,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" />
   
  
  
  
  1.1                  jakarta-avalon-excalibur/command/default.properties
  
  Index: default.properties
  ===================================================================
  # -------------------------------------------------------------------
  # B U I L D  P R O P E R T I E S
  # -------------------------------------------------------------------
  
  name=excalibur-command
  Name=Excalibur Command
  version=1.0a
  year=2002
  
  # --------------------------------------------------
  #                REQUIRED LIBRARIES
  # --------------------------------------------------
  # ----- 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 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 Concurrent, version 1.0 or later -----
  excalibur-concurrent.home=${basedir}/../concurrent/dist
  excalibur-concurrent.lib=${excalibur-concurrent.home}
  excalibur-concurrent.jar=${excalibur-concurrent.lib}/excalibur-concurrent-1.0.jar
  
  # ----- Excalibur Scratchpad -----
  excalibur-scratchpad.home=${basedir}/../all
  excalibur-scratchpad.lib=${excalibur-scratchpad.home}/build/lib
  excalibur-scratchpad.jar=${excalibur-scratchpad.lib}/excalibur-scratchpad.jar
  
  # ----- Excalibur Core -----
  excalibur-core.home=${basedir}/../all
  excalibur-core.lib=${excalibur-core.home}/build/lib
  excalibur-core.jar=${excalibur-core.lib}/excalibur-core.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
  
  # --------------------------------------------------
  
  #  Settings used to configure compile environment
  build.debug = on
  build.optimize = off
  build.deprecation = off
  build.compress = false
  junit.failonerror = false
  
  #  location of intermediate products
  build.dir = build
  build.lib = ${build.dir}/lib
  build.conf = ${build.dir}/conf
  build.classes = ${build.dir}/classes
  build.tests = ${build.dir}/tests
  build.reports = ${build.dir}/reports
  
  #  Set the properties for source directories
  src.dir = src
  java.dir = ${src.dir}/java
  conf.dir = ${src.dir}/conf
  test.dir = ${src.dir}/test
  
  #  Set the properties for distribution directories
  dist.dir = dist
  dist.javadocs = ${dist.dir}/docs/api
  
  #  name of .zip/.tar.gz/.bz2 files and their top-level directory
  dist.name = ${name}-${version}
  
  #  name of jar file
  jar.name = ${name}-${version}.jar
  
  #  property indicating directory where all distribution archives are placed
  dist.base = distributions
  
  depchecker.prefix=.
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.5.2.1   +6 -42     jakarta-avalon-excalibur/concurrent/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/concurrent/build.xml,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- build.xml	31 Mar 2002 08:36:45 -0000	1.5
  +++ build.xml	1 Apr 2002 05:46:12 -0000	1.5.2.1
  @@ -1,51 +1,15 @@
   <?xml version="1.0"?>
   
   <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="../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"/>
  -
  -    <!-- 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="../ant.properties"/>
  +    <property file="ant.properties"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
  @@ -97,7 +61,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 +105,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" />
   
  
  
  
  1.1                  jakarta-avalon-excalibur/concurrent/default.properties
  
  Index: default.properties
  ===================================================================
  # -------------------------------------------------------------------
  # B U I L D  P R O P E R T I E S
  # -------------------------------------------------------------------
  
  name=excalibur-concurrent
  Name=Excalibur Concurrent
  version=1.0
  year=2000-2002
  
  #  Settings used to configure compile environment
  build.debug = on
  build.optimize = off
  build.deprecation = off
  build.compress = false
  junit.failonerror = false
  
  #  location of intermediate products
  build.dir = build
  build.lib = ${build.dir}/lib
  build.conf = ${build.dir}/conf
  build.classes = ${build.dir}/classes
  build.tests = ${build.dir}/tests
  build.reports = ${build.dir}/reports
  
  #  Set the properties for source directories
  src.dir = src
  java.dir = ${src.dir}/java
  conf.dir = ${src.dir}/conf
  test.dir = ${src.dir}/test
  
  #  Set the properties for distribution directories
  dist.dir = dist
  dist.javadocs = ${dist.dir}/docs/api
  
  #  name of .zip/.tar.gz/.bz2 files and their top-level directory
  dist.name = ${name}-${version}
  
  #  name of jar file
  jar.name = ${name}-${version}.jar
  
  #  property indicating directory where all distribution archives are placed
  dist.base = distributions
  
  depchecker.prefix=.
  
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.7.2.1   +20 -42    jakarta-avalon-excalibur/event/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/event/build.xml,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- build.xml	31 Mar 2002 08:36:45 -0000	1.7
  +++ build.xml	1 Apr 2002 05:46:12 -0000	1.7.2.1
  @@ -2,50 +2,15 @@
   
   <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="../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"/>
  -
  -    <!-- 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="../ant.properties"/>
  +    <property file="ant.properties"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
  @@ -60,8 +25,21 @@
       <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="checkRequiredFile">
  +            <property name="name" value="excalibur-collections.jar"/>
  +            <property name="path" value="${excalibur-collections.jar}"/>
  +            <property name="dependency" 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="dependency" value="${basedir}/../concurrent"/>
  +       </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}"/>
   
  @@ -99,7 +77,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 +121,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" />
   
  
  
  
  1.1                  jakarta-avalon-excalibur/event/default.properties
  
  Index: default.properties
  ===================================================================
  # -------------------------------------------------------------------
  # B U I L D  P R O P E R T I E S
  # -------------------------------------------------------------------
  
  name=excalibur-event
  Name=Excalibur Event
  version=1.0a
  year=2002
  
  # --------------------------------------------------
  #                REQUIRED LIBRARIES
  # --------------------------------------------------
  
  # ----- Excalibur Collections, version 1.0 or later -----
  excalibur-collections.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=../concurrent/dist
  excalibur-concurrent.lib=${excalibur-concurrent.home}
  excalibur-concurrent.jar=${excalibur-concurrent.lib}/excalibur-concurrent-1.0.jar
  
  
  # --------------------------------------------------
  
  #  Settings used to configure compile environment
  build.debug = on
  build.optimize = off
  build.deprecation = off
  build.compress = false
  junit.failonerror = false
  
  #  location of intermediate products
  build.dir = build
  build.lib = ${build.dir}/lib
  build.conf = ${build.dir}/conf
  build.classes = ${build.dir}/classes
  build.tests = ${build.dir}/tests
  build.reports = ${build.dir}/reports
  
  #  Set the properties for source directories
  src.dir = src
  java.dir = ${src.dir}/java
  conf.dir = ${src.dir}/conf
  test.dir = ${src.dir}/test
  
  #  Set the properties for distribution directories
  dist.dir = dist
  dist.javadocs = ${dist.dir}/docs/api
  
  #  name of .zip/.tar.gz/.bz2 files and their top-level directory
  dist.name = ${name}-${version}
  
  #  name of jar file
  jar.name = ${name}-${version}.jar
  
  #  property indicating directory where all distribution archives are placed
  dist.base = distributions
  
  depchecker.prefix=.
  
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.31.2.1  +6 -41     jakarta-avalon-excalibur/extension/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/extension/build.xml,v
  retrieving revision 1.31
  retrieving revision 1.31.2.1
  diff -u -r1.31 -r1.31.2.1
  --- build.xml	31 Mar 2002 08:36:45 -0000	1.31
  +++ build.xml	1 Apr 2002 05:46:12 -0000	1.31.2.1
  @@ -2,50 +2,15 @@
   
   <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="../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"/>
  -
  -    <!-- 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="../ant.properties"/>
  +    <property file="ant.properties"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
  @@ -97,7 +62,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 +106,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" />
   
  
  
  
  1.1                  jakarta-avalon-excalibur/extension/default.properties
  
  Index: default.properties
  ===================================================================
  # -------------------------------------------------------------------
  # B U I L D  P R O P E R T I E S
  # -------------------------------------------------------------------
  
  name=excalibur-extension
  Name=Excalibur Extension
  version=1.0a
  year=2000-2002
  
  #  Settings used to configure compile environment
  build.debug = on
  build.optimize = off
  build.deprecation = off
  build.compress = false
  junit.failonerror = false
  
  #  location of intermediate products
  build.dir = build
  build.lib = ${build.dir}/lib
  build.conf = ${build.dir}/conf
  build.classes = ${build.dir}/classes
  build.tests = ${build.dir}/tests
  build.reports = ${build.dir}/reports
  
  #  Set the properties for source directories
  src.dir = src
  java.dir = ${src.dir}/java
  conf.dir = ${src.dir}/conf
  test.dir = ${src.dir}/test
  
  #  Set the properties for distribution directories
  dist.dir = dist
  dist.javadocs = ${dist.dir}/docs/api
  
  #  name of .zip/.tar.gz/.bz2 files and their top-level directory
  dist.name = ${name}-${version}
  
  #  name of jar file
  jar.name = ${name}-${version}.jar
  
  #  property indicating directory where all distribution archives are placed
  dist.base = distributions
  
  depchecker.prefix=.
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.29.2.1  +6 -41     jakarta-avalon-excalibur/i18n/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/i18n/build.xml,v
  retrieving revision 1.29
  retrieving revision 1.29.2.1
  diff -u -r1.29 -r1.29.2.1
  --- build.xml	31 Mar 2002 08:36:45 -0000	1.29
  +++ build.xml	1 Apr 2002 05:46:12 -0000	1.29.2.1
  @@ -2,50 +2,15 @@
   
   <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="../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"/>
  -
  -    <!-- 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="../ant.properties"/>
  +    <property file="ant.properties"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
  @@ -97,7 +62,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 +106,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" />
   
  
  
  
  1.1                  jakarta-avalon-excalibur/i18n/default.properties
  
  Index: default.properties
  ===================================================================
  # -------------------------------------------------------------------
  # B U I L D  P R O P E R T I E S
  # -------------------------------------------------------------------
  
  name=excalibur-i18n
  Name=Excalibur I18N
  version=1.0
  year=2000-2002
  
  
  #  Settings used to configure compile environment
  build.debug = on
  build.optimize = off
  build.deprecation = off
  build.compress = false
  junit.failonerror = false
  
  #  location of intermediate products
  build.dir = build
  build.lib = ${build.dir}/lib
  build.conf = ${build.dir}/conf
  build.classes = ${build.dir}/classes
  build.tests = ${build.dir}/tests
  build.reports = ${build.dir}/reports
  
  #  Set the properties for source directories
  src.dir = src
  java.dir = ${src.dir}/java
  conf.dir = ${src.dir}/conf
  test.dir = ${src.dir}/test
  
  #  Set the properties for distribution directories
  dist.dir = dist
  dist.javadocs = ${dist.dir}/docs/api
  
  #  name of .zip/.tar.gz/.bz2 files and their top-level directory
  dist.name = ${name}-${version}
  
  #  name of jar file
  jar.name = ${name}-${version}.jar
  
  #  property indicating directory where all distribution archives are placed
  dist.base = distributions
  
  depchecker.prefix=.
  
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.7.2.1   +6 -40     jakarta-avalon-excalibur/instrument/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument/build.xml,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- build.xml	31 Mar 2002 08:36:45 -0000	1.7
  +++ build.xml	1 Apr 2002 05:46:12 -0000	1.7.2.1
  @@ -2,50 +2,16 @@
   
   <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="../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"/>
  -
  -    <!-- 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="../ant.properties"/>
  +    <property file="ant.properties"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
  @@ -97,7 +63,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 +107,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" />
   
  
  
  
  1.1                  jakarta-avalon-excalibur/instrument/default.properties
  
  Index: default.properties
  ===================================================================
  # -------------------------------------------------------------------
  # B U I L D  P R O P E R T I E S
  # -------------------------------------------------------------------
  
  name=excalibur-instrument
  Name=Excalibur Instrument
  version=0.1
  year=2002
  
  #  Settings used to configure compile environment
  build.debug = on
  build.optimize = off
  build.deprecation = off
  build.compress = false
  junit.failonerror = false
  
  #  location of intermediate products
  build.dir = ${basedir}/build
  build.lib = ${build.dir}/lib
  build.conf = ${build.dir}/conf
  build.classes = ${build.dir}/classes
  build.tests = ${build.dir}/tests
  build.reports = ${build.dir}/reports
  
  #  Set the properties for source directories
  src.dir = ${basedir}/src
  java.dir = ${src.dir}/java
  conf.dir = ${src.dir}/conf
  test.dir = ${src.dir}/test
  
  #  Set the properties for distribution directories
  dist.dir = ${basedir}/dist
  dist.javadocs = ${dist.dir}/docs/api
  
  #  name of .zip/.tar.gz/.bz2 files and their top-level directory
  dist.name = ${name}-${version}
  
  #  name of jar file
  jar.name = ${name}-${version}.jar
  
  #  property indicating directory where all distribution archives are placed
  dist.base = distributions
  
  depchecker.prefix=.
  
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.9.2.1   +30 -43    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.9
  retrieving revision 1.9.2.1
  diff -u -r1.9 -r1.9.2.1
  --- build.xml	31 Mar 2002 08:36:45 -0000	1.9
  +++ build.xml	1 Apr 2002 05:46:12 -0000	1.9.2.1
  @@ -2,51 +2,15 @@
   
   <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="../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"/>
  -
  -    <!-- 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="../ant.properties"/>
  +    <property file="ant.properties"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
  @@ -61,6 +25,7 @@
           <pathelement location="${junit.jar}"/>
           <pathelement location="${checkstyle.jar}"/>
       </path>
  +    <property name="cp" refid="project.class.path"/>
   
       <taskdef name="altrmiproxies"
           classname="org.apache.commons.altrmi.generator.ant.AltrmiProxyTask">
  @@ -70,8 +35,30 @@
       <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="checkRequiredFile">
  +            <property name="name" value="excalibur-instrument-manager-interfaces.jar"/>
  +            <property name="path" value="${excalibur-instrument-manager-interfaces.jar}"/>
  +            <property name="dependency" 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="dependency" 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="classpath" value="${cp}"/>
  +        </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}"/>
   
  @@ -109,7 +96,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>
  @@ -174,7 +161,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" />
   
  
  
  
  1.1                  jakarta-avalon-excalibur/instrument-client/default.properties
  
  Index: default.properties
  ===================================================================
  # -------------------------------------------------------------------
  # B U I L D  P R O P E R T I E S
  # -------------------------------------------------------------------
  
  name=excalibur-instrument-client
  Name=Excalibur Instrument Client
  version=0.1
  year=2002
  
  # --------------------------------------------------
  #                REQUIRED LIBRARIES
  # --------------------------------------------------
  
  # ----- 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 Manager -----
  excalibur-instrument-manager-interfaces.home=../instrument-manager/dist
  excalibur-instrument-manager-interfaces.lib=${excalibur-instrument-manager-interfaces.home}
  # Note: this jar should match the property name!
  excalibur-instrument-manager-interfaces.jar=${excalibur-instrument-manager-interfaces.lib}/excalibur-instrument-manager-0.1.jar
  
  
  # ----- Altrmi -----
  commons-altrmi.home=../../jakarta-commons-sandbox/altrmi/dist
  commons-altrmi-client-impl.jar=${commons-altrmi.home}/commons-altrmi-client-impl.jar
  commons-altrmi-client-interfaces.jar=${commons-altrmi.home}/commons-altrmi-client-interfaces.jar
  commons-altrmi-common.jar=${commons-altrmi.home}/commons-altrmi-common.jar
  commons-altrmi-generator.jar=${commons-altrmi.home}/commons-altrmi-generator.jar
  
  
  
  #  Settings used to configure compile environment
  build.debug = on
  build.optimize = off
  build.deprecation = off
  build.compress = false
  junit.failonerror = false
  
  #  location of intermediate products
  build.dir = ${basedir}/build
  build.lib = ${build.dir}/lib
  build.conf = ${build.dir}/conf
  build.classes = ${build.dir}/classes
  build.genjava = ${build.dir}/genjava
  build.tests = ${build.dir}/tests
  build.reports = ${build.dir}/reports
  
  #  Set the properties for source directories
  src.dir = ${basedir}/src
  java.dir = ${src.dir}/java
  conf.dir = ${src.dir}/conf
  test.dir = ${src.dir}/test
  
  #  Set the properties for distribution directories
  dist.dir = ${basedir}/dist
  dist.javadocs = ${dist.dir}/docs/api
  
  #  name of .zip/.tar.gz/.bz2 files and their top-level directory
  dist.name = ${name}-${version}
  
  #  name of jar file
  jar.name = ${name}-${version}.jar
  
  #  property indicating directory where all distribution archives are placed
  dist.base = distributions
  
  depchecker.prefix=.
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.1   +2 -2      jakarta-avalon-excalibur/instrument-manager/BUILDING.txt
  
  Index: BUILDING.txt
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-manager/BUILDING.txt,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- BUILDING.txt	26 Mar 2002 11:58:36 -0000	1.2
  +++ BUILDING.txt	1 Apr 2002 05:46:12 -0000	1.2.2.1
  @@ -10,8 +10,8 @@
    - Your directory structure follows standard CVS layout:
   
   jakarta-avalon/                   # jakarta-avalon CVS module, containing Ant
  -jakarta-avalon-excalibur/              # contains build.sh, build.bat
  -jakarta-avalon-excalibur/<component>   # you are here
  +jakarta-excalibur-core/              # contains build.sh, build.bat
  +jakarta-excalibur-core/<component>   # you are here
   
   Then to build, you need only customize ant.properties (see step 6 below) and
   type './build.sh' (Unix) or 'build' (DOS). The '-projecthelp' option will
  
  
  
  1.2.2.1   +3 -3      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.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- ant.properties.sample	30 Mar 2002 08:46:04 -0000	1.2
  +++ ant.properties.sample	1 Apr 2002 05:46:12 -0000	1.2.2.1
  @@ -9,7 +9,7 @@
   # The ant.properties values in this directory apply only to this component, and
   # override the defaults in ../ant.properties.
   #
  -# $Id: ant.properties.sample,v 1.2 2002/03/30 08:46:04 jefft Exp $
  +# $Id: ant.properties.sample,v 1.2.2.1 2002/04/01 05:46:12 jefft Exp $
   # -----------------------------------------------------------------------------
   
   # --------------------------------------------------
  @@ -38,8 +38,8 @@
   avalon-framework.jar=${avalon-framework.home}/avalon-framework.jar
   
   # ----- Avalon Excalibur -----
  -avalon-excalibur.home=../all/build/lib
  -avalon-excalibur.jar=${avalon-excalibur.home}/avalon-excalibur.jar
  +excalibur-core.home=../all/build/lib
  +excalibur-core.jar=${excalibur-core.home}/excalibur-core.jar
   
   # ----- Excalibur Collections -----
   excalibur-collections.home=../collections/build/lib
  
  
  
  1.10.2.1  +50 -43    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.10
  retrieving revision 1.10.2.1
  diff -u -r1.10 -r1.10.2.1
  --- build.xml	31 Mar 2002 08:36:45 -0000	1.10
  +++ build.xml	1 Apr 2002 05:46:12 -0000	1.10.2.1
  @@ -2,50 +2,15 @@
   
   <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="../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"/>
  -
  -    <!-- 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="excalibur-${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="../ant.properties"/>
  +    <property file="ant.properties"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
  @@ -53,7 +18,7 @@
           <pathelement location="${build.classes}"/>
           <pathelement location="${logkit.jar}"/>
           <pathelement location="${avalon-framework.jar}"/>
  -        <pathelement location="${avalon-excalibur.jar}"/>
  +        <pathelement location="${excalibur-core.jar}"/>
           <pathelement location="${excalibur-collections.jar}"/>
           <pathelement location="${excalibur-instrument.jar}"/>
           <pathelement location="${commons-altrmi-common.jar}"/>
  @@ -66,8 +31,50 @@
       <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="checkRequiredFile">
  +            <property name="name" value="excalibur-collections.jar"/>
  +            <property name="path" value="${excalibur-collections.jar}"/>
  +            <property name="dependency" value="${basedir}/../collections"/>
  +        </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="dependency" value="${basedir}/../instrument"/>
  +        </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="dependency" value="${basedir}/../../jakarta-avalon"/>
  +        </ant>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
  +            <property name="name" value="excalibur-core.jar"/>
  +            <property name="path" value="${excalibur-core.jar}"/>
  +            <property name="dependency" value="${basedir}/../all"/>
  +            <property name="target" value="all"/>
  +        </ant>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
  +            <property name="name" value="logkit.jar"/>
  +            <property name="path" value="${logkit.jar}"/>
  +            <property name="dependency" value="${basedir}/../../jakarta-avalon-logkit"/>
  +            <property name="target" value="compile"/>
  +        </ant>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
  +            <property name="name" value="commons-altrmi-common.jar"/>
  +            <property name="path" value="${commons-altrmi-common.jar}"/>
  +        </ant>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
  +            <property name="name" value="commons-altrmi-server-impl.jar"/>
  +            <property name="path" value="${commons-altrmi-server-impl.jar}"/>
  +        </ant>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredFile">
  +            <property name="name" value="commons-altrmi-server-interfaces.jar"/>
  +            <property name="path" value="${commons-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}"/>
   
  @@ -105,7 +112,7 @@
               <fileset dir="../" includes="LICENSE.txt"/>
               <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
               <filterset>
  -                <filtersfile file="project.properties"/>
  +                <filtersfile file="default.properties"/>
               </filterset>
           </copy>
   
  @@ -159,7 +166,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" />
   
  
  
  
  1.1                  jakarta-avalon-excalibur/instrument-manager/default.properties
  
  Index: default.properties
  ===================================================================
  # -------------------------------------------------------------------
  # B U I L D  P R O P E R T I E S
  # -------------------------------------------------------------------
  
  name=excalibur-instrument-manager
  Name=Excalibur Instrument Manager
  version=0.1
  year=2002
  
  # --------------------------------------------------
  #                REQUIRED LIBRARIES
  # --------------------------------------------------
  
  # ----- Logkit -----
  logkit.home=${basedir}/../../jakarta-avalon-logkit
  logkit.lib=${logkit.home}/build/lib
  logkit.jar=${logkit.lib}/logkit.jar
  
  # ----- 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 Core -----
  excalibur-core.home=${basedir}/../all
  excalibur-core.lib=${excalibur-core.home}/build/lib
  excalibur-core.jar=${excalibur-core.lib}/excalibur-core.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 0.1 or later -----
  excalibur-instrument.home=${basedir}/../instrument/dist
  excalibur-instrument.lib=${excalibur-instrument.home}
  excalibur-instrument.jar=${excalibur-instrument.lib}/excalibur-instrument-0.1.jar
  
  # ----- Altrmi -----
  commons-altrmi.home=../../jakarta-commons-sandbox/altrmi/dist
  commons-altrmi-common.jar=${commons-altrmi.home}/commons-altrmi-common.jar
  commons-altrmi-server-impl.jar=${commons-altrmi.home}/commons-altrmi-server-impl.jar
  commons-altrmi-server-interfaces.jar=${commons-altrmi.home}/commons-altrmi-server-interfaces.jar
  
  
  
  # --------------------------------------------------
  
  #  Settings used to configure compile environment
  build.debug = on
  build.optimize = off
  build.deprecation = off
  build.compress = false
  junit.failonerror = false
  
  #  location of intermediate products
  build.dir = ${basedir}/build
  build.lib = ${build.dir}/lib
  build.conf = ${build.dir}/conf
  build.classes = ${build.dir}/classes
  build.tests = ${build.dir}/tests
  build.reports = ${build.dir}/reports
  
  #  Set the properties for source directories
  src.dir = ${basedir}/src
  java.dir = ${src.dir}/java
  conf.dir = ${src.dir}/conf
  test.dir = ${src.dir}/test
  
  #  Set the properties for distribution directories
  dist.dir = ${basedir}/dist
  dist.javadocs = ${dist.dir}/docs/api
  
  #  name of .zip/.tar.gz/.bz2 files and their top-level directory
  dist.name = ${name}-${version}
  dist-interfaces.name = excalibur-${name}-interfaces-${version}
  #  name of jar file
  jar.name = ${name}-${version}.jar
  
  #  property indicating directory where all distribution archives are placed
  dist.base = distributions
  
  depchecker.prefix=.
  
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +3 -3      jakarta-avalon-excalibur/instrument-manager/example/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-manager/example/ant.properties.sample,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- ant.properties.sample	26 Mar 2002 11:56:15 -0000	1.1
  +++ ant.properties.sample	1 Apr 2002 05:46:13 -0000	1.1.2.1
  @@ -9,7 +9,7 @@
   # The ant.properties values in this directory apply only to this component, and
   # override the defaults in ../ant.properties.
   #
  -# $Id: ant.properties.sample,v 1.1 2002/03/26 11:56:15 leif Exp $
  +# $Id: ant.properties.sample,v 1.1.2.1 2002/04/01 05:46:13 jefft Exp $
   # -----------------------------------------------------------------------------
   
   # --------------------------------------------------
  @@ -50,8 +50,8 @@
   avalon-framework.jar=${avalon-framework.home}/avalon-framework.jar
   
   # ----- Avalon Excalibur -----
  -avalon-excalibur.home=../../all/build/lib
  -avalon-excalibur.jar=${avalon-excalibur.home}/avalon-excalibur.jar
  +excalibur-core.home=../../all/build/lib
  +excalibur-core.jar=${excalibur-core.home}/excalibur-core.jar
   
   # ----- Excalibur Instrument -----
   excalibur-instrument.home=../../instrument/build/lib
  
  
  
  1.2.2.1   +1 -1      jakarta-avalon-excalibur/instrument-manager/example/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/instrument-manager/example/build.xml,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- build.xml	27 Mar 2002 11:38:05 -0000	1.2
  +++ build.xml	1 Apr 2002 05:46:13 -0000	1.2.2.1
  @@ -62,7 +62,7 @@
           <copy file="${avalon-framework.jar}" todir="${lib.dir}" preservelastmodified="yes"/>
           
           <!-- Avalon Excalibur -->
  -        <copy file="${avalon-excalibur.jar}" todir="${lib.dir}" preservelastmodified="yes"/>
  +        <copy file="${excalibur-core.jar}" todir="${lib.dir}" preservelastmodified="yes"/>
           
           <!-- Avalon Excalibur Instrument -->
           <copy file="${excalibur-instrument.jar}"
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.31.2.1  +17 -42    jakarta-avalon-excalibur/io/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/io/build.xml,v
  retrieving revision 1.31
  retrieving revision 1.31.2.1
  diff -u -r1.31 -r1.31.2.1
  --- build.xml	31 Mar 2002 08:36:45 -0000	1.31
  +++ build.xml	1 Apr 2002 05:46:13 -0000	1.31.2.1
  @@ -2,50 +2,15 @@
   
   <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="../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"/>
  -
  -    <!-- 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="../ant.properties"/>
  +    <property file="ant.properties"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
  @@ -54,12 +19,22 @@
           <pathelement location="${junit.jar}"/>
           <pathelement location="${checkstyle.jar}"/>
       </path>
  +    <property name="cp" refid="project.class.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="checkRequiredClass">
  +            <property name="name" value="junit.jar"/>
  +            <property name="class" value="junit.framework.Test"/>
  +            <property name="classpath" value="${cp}"/>
  +        </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}"/>
   
  @@ -97,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>
   
  @@ -141,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" />
   
  
  
  
  1.1                  jakarta-avalon-excalibur/io/default.properties
  
  Index: default.properties
  ===================================================================
  # -------------------------------------------------------------------
  # B U I L D  P R O P E R T I E S
  # -------------------------------------------------------------------
  
  name=excalibur-io
  Name=Excalibur IO
  version=1.1
  year=2000-2002
  
  #  Settings used to configure compile environment
  build.debug = on
  build.optimize = off
  build.deprecation = off
  build.compress = false
  junit.failonerror = false
  
  #  location of intermediate products
  build.dir = build
  build.lib = ${build.dir}/lib
  build.conf = ${build.dir}/conf
  build.classes = ${build.dir}/classes
  build.tests = ${build.dir}/tests
  build.reports = ${build.dir}/reports
  
  #  Set the properties for source directories
  src.dir = src
  java.dir = ${src.dir}/java
  conf.dir = ${src.dir}/conf
  test.dir = ${src.dir}/test
  
  #  Set the properties for distribution directories
  dist.dir = dist
  dist.javadocs = ${dist.dir}/docs/api
  
  #  name of .zip/.tar.gz/.bz2 files and their top-level directory
  dist.name = ${name}-${version}
  
  #  name of jar file
  jar.name = ${name}-${version}.jar
  
  #  property indicating directory where all distribution archives are placed
  dist.base = distributions
  
  depchecker.prefix=.
  
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.31.2.1  +6 -41     jakarta-avalon-excalibur/naming/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/naming/build.xml,v
  retrieving revision 1.31
  retrieving revision 1.31.2.1
  diff -u -r1.31 -r1.31.2.1
  --- build.xml	31 Mar 2002 08:36:45 -0000	1.31
  +++ build.xml	1 Apr 2002 05:46:13 -0000	1.31.2.1
  @@ -2,50 +2,15 @@
   
   <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="../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"/>
  -
  -    <!-- 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="../ant.properties"/>
  +    <property file="ant.properties"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
  @@ -104,7 +69,7 @@
               <fileset dir="../" includes="LICENSE.txt"/>
               <fileset dir="${conf.dir}" includes="MANIFEST.MF"/> 
               <filterset>
  -                <filtersfile file="project.properties"/>
  +                <filtersfile file="default.properties"/>
               </filterset>
           </copy>
   
  @@ -148,7 +113,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" />
   
  
  
  
  1.1                  jakarta-avalon-excalibur/naming/default.properties
  
  Index: default.properties
  ===================================================================
  # -------------------------------------------------------------------
  # B U I L D  P R O P E R T I E S
  # -------------------------------------------------------------------
  
  name=excalibur-naming
  Name=Excalibur Naming
  version=1.0
  year=2000-2002
  
  
  #  Settings used to configure compile environment
  build.debug = on
  build.optimize = off
  build.deprecation = off
  build.compress = false
  junit.failonerror = false
  
  #  location of intermediate products
  build.dir = build
  build.lib = ${build.dir}/lib
  build.conf = ${build.dir}/conf
  build.classes = ${build.dir}/classes
  build.tests = ${build.dir}/tests
  build.reports = ${build.dir}/reports
  
  #  Set the properties for source directories
  src.dir = src
  java.dir = ${src.dir}/java
  conf.dir = ${src.dir}/conf
  test.dir = ${src.dir}/test
  
  #  Set the properties for distribution directories
  dist.dir = dist
  dist.javadocs = ${dist.dir}/docs/api
  
  #  name of .zip/.tar.gz/.bz2 files and their top-level directory
  dist.name = ${name}-${version}
  
  #  name of jar file
  jar.name = ${name}-${version}.jar
  
  #  property indicating directory where all distribution archives are placed
  dist.base = distributions
  
  depchecker.prefix=.
  
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.10.2.1  +6 -40     jakarta-avalon-excalibur/tar/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/tar/build.xml,v
  retrieving revision 1.10
  retrieving revision 1.10.2.1
  diff -u -r1.10 -r1.10.2.1
  --- build.xml	31 Mar 2002 08:36:45 -0000	1.10
  +++ build.xml	1 Apr 2002 05:46:13 -0000	1.10.2.1
  @@ -2,50 +2,16 @@
   
   <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="../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"/>
  -
  -    <!-- 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="../ant.properties"/>
  +    <property file="ant.properties"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
  @@ -97,7 +63,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 +107,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" />
   
  
  
  
  1.1                  jakarta-avalon-excalibur/tar/default.properties
  
  Index: default.properties
  ===================================================================
  # -------------------------------------------------------------------
  # B U I L D  P R O P E R T I E S
  # -------------------------------------------------------------------
  
  name=excalibur-tar
  Name=Excalibur TAR
  version=1.0a
  year=2000-2002
  
  #  Settings used to configure compile environment
  build.debug = on
  build.optimize = off
  build.deprecation = off
  build.compress = false
  junit.failonerror = false
  
  #  location of intermediate products
  build.dir = build
  build.lib = ${build.dir}/lib
  build.conf = ${build.dir}/conf
  build.classes = ${build.dir}/classes
  build.tests = ${build.dir}/tests
  build.reports = ${build.dir}/reports
  
  #  Set the properties for source directories
  src.dir = src
  java.dir = ${src.dir}/java
  conf.dir = ${src.dir}/conf
  test.dir = ${src.dir}/test
  
  #  Set the properties for distribution directories
  dist.dir = dist
  dist.javadocs = ${dist.dir}/docs/api
  
  #  name of .zip/.tar.gz/.bz2 files and their top-level directory
  dist.name = ${name}-${version}
  
  #  name of jar file
  jar.name = ${name}-${version}.jar
  
  #  property indicating directory where all distribution archives are placed
  dist.base = distributions
  
  depchecker.prefix=.
  
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.8.2.1   +6 -40     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.8
  retrieving revision 1.8.2.1
  diff -u -r1.8 -r1.8.2.1
  --- build.xml	31 Mar 2002 08:36:45 -0000	1.8
  +++ build.xml	1 Apr 2002 05:46:13 -0000	1.8.2.1
  @@ -2,50 +2,16 @@
   
   <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="../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"/>
  -
  -    <!-- 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="../ant.properties"/>
  +    <property file="ant.properties"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
  @@ -97,7 +63,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 +107,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" />
   
  
  
  
  1.1                  jakarta-avalon-excalibur/template-product/default.properties
  
  Index: default.properties
  ===================================================================
  # -------------------------------------------------------------------
  # B U I L D  P R O P E R T I E S
  # -------------------------------------------------------------------
  
  name=excalibur-my-component
  Name=Excalibur MyComponent
  version=1.0
  year=2000-2002
  
  # --------------------------------------------------
  #                REQUIRED LIBRARIES
  # --------------------------------------------------
  
  
  # --------------------------------------------------
  
  #  Settings used to configure compile environment
  build.debug = on
  build.optimize = off
  build.deprecation = off
  build.compress = false
  junit.failonerror = false
  
  #  location of intermediate products
  build.dir = build
  build.lib = ${build.dir}/lib
  build.conf = ${build.dir}/conf
  build.classes = ${build.dir}/classes
  build.tests = ${build.dir}/tests
  build.reports = ${build.dir}/reports
  
  #  Set the properties for source directories
  src.dir = src
  java.dir = ${src.dir}/java
  conf.dir = ${src.dir}/conf
  test.dir = ${src.dir}/test
  
  #  Set the properties for distribution directories
  dist.dir = dist
  dist.javadocs = ${dist.dir}/docs/api
  
  #  name of .zip/.tar.gz/.bz2 files and their top-level directory
  dist.name = ${name}-${version}
  
  #  name of jar file
  jar.name = ${name}-${version}.jar
  
  #  property indicating directory where all distribution archives are placed
  dist.base = distributions
  
  depchecker.prefix=.
  
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.10.2.1  +6 -40     jakarta-avalon-excalibur/zip/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/zip/build.xml,v
  retrieving revision 1.10
  retrieving revision 1.10.2.1
  diff -u -r1.10 -r1.10.2.1
  --- build.xml	31 Mar 2002 08:36:45 -0000	1.10
  +++ build.xml	1 Apr 2002 05:46:13 -0000	1.10.2.1
  @@ -2,50 +2,16 @@
   
   <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="../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"/>
  -
  -    <!-- 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="../ant.properties"/>
  +    <property file="ant.properties"/>
  +    <property file="../default.properties"/>
  +    <property file="default.properties"/>
   
       <!-- Classpath for product -->
       <path id="project.class.path">
  @@ -97,7 +63,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 +107,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" />
   
  
  
  
  1.1                  jakarta-avalon-excalibur/zip/default.properties
  
  Index: default.properties
  ===================================================================
  # -------------------------------------------------------------------
  # B U I L D  P R O P E R T I E S
  # -------------------------------------------------------------------
  
  name=excalibur-zip
  Name=Excalibur Zip
  version=1.0a
  year=2000-2002
  
  #  Settings used to configure compile environment
  build.debug = on
  build.optimize = off
  build.deprecation = off
  build.compress = false
  junit.failonerror = false
  
  #  location of intermediate products
  build.dir = build
  build.lib = ${build.dir}/lib
  build.conf = ${build.dir}/conf
  build.classes = ${build.dir}/classes
  build.tests = ${build.dir}/tests
  build.reports = ${build.dir}/reports
  
  #  Set the properties for source directories
  src.dir = src
  java.dir = ${src.dir}/java
  conf.dir = ${src.dir}/conf
  test.dir = ${src.dir}/test
  
  #  Set the properties for distribution directories
  dist.dir = dist
  dist.javadocs = ${dist.dir}/docs/api
  
  #  name of .zip/.tar.gz/.bz2 files and their top-level directory
  dist.name = ${name}-${version}
  
  #  name of jar file
  jar.name = ${name}-${version}.jar
  
  #  property indicating directory where all distribution archives are placed
  dist.base = distributions
  
  depchecker.prefix=.
  
  
  
  

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