avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/xmlutil default.properties
Date Thu, 23 Jan 2003 22:57:12 GMT
mcconnell    2003/01/23 14:57:12

  Modified:    .        build.xml
               altrmi   default.properties
               component default.properties
               component/examples/instrument-manager default.properties
               datasource default.properties
               event    default.properties
               fortress default.properties
               logger   default.properties
               meta/src/java/org/apache/excalibur/meta/info/builder
                        XMLTypeCreator.java
               monitor  default.properties
               pool     build.xml default.properties
               pool/src/java/org/apache/avalon/excalibur/pool
                        AbstractPool.java
               thread   default.properties
               xfc      default.properties
               xmlutil  default.properties
  Log:
  Transition of excalibur-pool from excalibur-collections to commons-collections.  Bumped
version to 1.2 and updated related property files in dependent facilities.
  
  Revision  Changes    Path
  1.197     +3 -18     jakarta-avalon-excalibur/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/build.xml,v
  retrieving revision 1.196
  retrieving revision 1.197
  diff -u -r1.196 -r1.197
  --- build.xml	22 Jan 2003 20:38:24 -0000	1.196
  +++ build.xml	23 Jan 2003 22:57:04 -0000	1.197
  @@ -31,11 +31,6 @@
           <ant dir="altrmi" target="${subproject-target}"/>
       </target>
   
  -    <!-- Assembly (Merlin 2) -->
  -    <target name="prj-assembly" depends="prj-i18n, prj-configuration, prj-container,
prj-meta, prj-extension, prj-event, prj-collections, prj-concurrent, prj-util, prj-logger">
  -        <ant dir="assembly" target="${subproject-target}"/>
  -    </target>
  -
       <!-- Baxter -->
       <target name="prj-baxter">
           <ant dir="baxter" target="${subproject-target}"/>
  @@ -97,7 +92,7 @@
       </target>
   
       <!-- Fortress -->
  -    <target name="prj-fortress" depends="prj-altrmi, prj-assembly, prj-collections,
prj-container, prj-event, prj-instrument, prj-instrument-manager, prj-logger, prj-sourceresolve,
prj-threadcontext">
  +    <target name="prj-fortress" depends="prj-altrmi, prj-collections, prj-container,
