You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by do...@apache.org on 2002/05/21 12:03:23 UTC
cvs commit: jakarta-avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger DefaultLogKitManager.java
donaldp 02/05/21 03:03:23
Modified: logger/src/java/org/apache/avalon/excalibur/logger
DefaultLogKitManager.java
Log:
Use ContainerUtil to handle lifecycle stuff.
Revision Changes Path
1.2 +18 -34 jakarta-avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/DefaultLogKitManager.java
Index: DefaultLogKitManager.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/logger/src/java/org/apache/avalon/excalibur/logger/DefaultLogKitManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultLogKitManager.java 4 Apr 2002 02:34:14 -0000 1.1
+++ DefaultLogKitManager.java 21 May 2002 10:03:23 -0000 1.2
@@ -16,9 +16,9 @@
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.LogKitLogger;
import org.apache.avalon.framework.logger.Loggable;
+import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.log.Hierarchy;
import org.apache.log.LogTarget;
import org.apache.log.Logger;
@@ -32,7 +32,7 @@
* supports the new framework Logger interface.
*
* @author <a href="mailto:giacomo@apache.org">Giacomo Pati</a>
- * @version CVS $Revision: 1.1 $ $Date: 2002/04/04 02:34:14 $
+ * @version CVS $Revision: 1.2 $ $Date: 2002/05/21 10:03:23 $
* @since 4.0
*/
public class DefaultLogKitManager
@@ -174,24 +174,17 @@
throws ConfigurationException
{
final DefaultLogTargetFactoryManager targetFactoryManager = new DefaultLogTargetFactoryManager();
- if( targetFactoryManager instanceof LogEnabled )
+ ContainerUtil.enableLogging( targetFactoryManager, getLogger() );
+ try
{
- targetFactoryManager.enableLogging( getLogger() );
+ ContainerUtil.contextualize( targetFactoryManager, m_context );
}
-
- if( targetFactoryManager instanceof Contextualizable )
+ catch( final ContextException ce )
{
- try
- {
- targetFactoryManager.contextualize( m_context );
- }
- catch( final ContextException ce )
- {
- throw new ConfigurationException( "cannot contextualize default factory manager", ce );
- }
+ final String message = "cannot contextualize default factory manager";
+ throw new ConfigurationException( message, ce );
}
-
- targetFactoryManager.configure( configuration );
+ ContainerUtil.configure( targetFactoryManager, configuration );
return targetFactoryManager;
}
@@ -208,21 +201,15 @@
{
final DefaultLogTargetManager targetManager = new DefaultLogTargetManager();
- if( targetManager instanceof LogEnabled )
+ ContainerUtil.enableLogging( targetManager, getLogger() );
+ try
{
- targetManager.enableLogging( getLogger() );
+ ContainerUtil.contextualize( targetManager, m_context );
}
-
- if( targetManager instanceof Contextualizable )
+ catch( final ContextException ce )
{
- try
- {
- targetManager.contextualize( m_context );
- }
- catch( final ContextException ce )
- {
- throw new ConfigurationException( "cannot contextualize factory manager", ce );
- }
+ final String message = "cannot contextualize factory manager";
+ throw new ConfigurationException( message, ce );
}
if( targetManager instanceof LogTargetFactoryManageable )
@@ -230,11 +217,7 @@
targetManager.setLogTargetFactoryManager( targetFactoryManager );
}
- if( targetManager instanceof Configurable )
- {
- targetManager.configure( configuration );
- }
-
+ ContainerUtil.configure( targetManager, configuration );
return targetManager;
}
@@ -278,7 +261,8 @@
fullCategory = parentCategory + Logger.CATEGORY_SEPARATOR + category;
}
- final Logger logger = m_hierarchy.getLoggerFor( fullCategory );
+ final Logger logger =
+ m_hierarchy.getLoggerFor( fullCategory );
m_loggers.put( fullCategory, logger );
if( getLogger().isDebugEnabled() )
{
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>