jefft       02/04/24 19:29:41

  Modified:    .        ant.properties.sample depchecker.xml
               all      ant.properties.sample build.xml default.properties
               all/examples build.xml
               component ant.properties.sample build.xml default.properties
               datasource ant.properties.sample build.xml
                        default.properties
               fortress build.xml default.properties
               instrument-manager ant.properties.sample build.xml
                        default.properties
               logger   build.xml default.properties
               monitor  build.xml default.properties
               pool     build.xml default.properties
               testcase build.xml default.properties
               thread   build.xml default.properties
               xmlbundle build.xml default.properties
  Log:
  Deprecate use of 'avalon-logkit.jar' property in favour of 'logkit.jar'.
  
  Revision  Changes    Path
  1.13      +3 -3      jakarta-avalon-excalibur/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/ant.properties.sample,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ant.properties.sample     23 Apr 2002 11:53:54 -0000      1.12
  +++ ant.properties.sample     25 Apr 2002 02:29:39 -0000      1.13
  @@ -10,7 +10,7 @@
   # building all components. These values are overridable in component-specific
   # ant.properties files.
   #
  -# $Id: ant.properties.sample,v 1.12 2002/04/23 11:53:54 jefft Exp $
  +# $Id: ant.properties.sample,v 1.13 2002/04/25 02:29:39 jefft Exp $
   # 
-----------------------------------------------------------------------------
   
   
  @@ -39,8 +39,8 @@
   xalan.jar=${xalan.home}/xalan-2.2.0-D13.jar
   
   # ----- Logkit -----
  -avalon-logkit.home=${base.path}/jakarta-avalon-logkit/build/lib
  -avalon-logkit.jar=${avalon-logkit.home}/logkit.jar
  +logkit.home=${base.path}/jakarta-avalon-logkit/build/lib
  +logkit.jar=${logkit.home}/logkit.jar
   
   # ----- Avalon Framework -----
   avalon-framework.home=${base.path}/jakarta-avalon/build/lib
  
  
  
  1.21      +38 -4     jakarta-avalon-excalibur/depchecker.xml
  
  Index: depchecker.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/depchecker.xml,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- depchecker.xml    22 Apr 2002 10:09:12 -0000      1.20
  +++ depchecker.xml    25 Apr 2002 02:29:39 -0000      1.21
  @@ -3,7 +3,7 @@
   <!--
   ============================================================
                   Dependency updater
  -                   Version $Revision: 1.20 $
  +                   Version $Revision: 1.21 $
              Jeff Turner <[EMAIL PROTECTED]>
   
   This Ant script provides "functions" to check if
  @@ -137,7 +137,41 @@
       <!-- Dependency checking library                            -->
       <!-- ====================================================== -->
   
  -    <target name="checkCommon" description="Checks applying to all 
components" depends=""/>
  +    <!-- Print a warning if a deprecated property is being used. -->
  +    <target name="checkDeprecatedProp">
  +        <available type="file" file="${path}" property="prop.present"/>
  +        <antcall target="deprecatedProp.warn"/>
  +    </target>
  +    <target name="deprecatedProp.warn" if="prop.present">
  +        <echo>
  +            .---------------------------------------------------------------.
  +            | DEPRECATED PROPERTY WARNING                                   |
  +            |                                                               |
  +            |---------------------------------------------------------------|
  +            | While processing subproject:                                  |
  +            |   ${basedir}
  +            | The following deprecated property was found:                  |
  +            |   ${name}
  +            | Please replace it with:
  +            |   ${newname}
  +            |
  +            | The property may be defined in your project's ant.properties  |
  +            | file, Excalibur's root ant.properties, or the ant.properties  |
  +            | or build.properties in your home directory, ${user.home}
  +            | Please consult the subproject build.xml for a full list of    |
  +            | possible locations.                                           |
  +            '---------------------------------------------------------------'
  +        </echo>
  + 
  +    </target>
  +
  +    <target name="checkCommon" description="Checks applying to all 
components">
  +        <antcall target="checkDeprecatedProp">
  +            <param name="name" value="avalon-logkit.jar"/>
  +            <param name="path" value="${avalon-logkit.jar}"/>
  +            <param name="newname" value="logkit.jar"/>
  +        </antcall>
  +    </target>
   
       <target name="checkJUnit">
           <ant antfile="${depchecker.prefix}/depchecker.xml" 
