leif 2002/08/07 02:56:33
Modified: fortress/src/java/org/apache/excalibur/fortress/util
ContextManager.java
Log:
Simplify the shutdown code by making use of ContainerUtil
Revision Changes Path
1.34 +6 -13
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.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ContextManager.java 7 Aug 2002 04:55:55 -0000 1.33
+++ ContextManager.java 7 Aug 2002 09:56:33 -0000 1.34
@@ -331,15 +331,7 @@
try
{
- if( o instanceof Startable )
- {
- ( (Startable)o ).stop();
- }
-
- if( o instanceof Disposable )
- {
- ( (Disposable)o ).dispose();
- }
+ ContainerUtil.shutdown( o );
}
catch( Exception e )
{
@@ -773,19 +765,20 @@
lmLoggerName = logPrefix +
org.apache.log.Logger.CATEGORY_SEPARATOR
+ loggerManagerConfig.getAttribute( "logger",
"system.logkit" );
}
-
+
// Create the default logger for the Logger Manager.
org.apache.log.Logger lmDefaultLogger =
Hierarchy.getDefaultHierarchy().getLoggerFor(
lmDefaultLoggerName );
// The default logger is not used until after the logger conf
has been loaded
// so it is possible to configure the priority there.
lmDefaultLogger.setPriority( Priority.DEBUG );
-
+
+ // Create the logger for use internally by the Logger Manager.
org.apache.log.Logger lmLogger =
Hierarchy.getDefaultHierarchy().getLoggerFor( lmLoggerName );
lmLogger.setPriority( Priority.getPriorityForName(
loggerManagerConfig.getAttribute( "log-level", "DEBUG" ) ) );
-
+
// Setup the Logger Manager
LogKitLoggerManager logManager = new LogKitLoggerManager(
logPrefix, Hierarchy.getDefaultHierarchy(),
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
