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/test/org/apache/excalibur/fortress/test ContainerProfile.java ContainerProfile.roles ContainerProfile.xconf TestContainer.java
Date Thu, 04 Apr 2002 16:04:29 GMT
bloritsch    02/04/04 08:04:29

  Modified:    fortress/src/java/org/apache/excalibur/fortress
                        AbstractContainer.java Container.java
                        ContainerConstants.java ContainerManager.java
                        ContainerManagerConstants.java
                        DefaultContainerManager.java
                        InitializationException.java
               fortress/src/java/org/apache/excalibur/fortress/handler
                        ComponentFactory.java ComponentHandler.java
                        FactoryComponentHandler.java
                        PerThreadComponentHandler.java
                        PoolableComponentHandler.java
                        ThreadSafeComponentHandler.java
               fortress/src/java/org/apache/excalibur/fortress/util
                        AbstractRoleManager.java
                        ConfigurableRoleManager.java ContextBuilder.java
                        ContextManager.java ContextManagerConstants.java
                        ExcaliburRoleManager.java OverridableContext.java
                        RoleManager.java
               fortress/src/test/org/apache/excalibur/fortress/test
                        ContainerProfile.java ContainerProfile.roles
                        ContainerProfile.xconf TestContainer.java
  Removed:     fortress/examples/src/java/org/apache/example/container
                        DefaultExampleProfilable.java ExampleContainer.java
                        ExampleProfilable.java Main.java
  Log:
  fix fortress package names to apache.excalibur.fortress.**
  
  Revision  Changes    Path
  1.28      +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.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- AbstractContainer.java	4 Apr 2002 13:17:48 -0000	1.27
  +++ AbstractContainer.java	4 Apr 2002 16:04:28 -0000	1.28
  @@ -5,7 +5,7 @@
    * version 1.1, a copy of which has been included with this distribution in
    * the LICENSE.txt file.
    */
  -package org.apache.avalon.excalibur.fortress;
  +package org.apache.excalibur.fortress;
   
   import java.lang.reflect.Constructor;
   import java.util.ArrayList;
  @@ -43,7 +43,7 @@
    * Manager can expose that to the instantiating class.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.27 $ $Date: 2002/04/04 13:17:48 $
  + * @version CVS $Revision: 1.28 $ $Date: 2002/04/04 16:04:28 $
    */
   public abstract class AbstractContainer
       extends AbstractLogEnabled
  
  
  
  1.11      +2 -2      jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/Container.java
  
  Index: Container.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/Container.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Container.java	3 Apr 2002 22:55:58 -0000	1.10
  +++ Container.java	4 Apr 2002 16:04:28 -0000	1.11
  @@ -5,7 +5,7 @@
    * version 1.1, a copy of which has been included with this distribution in
    * the LICENSE.txt file.
    */
  -package org.apache.avalon.excalibur.fortress;
  +package org.apache.excalibur.fortress;
   
   /**
    * The Container is an interface used to assist Container developers to obtain
  @@ -13,7 +13,7 @@
    * ContainerManager to the Container is through the Context object.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.10 $ $Date: 2002/04/03 22:55:58 $
  + * @version CVS $Revision: 1.11 $ $Date: 2002/04/04 16:04:28 $
    */
   public interface Container extends ContainerConstants
   {
  
  
  
  1.5       +2 -2      jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/ContainerConstants.java
  
  Index: ContainerConstants.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/ContainerConstants.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ContainerConstants.java	3 Apr 2002 22:55:58 -0000	1.4
  +++ ContainerConstants.java	4 Apr 2002 16:04:28 -0000	1.5
  @@ -5,7 +5,7 @@
    * version 1.1, a copy of which has been included with this distribution in
    * the LICENSE.txt file.
    */
  -package org.apache.avalon.excalibur.fortress;
  +package org.apache.excalibur.fortress;
   
   /**
    * Provides constants used to access the Context object for containers.
  @@ -13,7 +13,7 @@
    * so that they may create child containers in turn.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.4 $ $Date: 2002/04/03 22:55:58 $
  + * @version CVS $Revision: 1.5 $ $Date: 2002/04/04 16:04:28 $
    */
   public interface ContainerConstants
   {
  
  
  
  1.36      +2 -2      jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/ContainerManager.java
  
  Index: ContainerManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/ContainerManager.java,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- ContainerManager.java	4 Apr 2002 13:17:48 -0000	1.35
  +++ ContainerManager.java	4 Apr 2002 16:04:28 -0000	1.36
  @@ -5,7 +5,7 @@
    * version 1.1, a copy of which has been included with this distribution in
    * the LICENSE.txt file.
    */
  -package org.apache.avalon.excalibur.fortress;
  +package org.apache.excalibur.fortress;
   
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.activity.Initializable;
  @@ -54,7 +54,7 @@
    * </pre>
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.35 $ $Date: 2002/04/04 13:17:48 $
  + * @version CVS $Revision: 1.36 $ $Date: 2002/04/04 16:04:28 $
    */
   public interface ContainerManager extends Disposable, Initializable
   {
  
  
  
  1.5       +2 -2      jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/ContainerManagerConstants.java
  
  Index: ContainerManagerConstants.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/ContainerManagerConstants.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ContainerManagerConstants.java	3 Apr 2002 22:55:58 -0000	1.4
  +++ ContainerManagerConstants.java	4 Apr 2002 16:04:28 -0000	1.5
  @@ -5,7 +5,7 @@
    * version 1.1, a copy of which has been included with this distribution in
    * the LICENSE.txt file.
    */
  -package org.apache.avalon.excalibur.fortress;
  +package org.apache.excalibur.fortress;
   
   /**
    * Provides constants used to access the Context object for container managers.
  @@ -13,7 +13,7 @@
    * the initial context.
    *
    * @author <a href="mailto:leo.sutic@inspireinfrastructure.com">Leo Sutic</a>
  - * @version CVS $Revision: 1.4 $ $Date: 2002/04/03 22:55:58 $
  + * @version CVS $Revision: 1.5 $ $Date: 2002/04/04 16:04:28 $
    */
   public interface ContainerManagerConstants extends ContainerConstants
   {
  
  
  
  1.7       +3 -3      jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/DefaultContainerManager.java
  
  Index: DefaultContainerManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/DefaultContainerManager.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DefaultContainerManager.java	3 Apr 2002 22:55:58 -0000	1.6
  +++ DefaultContainerManager.java	4 Apr 2002 16:04:28 -0000	1.7
  @@ -5,10 +5,10 @@
    * version 1.1, a copy of which has been included with this distribution in
    * the LICENSE.txt file.
    */
  -package org.apache.avalon.excalibur.fortress;
  +package org.apache.excalibur.fortress;
   
   import org.apache.avalon.excalibur.logger.LoggerManager;
  -import org.apache.avalon.excalibur.fortress.util.ContextManager;
  +import org.apache.excalibur.fortress.util.ContextManager;
   import org.apache.avalon.excalibur.util.ComponentStateValidator;
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.activity.Initializable;
  @@ -40,7 +40,7 @@
    * </p>
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.6 $ $Date: 2002/04/03 22:55:58 $
  + * @version CVS $Revision: 1.7 $ $Date: 2002/04/04 16:04:28 $
    */
   public class DefaultContainerManager implements ContainerManager, ContainerManagerConstants
   {
  
  
  
  1.4       +2 -2      jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/InitializationException.java
  
  Index: InitializationException.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/InitializationException.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- InitializationException.java	3 Apr 2002 22:55:58 -0000	1.3
  +++ InitializationException.java	4 Apr 2002 16:04:28 -0000	1.4
  @@ -5,7 +5,7 @@
    * version 1.1, a copy of which has been included with this distribution in
    * the LICENSE.txt file.
    */
  -package org.apache.avalon.excalibur.fortress;
  +package org.apache.excalibur.fortress;
   
   import org.apache.avalon.framework.CascadingException;
   
  @@ -14,7 +14,7 @@
    * ContainerManager, and it is unable to create a new instance of your Container.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.3 $ $Date: 2002/04/03 22:55:58 $
  + * @version CVS $Revision: 1.4 $ $Date: 2002/04/04 16:04:28 $
    */
   public class InitializationException extends CascadingException
   {
  
  
  
  1.8       +3 -3      jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/ComponentFactory.java
  
  Index: ComponentFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/ComponentFactory.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ComponentFactory.java	4 Apr 2002 13:17:48 -0000	1.7
  +++ ComponentFactory.java	4 Apr 2002 16:04:28 -0000	1.8
  @@ -5,14 +5,14 @@
    * version 1.1, a copy of which has been included with this distribution in
    * the LICENSE.txt file.
    */
  -package org.apache.avalon.excalibur.fortress.handler;
  +package org.apache.excalibur.fortress.handler;
   
   import org.apache.avalon.excalibur.instrument.CounterInstrument;
   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.ObjectFactory;
  -import org.apache.avalon.excalibur.fortress.util.RoleManager;
  +import org.apache.excalibur.fortress.util.RoleManager;
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.framework.activity.Startable;
  @@ -33,7 +33,7 @@
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
    * @author <a href="mailto:paul@luminas.co.uk">Paul Russell</a>
  - * @version CVS $Revision: 1.7 $ $Date: 2002/04/04 13:17:48 $
  + * @version CVS $Revision: 1.8 $ $Date: 2002/04/04 16:04:28 $
    * @since 4.0
    */
   public class ComponentFactory
  
  
  
  1.7       +2 -2      jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/ComponentHandler.java
  
  Index: ComponentHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/ComponentHandler.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ComponentHandler.java	3 Apr 2002 23:02:56 -0000	1.6
  +++ ComponentHandler.java	4 Apr 2002 16:04:28 -0000	1.7
  @@ -5,7 +5,7 @@
    * version 1.1, a copy of which has been included with this distribution in
    * the LICENSE.txt file.
    */
  -package org.apache.avalon.excalibur.fortress.handler;
  +package org.apache.excalibur.fortress.handler;
   
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.activity.Initializable;
  @@ -19,7 +19,7 @@
    * The desire for a ComponentHandler is to manage the instances of a Component.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.6 $ $Date: 2002/04/03 23:02:56 $
  + * @version CVS $Revision: 1.7 $ $Date: 2002/04/04 16:04:28 $
    * @since 4.0
    */
   public interface ComponentHandler
  
  
  
  1.12      +4 -4      jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/FactoryComponentHandler.java
  
  Index: FactoryComponentHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/FactoryComponentHandler.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- FactoryComponentHandler.java	4 Apr 2002 13:17:48 -0000	1.11
  +++ FactoryComponentHandler.java	4 Apr 2002 16:04:28 -0000	1.12
  @@ -5,13 +5,13 @@
    * version 1.1, a copy of which has been included with this distribution in
    * the LICENSE.txt file.
    */
  -package org.apache.avalon.excalibur.fortress.handler;
  +package org.apache.excalibur.fortress.handler;
   
   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.fortress.Container;
  -import org.apache.avalon.excalibur.fortress.util.RoleManager;
  +import org.apache.excalibur.fortress.Container;
  +import org.apache.excalibur.fortress.util.RoleManager;
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.component.ComponentManager;
  @@ -24,7 +24,7 @@
    * and destroyed correctly.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.11 $ $Date: 2002/04/04 13:17:48 $
  + * @version CVS $Revision: 1.12 $ $Date: 2002/04/04 16:04:28 $
    * @since 4.0
    */
   public final class FactoryComponentHandler
  
  
  
  1.13      +4 -4      jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/PerThreadComponentHandler.java
  
  Index: PerThreadComponentHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/PerThreadComponentHandler.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- PerThreadComponentHandler.java	4 Apr 2002 13:17:48 -0000	1.12
  +++ PerThreadComponentHandler.java	4 Apr 2002 16:04:28 -0000	1.13
  @@ -5,13 +5,13 @@
    * version 1.1, a copy of which has been included with this distribution in
    * the LICENSE.txt file.
    */
  -package org.apache.avalon.excalibur.fortress.handler;
  +package org.apache.excalibur.fortress.handler;
   
   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.fortress.Container;
  -import org.apache.avalon.excalibur.fortress.util.RoleManager;
  +import org.apache.excalibur.fortress.Container;
  +import org.apache.excalibur.fortress.util.RoleManager;
   import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.configuration.Configuration;
  @@ -23,7 +23,7 @@
    * and destroyed correctly.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.12 $ $Date: 2002/04/04 13:17:48 $
  + * @version CVS $Revision: 1.13 $ $Date: 2002/04/04 16:04:28 $
    * @since 4.0
    */
   public final class PerThreadComponentHandler implements ComponentHandler
  
  
  
  1.15      +4 -4      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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- PoolableComponentHandler.java	4 Apr 2002 13:17:48 -0000	1.14
  +++ PoolableComponentHandler.java	4 Apr 2002 16:04:28 -0000	1.15
  @@ -5,15 +5,15 @@
    * version 1.1, a copy of which has been included with this distribution in
    * the LICENSE.txt file.
    */
  -package org.apache.avalon.excalibur.fortress.handler;
  +package org.apache.excalibur.fortress.handler;
   
   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.avalon.excalibur.fortress.Container;
  -import org.apache.avalon.excalibur.fortress.util.RoleManager;
  +import org.apache.excalibur.fortress.Container;
  +import org.apache.excalibur.fortress.util.RoleManager;
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.component.ComponentManager;
  @@ -26,7 +26,7 @@
    * and destroyed correctly.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.14 $ $Date: 2002/04/04 13:17:48 $
  + * @version CVS $Revision: 1.15 $ $Date: 2002/04/04 16:04:28 $
    * @since 4.0
    */
   public final class PoolableComponentHandler implements ComponentHandler
  
  
  
  1.11      +4 -4      jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/ThreadSafeComponentHandler.java
  
  Index: ThreadSafeComponentHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/ThreadSafeComponentHandler.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ThreadSafeComponentHandler.java	4 Apr 2002 13:17:48 -0000	1.10
  +++ ThreadSafeComponentHandler.java	4 Apr 2002 16:04:28 -0000	1.11
  @@ -5,13 +5,13 @@
    * version 1.1, a copy of which has been included with this distribution in
    * the LICENSE.txt file.
    */
  -package org.apache.avalon.excalibur.fortress.handler;
  +package org.apache.excalibur.fortress.handler;
   
   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.fortress.Container;
  -import org.apache.avalon.excalibur.fortress.util.RoleManager;
  +import org.apache.excalibur.fortress.Container;
  +import org.apache.excalibur.fortress.util.RoleManager;
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.activity.Startable;
   import org.apache.avalon.framework.component.Component;
  @@ -25,7 +25,7 @@
    * and destroyed correctly.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.10 $ $Date: 2002/04/04 13:17:48 $
  + * @version CVS $Revision: 1.11 $ $Date: 2002/04/04 16:04:28 $
    * @since 4.0
    */
   public final class ThreadSafeComponentHandler implements ComponentHandler
  
  
  
  1.6       +2 -2      jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/AbstractRoleManager.java
  
  Index: AbstractRoleManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/AbstractRoleManager.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AbstractRoleManager.java	4 Apr 2002 13:17:48 -0000	1.5
  +++ AbstractRoleManager.java	4 Apr 2002 16:04:28 -0000	1.6
  @@ -5,7 +5,7 @@
    * version 1.1, a copy of which has been included  with this distribution in
    * the LICENSE.txt file.
    */
  -package org.apache.avalon.excalibur.fortress.util;
  +package org.apache.excalibur.fortress.util;
   
   import java.util.ArrayList;
   import java.util.List;
  @@ -17,7 +17,7 @@
    * information is hard-coded.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.5 $ $Date: 2002/04/04 13:17:48 $
  + * @version CVS $Revision: 1.6 $ $Date: 2002/04/04 16:04:28 $
    * @since 4.1
    */
   public abstract class AbstractRoleManager
  
  
  
  1.7       +2 -2      jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ConfigurableRoleManager.java
  
  Index: ConfigurableRoleManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ConfigurableRoleManager.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ConfigurableRoleManager.java	4 Apr 2002 13:17:48 -0000	1.6
  +++ ConfigurableRoleManager.java	4 Apr 2002 16:04:28 -0000	1.7
  @@ -5,7 +5,7 @@
    * version 1.1, a copy of which has been included  with this distribution in
    * the LICENSE.txt file.
    */
  -package org.apache.avalon.excalibur.fortress.util;
  +package org.apache.excalibur.fortress.util;
   
   import java.util.Collections;
   import java.util.HashMap;
  @@ -20,7 +20,7 @@
    * in the org.apache.avalon.component package.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.6 $ $Date: 2002/04/04 13:17:48 $
  + * @version CVS $Revision: 1.7 $ $Date: 2002/04/04 16:04:28 $
    * @since 4.1
    */
   public class ConfigurableRoleManager
  
  
  
  1.7       +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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ContextBuilder.java	3 Apr 2002 23:13:46 -0000	1.6
  +++ ContextBuilder.java	4 Apr 2002 16:04:28 -0000	1.7
  @@ -1,4 +1,4 @@
  -package org.apache.avalon.excalibur.fortress.util;
  +package org.apache.excalibur.fortress.util;
   
   import java.io.File;
   import org.apache.avalon.excalibur.instrument.InstrumentManager;
  
  
  
  1.13      +2 -2      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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ContextManager.java	3 Apr 2002 23:13:46 -0000	1.12
  +++ ContextManager.java	4 Apr 2002 16:04:28 -0000	1.13
  @@ -5,7 +5,7 @@
    * version 1.1, a copy of which has been included  with this distribution in
    * the LICENSE.txt file.
    */
  -package org.apache.avalon.excalibur.fortress.util;
  +package org.apache.excalibur.fortress.util;
   
   import java.util.ArrayList;
   import java.util.Iterator;
  @@ -60,7 +60,7 @@
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
    * @author <a href="mailto:leo.sutic@inspireinfrastructure.com">Leo Sutic</a>
  - * @version CVS $Revision: 1.12 $ $Date: 2002/04/03 23:13:46 $
  + * @version CVS $Revision: 1.13 $ $Date: 2002/04/04 16:04:28 $
    * @since 4.1
    */
   public class ContextManager implements ContextManagerConstants
  
  
  
  1.5       +3 -3      jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextManagerConstants.java
  
  Index: ContextManagerConstants.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextManagerConstants.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ContextManagerConstants.java	3 Apr 2002 23:13:46 -0000	1.4
  +++ ContextManagerConstants.java	4 Apr 2002 16:04:28 -0000	1.5
  @@ -5,15 +5,15 @@
    * version 1.1, a copy of which has been included with this distribution in
    * the LICENSE.txt file.
    */
  -package org.apache.avalon.excalibur.fortress.util;
  +package org.apache.excalibur.fortress.util;
   
  -import org.apache.avalon.excalibur.fortress.ContainerManagerConstants;
  +import org.apache.excalibur.fortress.ContainerManagerConstants;
   
   /**
    * Provides constants used to access the Context object for containers.
    *
    * @author <a href="mailto:leo.sutic@inspireinfrastructure.com">Leo Sutic</a>
  - * @version CVS $Revision: 1.4 $ $Date: 2002/04/03 23:13:46 $
  + * @version CVS $Revision: 1.5 $ $Date: 2002/04/04 16:04:28 $
    */
   public interface ContextManagerConstants extends ContainerManagerConstants
   {
  
  
  
  1.7       +2 -2      jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ExcaliburRoleManager.java
  
  Index: ExcaliburRoleManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ExcaliburRoleManager.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ExcaliburRoleManager.java	4 Apr 2002 13:17:48 -0000	1.6
  +++ ExcaliburRoleManager.java	4 Apr 2002 16:04:28 -0000	1.7
  @@ -5,7 +5,7 @@
    * version 1.1, a copy of which has been included  with this distribution in
    * the LICENSE.txt file.
    */
  -package org.apache.avalon.excalibur.fortress.util;
  +package org.apache.excalibur.fortress.util;
   
   import java.util.Collections;
   import java.util.HashMap;
  @@ -15,7 +15,7 @@
    * information is hard-coded.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.6 $ $Date: 2002/04/04 13:17:48 $
  + * @version CVS $Revision: 1.7 $ $Date: 2002/04/04 16:04:28 $
    * @since 4.1
    */
   public class ExcaliburRoleManager
  
  
  
  1.6       +2 -2      jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/OverridableContext.java
  
  Index: OverridableContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/OverridableContext.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- OverridableContext.java	3 Apr 2002 23:13:46 -0000	1.5
  +++ OverridableContext.java	4 Apr 2002 16:04:28 -0000	1.6
  @@ -5,7 +5,7 @@
    * version 1.1, a copy of which has been included  with this distribution in
    * the LICENSE.txt file.
    */
  -package org.apache.avalon.excalibur.fortress.util;
  +package org.apache.excalibur.fortress.util;
   
   import org.apache.avalon.framework.context.Context;
   import org.apache.avalon.framework.context.ContextException;
  @@ -16,7 +16,7 @@
    * in a parent context.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.5 $ $Date: 2002/04/03 23:13:46 $
  + * @version CVS $Revision: 1.6 $ $Date: 2002/04/04 16:04:28 $
    * @since 4.1
    */
   public final class OverridableContext extends DefaultContext
  
  
  
  1.4       +2 -2      jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/RoleManager.java
  
  Index: RoleManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/RoleManager.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- RoleManager.java	3 Apr 2002 23:13:46 -0000	1.3
  +++ RoleManager.java	4 Apr 2002 16:04:28 -0000	1.4
  @@ -5,7 +5,7 @@
    * version 1.1, a copy of which has been included  with this distribution in
    * the LICENSE.txt file.
    */
  -package org.apache.avalon.excalibur.fortress.util;
  +package org.apache.excalibur.fortress.util;
   
   /**
    * RoleManager Interface, use this to specify the Components and how they
  @@ -13,7 +13,7 @@
    * relationship of shorthand names to classes, and classes to roles.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.3 $ $Date: 2002/04/03 23:13:46 $
  + * @version CVS $Revision: 1.4 $ $Date: 2002/04/04 16:04:28 $
    * @since 4.1
    */
   public interface RoleManager
  
  
  
  1.15      +6 -6      jakarta-avalon-excalibur/fortress/src/test/org/apache/excalibur/fortress/test/ContainerProfile.java
  
  Index: ContainerProfile.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/test/org/apache/excalibur/fortress/test/ContainerProfile.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ContainerProfile.java	4 Apr 2002 13:17:48 -0000	1.14
  +++ ContainerProfile.java	4 Apr 2002 16:04:28 -0000	1.15
  @@ -5,7 +5,7 @@
    * version 1.1, a copy of which has been included with this distribution in
    * the LICENSE.txt file.
    */
  -package org.apache.avalon.excalibur.fortress.test;
  +package org.apache.excalibur.fortress.test;
   
   import java.net.URL;
   import junit.framework.TestCase;
  @@ -14,10 +14,10 @@
   import org.apache.avalon.excalibur.datasource.DataSourceComponent;
   import org.apache.avalon.excalibur.logger.DefaultLogKitManager;
   import org.apache.avalon.excalibur.monitor.Monitor;
  -import org.apache.avalon.excalibur.fortress.ContainerManager;
  -import org.apache.avalon.excalibur.fortress.DefaultContainerManager;
  -import org.apache.avalon.excalibur.fortress.util.ContextBuilder;
  -import org.apache.avalon.excalibur.fortress.util.ContextManager;
  +import org.apache.excalibur.fortress.ContainerManager;
  +import org.apache.excalibur.fortress.DefaultContainerManager;
  +import org.apache.excalibur.fortress.util.ContextBuilder;
  +import org.apache.excalibur.fortress.util.ContextManager;
   import org.apache.avalon.excalibur.testcase.CascadingAssertionFailedError;
   import org.apache.avalon.excalibur.testcase.LatchedThreadGroup;
   import org.apache.avalon.excalibur.xml.Parser;
  @@ -33,7 +33,7 @@
    * Used as a basis for the PoolComparisonProfile Tests
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version $Id: ContainerProfile.java,v 1.14 2002/04/04 13:17:48 jefft Exp $
  + * @version $Id: ContainerProfile.java,v 1.15 2002/04/04 16:04:28 bloritsch Exp $
    */
   public final class ContainerProfile
       extends TestCase
  
  
  
  1.4       +3 -3      jakarta-avalon-excalibur/fortress/src/test/org/apache/excalibur/fortress/test/ContainerProfile.roles
  
  Index: ContainerProfile.roles
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/test/org/apache/excalibur/fortress/test/ContainerProfile.roles,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ContainerProfile.roles	3 Apr 2002 23:22:38 -0000	1.3
  +++ ContainerProfile.roles	4 Apr 2002 16:04:28 -0000	1.4
  @@ -2,17 +2,17 @@
     <role name="org.apache.avalon.excalibur.datasource.DataSourceComponent">
       <component shorthand="datasource"
                  class="org.apache.avalon.excalibur.datasource.JdbcDataSource"
  -               handler="org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler"/>
  +               handler="org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler"/>
     </role>
     <role name="org.apache.avalon.excalibur.monitor.Monitor">
       <component shorthand="monitor"
                  class="org.apache.avalon.excalibur.monitor.ActiveMonitor"
  -               handler="org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler"/>
  +               handler="org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler"/>
     </role>
     <role name="org.apache.avalon.excalibur.xml.Parser">
       <component shorthand="parser"
                  class="org.apache.avalon.excalibur.xml.JaxpParser"
  -               handler="org.apache.avalon.excalibur.fortress.handler.PoolableComponentHandler"/>
  +               handler="org.apache.excalibur.fortress.handler.PoolableComponentHandler"/>
     </role>
   </test>
   
  
  
  
  1.5       +3 -3      jakarta-avalon-excalibur/fortress/src/test/org/apache/excalibur/fortress/test/ContainerProfile.xconf
  
  Index: ContainerProfile.xconf
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/test/org/apache/excalibur/fortress/test/ContainerProfile.xconf,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ContainerProfile.xconf	3 Apr 2002 23:22:38 -0000	1.4
  +++ ContainerProfile.xconf	4 Apr 2002 16:04:28 -0000	1.5
  @@ -3,7 +3,7 @@
     <component id="test1"
           class="org.apache.avalon.excalibur.datasource.JdbcDataSource"
   	role="org.apache.avalon.excalibur.datasource.DataSourceComponent"
  -	handler="org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler"
  +	handler="org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler"
           logger="test">
       <pool-controller min="5" max="10">
         <keep-alive>SELECT 1 FROM groups</keep-alive>
  @@ -17,14 +17,14 @@
     <component id="test2"
           class="org.apache.avalon.excalibur.monitor.ActiveMonitor"
   	role="org.apache.avalon.excalibur.monitor.Monitor"
  -	handler="org.apache.avalon.excalibur.fortress.handler.ThreadSafeComponentHandler"
  +	handler="org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler"
   	logger="test">
       <thread priority="10" frequency="1"/>
     </component>
     <component id="test3"
           class="org.apache.avalon.excalibur.xml.JaxpParser"
   	role="org.apache.avalon.excalibur.xml.Parser"
  -	handler="org.apache.avalon.excalibur.fortress.handler.PoolableComponentHandler"
  +	handler="org.apache.excalibur.fortress.handler.PoolableComponentHandler"
   	logger="test">
       <parameter name="validate" value="false"/>
       <parameter name="namespace-prefixes" value="false"/>
  
  
  
  1.6       +3 -3      jakarta-avalon-excalibur/fortress/src/test/org/apache/excalibur/fortress/test/TestContainer.java
  
  Index: TestContainer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/test/org/apache/excalibur/fortress/test/TestContainer.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- TestContainer.java	3 Apr 2002 23:22:38 -0000	1.5
  +++ TestContainer.java	4 Apr 2002 16:04:28 -0000	1.6
  @@ -5,9 +5,9 @@
    * version 1.1, a copy of which has been included with this distribution in
    * the LICENSE.txt file.
    */
  -package org.apache.avalon.excalibur.fortress.test;
  +package org.apache.excalibur.fortress.test;
   
  -import org.apache.avalon.excalibur.fortress.AbstractContainer;
  +import org.apache.excalibur.fortress.AbstractContainer;
   import org.apache.avalon.framework.component.ComponentManager;
   
   /**
  @@ -16,7 +16,7 @@
    * Manager can expose that to the instantiating class.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.5 $ $Date: 2002/04/03 23:22:38 $
  + * @version CVS $Revision: 1.6 $ $Date: 2002/04/04 16:04:28 $
    */
   public final class TestContainer
       extends AbstractContainer
  
  
  

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