leif 02/02/20 02:41:10
Modified: src/java/org/apache/avalon/excalibur/testcase
ExcaliburTestCase.java
Log:
Further clean up the way the logging is handled.
Revision Changes Path
1.19 +10 -19
jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/testcase/ExcaliburTestCase.java
Index: ExcaliburTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/testcase/ExcaliburTestCase.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ExcaliburTestCase.java 20 Feb 2002 10:24:54 -0000 1.18
+++ ExcaliburTestCase.java 20 Feb 2002 10:41:10 -0000 1.19
@@ -146,7 +146,7 @@
* </pre>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version $Id: ExcaliburTestCase.java,v 1.18 2002/02/20 10:24:54 leif Exp $
+ * @version $Id: ExcaliburTestCase.java,v 1.19 2002/02/20 10:41:10 leif Exp $
*/
public class ExcaliburTestCase
extends TestCase
@@ -195,22 +195,12 @@
/** Return the logger */
protected Logger getLogger()
{
- if ( null == m_logger )
- {
- m_logger = this.setupLogger( getName() );
- }
-
return m_logger;
}
/** Return the logger */
protected LogKitLogger getLogEnabledLogger()
{
- if ( null == m_logEnabledLogger )
- {
- m_logEnabledLogger = new LogKitLogger( this.getLogger() );
- }
-
return m_logEnabledLogger;
}
@@ -227,7 +217,7 @@
URL resource = this.getClass().getClassLoader().getResource(
resourceName );
// Set the logger for the initialization phase.
- m_logger = setupLogger( "testcase" );
+ setCurrentLogger( "testcase" );
if ( resource != null ) {
getLogger().debug("Loading resource " + resourceName);
@@ -312,7 +302,7 @@
{
String methodName = (String) tests.next();
this.setName( methodName );
- m_logger = null;
+ setCurrentLogger( methodName );
if ( this.getLogger().isDebugEnabled() )
{
@@ -360,9 +350,9 @@
}
/**
- * Set up logger configuration
+ * Sets the logger which will be returned by getLogger and
getLogEnabledLogger
*/
- final private Logger setupLogger( String name )
+ final private void setCurrentLogger( String name )
{
//FIXME(GP): This method should setup a LogConfigurator and
LogManager
// according to the configuration spec. not yet
completed/implemented
@@ -374,7 +364,8 @@
final StreamTarget target = new StreamTarget( System.out, formatter
);
logger.setLogTargets( new LogTarget[] { target } );
- return logger;
+ m_logger = logger;
+ m_logEnabledLogger = new LogKitLogger( m_logger );
}
/**
@@ -426,18 +417,18 @@
throws Exception
{
// Create a loggers for each of the managers so that they will get
the correct logger.
- m_logger = setupLogger( "rm" );
+ setCurrentLogger( "rm" );
final DefaultRoleManager roleManager = new DefaultRoleManager();
roleManager.setLogger( getLogger() );
roleManager.configure( confRM );
- m_logger = setupLogger( "lm" );
+ setCurrentLogger( "lm" );
final DefaultLogKitManager logKitManager = new
DefaultLogKitManager();
logKitManager.enableLogging( getLogEnabledLogger() );
logKitManager.contextualize( context );
logKitManager.configure( confLM );
- m_logger = setupLogger( "cm" );
+ setCurrentLogger( "cm" );
final ExcaliburComponentManager manager = new
ExcaliburComponentManager();
manager.setLogger( getLogger() );
manager.setRoleManager( roleManager );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
