Index: ExcaliburTestCase.java
===================================================================
RCS file: /home/cvspublic/jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/testcase/ExcaliburTestCase.java,v
retrieving revision 1.15
diff -r1.15 ExcaliburTestCase.java
26a27
> import org.apache.avalon.excalibur.logger.LogKitManager;
160a162,164
>     //The internal logger
>     private Logger                      m_envlogger;
> 
161a166
>     private LogKitManager               m_logKitManager;
200c205
<             m_logger = this.setupLogger();
---
>             m_logger = m_logKitManager.getLogger( getName() );
216a222,231
>     protected Logger getEnvLogger()
>     {
>         if ( null == m_envlogger )
>         {
>             m_envlogger = this.setupDefaultLogger( "environment" );
>         }
> 
>         return m_envlogger;
>     }
> 
229c244
<             getLogger().debug("Loading resource " + resourceName);
---
>             getEnvLogger().debug("Loading resource " + resourceName);
233c248
<             getLogger().debug("Resource not found " + resourceName);
---
>             getEnvLogger().debug("Resource not found " + resourceName);
250c265
<         getLogger().debug( "ExcaliburTestCase.initialize" );
---
>         getEnvLogger().debug( "ExcaliburTestCase.initialize" );
259c274
<             m_logger.info( annotation );
---
>             getEnvLogger().info( annotation );
313c328
<                 if ( this.getLogger().isDebugEnabled() )
---
>                 if ( this.getEnvLogger().isDebugEnabled() )
315c330
<                     this.getLogger().debug("Now running the following test: " + methodName);
---
>                     this.getEnvLogger().debug("Now running the following test: " + methodName);
324c339
<             result.addFailure(this, new AssertionFailedError());
---
>             result.addFailure(this, new AssertionFailedError(e.getMessage()));
350c365
<     final private Logger setupLogger()
---
>     final private Logger setupDefaultLogger( String name )
355c370
<         final org.apache.log.Logger logger = Hierarchy.getDefaultHierarchy().getLoggerFor( getName() );
---
>         final org.apache.log.Logger logger = Hierarchy.getDefaultHierarchy().getLoggerFor( name );
387,388c402,403
<                 if (getLogger().isInfoEnabled())
<                     getLogger().info( "ExcaliburTestCase: added an instance of class " + clazz + " to context entry " + key);
---
>                 if (getEnvLogger().isInfoEnabled())
>                     getEnvLogger().info( "ExcaliburTestCase: added an instance of class " + clazz + " to context entry " + key);
391,392c406,407
<                 if (getLogger().isInfoEnabled())
<                     getLogger().info( "ExcaliburTestCase: added value \""  + value + "\" to context entry " + key);
---
>                 if (getEnvLogger().isInfoEnabled())
>                     getEnvLogger().info( "ExcaliburTestCase: added value \""  + value + "\" to context entry " + key);
414c429
<         roleManager.setLogger( getLogger() );
---
>         roleManager.setLogger( getEnvLogger() );
418c433
<         logKitManager.enableLogging( getLogEnabledLogger() );
---
>         logKitManager.enableLogging( new LogKitLogger( getEnvLogger() ) );
421a437,440
>         m_logKitManager = logKitManager;
>         m_logger = null;
>         m_logEnabledLogger = null;
> 
423c442
<         manager.setLogger( getLogger() );
---
>         manager.setLogger( getEnvLogger() );