prj-event, prj-instrument, prj-instrument-manager, prj-logger, prj-sourceresolve, prj-threadcontext">
           <ant dir="fortress" target="${subproject-target}"/>
       </target>
   
  @@ -141,16 +136,6 @@
           <ant dir="loader" target="${subproject-target}"/>
       </target>
   
  -    <!-- Meta -->
  -    <target name="prj-meta" depends="prj-i18n, prj-configuration">
  -        <ant dir="meta" target="${subproject-target}"/>
  -    </target>
  -
  -    <!-- Monitor -->
  -    <target name="prj-monitor" depends="prj-logger, prj-sourceresolve">
  -        <ant dir="monitor" target="${subproject-target}"/>
  -    </target>
  -
       <!-- Naming -->
       <target name="prj-naming">
           <ant dir="naming" target="${subproject-target}"/>
  @@ -213,10 +198,10 @@
                   prj-concurrent, prj-altrmi,
                   prj-container, prj-cache, prj-configuration, prj-event,
                   prj-thread, prj-monitor, prj-fortress, prj-datasource,
  -                prj-instrument, prj-store, prj-logger, prj-meta, prj-policy,
  +                prj-instrument, prj-store, prj-logger, prj-policy,
                   prj-pool, prj-util, prj-xmlutil,
                   prj-sourceresolve, prj-instrument-client,
  -                prj-instrument-manager, prj-component, prj-assembly,
  +                prj-instrument-manager, prj-component,
                   prj-testcase "/>
   
       <!-- ************************************************************ -->
  
  
  
  1.24      +1 -1      jakarta-avalon-excalibur/altrmi/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/altrmi/default.properties,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- default.properties	19 Jan 2003 18:03:52 -0000	1.23
  +++ default.properties	23 Jan 2003 22:57:06 -0000	1.24
  @@ -45,7 +45,7 @@
   # ----- Excalibur pool, version 1.1 or later -----
   excalibur-pool.home=${basedir}/../pool/dist
   excalibur-pool.lib=${excalibur-pool.home}
  -excalibur-pool.jar=${excalibur-pool.lib}/excalibur-pool-1.1.jar
  +excalibur-pool.jar=${excalibur-pool.lib}/excalibur-pool-1.2.jar
   
   # --------------------------------------------------
   
  
  
  
  1.18      +1 -1      jakarta-avalon-excalibur/component/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/component/default.properties,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- default.properties	28 Nov 2002 16:03:48 -0000	1.17
  +++ default.properties	23 Jan 2003 22:57:06 -0000	1.18
  @@ -46,7 +46,7 @@
   # ----- Excalibur pool, version 1.1 or later -----
   excalibur-pool.home=${basedir}/../pool/dist
   excalibur-pool.lib=${excalibur-pool.home}
  -excalibur-pool.jar=${excalibur-pool.lib}/excalibur-pool-1.1.jar
  +excalibur-pool.jar=${excalibur-pool.lib}/excalibur-pool-1.2.jar
   
   # ----- Excalibur i18n -----
   excalibur-i18n.home=${basedir}/../i18n/dist
  
  
  
  1.8       +1 -1      jakarta-avalon-excalibur/component/examples/instrument-manager/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/component/examples/instrument-manager/default.properties,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- default.properties	16 Nov 2002 22:54:25 -0000	1.7
  +++ default.properties	23 Jan 2003 22:57:06 -0000	1.8
  @@ -52,7 +52,7 @@
   
   # ----- Excalibur Pool -----
   excalibur-pool.home=${excalibur.dir}/pool/dist
  -excalibur-pool.jar=${excalibur-pool.home}/excalibur-pool-1.1.jar
  +excalibur-pool.jar=${excalibur-pool.home}/excalibur-pool-1.2.jar
   
   # ----- Excalibur instrument -----
   excalibur-instrument.home=${excalibur.dir}/instrument/dist
  
  
  
  1.16      +1 -1      jakarta-avalon-excalibur/datasource/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/datasource/default.properties,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- default.properties	16 Nov 2002 12:08:50 -0000	1.15
  +++ default.properties	23 Jan 2003 22:57:07 -0000	1.16
  @@ -29,7 +29,7 @@
   # ----- Excalibur pool, version 1.1 or later -----
   excalibur-pool.home=${basedir}/../pool/dist
   excalibur-pool.lib=${excalibur-pool.home}
  -excalibur-pool.jar=${excalibur-pool.lib}/excalibur-pool-1.1.jar
  +excalibur-pool.jar=${excalibur-pool.lib}/excalibur-pool-1.2.jar
   
   # ----- Excalibur instrument, version 1.0 or later -----
   excalibur-instrument.home=${basedir}/../instrument/dist
  
  
  
  1.29      +1 -1      jakarta-avalon-excalibur/event/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/event/default.properties,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- default.properties	22 Jan 2003 03:57:32 -0000	1.28
  +++ default.properties	23 Jan 2003 22:57:07 -0000	1.29
  @@ -51,7 +51,7 @@
   # ----- Excalibur Pool, version 1.0 or later -----
   excalibur-pool.home=${basedir}/../pool/dist
   excalibur-pool.lib=${excalibur-pool.home}
  -excalibur-pool.jar=${excalibur-pool.lib}/excalibur-pool-1.1.jar
  +excalibur-pool.jar=${excalibur-pool.lib}/excalibur-pool-1.2.jar
   
   # ----- Logkit -----
   logkit.home=${basedir}/../../jakarta-avalon-logkit
  
  
  
  1.53      +1 -1      jakarta-avalon-excalibur/fortress/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/default.properties,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- default.properties	22 Jan 2003 04:34:55 -0000	1.52
  +++ default.properties	23 Jan 2003 22:57:10 -0000	1.53
  @@ -118,7 +118,7 @@
   # ----- Excalibur Pool, version 1.0 or later -----
   excalibur-pool.home=${basedir}/../pool/dist
   excalibur-pool.lib=${excalibur-pool.home}
  -excalibur-pool.jar=${excalibur-pool.lib}/excalibur-pool-1.1.jar
  +excalibur-pool.jar=${excalibur-pool.lib}/excalibur-pool-1.2.jar
   
   # ----- Excalibur component, version 1.0 or later -----
   excalibur-component.home=${basedir}/../component/dist
  
  
  
  1.14      +1 -1      jakarta-avalon-excalibur/logger/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/logger/default.properties,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- default.properties	16 Nov 2002 12:26:34 -0000	1.13
  +++ default.properties	23 Jan 2003 22:57:11 -0000	1.14
  @@ -60,7 +60,7 @@
   # ----- Excalibur pool, version 1.1 or later -----
   excalibur-pool.home=${basedir}/../pool/dist
   excalibur-pool.lib=${excalibur-pool.home}
  -excalibur-pool.jar=${excalibur-pool.lib}/excalibur-pool-1.1.jar
  +excalibur-pool.jar=${excalibur-pool.lib}/excalibur-pool-1.2.jar
   
   # ----- Excalibur i18n, version 1.0 or later -----
   excalibur-i18n.home=${basedir}/../i18n/dist
  
  
  
  1.16      +2 -2      jakarta-avalon-excalibur/meta/src/java/org/apache/excalibur/meta/info/builder/XMLTypeCreator.java
  
  Index: XMLTypeCreator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/meta/src/java/org/apache/excalibur/meta/info/builder/XMLTypeCreator.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- XMLTypeCreator.java	19 Nov 2002 19:17:47 -0000	1.15
  +++ XMLTypeCreator.java	23 Jan 2003 22:57:11 -0000	1.16
  @@ -299,7 +299,7 @@
           // try both merlin and containerkit variants for this attribute
           //
   
  -        Configuration serviceRef = serviceRef = dependency.getChild( "reference" );
  +        Configuration serviceRef = dependency.getChild( "reference" );
           final ReferenceDescriptor service =
               buildReferenceDescriptor( serviceRef );
           final boolean optional =
  
  
  
  1.15      +1 -1      jakarta-avalon-excalibur/monitor/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/monitor/default.properties,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- default.properties	17 Jan 2003 08:48:02 -0000	1.14
  +++ default.properties	23 Jan 2003 22:57:11 -0000	1.15
  @@ -42,7 +42,7 @@
   # ----- Excalibur pool, version 1.1 or later -----
   excalibur-pool.home=${basedir}/../pool/dist
   excalibur-pool.lib=${excalibur-pool.home}
  -excalibur-pool.jar=${excalibur-pool.lib}/excalibur-pool-1.1.jar
  +excalibur-pool.jar=${excalibur-pool.lib}/excalibur-pool-1.2.jar
   
   # ----- Excalibur Testcase, version 1.0 or later -----
   excalibur-testcase.home=${basedir}/../testcase/dist
  
  
  
  1.28      +1 -3      jakarta-avalon-excalibur/pool/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/pool/build.xml,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- build.xml	10 Aug 2002 21:14:35 -0000	1.27
  +++ build.xml	23 Jan 2003 22:57:11 -0000	1.28
  @@ -13,7 +13,7 @@
       <path id="project.class.path">
           <pathelement location="${build.classes}"/>
           <pathelement location="${avalon-framework.jar}"/>
  -        <pathelement location="${excalibur-collections.jar}"/>
  +        <pathelement location="${commons-collections.jar}"/>
           <pathelement location="${excalibur-instrument.jar}"/>
           <pathelement location="${checkstyle.jar}"/>
           <pathelement path="${java.class.path}"/>
  @@ -42,7 +42,6 @@
       <target name="dependencies" description="Check dependencies" unless="skip.dependencies">
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkFramework"/>
  -        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCollections"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkInstrument"/>
       </target>
   
  @@ -53,7 +52,6 @@
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkJUnit"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkJUnitPerf"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkTestcase"/>
  -        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkLogkit"/>
       </target>
   
   
  
  
  
  1.15      +7 -8      jakarta-avalon-excalibur/pool/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/pool/default.properties,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- default.properties	16 Nov 2002 12:16:49 -0000	1.14
  +++ default.properties	23 Jan 2003 22:57:11 -0000	1.15
  @@ -8,8 +8,8 @@
   name=excalibur-pool
   Name=Excalibur Pool
   dir-name=pool
  -version=1.1
  -package-version=0.99
  +version=1.0
  +package-version=1.2
   year=2000-2002
   
   # --------------------------------------------------
  @@ -21,10 +21,9 @@
   avalon-framework.lib=${avalon-framework.home}/target/lib
   avalon-framework.jar=${avalon-framework.lib}/avalon-framework.jar
   
  -# ----- 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
  +commons-collections.home=../collections
  +commons-collections.lib=${commons-collections.home}/lib
  +commons-collections.jar=${commons-collections.lib}/commons-collections-2.0.jar
   
   # --------------------------------------------------
   #                OPTIONAL LIBRARIES
  @@ -90,10 +89,10 @@
   dist.javadocs = ${docs.dir}/api
   
   #  name of .zip/.tar.gz/.bz2 files and their top-level directory
  -dist.name = ${name}-${version}
  +dist.name = ${name}-${package-version}
   
   #  name of jar file
  -jar.name = ${name}-${version}.jar
  +jar.name = ${name}-${package-version}.jar
   
   #  property indicating directory where all distribution archives are placed
   dist.base = distributions
  
  
  
  1.6       +4 -4      jakarta-avalon-excalibur/pool/src/java/org/apache/avalon/excalibur/pool/AbstractPool.java
  
  Index: AbstractPool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/pool/src/java/org/apache/avalon/excalibur/pool/AbstractPool.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AbstractPool.java	7 Aug 2002 16:31:38 -0000	1.5
  +++ AbstractPool.java	23 Jan 2003 22:57:12 -0000	1.6
  @@ -9,8 +9,8 @@
   
   import java.util.ArrayList;
   import java.util.List;
  -import org.apache.avalon.excalibur.collections.Buffer;
  -import org.apache.avalon.excalibur.collections.VariableSizeBuffer;
  +import org.apache.commons.collections.Buffer; 
  +import org.apache.commons.collections.UnboundedFifoBuffer; 
   import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.framework.thread.ThreadSafe;
  @@ -29,7 +29,7 @@
       public static final int DEFAULT_POOL_SIZE = 8;
       protected final ObjectFactory m_factory;
       protected List m_active = new ArrayList();
  -    protected Buffer m_ready = new VariableSizeBuffer();
  +    protected Buffer m_ready = new UnboundedFifoBuffer();
       protected Mutex m_mutex = new Mutex();
       protected boolean m_initialized = false;
       protected int m_min;
  
  
  
  1.17      +1 -1      jakarta-avalon-excalibur/thread/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/thread/default.properties,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- default.properties	19 Jan 2003 15:13:05 -0000	1.16
  +++ default.properties	23 Jan 2003 22:57:12 -0000	1.17
  @@ -30,7 +30,7 @@
   # ----- Excalibur pool, version 1.1 or later -----
   excalibur-pool.home=${basedir}/../pool/dist
   excalibur-pool.lib=${excalibur-pool.home}
  -excalibur-pool.jar=${excalibur-pool.lib}/excalibur-pool-1.1.jar
  +excalibur-pool.jar=${excalibur-pool.lib}/excalibur-pool-1.2.jar
   
   # ----- Excalibur instrument, version 0.1 or later -----
   excalibur-instrument.home=${basedir}/../instrument/build
  
  
  
  1.7       +1 -1      jakarta-avalon-excalibur/xfc/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/xfc/default.properties,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- default.properties	16 Nov 2002 22:54:25 -0000	1.6
  +++ default.properties	23 Jan 2003 22:57:12 -0000	1.7
  @@ -44,7 +44,7 @@
   # ----- Excalibur Pool -----
   excalibur-pool.home=${basedir}/../pool
   excalibur-pool.lib=${excalibur-pool.home}/build/lib
  -excalibur-pool.jar=${excalibur-pool.lib}/excalibur-pool-1.1.jar
  +excalibur-pool.jar=${excalibur-pool.lib}/excalibur-pool-1.2.jar
   
   # ----- Excalibur SourceResolve -----
   excalibur-sourceresolve.home=${basedir}/../sourceresolve
  
  
  
  1.20      +2 -2      jakarta-avalon-excalibur/xmlutil/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/xmlutil/default.properties,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- default.properties	22 Jan 2003 02:16:26 -0000	1.19
  +++ default.properties	23 Jan 2003 22:57:12 -0000	1.20
  @@ -55,10 +55,10 @@
   excalibur-instrument.lib=${excalibur-instrument.home}
   excalibur-instrument.jar=${excalibur-instrument.lib}/excalibur-instrument-0.3.jar
   
  -# ----- Excalibur Pool, version 1.1 or later -----
  +# ----- Excalibur Pool, version 1.2 or later -----
   excalibur-pool.home=${basedir}/../pool/dist
   excalibur-pool.lib=${excalibur-pool.home}
  -excalibur-pool.jar=${excalibur-pool.lib}/excalibur-pool-1.1.jar
  +excalibur-pool.jar=${excalibur-pool.lib}/excalibur-pool-1.2.jar
   
   # ----- Excalibur Source Resolver, version 1.0 or later -----
   excalibur-sourceresolve.home=${basedir}/../sourceresolve/dist
  
  
  

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