target="checkRequiredClass">
  @@ -350,8 +384,8 @@
       </target>
       <target name="checkLogkit">
           <ant antfile="${depchecker.prefix}/depchecker.xml" 
target="checkRequiredFile">
  -            <property name="name" value="avalon-logkit.jar"/>
  -            <property name="path" value="${avalon-logkit.jar}"/>
  +            <property name="name" value="logkit.jar"/>
  +            <property name="path" value="${logkit.jar}"/>
           </ant>
       </target>
       <target name="checkLogger">
  
  
  
  1.13      +6 -6      jakarta-avalon-excalibur/all/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/all/ant.properties.sample,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ant.properties.sample     13 Apr 2002 08:30:05 -0000      1.12
  +++ ant.properties.sample     25 Apr 2002 02:29:39 -0000      1.13
  @@ -11,7 +11,7 @@
   # It is overridden by ../ant.properties and ~/build.properties
   # It overrides all default.properties files.
   #
  -# $Id: ant.properties.sample,v 1.12 2002/04/13 08:30:05 jefft Exp $
  +# $Id: ant.properties.sample,v 1.13 2002/04/25 02:29:39 jefft Exp $
   # 
-----------------------------------------------------------------------------
   # --------------------------------------------------
   #                REQUIRED LIBRARIES
  @@ -21,7 +21,7 @@
   # delete all subsequent jar sections
   #
   #avalon-framework.jar = 
${lib.repo}/avalon-framework-${avalon-framework-ver}.jar
  -#avalon-logkit.jar = ${lib.repo}/avalon-logkit.jar
  +#logkit.jar = ${lib.repo}/logkit.jar
   #excalibur-instrument.jar = 
${lib.repo}/excalibur-instrument-${excalibur-instrument.ver}.jar
   #excalibur-collections.jar = 
${lib.repo}/excalibur-collections-${excalibur-collections.ver}.jar
   #excalibur-concurrent.jar = 
${lib.repo}/excalibur-concurrent-${excalibur-concurrent.ver}.jar
  @@ -60,12 +60,12 @@
   
