donaldp 2002/11/10 04:00:17
Modified: fortress/src/java/org/apache/excalibur/fortress
DefaultContainerManager.java
fortress/src/java/org/apache/excalibur/fortress/container
AbstractContainer.java
fortress/src/java/org/apache/excalibur/fortress/container/commands
PrepareHandlerCommand.java
fortress/src/java/org/apache/excalibur/fortress/handler
ComponentFactory.java
PerThreadComponentHandler.java
fortress/src/java/org/apache/excalibur/fortress/role
AbstractRoleManager.java
ConfigurableRoleManager.java
ExcaliburRoleManager.java
fortress/src/java/org/apache/excalibur/fortress/util
ContextBuilder.java ContextManager.java
OverridableServiceManager.java
Log:
Optimize imports/style
Revision Changes Path
1.37 +5 -5
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.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- DefaultContainerManager.java 10 Nov 2002 11:56:27 -0000 1.36
+++ DefaultContainerManager.java 10 Nov 2002 12:00:17 -0000 1.37
@@ -62,12 +62,12 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.DefaultServiceManager;
import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.excalibur.fortress.util.ContextManager;
-import org.apache.excalibur.fortress.role.RoleManager;
+import org.apache.excalibur.container.lifecycle.LifecycleExtensionManager;
import org.apache.excalibur.event.Queue;
-import org.apache.excalibur.mpool.PoolManager;
+import org.apache.excalibur.fortress.role.RoleManager;
+import org.apache.excalibur.fortress.util.ContextManager;
import org.apache.excalibur.instrument.InstrumentManager;
-import org.apache.excalibur.container.lifecycle.LifecycleExtensionManager;
+import org.apache.excalibur.mpool.PoolManager;
/**
* The ContainerManager is a single point of contact to manage your Container
1.14 +1 -2
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/container/AbstractContainer.java
Index: AbstractContainer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/container/AbstractContainer.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- AbstractContainer.java 10 Nov 2002 11:58:49 -0000 1.13
+++ AbstractContainer.java 10 Nov 2002 12:00:17 -0000 1.14
@@ -72,7 +72,6 @@
import org.apache.excalibur.container.lifecycle.LifecycleExtensionManager;
import org.apache.excalibur.event.Queue;
import org.apache.excalibur.fortress.Container;
-import org.apache.excalibur.fortress.ContainerConstants;
import org.apache.excalibur.fortress.container.commands.PrepareHandlerCommand;
import org.apache.excalibur.fortress.handler.ComponentFactory;
import org.apache.excalibur.fortress.handler.ComponentHandler;
1.3 +2 -2
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/container/commands/PrepareHandlerCommand.java
Index: PrepareHandlerCommand.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/container/commands/PrepareHandlerCommand.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PrepareHandlerCommand.java 9 Nov 2002 09:16:51 -0000 1.2
+++ PrepareHandlerCommand.java 10 Nov 2002 12:00:17 -0000 1.3
@@ -66,7 +66,7 @@
private final Logger m_logger;
public PrepareHandlerCommand( final ComponentHandler handler,
- final Logger logger )
+ final Logger logger )
{
m_handler = handler;
m_logger = ( null == logger ) ? new NullLogger() : logger;
1.36 +2 -2
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.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ComponentFactory.java 10 Nov 2002 11:39:37 -0000 1.35
+++ ComponentFactory.java 10 Nov 2002 12:00:17 -0000 1.36
@@ -54,11 +54,11 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.LogKit2AvalonLoggerAdapter;
import org.apache.avalon.framework.logger.Loggable;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceManager;
1.41 +1 -3
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.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- PerThreadComponentHandler.java 10 Nov 2002 11:41:02 -0000 1.40
+++ PerThreadComponentHandler.java 10 Nov 2002 12:00:17 -0000 1.41
@@ -48,8 +48,6 @@
*/
package org.apache.excalibur.fortress.handler;
-import org.apache.excalibur.mpool.ObjectFactory;
-
/**
* The ThreadSafeComponentHandler to make sure components are initialized
* and destroyed correctly.
1.2 +1 -2
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/role/AbstractRoleManager.java
Index: AbstractRoleManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/role/AbstractRoleManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractRoleManager.java 10 Nov 2002 02:39:50 -0000 1.1
+++ AbstractRoleManager.java 10 Nov 2002 12:00:17 -0000 1.2
@@ -53,7 +53,6 @@
import java.util.List;
import java.util.Map;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.excalibur.fortress.role.RoleManager;
/**
* The Excalibur Role Manager is used for Excalibur Role Mappings. All of
1.2 +1 -2
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/role/ConfigurableRoleManager.java
Index: ConfigurableRoleManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/role/ConfigurableRoleManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ConfigurableRoleManager.java 10 Nov 2002 02:39:50 -0000 1.1
+++ ConfigurableRoleManager.java 10 Nov 2002 12:00:17 -0000 1.2
@@ -55,7 +55,6 @@
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.excalibur.fortress.role.RoleManager;
/**
* Configurable RoleManager implementation. It populates the RoleManager
1.2 +1 -2
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/role/ExcaliburRoleManager.java
Index: ExcaliburRoleManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/role/ExcaliburRoleManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ExcaliburRoleManager.java 10 Nov 2002 02:39:50 -0000 1.1
+++ ExcaliburRoleManager.java 10 Nov 2002 12:00:17 -0000 1.2
@@ -52,7 +52,6 @@
import java.util.Collections;
import java.util.HashMap;
import org.apache.avalon.framework.activity.Initializable;
-import org.apache.excalibur.fortress.role.RoleManager;
/**
* The Excalibur Role Manager is used for Excalibur Role Mappings. All of
1.30 +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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ContextBuilder.java 10 Nov 2002 11:58:49 -0000 1.29
+++ ContextBuilder.java 10 Nov 2002 12:00:17 -0000 1.30
@@ -57,9 +57,9 @@
import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.excalibur.event.Queue;
+import org.apache.excalibur.fortress.role.RoleManager;
import org.apache.excalibur.instrument.InstrumentManager;
import org.apache.excalibur.mpool.PoolManager;
-import org.apache.excalibur.fortress.role.RoleManager;
/**
* Helper class to create a context for the ContextManager.
1.53 +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.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- ContextManager.java 10 Nov 2002 11:58:49 -0000 1.52
+++ ContextManager.java 10 Nov 2002 12:00:17 -0000 1.53
@@ -69,16 +69,16 @@
import org.apache.avalon.framework.service.DefaultServiceManager;
import org.apache.avalon.framework.service.DefaultServiceSelector;
import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.excalibur.event.Sink;
import org.apache.excalibur.event.Queue;
+import org.apache.excalibur.event.Sink;
import org.apache.excalibur.event.command.CommandManager;
import org.apache.excalibur.event.command.TPCThreadManager;
import org.apache.excalibur.event.command.ThreadManager;
import org.apache.excalibur.fortress.role.ConfigurableRoleManager;
import org.apache.excalibur.fortress.role.ExcaliburRoleManager;
import org.apache.excalibur.fortress.role.RoleManager;
-import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
import org.apache.excalibur.instrument.InstrumentManager;
+import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
import org.apache.excalibur.mpool.DefaultPoolManager;
import org.apache.excalibur.mpool.PoolManager;
import org.apache.excalibur.source.Source;
1.2 +2 -2
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/OverridableServiceManager.java
Index: OverridableServiceManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/OverridableServiceManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- OverridableServiceManager.java 10 Nov 2002 09:29:57 -0000 1.1
+++ OverridableServiceManager.java 10 Nov 2002 12:00:17 -0000 1.2
@@ -8,8 +8,8 @@
package org.apache.excalibur.fortress.util;
import org.apache.avalon.framework.service.DefaultServiceManager;
-import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
/**
* The OverridableServiceManager allows you to "null" out entries, even if they are
--
To unsubscribe, e-mail: <mailto:avalon-cvs-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@;jakarta.apache.org>
