donaldp 2002/11/07 18:32:31
Modified: fortress/src/java/org/apache/excalibur/fortress
AbstractContainer.java DefaultContainerManager.java
Kernel.java
fortress/src/java/org/apache/excalibur/fortress/container
MetaDataContainer.java
fortress/src/java/org/apache/excalibur/fortress/container/commands
DisposeComponentHandlerCommand.java
InitializeComponentHandlerCommand.java
fortress/src/java/org/apache/excalibur/fortress/handler
AbstractComponentHandler.java
PoolableComponentHandler.java
fortress/src/java/org/apache/excalibur/fortress/lookup
FortressServiceSelector.java
fortress/src/java/org/apache/excalibur/fortress/util
ContextManager.java
Log:
Whitespace and import optimization
Revision Changes Path
1.67 +4 -5
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.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- AbstractContainer.java 8 Nov 2002 02:20:43 -0000 1.66
+++ AbstractContainer.java 8 Nov 2002 02:32:30 -0000 1.67
@@ -54,9 +54,6 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-
-import org.apache.commons.collections.StaticBucketMap;
-import org.apache.commons.collections.BoundedFifoBuffer;
import org.apache.avalon.excalibur.logger.LoggerManager;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
@@ -71,7 +68,9 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
-import org.apache.excalibur.container.legacy.*;
+import org.apache.commons.collections.BoundedFifoBuffer;
+import org.apache.commons.collections.StaticBucketMap;
+import org.apache.excalibur.container.legacy.LegacyComponentManager;
import org.apache.excalibur.event.Queue;
import
org.apache.excalibur.fortress.container.commands.DisposeComponentHandlerCommand;
import
org.apache.excalibur.fortress.container.commands.InitializeComponentHandlerCommand;
1.32 +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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- DefaultContainerManager.java 8 Nov 2002 02:27:35 -0000 1.31
+++ DefaultContainerManager.java 8 Nov 2002 02:32:30 -0000 1.32
@@ -50,6 +50,8 @@
package org.apache.excalibur.fortress;
import org.apache.avalon.excalibur.logger.LoggerManager;
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.container.ContainerUtil;
@@ -59,8 +61,6 @@
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.activity.Initializable;
import org.apache.excalibur.fortress.util.ContextManager;
/**
1.3 +37 -38
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/Kernel.java
Index: Kernel.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/Kernel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Kernel.java 2 Nov 2002 00:03:44 -0000 1.2
+++ Kernel.java 8 Nov 2002 02:32:30 -0000 1.3
@@ -49,30 +49,29 @@
*/
package org.apache.excalibur.fortress;
+import java.util.Iterator;
+import java.util.Map;
+import org.apache.avalon.excalibur.logger.LoggerManager;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
-import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.container.ContainerUtil;
-import org.apache.avalon.framework.logger.NullLogger;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.DefaultContext;
+import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.logger.NullLogger;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.DefaultServiceManager;
-import org.apache.avalon.excalibur.logger.LoggerManager;
import org.apache.commons.collections.StaticBucketMap;
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.mpool.PoolManager;
-import org.apache.excalibur.mpool.DefaultPoolManager;
-import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
import org.apache.excalibur.instrument.InstrumentManager;
-
-import java.util.Map;
-import java.util.Iterator;
+import org.apache.excalibur.instrument.manager.DefaultInstrumentManager;
+import org.apache.excalibur.mpool.DefaultPoolManager;
+import org.apache.excalibur.mpool.PoolManager;
/**
* The Kernel sets up the Fortress containers and core services that are
@@ -144,7 +143,7 @@
public Kernel( String configURI )
throws Exception
{
- this ( configURI, new NullLogger() );
+ this( configURI, new NullLogger() );
}
/**
@@ -158,13 +157,13 @@
public Kernel( String configURI, Logger logger )
throws Exception
{
- if ( null == logger )
+ if( null == logger )
throw new IllegalArgumentException( "You must pass in a logger for " +
getClass().getName() + "'s
constructor" );
- if ( null == configURI )
+ if( null == configURI )
throw new IllegalArgumentException( "You must pass in a configuration
URI for " +
getClass().getName() + "'s
constructor" );
- m_rootContainers = new StaticBucketMap(17);
+ m_rootContainers = new StaticBucketMap( 17 );
m_rootContext = new DefaultContext();
m_kernelConfig = loadKernelConfig( logger, configURI );
m_loggerManager = initializeLoggerManager( logger );
@@ -174,16 +173,16 @@
public void initialize()
throws Exception
{
- Configuration[] containers = m_kernelConfig.getChildren("container");
- if ( containers.length == 0 )
- throw new ConfigurationException("There must be at least one
container!");
+ Configuration[] containers = m_kernelConfig.getChildren( "container" );
+ if( containers.length == 0 )
+ throw new ConfigurationException( "There must be at least one
container!" );
- m_serviceManager.put(LoggerManager.class.getName(), m_loggerManager );
+ m_serviceManager.put( LoggerManager.class.getName(), m_loggerManager );
// Set up the ThreadManager
- Configuration threadManagerConfig =
m_kernelConfig.getChild("thread-manager");
+ Configuration threadManagerConfig = m_kernelConfig.getChild(
"thread-manager" );
m_threadManager = new TPCThreadManager();
- initializeService(m_threadManager, "thread-manager", threadManagerConfig );
+ initializeService( m_threadManager, "thread-manager", threadManagerConfig
);
m_serviceManager.put( ThreadManager.class.getName(), m_threadManager );
// Set up the CommandManager and PoolManager
@@ -198,11 +197,11 @@
m_serviceManager.put( InstrumentManager.class.getName(),
m_instrumentManager );
m_serviceManager.makeReadOnly();
- for ( int i = 0; i < containers.length; i++ )
+ for( int i = 0; i < containers.length; i++ )
{
- Class klass = getClass().getClassLoader().loadClass(
containers[i].getAttribute("class") );
+ Class klass = getClass().getClassLoader().loadClass( containers[ i
].getAttribute( "class" ) );
Object container = klass.newInstance();
- initializeService( container, containers[i].getAttribute("name"),
containers[i] );
+ initializeService( container, containers[ i ].getAttribute( "name" ),
containers[ i ] );
}
}
@@ -211,7 +210,7 @@
disposeService( m_instrumentManager );
Iterator it = m_rootContainers.keySet().iterator();
- while ( it.hasNext() )
+ while( it.hasNext() )
{
disposeService( it.next() );
it.remove();
@@ -230,7 +229,7 @@
*/
public Object getRootContainer()
{
- return getRootContainer("default");
+ return getRootContainer( "default" );
}
/**
@@ -242,7 +241,7 @@
*/
public Object getRootContainer( String name )
{
- return m_rootContainers.get(name);
+ return m_rootContainers.get( name );
}
private Configuration loadKernelConfig( final Logger initLogger, final String
configURI )
@@ -251,7 +250,7 @@
Configuration config = null;
String uri = configURI;
- if ( configURI.endsWith(".jar") )
+ if( configURI.endsWith( ".jar" ) )
{
initLogger.debug( "The configuration URI is a jar file, looking
inside..." );
uri = "jar:" + uri + "!/META-INF/fortress/kernel.xconf";
@@ -267,7 +266,7 @@
{
Configuration config = null;
- if ( initLogger.isDebugEnabled() )
+ if( initLogger.isDebugEnabled() )
initLogger.debug( "Looking for the config here: " + configURI );
try
@@ -275,16 +274,16 @@
DefaultConfigurationBuilder builder = new
DefaultConfigurationBuilder();
config = builder.build( configURI );
}
- catch ( ConfigurationException ce )
+ catch( ConfigurationException ce )
{
throw ce;
}
- catch ( Exception e )
+ catch( Exception e )
{
throw new ConfigurationException( "Could not load configuration", e );
}
- if ( initLogger.isDebugEnabled() )
+ if( initLogger.isDebugEnabled() )
initLogger.debug( "Found and loaded configuration successfully" );
return config;
@@ -296,7 +295,7 @@
Configuration config = m_kernelConfig.getChild( "logger-manager" );
String loggerConfigURI = config.getAttribute( "config-uri", "" );
- if ( loggerConfigURI.equals("") )
+ if( loggerConfigURI.equals( "" ) )
{
initLogger.debug( "The logger configuration was completely local" );
}
@@ -314,7 +313,7 @@
{
Configuration config = getLoggerManagerConfig( logger );
LoggerManager logManager = (LoggerManager)getClass().getClassLoader()
- .loadClass(config.getAttribute( "class" ) ).newInstance();
+ .loadClass( config.getAttribute( "class" ) ).newInstance();
initializeService( logManager, logger, config );
return logManager;
}
@@ -330,7 +329,7 @@
private void initializeService( Object service, String name, Configuration
config )
throws Exception
{
- initializeService( service, m_loggerManager.getLoggerForCategory(name),
config );
+ initializeService( service, m_loggerManager.getLoggerForCategory( name ),
config );
}
/**
@@ -349,7 +348,7 @@
ContainerUtil.contextualize( service, m_rootContext );
ContainerUtil.service( service, m_serviceManager );
ContainerUtil.configure( service, config );
- ContainerUtil.parameterize( service, Parameters.fromConfiguration(config)
);
+ ContainerUtil.parameterize( service, Parameters.fromConfiguration( config )
);
ContainerUtil.initialize( service );
}
@@ -364,9 +363,9 @@
{
ContainerUtil.stop( service );
}
- catch (Exception e)
+ catch( Exception e )
{
- m_loggerManager.getDefaultLogger().error("Can't stop service, will
attempt to discontinue anyway", e);
+ m_loggerManager.getDefaultLogger().error( "Can't stop service, will
attempt to discontinue anyway", e );
}
ContainerUtil.dispose( service );
1.11 +5 -4
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/container/MetaDataContainer.java
Index: MetaDataContainer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/container/MetaDataContainer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MetaDataContainer.java 8 Nov 2002 01:58:31 -0000 1.10
+++ MetaDataContainer.java 8 Nov 2002 02:32:31 -0000 1.11
@@ -64,13 +64,14 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
-import org.apache.excalibur.container.classloader.*;
+import org.apache.excalibur.container.classloader.ComponentClassLoader;
+import org.apache.excalibur.container.classloader.JarEntries;
+import org.apache.excalibur.container.classloader.JarScanner;
import org.apache.excalibur.event.Queue;
import org.apache.excalibur.event.SinkException;
import org.apache.excalibur.event.command.Command;
-import org.apache.excalibur.fortress.Container;
-import org.apache.excalibur.fortress.ContainerManagerConstants;
import org.apache.excalibur.fortress.ContainerConstants;
+import org.apache.excalibur.fortress.ContainerManagerConstants;
import org.apache.excalibur.fortress.container.commands.CheckTypeInfoCommand;
import org.apache.excalibur.fortress.container.commands.CommandFinishedListener;
import org.apache.excalibur.fortress.lifecycle.LifecycleExtensionManager;
1.5 +2 -2
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/container/commands/DisposeComponentHandlerCommand.java
Index: DisposeComponentHandlerCommand.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/container/commands/DisposeComponentHandlerCommand.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DisposeComponentHandlerCommand.java 8 Nov 2002 00:54:14 -0000 1.4
+++ DisposeComponentHandlerCommand.java 8 Nov 2002 02:32:31 -0000 1.5
@@ -49,9 +49,9 @@
*/
package org.apache.excalibur.fortress.container.commands;
+import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.logger.NullLogger;
-import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.excalibur.event.command.Command;
import org.apache.excalibur.fortress.handler.ComponentHandler;
1.5 +2 -2
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/container/commands/InitializeComponentHandlerCommand.java
Index: InitializeComponentHandlerCommand.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/container/commands/InitializeComponentHandlerCommand.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- InitializeComponentHandlerCommand.java 8 Nov 2002 00:54:14 -0000 1.4
+++ InitializeComponentHandlerCommand.java 8 Nov 2002 02:32:31 -0000 1.5
@@ -49,9 +49,9 @@
*/
package org.apache.excalibur.fortress.container.commands;
+import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.logger.NullLogger;
-import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.excalibur.event.command.Command;
import org.apache.excalibur.fortress.handler.ComponentHandler;
1.28 +1 -2
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/AbstractComponentHandler.java
Index: AbstractComponentHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/AbstractComponentHandler.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- AbstractComponentHandler.java 8 Nov 2002 02:20:43 -0000 1.27
+++ AbstractComponentHandler.java 8 Nov 2002 02:32:31 -0000 1.28
@@ -57,7 +57,6 @@
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.excalibur.fortress.Container;
import org.apache.excalibur.fortress.ContainerConstants;
import org.apache.excalibur.fortress.lifecycle.LifecycleExtensionManager;
import org.apache.excalibur.instrument.AbstractInstrumentable;
1.37 +1 -2
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.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- PoolableComponentHandler.java 8 Nov 2002 01:58:31 -0000 1.36
+++ PoolableComponentHandler.java 8 Nov 2002 02:32:31 -0000 1.37
@@ -52,7 +52,6 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.excalibur.fortress.Container;
import org.apache.excalibur.fortress.ContainerConstants;
import org.apache.excalibur.fortress.lifecycle.LifecycleExtensionManager;
import org.apache.excalibur.mpool.Pool;
1.14 +2 -2
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/lookup/FortressServiceSelector.java
Index: FortressServiceSelector.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/lookup/FortressServiceSelector.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- FortressServiceSelector.java 8 Nov 2002 02:20:43 -0000 1.13
+++ FortressServiceSelector.java 8 Nov 2002 02:32:31 -0000 1.14
@@ -99,7 +99,7 @@
{
if( !handler.isInitialized() )
{
- ContainerUtil.initialize(handler );
+ ContainerUtil.initialize( handler );
}
final Object component = handler.get();
1.47 +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.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- ContextManager.java 8 Nov 2002 02:25:04 -0000 1.46
+++ ContextManager.java 8 Nov 2002 02:32:31 -0000 1.47
@@ -53,8 +53,8 @@
import java.util.Iterator;
import org.apache.avalon.excalibur.logger.LogKitLoggerManager;
import org.apache.avalon.excalibur.logger.LoggerManager;
-import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
--
To unsubscribe, e-mail: <mailto:avalon-cvs-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@;jakarta.apache.org>