excalibur-concurrent.jar=${excalibur-concurrent.lib}/excalibur-concurrent-1.0.jar
   
   # ----- Avalon Logkit -----
  -avalon-logkit.home=${base.path}/jakarta-avalon-logkit
  -avalon-logkit.lib=${avalon-logkit.home}/build/lib
  -avalon-logkit.jar=${avalon-logkit.lib}/logkit.jar
  +logkit.home=${base.path}/jakarta-avalon-logkit
  +logkit.lib=${logkit.home}/build/lib
  +logkit.jar=${logkit.lib}/logkit.jar
   
   tools.dir = ${avalon-framework.home}/tools
  -avalon-logkit.jar = ${tools.dir}/ext/logkit.jar
  +logkit.jar = ${tools.dir}/ext/logkit.jar
   xml-apis.jar = ${tools.dir}/lib/xml-apis.jar
   xerces.jar = ${tools.dir}/lib/xerces-1.4.4.jar
   
  
  
  
  1.147     +3 -3      jakarta-avalon-excalibur/all/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/all/build.xml,v
  retrieving revision 1.146
  retrieving revision 1.147
  diff -u -r1.146 -r1.147
  --- build.xml 24 Apr 2002 05:15:40 -0000      1.146
  +++ build.xml 25 Apr 2002 02:29:39 -0000      1.147
  @@ -35,7 +35,7 @@
           <pathelement path="${build.classes}" />
           <pathelement location="${checkstyle.jar}"/>
           <pathelement location="${avalon-framework.jar}"/>
  -        <pathelement location="${avalon-logkit.jar}"/>
  +        <pathelement location="${logkit.jar}"/>
           <pathelement location="${excalibur-pool.jar}"/>
           <pathelement location="${excalibur-collections.jar}"/>
           <pathelement location="${excalibur-concurrent.jar}"/>
  @@ -512,7 +512,7 @@
           <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="${avalon-logkit.jar}" todir="${dist.dir}"/>
  +        <copy file="${logkit.jar}" todir="${dist.dir}"/>
           <copy file="${avalon-framework.jar}" todir="${dist.dir}"/>
   
           <mkdir dir="${dist.docs}"/>
  @@ -562,7 +562,7 @@
               </fileset>
           </copy>
   
  -        <copy file="${avalon-logkit.jar}" todir="${src.dist.lib}"/>
  +        <copy file="${logkit.jar}" todir="${src.dist.lib}"/>
           <copy file="${avalon-framework.jar}" todir="${src.dist.lib}"/>
   
           <copy todir="${src.dist.src}">
  
  
  
  1.9       +1 -1      jakarta-avalon-excalibur/all/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/all/default.properties,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- default.properties        22 Apr 2002 10:09:13 -0000      1.8
  +++ default.properties        25 Apr 2002 02:29:40 -0000      1.9
  @@ -84,7 +84,7 @@
   
   tools.dir=${basedir}/../../jakarta-avalon/tools
   
  -avalon-logkit.jar = ${tools.dir}/ext/logkit.jar
  +logkit.jar = ${tools.dir}/ext/logkit.jar
   xml-apis.jar = ${tools.dir}/lib/xml-apis.jar
   xerces.jar=${tools.dir}/lib/xerces-1.4.4.jar
   xalan.jar = ${tools.dir}/lib/xalan-2.2.0-D13.jar
  
  
  
  1.8       +6 -6      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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- build.xml 4 Apr 2002 07:09:25 -0000       1.7
  +++ build.xml 25 Apr 2002 02:29:40 -0000      1.8
  @@ -12,7 +12,7 @@
           value="${basedir}/../../../jakarta-avalon-excalibur"/>
       <property name="avalon-excalibur.proj"
           value="${avalon-excalibur.root.proj}/all"/>
  -    <property name="avalon-logkit.proj"
  +    <property name="logkit.proj"
           value="${basedir}/../../../jakarta-avalon-logkit"/>
       
       <!-- Existing Directories -->  
  @@ -64,13 +64,13 @@
           
           <!-- Avalon LogKit jars -->
           <condition property="logkit.jar.present">
  -            <available file="${avalon-logkit.proj}/build/lib/logkit.jar"/>
  +            <available file="${logkit.proj}/build/lib/logkit.jar"/>
           </condition>
           <condition property="logkit.jar.needbuild">
               <and>
  -                <available file="${avalon-logkit.proj}"/>    
  +                <available file="${logkit.proj}"/>   
                   <not>
  -                    <available 
file="${avalon-logkit.proj}/build/lib/logkit.jar"/>
  +                    <available file="${logkit.proj}/build/lib/logkit.jar"/>
                   </not>
               </and>
           </condition>
  @@ -145,12 +145,12 @@
       <!-- =================================================================== 
-->
       <target name="collect-logkit-build-jars-present"
           depends="find-projects" if="logkit.jar.present">
  -        <copy file="${avalon-logkit.proj}/build/lib/logkit.jar"
  +        <copy file="${logkit.proj}/build/lib/logkit.jar"
               todir="${commonlib.dir}" preservelastmodified="yes"/>
       </target>
       <target name="collect-logkit-build-jars-needbuild"
           depends="find-projects" if="logkit.jar.needbuild">
  -        <fail message="Please go to ${avalon-logkit.proj} and run build 
first."/>
  +        <fail message="Please go to ${logkit.proj} and run build first."/>
       </target>
       <target name="collect-logkit-build-jars"
           depends="collect-logkit-build-jars-present, 
collect-logkit-build-jars-needbuild"/>
  
  
  
  1.5       +4 -4      jakarta-avalon-excalibur/component/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/component/ant.properties.sample,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ant.properties.sample     10 Apr 2002 05:34:48 -0000      1.4
  +++ ant.properties.sample     25 Apr 2002 02:29:40 -0000      1.5
  @@ -10,7 +10,7 @@
   # It is overridden by ../ant.properties and ~/build.properties
   # It overrides all default.properties files and ~/.ant.properties
   #
  -# $Id: ant.properties.sample,v 1.4 2002/04/10 05:34:48 leif Exp $
  +# $Id: ant.properties.sample,v 1.5 2002/04/25 02:29:40 jefft Exp $
   # 
