bloritsch 01/11/01 06:25:57
Modified: lib avalon-framework.jar
src/java/org/apache/avalon/excalibur/component
DefaultComponentFactory.java
DefaultComponentHandler.java
PoolableComponentHandler.java
ThreadSafeComponentHandler.java
src/java/org/apache/avalon/excalibur/datasource
Jdbc2Connection.java Jdbc3Connection.java
JdbcConnectionFactory.java JdbcDataSource.java
src/java/org/apache/avalon/excalibur/testcase
ExcaliburTestCase.java
src/scratchpad/org/apache/avalon/excalibur/i18n
AbstractBundle.java
src/scratchpad/org/apache/avalon/excalibur/i18n/test
AbstractBundleTestCase.java XmlBundleTestCase.java
src/scratchpad/org/apache/avalon/excalibur/thread/impl
DefaultThreadPool.java
src/test/org/apache/avalon/excalibur/logger/test
LogKitManagementTestCase.java
TestComponentImpl.java
Log:
Repair logging stuff I did yesterday
Revision Changes Path
1.6 +94 -101 jakarta-avalon-excalibur/lib/avalon-framework.jar
<<Binary file>>
1.9 +39 -2
jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/component/DefaultComponentFactory.java
Index: DefaultComponentFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/component/DefaultComponentFactory.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DefaultComponentFactory.java 2001/10/31 21:40:59 1.8
+++ DefaultComponentFactory.java 2001/11/01 14:25:57 1.9
@@ -20,6 +20,7 @@
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.avalon.framework.logger.Loggable;
+import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.LogKitLogger;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.avalon.excalibur.pool.ObjectFactory;
@@ -31,7 +32,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Paul Russell</a>
- * @version CVS $Revision: 1.8 $ $Date: 2001/10/31 21:40:59 $
+ * @version CVS $Revision: 1.9 $ $Date: 2001/11/01 14:25:57 $
* @since 4.0
*/
public class DefaultComponentFactory
@@ -63,6 +64,10 @@
*/
private LogKitManager m_logkit;
+ /** The org.apache.avalon.framework.logger.Logger instance.
+ */
+ private org.apache.avalon.framework.logger.Logger m_logEnabledLogger;
+
/**
* Construct a new component factory for the specified component.
*
@@ -98,6 +103,28 @@
m_componentClass.getName() + "." );
}
+ if( component instanceof LogEnabled )
+ {
+ if( null == m_logkit || null == m_configuration )
+ {
+ ((LogEnabled)component).enableLogging( getLogEnabledLogger()
);
+ }
+ else
+ {
+ final String logger = m_configuration.getAttribute(
"logger", null );
+ if( null == logger )
+ {
+ getLogger().debug( "no logger attribute available, using
standard logger" );
+ ((LogEnabled)component).enableLogging(
getLogEnabledLogger() );
+ }
+ else
+ {
+ getLogger().debug( "logger attribute is " + logger );
+ ((LogEnabled)component).enableLogging( new LogKitLogger(
m_logkit.getLogger( logger ) ) );
+ }
+ }
+ }
+
if( component instanceof Loggable )
{
if( null == m_logkit || null == m_configuration )
@@ -115,7 +142,7 @@
else
{
getLogger().debug( "logger attribute is " + logger );
- ((Loggable)component).setLogger( new LogKitLogger(
m_logkit.getLogger( logger ) ) );
+ ((Loggable)component).setLogger( m_logkit.getLogger(
logger ) );
}
}
}
@@ -187,5 +214,15 @@
{
((Disposable)component).dispose();
}
+ }
+
+ protected org.apache.avalon.framework.logger.Logger getLogEnabledLogger()
+ {
+ if ( null == m_logEnabledLogger )
+ {
+ m_logEnabledLogger = new LogKitLogger( getLogger() );
+ }
+
+ return m_logEnabledLogger;
}
}
1.6 +2 -2
jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/component/DefaultComponentHandler.java
Index: DefaultComponentHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/component/DefaultComponentHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultComponentHandler.java 2001/10/31 21:40:59 1.5
+++ DefaultComponentHandler.java 2001/11/01 14:25:57 1.6
@@ -14,14 +14,14 @@
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.avalon.excalibur.logger.LogKitManager;
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.log.Logger;
/**
* The DefaultComponentHandler to make sure components are initialized
* and destroyed correctly.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.5 $ $Date: 2001/10/31 21:40:59 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/11/01 14:25:57 $
* @since 4.0
*/
class DefaultComponentHandler
1.6 +2 -2
jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/component/PoolableComponentHandler.java
Index: PoolableComponentHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/component/PoolableComponentHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PoolableComponentHandler.java 2001/10/31 21:40:59 1.5
+++ PoolableComponentHandler.java 2001/11/01 14:25:57 1.6
@@ -14,14 +14,14 @@
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.excalibur.pool.Poolable;
import org.apache.avalon.excalibur.logger.LogKitManager;
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.log.Logger;
/**
* The PoolableComponentHandler to make sure components are initialized
* and destroyed correctly.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.5 $ $Date: 2001/10/31 21:40:59 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/11/01 14:25:57 $
* @since 4.0
*/
public class PoolableComponentHandler extends ComponentHandler {
1.6 +2 -2
jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/component/ThreadSafeComponentHandler.java
Index: ThreadSafeComponentHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/component/ThreadSafeComponentHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ThreadSafeComponentHandler.java 2001/10/31 21:40:59 1.5
+++ ThreadSafeComponentHandler.java 2001/11/01 14:25:57 1.6
@@ -14,14 +14,14 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.excalibur.logger.LogKitManager;
-import org.apache.avalon.framework.logger.Logger;
+import org.apache.log.Logger;
/**
* The ThreadSafeComponentHandler to make sure components are initialized
* and destroyed correctly.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.5 $ $Date: 2001/10/31 21:40:59 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/11/01 14:25:57 $
* @since 4.0
*/
public class ThreadSafeComponentHandler extends ComponentHandler {
1.7 +5 -5
jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/datasource/Jdbc2Connection.java
Index: Jdbc2Connection.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/datasource/Jdbc2Connection.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Jdbc2Connection.java 2001/10/31 21:40:59 1.6
+++ Jdbc2Connection.java 2001/11/01 14:25:57 1.7
@@ -15,7 +15,7 @@
import java.sql.SQLWarning;
import java.sql.Statement;
import java.util.Map;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.excalibur.pool.Recyclable;
@@ -31,11 +31,11 @@
* total number of Connection objects that are created.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.6 $ $Date: 2001/10/31 21:40:59 $
+ * @version CVS $Revision: 1.7 $ $Date: 2001/11/01 14:25:57 $
* @since 4.0
*/
public class JdbcConnection
- extends AbstractLoggable
+ extends AbstractLogEnabled
implements Connection, Recyclable, Disposable, Initializable
{
protected Connection m_connection;
@@ -90,9 +90,9 @@
this.m_pool = pool;
}
- public final void setLogger( final Logger log )
+ public final void enableLogging( final Logger log )
{
- super.setLogger(log);
+ super.enableLogging(log);
if (m_test_statement == null && m_test_exception != null)
{
1.7 +5 -5
jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/datasource/Jdbc3Connection.java
Index: Jdbc3Connection.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/datasource/Jdbc3Connection.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Jdbc3Connection.java 2001/10/31 21:40:59 1.6
+++ Jdbc3Connection.java 2001/11/01 14:25:57 1.7
@@ -16,7 +16,7 @@
import java.sql.Statement;
import java.sql.Savepoint;
import java.util.Map;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.avalon.excalibur.pool.Pool;
@@ -31,11 +31,11 @@
* total number of Connection objects that are created.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.6 $ $Date: 2001/10/31 21:40:59 $
+ * @version CVS $Revision: 1.7 $ $Date: 2001/11/01 14:25:57 $
* @since 4.0
*/
public class JdbcConnection
- extends AbstractLoggable
+ extends AbstractLogEnabled
implements Connection, Recyclable, Disposable
{
protected Connection m_connection;
@@ -104,9 +104,9 @@
this.m_pool = pool;
}
- public final void setLogger( final Logger log )
+ public final void enableLogging( final Logger log )
{
- super.setLogger(log);
+ super.enableLogging(log);
if (m_test_statement == null)
{
1.6 +4 -4
jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/datasource/JdbcConnectionFactory.java
Index: JdbcConnectionFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/datasource/JdbcConnectionFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JdbcConnectionFactory.java 2001/08/14 16:26:09 1.5
+++ JdbcConnectionFactory.java 2001/11/01 14:25:57 1.6
@@ -7,7 +7,7 @@
*/
package org.apache.avalon.excalibur.datasource;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.excalibur.pool.ObjectFactory;
import java.lang.reflect.Constructor;
@@ -18,10 +18,10 @@
* The Factory implementation for JdbcConnections.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.5 $ $Date: 2001/08/14 16:26:09 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/11/01 14:25:57 $
* @since 4.0
*/
-public class JdbcConnectionFactory extends AbstractLoggable implements
ObjectFactory
+public class JdbcConnectionFactory extends AbstractLogEnabled implements
ObjectFactory
{
private final String m_dburl;
private final String m_username;
@@ -124,7 +124,7 @@
}
}
- jdbcConnection.setLogger(getLogger());
+ jdbcConnection.enableLogging(getLogger());
// Not all drivers are friendly to explicitly setting autocommit
if (jdbcConnection.getAutoCommit() != m_autoCommit) {
1.9 +3 -2
jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/datasource/JdbcDataSource.java
Index: JdbcDataSource.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/datasource/JdbcDataSource.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JdbcDataSource.java 2001/08/14 16:26:09 1.8
+++ JdbcDataSource.java 2001/11/01 14:25:57 1.9
@@ -13,6 +13,7 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.LogKitLogger;
import org.apache.avalon.excalibur.pool.DefaultPoolController;
/**
@@ -33,7 +34,7 @@
* </pre>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Revision: 1.8 $ $Date: 2001/08/14 16:26:09 $
+ * @version CVS $Revision: 1.9 $ $Date: 2001/11/01 14:25:57 $
* @since 4.0
*/
public class JdbcDataSource
@@ -154,7 +155,7 @@
new JdbcConnectionFactory( dburl, user, passwd,
autoCommit, keepAlive, connectionClass );
final DefaultPoolController poolController = new
DefaultPoolController(l_max / 4);
- factory.setLogger(getLogger());
+ factory.enableLogging( new LogKitLogger( getLogger() ) );
try
{
1.13 +15 -3
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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ExcaliburTestCase.java 2001/10/31 21:21:13 1.12
+++ ExcaliburTestCase.java 2001/11/01 14:25:57 1.13
@@ -19,8 +19,8 @@
import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.logger.LogKitLogger;
+import org.apache.log.Logger;
import org.apache.avalon.excalibur.component.DefaultRoleManager;
import org.apache.avalon.excalibur.component.ExcaliburComponentManager;
@@ -146,7 +146,7 @@
* </pre>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version $Id: ExcaliburTestCase.java,v 1.12 2001/10/31 21:21:13 bloritsch
Exp $
+ * @version $Id: ExcaliburTestCase.java,v 1.13 2001/11/01 14:25:57 bloritsch
Exp $
*/
public class ExcaliburTestCase
extends TestCase
@@ -157,6 +157,7 @@
//The default logger
private Logger m_logger;
+ private LogKitLogger m_logEnabledLogger;
private ExcaliburComponentManager m_manager;
private static HashMap m_tests = new HashMap();
@@ -202,6 +203,17 @@
return m_logger;
}
+ /** Return the logger */
+ protected LogKitLogger getLogEnabledLogger()
+ {
+ if ( null == m_logEnabledLogger )
+ {
+ m_logEnabledLogger = new LogKitLogger( this.getLogger() );
+ }
+
+ return m_logEnabledLogger;
+ }
+
/**
* Initializes the ComponentManager
*
@@ -347,7 +359,7 @@
final StreamTarget target = new StreamTarget( System.out, formatter
);
logger.setLogTargets( new LogTarget[] { target } );
- return new LogKitLogger(logger);
+ return logger;
}
/**
1.5 +2 -2
jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/i18n/AbstractBundle.java
Index: AbstractBundle.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/i18n/AbstractBundle.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractBundle.java 2001/10/31 19:56:47 1.4
+++ AbstractBundle.java 2001/11/01 14:25:57 1.5
@@ -11,11 +11,11 @@
import java.util.Locale;
import org.apache.log.Logger;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.component.Component;
public abstract class AbstractBundle
- extends AbstractLoggable
+ extends AbstractLogEnabled
implements Bundle, Component {
/** bundle info */
1.6 +2 -2
jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/i18n/test/AbstractBundleTestCase.java
Index: AbstractBundleTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/i18n/test/AbstractBundleTestCase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractBundleTestCase.java 2001/10/31 19:56:47 1.5
+++ AbstractBundleTestCase.java 2001/11/01 14:25:57 1.6
@@ -15,7 +15,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Neeme Praks</a>
- * @version $Id: AbstractBundleTestCase.java,v 1.5 2001/10/31 19:56:47 neeme
Exp $
+ * @version $Id: AbstractBundleTestCase.java,v 1.6 2001/11/01 14:25:57
bloritsch Exp $
*/
public class AbstractBundleTestCase extends ExcaliburTestCase {
@@ -31,7 +31,7 @@
this.variables.put("bad", "too bad");
this.variables.put("value", "a cat");
- this.bundle.setLogger(getLogger());
+ this.bundle.enableLogging( getLogEnabledLogger() );
this.bundle.put("cat", "Here is an example of {value}.");
this.bundle.put("nice", "This is a {nice} test!");
this.bundle.put("nice.nice", "This is a {nice}, {nice} test!");
1.3 +3 -3
jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/i18n/test/XmlBundleTestCase.java
Index: XmlBundleTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/i18n/test/XmlBundleTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XmlBundleTestCase.java 2001/10/31 20:46:06 1.2
+++ XmlBundleTestCase.java 2001/11/01 14:25:57 1.3
@@ -16,7 +16,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Neeme Praks</a>
- * @version $Id: XmlBundleTestCase.java,v 1.2 2001/10/31 20:46:06 bloritsch
Exp $
+ * @version $Id: XmlBundleTestCase.java,v 1.3 2001/11/01 14:25:57 bloritsch
Exp $
*/
public class XmlBundleTestCase extends ExcaliburTestCase {
@@ -35,14 +35,14 @@
getLogger().debug("Test-bundle file = " + bundleFileName);
this.bundle.setBundleInfo(new BundleInfo("test", null));
- this.bundle.setLogger(getLogger());
+ this.bundle.enableLogging(getLogEnabledLogger());
this.bundle.compose(this.manager);
this.bundle.setLoadOnInit(true);
this.bundleWithRoot.setUseRootElement(false);
this.bundle.init(this.getClass().getClassLoader().getResource(bundleFileName).openStream());
this.bundleWithRoot.setBundleInfo(new BundleInfo("test-with-root",
null));
- this.bundleWithRoot.setLogger(getLogger());
+ this.bundleWithRoot.enableLogging(getLogEnabledLogger());
this.bundleWithRoot.compose(super.manager);
this.bundleWithRoot.setLoadOnInit(true);
this.bundleWithRoot.setUseRootElement(true);
1.4 +1 -7
jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/thread/impl/DefaultThreadPool.java
Index: DefaultThreadPool.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/thread/impl/DefaultThreadPool.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultThreadPool.java 2001/10/31 21:21:14 1.3
+++ DefaultThreadPool.java 2001/11/01 14:25:57 1.4
@@ -15,8 +15,7 @@
import org.apache.avalon.excalibur.thread.ThreadControl;
import org.apache.avalon.framework.activity.Executable;
import org.apache.avalon.framework.logger.Loggable;
-import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.logger.LogKitLogger;
+import org.apache.log.Logger;
/**
* This class is the public frontend for the thread pool code.
@@ -70,11 +69,6 @@
{
m_logger.fatalError( "Could not initialize the pool", e );
}
- }
-
- public void setLogger( final org.apache.log.Logger logger )
- {
- setLogger( new LogKitLogger( logger ) );
}
public Object newInstance()
1.6 +4 -4
jakarta-avalon-excalibur/src/test/org/apache/avalon/excalibur/logger/test/LogKitManagementTestCase.java
Index: LogKitManagementTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/src/test/org/apache/avalon/excalibur/logger/test/LogKitManagementTestCase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LogKitManagementTestCase.java 2001/09/25 20:19:06 1.5
+++ LogKitManagementTestCase.java 2001/11/01 14:25:57 1.6
@@ -16,7 +16,7 @@
* LogKitManagementTest.
*
* @author <a href="mailto:[EMAIL PROTECTED],org">Giacomo Pati</a>
- * @version CVS $Revision: 1.5 $ $Date: 2001/09/25 20:19:06 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/11/01 14:25:57 $
*/
public class LogKitManagementTestCase
extends ExcaliburTestCase
@@ -50,7 +50,7 @@
try
{
tc = (TestComponent) manager.lookup( TestComponent.ROLE + "/A" );
- tc.test( getLogger(), "Test log entry A" );
+ tc.test( getLogEnabledLogger(), "Test log entry A" );
}
catch ( Exception e)
{
@@ -65,7 +65,7 @@
try
{
tc = (TestComponent) manager.lookup( TestComponent.ROLE + "/B" );
- tc.test( getLogger(), "Test log entry B" );
+ tc.test( getLogEnabledLogger(), "Test log entry B" );
}
catch ( Exception e)
{
@@ -80,7 +80,7 @@
try
{
tc = (TestComponent) manager.lookup( TestComponent.ROLE + "/C" );
- tc.test( getLogger(), "Test log entry C" );
+ tc.test( getLogEnabledLogger(), "Test log entry C" );
}
catch ( Exception e)
{
1.6 +3 -3
jakarta-avalon-excalibur/src/test/org/apache/avalon/excalibur/logger/test/TestComponentImpl.java
Index: TestComponentImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/src/test/org/apache/avalon/excalibur/logger/test/TestComponentImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TestComponentImpl.java 2001/10/31 21:21:14 1.5
+++ TestComponentImpl.java 2001/11/01 14:25:57 1.6
@@ -7,7 +7,7 @@
*/
package org.apache.avalon.excalibur.logger.test;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.Logger;
import org.apache.log.LogTarget;
@@ -15,10 +15,10 @@
* TestComponent.
*
* @author <a href="mailto:[EMAIL PROTECTED],org">Giacomo Pati</a>
- * @version CVS $Revision: 1.5 $ $Date: 2001/10/31 21:21:14 $
+ * @version CVS $Revision: 1.6 $ $Date: 2001/11/01 14:25:57 $
*/
public class TestComponentImpl
- extends AbstractLoggable
+ extends AbstractLogEnabled
implements TestComponent
{
public void test( Logger defaultLogger, String message )
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
