avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From blorit...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util ContextBuilder.java ContextManager.java
Date Thu, 02 May 2002 19:23:51 GMT
bloritsch    02/05/02 12:23:50

  Modified:    all/src/scratchpad/org/apache/avalon/excalibur/service
                        PooledProvider.java ServiceFactory.java
                        UnitInfo.java
               fortress build.xml default.properties
               fortress/src/java/org/apache/excalibur/fortress
                        AbstractContainer.java
               fortress/src/java/org/apache/excalibur/fortress/handler
                        PoolableComponentHandler.java
               fortress/src/java/org/apache/excalibur/fortress/util
                        ContextBuilder.java ContextManager.java
  Log:
  update to classes
  
  Revision  Changes    Path
  1.3       +1 -1      jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/service/PooledProvider.java
  
  Index: PooledProvider.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/service/PooledProvider.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PooledProvider.java	16 Mar 2002 00:05:48 -0000	1.2
  +++ PooledProvider.java	2 May 2002 19:23:50 -0000	1.3
  @@ -7,7 +7,7 @@
   
   package org.apache.avalon.excalibur.service;
   
  -import org.apache.avalon.excalibur.mpool.Pool;
  +import org.apache.excalibur.mpool.Pool;
   import org.apache.avalon.framework.activity.Disposable;
   
   /**
  
  
  
  1.9       +1 -1      jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/service/ServiceFactory.java
  
  Index: ServiceFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/service/ServiceFactory.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ServiceFactory.java	24 Mar 2002 09:56:41 -0000	1.8
  +++ ServiceFactory.java	2 May 2002 19:23:50 -0000	1.9
  @@ -12,7 +12,7 @@
   import java.util.Hashtable;
   import java.util.Map;
   import java.util.Vector;
  -import org.apache.avalon.excalibur.mpool.Pool;
  +import org.apache.excalibur.mpool.Pool;
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.framework.activity.Startable;
  
  
  
  1.5       +1 -1      jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/service/UnitInfo.java
  
  Index: UnitInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/all/src/scratchpad/org/apache/avalon/excalibur/service/UnitInfo.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- UnitInfo.java	16 Mar 2002 00:05:49 -0000	1.4
  +++ UnitInfo.java	2 May 2002 19:23:50 -0000	1.5
  @@ -10,7 +10,7 @@
   import java.io.InputStream;
   import java.util.Vector;
   import org.apache.avalon.excalibur.configuration.CascadingConfiguration;
  -import org.apache.avalon.excalibur.mpool.Pool;
  +import org.apache.excalibur.mpool.Pool;
   import org.apache.avalon.framework.CascadingException;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
  
  
  
  1.16      +4 -4      jakarta-avalon-excalibur/fortress/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/build.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- build.xml	26 Apr 2002 01:36:21 -0000	1.15
  +++ build.xml	2 May 2002 19:23:50 -0000	1.16
  @@ -16,7 +16,7 @@
           <pathelement location="${avalon-logkit.jar}"/> <!-- deprecated -->
           <pathelement location="${logkit.jar}"/>
           <pathelement location="${excalibur-core.jar}"/>
  -        <pathelement location="${excalibur-scratchpad.jar}"/>
  +	<!--        <pathelement location="${excalibur-scratchpad.jar}"/> -->
           <pathelement location="${excalibur-collections.jar}"/>
           <pathelement location="${excalibur-instrument.jar}"/>
           <pathelement location="${excalibur-instrument-manager.jar}"/>
  @@ -60,12 +60,12 @@
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkEvent"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkComponent"/>
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkLogger"/>
  -        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredClass">
  +	<!--        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredClass">
               <property name="name" value="excalibur-scratchpad.jar"/>
  -            <property name="class" value="org.apache.avalon.excalibur.mpool.PoolManager"/>
  +            <property name="class" value="org.apache.excalibur.mpool.PoolManager"/>
               <property name="classpath" value="${cp}"/>
               <property name="message" value="This class is defined in Excalibur's scratchpad,
and due to a recursive dependency with Fortress, may be commented out in the scratchpad jar's
build"/>
  -        </ant>
  +    </ant> -->
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkRequiredClass">
               <property name="name" value="xml-apis.jar"/>
               <property name="class" value="org.xml.sax.InputSource"/>
  
  
  
  1.11      +0 -6      jakarta-avalon-excalibur/fortress/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/default.properties,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- default.properties	27 Apr 2002 12:47:49 -0000	1.10
  +++ default.properties	2 May 2002 19:23:50 -0000	1.11
  @@ -16,12 +16,6 @@
   #                REQUIRED LIBRARIES
   # --------------------------------------------------
   
  -# ----- Excalibur Core -----
  -excalibur-core.home=${basedir}/../all
  -excalibur-core.lib=${excalibur-core.home}/build/lib
  -excalibur-core.jar=${excalibur-core.lib}/excalibur-core.jar
  -excalibur-scratchpad.jar=${excalibur-core.lib}/excalibur-scratchpad.jar
  -
   # ----- Excalibur collections, version 1.0 or later -----
   excalibur-collections.home=${basedir}/../collections/dist
   excalibur-collections.lib=${excalibur-collections.home}
  
  
  
  1.33      +2 -2      jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/AbstractContainer.java
  
  Index: AbstractContainer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/AbstractContainer.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- AbstractContainer.java	2 May 2002 17:33:02 -0000	1.32
  +++ AbstractContainer.java	2 May 2002 19:23:50 -0000	1.33
  @@ -16,10 +16,10 @@
   import org.apache.excalibur.fortress.handler.ComponentHandler;
   import org.apache.excalibur.fortress.util.ExcaliburRoleManager;
   import org.apache.excalibur.fortress.util.RoleManager;
  +import org.apache.excalibur.mpool.PoolManager;
   import org.apache.avalon.excalibur.collections.BucketMap;
   import org.apache.avalon.excalibur.collections.FixedSizeBuffer;
   import org.apache.avalon.excalibur.logger.LoggerManager;
  -import org.apache.avalon.excalibur.mpool.PoolManager;
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.framework.component.Component;
  @@ -44,7 +44,7 @@
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
    * @author <a href="mailto:proyal@apache.org">Peter Royal</a>
  - * @version CVS $Revision: 1.32 $ $Date: 2002/05/02 17:33:02 $
  + * @version CVS $Revision: 1.33 $ $Date: 2002/05/02 19:23:50 $
    */
   public abstract class AbstractContainer
       extends AbstractLogEnabled
  
  
  
  1.17      +3 -3      jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/PoolableComponentHandler.java
  
  Index: PoolableComponentHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/PoolableComponentHandler.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- PoolableComponentHandler.java	13 Apr 2002 01:39:57 -0000	1.16
  +++ PoolableComponentHandler.java	2 May 2002 19:23:50 -0000	1.17
  @@ -10,8 +10,8 @@
   import org.apache.avalon.excalibur.instrument.Instrumentable;
   import org.apache.avalon.excalibur.instrument.Instrument;
   import org.apache.avalon.excalibur.logger.LoggerManager;
  -import org.apache.avalon.excalibur.mpool.Pool;
  -import org.apache.avalon.excalibur.mpool.PoolManager;
  +import org.apache.excalibur.mpool.Pool;
  +import org.apache.excalibur.mpool.PoolManager;
   import org.apache.excalibur.fortress.Container;
   import org.apache.excalibur.fortress.util.RoleManager;
   import org.apache.avalon.framework.activity.Disposable;
  @@ -26,7 +26,7 @@
    * and destroyed correctly.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.16 $ $Date: 2002/04/13 01:39:57 $
  + * @version CVS $Revision: 1.17 $ $Date: 2002/05/02 19:23:50 $
    * @since 4.0
    */
   public final class PoolableComponentHandler implements ComponentHandler, Instrumentable
  
  
  
  1.10      +1 -1      jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextBuilder.java
  
  Index: ContextBuilder.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextBuilder.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ContextBuilder.java	2 May 2002 17:33:02 -0000	1.9
  +++ ContextBuilder.java	2 May 2002 19:23:50 -0000	1.10
  @@ -3,8 +3,8 @@
   import java.io.File;
   import org.apache.avalon.excalibur.instrument.InstrumentManager;
   import org.apache.excalibur.event.Queue;
  +import org.apache.excalibur.mpool.PoolManager;
   import org.apache.avalon.excalibur.logger.LoggerManager;
  -import org.apache.avalon.excalibur.mpool.PoolManager;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.context.Context;
  
  
  
  1.18      +3 -3      jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextManager.java
  
  Index: ContextManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextManager.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- ContextManager.java	2 May 2002 17:33:02 -0000	1.17
  +++ ContextManager.java	2 May 2002 19:23:50 -0000	1.18
  @@ -14,8 +14,8 @@
   import org.apache.excalibur.event.command.CommandManager;
   import org.apache.avalon.excalibur.logger.LogKitLoggerManager;
   import org.apache.avalon.excalibur.logger.LoggerManager;
  -import org.apache.avalon.excalibur.mpool.DefaultPoolManager;
  -import org.apache.avalon.excalibur.mpool.PoolManager;
  +import org.apache.excalibur.mpool.DefaultPoolManager;
  +import org.apache.excalibur.mpool.PoolManager;
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.activity.Startable;
   import org.apache.avalon.framework.component.ComponentManager;
  @@ -61,7 +61,7 @@
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
    * @author <a href="mailto:leo.sutic@inspireinfrastructure.com">Leo Sutic</a>
    * @author <a href="mailto:proyal@apache.org">Peter Royal</a>
  - * @version CVS $Revision: 1.17 $ $Date: 2002/05/02 17:33:02 $
  + * @version CVS $Revision: 1.18 $ $Date: 2002/05/02 19:23:50 $
    * @since 4.1
    */
   public class ContextManager implements ContextManagerConstants
  
  
  

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