-----------------------------------------------------------------------------
   
   # ----- Compile Control Flags -----
  @@ -26,9 +26,9 @@
   #                REQUIRED LIBRARIES
   # --------------------------------------------------
   # ----- Avalon Logkit -----
  -avalon-logkit.home=${base.path}/jakarta-avalon-logkit
  -avalon-logkit.lib=${avalon-logkit.home}/build/lib
  -avalon-logkit.jar=${avalon-logkit.lib}/logkit.jar
  +logkit.home=${base.path}/jakarta-avalon-logkit
  +logkit.lib=${logkit.home}/build/lib
  +logkit.jar=${logkit.lib}/logkit.jar
   
   # ----- Avalon Framework, version 4.1 or later -----
   avalon-framework.home=${base.path}/jakarta-avalon
  
  
  
  1.15      +2 -1      jakarta-avalon-excalibur/component/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/component/build.xml,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- build.xml 16 Apr 2002 12:00:40 -0000      1.14
  +++ build.xml 25 Apr 2002 02:29:40 -0000      1.15
  @@ -13,7 +13,8 @@
       <path id="project.class.path">
           <pathelement path="${java.class.path}"/>
           <pathelement location="${build.classes}"/>
  -        <pathelement location="${avalon-logkit.jar}"/>
  +        <pathelement location="${avalon-logkit.jar}"/> <!-- deprecated -->
  +        <pathelement location="${logkit.jar}"/>
           <pathelement location="${avalon-framework.jar}"/>
           <pathelement location="${excalibur-collections.jar}"/>
           <pathelement location="${excalibur-logger.jar}"/>
  
  
  
  1.6       +3 -3      jakarta-avalon-excalibur/component/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/component/default.properties,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- default.properties        16 Apr 2002 12:00:40 -0000      1.5
  +++ default.properties        25 Apr 2002 02:29:40 -0000      1.6
  @@ -18,9 +18,9 @@
   
   
   # ----- Logkit -----
  -avalon-logkit.home=${basedir}/../../jakarta-avalon-logkit
  -avalon-logkit.lib=${avalon-logkit.home}/build/lib
  -avalon-logkit.jar=${avalon-logkit.lib}/logkit.jar
  +logkit.home=${basedir}/../../jakarta-avalon-logkit
  +logkit.lib=${logkit.home}/build/lib
  +logkit.jar=${logkit.lib}/logkit.jar
   
   # ----- Avalon Framework, version 4.1 or later -----
   avalon-framework.home=${basedir}/../../jakarta-avalon
  
  
  
  1.6       +4 -4      jakarta-avalon-excalibur/datasource/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon-excalibur/datasource/ant.properties.sample,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ant.properties.sample     22 Apr 2002 00:44:28 -0000      1.5
  +++ ant.properties.sample     25 Apr 2002 02:29:40 -0000      1.6
  @@ -10,7 +10,7 @@
   # It is overridden by ../ant.properties and ~/build.properties
   # It overrides all default.properties files and ~/.ant.properties
   #
  -# $Id: ant.properties.sample,v 1.5 2002/04/22 00:44:28 leif Exp $
  +# $Id: ant.properties.sample,v 1.6 2002/04/25 02:29:40 jefft Exp $
   # 
