You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by bl...@apache.org on 2003/04/21 22:29:45 UTC

cvs commit: avalon-excalibur/fortress/src/test/org/apache/avalon/fortress/util/test FullLifecycleComponent.java

bloritsch    2003/04/21 13:29:45

  Modified:    fortress/src/test/org/apache/avalon/fortress/impl/extensions/test
                        InstrumentableCreatorTestCase.java
               fortress/src/test/org/apache/avalon/fortress/impl/role/test
                        AbstractMetaInfoManagerTestCase.java
                        ConfigurableRoleManagerTestCase.java
                        FortressRoleManagerTestCase.java
                        Role2MetaInfoManagerTestCase.java
                        ServiceMetaManagerTestCase.java
               fortress/src/test/org/apache/avalon/fortress/test
                        HandlersTestCase.java MetaInfoEntryTestCase.java
                        RoleEntryTestCase.java
               fortress/src/test/org/apache/avalon/fortress/util/test
                        FullLifecycleComponent.java
  Log:
  optimize imports
  
  Revision  Changes    Path
  1.2       +3 -5      avalon-excalibur/fortress/src/test/org/apache/avalon/fortress/impl/extensions/test/InstrumentableCreatorTestCase.java
  
  Index: InstrumentableCreatorTestCase.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/src/test/org/apache/avalon/fortress/impl/extensions/test/InstrumentableCreatorTestCase.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- InstrumentableCreatorTestCase.java	21 Apr 2003 19:53:47 -0000	1.1
  +++ InstrumentableCreatorTestCase.java	21 Apr 2003 20:29:42 -0000	1.2
  @@ -50,15 +50,13 @@
   package org.apache.avalon.fortress.impl.extensions.test;
   
   import junit.framework.TestCase;
  -import junit.framework.Assert;
  -import org.apache.avalon.lifecycle.Creator;
   import org.apache.avalon.fortress.impl.extensions.InstrumentableCreator;
  -import org.apache.avalon.framework.context.Context;
   import org.apache.avalon.framework.context.DefaultContext;
  -import org.apache.excalibur.instrument.Instrumentable;
  -import org.apache.excalibur.instrument.InstrumentManager;
  +import org.apache.avalon.lifecycle.Creator;
   import org.apache.excalibur.instrument.Instrument;
   import org.apache.excalibur.instrument.InstrumentManageable;
  +import org.apache.excalibur.instrument.InstrumentManager;
  +import org.apache.excalibur.instrument.Instrumentable;
   
   /**
    * InstrumentableCreatorTestCase does XYZ
  
  
  
  1.2       +1 -1      avalon-excalibur/fortress/src/test/org/apache/avalon/fortress/impl/role/test/AbstractMetaInfoManagerTestCase.java
  
  Index: AbstractMetaInfoManagerTestCase.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/src/test/org/apache/avalon/fortress/impl/role/test/AbstractMetaInfoManagerTestCase.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AbstractMetaInfoManagerTestCase.java	21 Apr 2003 18:34:54 -0000	1.1
  +++ AbstractMetaInfoManagerTestCase.java	21 Apr 2003 20:29:42 -0000	1.2
  @@ -50,8 +50,8 @@
   package org.apache.avalon.fortress.impl.role.test;
   
   import junit.framework.TestCase;
  -import org.apache.avalon.fortress.MetaInfoManager;
   import org.apache.avalon.fortress.MetaInfoEntry;
  +import org.apache.avalon.fortress.MetaInfoManager;
   
   /**
    * AbstractMetaInfoManagerTestCase does XYZ
  
  
  
  1.2       +2 -2      avalon-excalibur/fortress/src/test/org/apache/avalon/fortress/impl/role/test/ConfigurableRoleManagerTestCase.java
  
  Index: ConfigurableRoleManagerTestCase.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/src/test/org/apache/avalon/fortress/impl/role/test/ConfigurableRoleManagerTestCase.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ConfigurableRoleManagerTestCase.java	21 Apr 2003 18:05:02 -0000	1.1
  +++ ConfigurableRoleManagerTestCase.java	21 Apr 2003 20:29:42 -0000	1.2
  @@ -49,9 +49,9 @@
   */
   package org.apache.avalon.fortress.impl.role.test;
   
  +import org.apache.avalon.fortress.impl.role.ConfigurableRoleManager;
   import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
   import org.apache.avalon.framework.logger.ConsoleLogger;
  -import org.apache.avalon.fortress.impl.role.ConfigurableRoleManager;
   
   
   /**
  
  
  
  1.2       +2 -2      avalon-excalibur/fortress/src/test/org/apache/avalon/fortress/impl/role/test/FortressRoleManagerTestCase.java
  
  Index: FortressRoleManagerTestCase.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/src/test/org/apache/avalon/fortress/impl/role/test/FortressRoleManagerTestCase.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- FortressRoleManagerTestCase.java	21 Apr 2003 18:05:02 -0000	1.1
  +++ FortressRoleManagerTestCase.java	21 Apr 2003 20:29:42 -0000	1.2
  @@ -49,8 +49,8 @@
   */
   package org.apache.avalon.fortress.impl.role.test;
   
  -import org.apache.avalon.framework.logger.ConsoleLogger;
   import org.apache.avalon.fortress.impl.role.FortressRoleManager;
  +import org.apache.avalon.framework.logger.ConsoleLogger;
   
   /**
    * Configurable RoleManager implementation.  It populates the RoleManager
  
  
  
  1.2       +1 -2      avalon-excalibur/fortress/src/test/org/apache/avalon/fortress/impl/role/test/Role2MetaInfoManagerTestCase.java
  
  Index: Role2MetaInfoManagerTestCase.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/src/test/org/apache/avalon/fortress/impl/role/test/Role2MetaInfoManagerTestCase.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Role2MetaInfoManagerTestCase.java	21 Apr 2003 18:34:54 -0000	1.1
  +++ Role2MetaInfoManagerTestCase.java	21 Apr 2003 20:29:42 -0000	1.2
  @@ -49,9 +49,8 @@
   */
   package org.apache.avalon.fortress.impl.role.test;
   
  -import junit.framework.TestCase;
  -import org.apache.avalon.fortress.impl.role.Role2MetaInfoManager;
   import org.apache.avalon.fortress.impl.role.FortressRoleManager;
  +import org.apache.avalon.fortress.impl.role.Role2MetaInfoManager;
   import org.apache.avalon.framework.logger.ConsoleLogger;
   
   /**
  
  
  
  1.2       +3 -3      avalon-excalibur/fortress/src/test/org/apache/avalon/fortress/impl/role/test/ServiceMetaManagerTestCase.java
  
  Index: ServiceMetaManagerTestCase.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/src/test/org/apache/avalon/fortress/impl/role/test/ServiceMetaManagerTestCase.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ServiceMetaManagerTestCase.java	21 Apr 2003 18:34:54 -0000	1.1
  +++ ServiceMetaManagerTestCase.java	21 Apr 2003 20:29:42 -0000	1.2
  @@ -49,11 +49,11 @@
   */
   package org.apache.avalon.fortress.impl.role.test;
   
  -import org.apache.avalon.fortress.impl.role.ServiceMetaManager;
  -import org.apache.avalon.fortress.impl.handler.ThreadSafeComponentHandler;
  -import org.apache.avalon.fortress.impl.handler.PoolableComponentHandler;
   import org.apache.avalon.fortress.impl.handler.FactoryComponentHandler;
   import org.apache.avalon.fortress.impl.handler.PerThreadComponentHandler;
  +import org.apache.avalon.fortress.impl.handler.PoolableComponentHandler;
  +import org.apache.avalon.fortress.impl.handler.ThreadSafeComponentHandler;
  +import org.apache.avalon.fortress.impl.role.ServiceMetaManager;
   import org.apache.avalon.fortress.test.data.*;
   import org.apache.avalon.framework.container.ContainerUtil;
   import org.apache.avalon.framework.logger.NullLogger;
  
  
  
  1.13      +2 -6      avalon-excalibur/fortress/src/test/org/apache/avalon/fortress/test/HandlersTestCase.java
  
  Index: HandlersTestCase.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/src/test/org/apache/avalon/fortress/test/HandlersTestCase.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- HandlersTestCase.java	18 Apr 2003 20:02:31 -0000	1.12
  +++ HandlersTestCase.java	21 Apr 2003 20:29:43 -0000	1.13
  @@ -54,11 +54,7 @@
   import org.apache.avalon.fortress.ContainerManager;
   import org.apache.avalon.fortress.impl.DefaultContainer;
   import org.apache.avalon.fortress.impl.DefaultContainerManager;
  -import org.apache.avalon.fortress.test.data.BaseRole;
  -import org.apache.avalon.fortress.test.data.Role1;
  -import org.apache.avalon.fortress.test.data.Role2;
  -import org.apache.avalon.fortress.test.data.Role3;
  -import org.apache.avalon.fortress.test.data.Role4;
  +import org.apache.avalon.fortress.test.data.*;
   import org.apache.avalon.fortress.util.FortressConfig;
   import org.apache.avalon.framework.container.ContainerUtil;
   import org.apache.avalon.framework.service.ServiceManager;
  
  
  
  1.3       +3 -3      avalon-excalibur/fortress/src/test/org/apache/avalon/fortress/test/MetaInfoEntryTestCase.java
  
  Index: MetaInfoEntryTestCase.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/src/test/org/apache/avalon/fortress/test/MetaInfoEntryTestCase.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MetaInfoEntryTestCase.java	21 Apr 2003 17:40:17 -0000	1.2
  +++ MetaInfoEntryTestCase.java	21 Apr 2003 20:29:43 -0000	1.3
  @@ -52,13 +52,13 @@
   import junit.framework.TestCase;
   import org.apache.avalon.fortress.MetaInfoEntry;
   import org.apache.avalon.fortress.RoleEntry;
  -import org.apache.avalon.fortress.impl.handler.ThreadSafeComponentHandler;
  +import org.apache.avalon.fortress.impl.handler.FactoryComponentHandler;
   import org.apache.avalon.fortress.impl.handler.PerThreadComponentHandler;
   import org.apache.avalon.fortress.impl.handler.PoolableComponentHandler;
  -import org.apache.avalon.fortress.impl.handler.FactoryComponentHandler;
  +import org.apache.avalon.fortress.impl.handler.ThreadSafeComponentHandler;
  +import org.apache.avalon.fortress.test.data.BaseRole;
   import org.apache.avalon.fortress.test.data.Component1;
   import org.apache.avalon.fortress.test.data.Role1;
  -import org.apache.avalon.fortress.test.data.BaseRole;
   import org.apache.avalon.fortress.test.data.Role2;
   
   import java.util.*;
  
  
  
  1.2       +1 -1      avalon-excalibur/fortress/src/test/org/apache/avalon/fortress/test/RoleEntryTestCase.java
  
  Index: RoleEntryTestCase.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/src/test/org/apache/avalon/fortress/test/RoleEntryTestCase.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- RoleEntryTestCase.java	21 Apr 2003 17:40:17 -0000	1.1
  +++ RoleEntryTestCase.java	21 Apr 2003 20:29:44 -0000	1.2
  @@ -52,8 +52,8 @@
   import junit.framework.TestCase;
   import org.apache.avalon.fortress.RoleEntry;
   import org.apache.avalon.fortress.impl.handler.ThreadSafeComponentHandler;
  -import org.apache.avalon.fortress.test.data.Role1;
   import org.apache.avalon.fortress.test.data.Component1;
  +import org.apache.avalon.fortress.test.data.Role1;
   
   /**
    * RoleEntryTestCase tests the RoleEntry class.
  
  
  
  1.3       +14 -14    avalon-excalibur/fortress/src/test/org/apache/avalon/fortress/util/test/FullLifecycleComponent.java
  
  Index: FullLifecycleComponent.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/src/test/org/apache/avalon/fortress/util/test/FullLifecycleComponent.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- FullLifecycleComponent.java	21 Apr 2003 18:05:03 -0000	1.2
  +++ FullLifecycleComponent.java	21 Apr 2003 20:29:45 -0000	1.3
  @@ -49,24 +49,24 @@
   */
   package org.apache.avalon.fortress.util.test;
   
  -import org.apache.avalon.framework.logger.LogEnabled;
  -import org.apache.avalon.framework.logger.Logger;
  -import org.apache.avalon.framework.context.Contextualizable;
  +import org.apache.avalon.framework.activity.Disposable;
  +import org.apache.avalon.framework.activity.Initializable;
  +import org.apache.avalon.framework.activity.Startable;
  +import org.apache.avalon.framework.activity.Suspendable;
  +import org.apache.avalon.framework.configuration.Configurable;
  +import org.apache.avalon.framework.configuration.Configuration;
  +import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.framework.context.Context;
   import org.apache.avalon.framework.context.ContextException;
  +import org.apache.avalon.framework.context.Contextualizable;
  +import org.apache.avalon.framework.logger.LogEnabled;
  +import org.apache.avalon.framework.logger.Logger;
  +import org.apache.avalon.framework.parameters.ParameterException;
   import org.apache.avalon.framework.parameters.Parameterizable;
   import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.avalon.framework.parameters.ParameterException;
  -import org.apache.avalon.framework.configuration.Configurable;
  -import org.apache.avalon.framework.configuration.Configuration;
  -import org.apache.avalon.framework.configuration.ConfigurationException;
  -import org.apache.avalon.framework.service.Serviceable;
  -import org.apache.avalon.framework.service.ServiceManager;
   import org.apache.avalon.framework.service.ServiceException;
  -import org.apache.avalon.framework.activity.Initializable;
  -import org.apache.avalon.framework.activity.Startable;
  -import org.apache.avalon.framework.activity.Suspendable;
  -import org.apache.avalon.framework.activity.Disposable;
  +import org.apache.avalon.framework.service.ServiceManager;
  +import org.apache.avalon.framework.service.Serviceable;
   import org.apache.avalon.framework.thread.ThreadSafe;
   
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org