-----------------------------------------------------------------------------
   
   # ----- Compile Control Flags -----
  @@ -47,9 +47,9 @@
   avalon-framework.jar=${avalon-framework.lib}/avalon-framework.jar
   
   # ----- Logkit -----
  -avalon-logkit.home=${basedir}/../../jakarta-avalon-logkit
  -avalon-logkit.lib=${avalon-logkit.home}/build/lib
  -avalon-logkit.jar=${avalon-logkit.lib}/logkit.jar
  +logkit.home=${basedir}/../../jakarta-avalon-logkit
  +logkit.lib=${logkit.home}/build/lib
  +logkit.jar=${logkit.lib}/logkit.jar
   
   # ----- Excalibur instrument, version 1.0 or later -----
   excalibur-instrument.home=${basedir}/../pool/dist
  
  
  
  1.17      +2 -1      jakarta-avalon-excalibur/datasource/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/datasource/build.xml,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- build.xml 22 Apr 2002 03:04:26 -0000      1.16
  +++ build.xml 25 Apr 2002 02:29:40 -0000      1.17
  @@ -16,7 +16,8 @@
           <pathelement location="${checkstyle.jar}"/>
           <pathelement location="${jdbc.jar}"/>
           <pathelement location="${avalon-framework.jar}"/>
  -        <pathelement location="${avalon-logkit.jar}"/>
  +        <pathelement location="${avalon-logkit.jar}"/> <!-- deprecated -->
  +        <pathelement location="${logkit.jar}"/>
           <pathelement location="${excalibur-instrument.jar}"/>
           <pathelement location="${excalibur-pool.jar}"/>
       </path>
  
  
  
  1.9       +3 -3      jakarta-avalon-excalibur/datasource/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/datasource/default.properties,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- default.properties        22 Apr 2002 08:59:22 -0000      1.8
  +++ default.properties        25 Apr 2002 02:29:40 -0000      1.9
  @@ -22,9 +22,9 @@
   avalon-framework.jar=${avalon-framework.lib}/avalon-framework.jar
   
   # ----- Logkit -----
  -avalon-logkit.home=${basedir}/../../jakarta-avalon-logkit
  -avalon-logkit.lib=${avalon-logkit.home}/build/lib
  -avalon-logkit.jar=${avalon-logkit.lib}/logkit.jar
  +logkit.home=${basedir}/../../jakarta-avalon-logkit
  +logkit.lib=${logkit.home}/build/lib
  +logkit.jar=${logkit.lib}/logkit.jar
   
   # ----- Excalibur pool, version 1.0 or later -----
   excalibur-pool.home=${basedir}/../pool/dist
  
  
  
  1.13      +2 -1      jakarta-avalon-excalibur/fortress/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/build.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- build.xml 24 Apr 2002 18:29:29 -0000      1.12
  +++ build.xml 25 Apr 2002 02:29:40 -0000      1.13
  @@ -14,7 +14,8 @@
           <pathelement path="${java.class.path}"/>
           <pathelement location="${build.classes}"/>
           <pathelement location="${avalon-framework.jar}"/>
  -        <pathelement location="${avalon-logkit.jar}"/>
  +        <pathelement location="${avalon-logkit.jar}"/> <!-- deprecated -->
  +        <pathelement location="${logkit.jar}"/>
           <pathelement location="${excalibur-core.jar}"/>
           <pathelement location="${excalibur-scratchpad.jar}"/>
           <pathelement location="${excalibur-collections.jar}"/>
  
  
  
  1.8       +3 -3      jakarta-avalon-excalibur/fortress/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/default.properties,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- default.properties        24 Apr 2002 18:29:29 -0000      1.7
  +++ default.properties        25 Apr 2002 02:29:40 -0000      1.8
  @@ -69,9 +69,9 @@
   avalon-framework.jar=${avalon-framework.lib}/avalon-framework.jar
   
   # ----- Logkit -----
  -avalon-logkit.home=${basedir}/../../jakarta-avalon-logkit
  -avalon-logkit.lib=${avalon-logkit.home}/build/lib
  -avalon-logkit.jar=${avalon-logkit.lib}/logkit.jar
  +logkit.home=${basedir}/../../jakarta-avalon-logkit
  +logkit.lib=${logkit.home}/build/lib
  +logkit.jar=${logkit.lib}/logkit.jar
   
   # --------------------------------------------------
   #                REQUIRED LIBRARIES
  
  
  
  1.6       +4 -4      
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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ant.properties.sample     8 Apr 2002 10:32:10 -0000       1.5
  +++ ant.properties.sample     25 Apr 2002 02:29:40 -0000      1.6
  @@ -10,7 +10,7 @@
   # It is overridden by ../ant.properties and ~/build.properties
   # It overrides all default.properties files and ~/.ant.properties
   #
  -# $Id: ant.properties.sample,v 1.5 2002/04/08 10:32:10 jefft Exp $
  +# $Id: ant.properties.sample,v 1.6 2002/04/25 02:29:40 jefft Exp $
   # 
-----------------------------------------------------------------------------
   
   # ----- Compile Control Flags -----
  @@ -27,9 +27,9 @@
   # --------------------------------------------------
   
   # ----- Logkit -----
  -avalon-logkit.home=${basedir}/../../jakarta-avalon-logkit
  -avalon-logkit.lib=${avalon-logkit.home}/build/lib
  -avalon-logkit.jar=${avalon-logkit.lib}/logkit.jar
  +logkit.home=${basedir}/../../jakarta-avalon-logkit
  +logkit.lib=${logkit.home}/build/lib
  +logkit.jar=${logkit.lib}/logkit.jar
   
   # ----- Avalon Framework -----
   avalon-framework.home=${basedir}/../../jakarta-avalon
  
  
  
  1.25      +2 -1      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.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- build.xml 18 Apr 2002 04:29:29 -0000      1.24
  +++ build.xml 25 Apr 2002 02:29:40 -0000      1.25
  @@ -13,7 +13,8 @@
       <path id="project.class.path">
           <pathelement path="${java.class.path}"/>
           <pathelement location="${build.classes}"/>
  -        <pathelement location="${avalon-logkit.jar}"/>
  +        <pathelement location="${avalon-logkit.jar}"/> <!-- deprecated -->
  +        <pathelement location="${logkit.jar}"/>
           <pathelement location="${avalon-framework.jar}"/>
           <pathelement location="${excalibur-core.jar}"/>
           <pathelement location="${excalibur-collections.jar}"/>
  
  
  
  1.6       +3 -3      
jakarta-avalon-excalibur/instrument-manager/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon-excalibur/instrument-manager/default.properties,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- default.properties        16 Apr 2002 12:00:41 -0000      1.5
  +++ default.properties        25 Apr 2002 02:29:40 -0000      1.6
  @@ -17,9 +17,9 @@
   # --------------------------------------------------
   
   # ----- Logkit -----
  -avalon-logkit.home=${basedir}/../../jakarta-avalon-logkit
  -avalon-logkit.lib=${avalon-logkit.home}/build/lib
  -avalon-logkit.jar=${avalon-logkit.lib}/logkit.jar
  +logkit.home=${basedir}/../../jakarta-avalon-logkit
  +logkit.lib=${logkit.home}/build/lib
  +logkit.jar=${logkit.lib}/logkit.jar
   
   # ----- Avalon Framework -----
   avalon-framework.home=${basedir}/../../jakarta-avalon
  
  
  
  1.13      +2 -1      jakarta-avalon-excalibur/logger/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/logger/build.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- build.xml 16 Apr 2002 12:00:41 -0000      1.12
  +++ build.xml 25 Apr 2002 02:29:40 -0000      1.13
  @@ -13,7 +13,8 @@
       <path id="project.class.path">
           <pathelement path="${java.class.path}"/>
           <pathelement location="${build.classes}"/>
  -        <pathelement location="${avalon-logkit.jar}"/>
  +        <pathelement location="${avalon-logkit.jar}"/> <!-- deprecated -->
  +        <pathelement location="${logkit.jar}"/>
           <pathelement location="${avalon-framework.jar}"/>
           <pathelement location="${checkstyle.jar}"/>
       </path>
  
  
  
  1.6       +3 -3      jakarta-avalon-excalibur/logger/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/logger/default.properties,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- default.properties        16 Apr 2002 12:00:41 -0000      1.5
  +++ default.properties        25 Apr 2002 02:29:40 -0000      1.6
  @@ -24,9 +24,9 @@
   
   
   # ----- Logkit -----
  -avalon-logkit.home=${basedir}/../../jakarta-avalon-logkit
  -avalon-logkit.lib=${avalon-logkit.home}/build/lib
  -avalon-logkit.jar=${avalon-logkit.lib}/logkit.jar
  +logkit.home=${basedir}/../../jakarta-avalon-logkit
  +logkit.lib=${logkit.home}/build/lib
  +logkit.jar=${logkit.lib}/logkit.jar
   
   
   # --------------------------------------------------
  
  
  
  1.14      +7 -6      jakarta-avalon-excalibur/monitor/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/monitor/build.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- build.xml 23 Apr 2002 15:22:29 -0000      1.13
  +++ build.xml 25 Apr 2002 02:29:40 -0000      1.14
  @@ -13,17 +13,18 @@
       <path id="project.class.path">
           <pathelement path="${java.class.path}"/>
           <pathelement location="${build.classes}"/>
  -     <pathelement location="${avalon-framework.jar}"/>
  -      <pathelement location="${avalon-logkit.jar}"/>
  -     <pathelement location="${checkstyle.jar}"/>
  -      <pathelement location="${excalibur-logger.jar}"/>
  -      <pathelement location="${excalibur-sourceresolve.jar}"/>
  +        <pathelement location="${avalon-framework.jar}"/>
  +        <pathelement location="${avalon-logkit.jar}"/> <!-- deprecated -->
  +        <pathelement location="${logkit.jar}"/>
  +        <pathelement location="${checkstyle.jar}"/>
  +        <pathelement location="${excalibur-logger.jar}"/>
  +        <pathelement location="${excalibur-sourceresolve.jar}"/>
       </path>
   
       <path id="tools.class.path">
           <pathelement location="${junit.jar}"/>
           <pathelement location="${tools.jar}"/>
  -     <fileset dir="${tools.dir}/lib"/>
  +        <fileset dir="${tools.dir}/lib"/>
           <fileset dir="${tools.dir}/ext"/>
       </path>
   
  
  
  
  1.7       +3 -3      jakarta-avalon-excalibur/monitor/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/monitor/default.properties,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- default.properties        23 Apr 2002 15:22:29 -0000      1.6
  +++ default.properties        25 Apr 2002 02:29:40 -0000      1.7
  @@ -21,9 +21,9 @@
   avalon-framework.jar=${avalon-framework.lib}/avalon-framework.jar
   
   # ----- Logkit -----
  -avalon-logkit.home=${basedir}/../../jakarta-avalon-logkit
  -avalon-logkit.lib=${avalon-logkit.home}/build/lib
  -avalon-logkit.jar=${avalon-logkit.lib}/logkit.jar
  +logkit.home=${basedir}/../../jakarta-avalon-logkit
  +logkit.lib=${logkit.home}/build/lib
  +logkit.jar=${logkit.lib}/logkit.jar
   
   # ----- Excalibur logger, version 1.0 or later -----
   excalibur-logger.home=${basedir}/../logger/dist
  
  
  
  1.17      +2 -1      jakarta-avalon-excalibur/pool/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/pool/build.xml,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- build.xml 16 Apr 2002 12:00:42 -0000      1.16
  +++ build.xml 25 Apr 2002 02:29:40 -0000      1.17
  @@ -13,7 +13,8 @@
       <path id="project.class.path">
           <pathelement path="${java.class.path}"/>
           <pathelement location="${build.classes}"/>
  -        <pathelement location="${avalon-logkit.jar}"/>
  +        <pathelement location="${avalon-logkit.jar}"/> <!-- deprecated -->
  +        <pathelement location="${logkit.jar}"/>
           <pathelement location="${avalon-framework.jar}"/>
           <pathelement location="${excalibur-collections.jar}"/>
           <pathelement location="${excalibur-instrument.jar}"/>
  
  
  
  1.8       +3 -3      jakarta-avalon-excalibur/pool/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/pool/default.properties,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- default.properties        16 Apr 2002 12:00:42 -0000      1.7
  +++ default.properties        25 Apr 2002 02:29:40 -0000      1.8
  @@ -32,9 +32,9 @@
   
excalibur-instrument.jar=${excalibur-instrument.lib}/excalibur-instrument-0.1.jar
   
   # ----- Logkit -----
  -avalon-logkit.home=${basedir}/../../jakarta-avalon-logkit
  -avalon-logkit.lib=${avalon-logkit.home}/build/lib
  -avalon-logkit.jar=${avalon-logkit.lib}/logkit.jar
  +logkit.home=${basedir}/../../jakarta-avalon-logkit
  +logkit.lib=${logkit.home}/build/lib
  +logkit.jar=${logkit.lib}/logkit.jar
   
   # --------------------------------------------------
   #                OPTIONAL LIBRARIES
  
  
  
  1.14      +2 -1      jakarta-avalon-excalibur/testcase/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/testcase/build.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- build.xml 20 Apr 2002 11:58:16 -0000      1.13
  +++ build.xml 25 Apr 2002 02:29:40 -0000      1.14
  @@ -14,7 +14,8 @@
           <pathelement path="${java.class.path}"/>
           <pathelement location="${build.classes}"/>
           <pathelement location="${junit.jar}"/>
  -        <pathelement location="${avalon-logkit.jar}"/>
  +        <pathelement location="${avalon-logkit.jar}"/> <!-- deprecated -->
  +        <pathelement location="${logkit.jar}"/>
           <pathelement location="${avalon-framework.jar}"/>
           <pathelement location="${excalibur-logger.jar}"/>
           <pathelement location="${excalibur-component.jar}"/>
  
  
  
  1.5       +3 -3      jakarta-avalon-excalibur/testcase/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/testcase/default.properties,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- default.properties        16 Apr 2002 12:00:42 -0000      1.4
  +++ default.properties        25 Apr 2002 02:29:41 -0000      1.5
  @@ -18,9 +18,9 @@
   # --------------------------------------------------
   
   # ----- Logkit -----
  -avalon-logkit.home=${basedir}/../../jakarta-avalon-logkit
  -avalon-logkit.lib=${avalon-logkit.home}/build/lib
  -avalon-logkit.jar=${avalon-logkit.lib}/logkit.jar
  +logkit.home=${basedir}/../../jakarta-avalon-logkit
  +logkit.lib=${logkit.home}/build/lib
  +logkit.jar=${logkit.lib}/logkit.jar
   
   # ----- Avalon Framework, version 4.1 or later -----
   avalon-framework.home=${basedir}/../../jakarta-avalon
  
  
  
  1.16      +2 -1      jakarta-avalon-excalibur/thread/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/thread/build.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- build.xml 16 Apr 2002 12:00:42 -0000      1.15
  +++ build.xml 25 Apr 2002 02:29:41 -0000      1.16
  @@ -13,7 +13,8 @@
       <path id="project.class.path">
           <pathelement path="${java.class.path}"/>
           <pathelement location="${build.classes}"/>
  -        <pathelement location="${avalon-logkit.jar}"/>
  +        <pathelement location="${avalon-logkit.jar}"/> <!-- deprecated -->
  +        <pathelement location="${logkit.jar}"/>
           <pathelement location="${avalon-framework.jar}"/>
           <pathelement location="${excalibur-threadcontext.jar}"/>
           <pathelement location="${excalibur-instrument.jar}"/>
  
  
  
  1.8       +3 -3      jakarta-avalon-excalibur/thread/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/thread/default.properties,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- default.properties        16 Apr 2002 12:00:42 -0000      1.7
  +++ default.properties        25 Apr 2002 02:29:41 -0000      1.8
  @@ -38,9 +38,9 @@
   
excalibur-instrument.jar=${excalibur-instrument.lib}/excalibur-instrument-0.1.jar
   
   # ----- Logkit -----
  -avalon-logkit.home=${basedir}/../../jakarta-avalon-logkit
  -avalon-logkit.lib=${avalon-logkit.home}/build/lib
  -avalon-logkit.jar=${avalon-logkit.lib}/logkit.jar
  +logkit.home=${basedir}/../../jakarta-avalon-logkit
  +logkit.lib=${logkit.home}/build/lib
  +logkit.jar=${logkit.lib}/logkit.jar
   
   
   # --------------------------------------------------
  
  
  
  1.16      +2 -1      jakarta-avalon-excalibur/xmlbundle/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/xmlbundle/build.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- build.xml 24 Apr 2002 18:27:42 -0000      1.15
  +++ build.xml 25 Apr 2002 02:29:41 -0000      1.16
  @@ -15,7 +15,8 @@
           <pathelement location="${build.classes}"/>
           <pathelement location="${avalon-framework.jar}"/>
           <pathelement location="${excalibur-logger.jar}"/>
  -        <pathelement location="${avalon-logkit.jar}"/>
  +        <pathelement location="${avalon-logkit.jar}"/> <!-- deprecated -->
  +        <pathelement location="${logkit.jar}"/>
           <pathelement location="${excalibur-component.jar}"/>
           <pathelement location="${excalibur-pool.jar}"/>
        <pathelement location="${excalibur-sourceresolve.jar}"/>
  
  
  
  1.9       +3 -3      jakarta-avalon-excalibur/xmlbundle/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/xmlbundle/default.properties,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- default.properties        24 Apr 2002 18:27:42 -0000      1.8
  +++ default.properties        25 Apr 2002 02:29:41 -0000      1.9
  @@ -21,9 +21,9 @@
   avalon-framework.jar=${avalon-framework.lib}/avalon-framework.jar
   
   # ----- Logkit -----
  -avalon-logkit.home=${basedir}/../../jakarta-avalon-logkit
  -avalon-logkit.lib=${avalon-logkit.home}/build/lib
  -avalon-logkit.jar=${avalon-logkit.lib}/logkit.jar
  +logkit.home=${basedir}/../../jakarta-avalon-logkit
  +logkit.lib=${logkit.home}/build/lib
  +logkit.jar=${logkit.lib}/logkit.jar
   
   # ----- Excalibur logger, version 1.0 or later -----
   excalibur-logger.home=${basedir}/../logger/dist
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to