colus 01/11/18 18:15:39
Modified: src/java/org/apache/avalon/excalibur/logger
DefaultLogKitManager.java
DefaultLogTargetFactoryManager.java
DefaultLogTargetManager.java
src/java/org/apache/avalon/excalibur/logger/factory
AbstractTargetFactory.java
src/java/org/apache/avalon/excalibur/testcase
ExcaliburTestCase.java
src/test/org/apache/avalon/excalibur/logger/test
LogKitManagementTest.java
Log:
LogEnabled DefaultLogKitManager.
Revision Changes Path
1.8 +14 -7
jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/logger/DefaultLogKitManager.java
Index: DefaultLogKitManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/logger/DefaultLogKitManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultLogKitManager.java 2001/09/26 11:39:55 1.7
+++ DefaultLogKitManager.java 2001/11/19 02:15:39 1.8
@@ -15,7 +15,9 @@
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+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.log.Hierarchy;
import org.apache.log.LogTarget;
@@ -27,11 +29,11 @@
* from a configuration file.
*
* @author <a href="mailto:[EMAIL PROTECTED],org">Giacomo Pati</a>
- * @version CVS $Revision: 1.7 $ $Date: 2001/09/26 11:39:55 $
+ * @version CVS $Revision: 1.8 $ $Date: 2001/11/19 02:15:39 $
* @since 4.0
*/
public class DefaultLogKitManager
- extends AbstractLoggable
+ extends AbstractLogEnabled
implements LogKitManager, Contextualizable, Configurable
{
/** Map for name to logger mapping */
@@ -81,6 +83,11 @@
m_hierarchy = hierarchy;
}
+ public void setLogger( final Logger logger )
+ {
+ enableLogging( new LogKitLogger( logger ) );
+ }
+
/**
* Retrieves a Logger from a category name. Usually
* the category name refers to a configuration attribute name. If
@@ -164,9 +171,9 @@
throws ConfigurationException
{
final DefaultLogTargetFactoryManager targetFactoryManager = new
DefaultLogTargetFactoryManager();
- if( targetFactoryManager instanceof Loggable )
+ if( targetFactoryManager instanceof LogEnabled )
{
- targetFactoryManager.setLogger( getLogger() );
+ targetFactoryManager.enableLogging( getLogger() );
}
if( targetFactoryManager instanceof Contextualizable )
@@ -198,9 +205,9 @@
{
final DefaultLogTargetManager targetManager = new
DefaultLogTargetManager();
- if (targetManager instanceof Loggable)
+ if (targetManager instanceof LogEnabled)
{
- targetManager.setLogger( getLogger() );
+ targetManager.enableLogging( getLogger() );
}
if( targetManager instanceof Contextualizable )
1.3 +6 -6
jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/logger/DefaultLogTargetFactoryManager.java
Index: DefaultLogTargetFactoryManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/logger/DefaultLogTargetFactoryManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultLogTargetFactoryManager.java 2001/08/29 14:38:16 1.2
+++ DefaultLogTargetFactoryManager.java 2001/11/19 02:15:39 1.3
@@ -15,19 +15,19 @@
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.framework.logger.AbstractLoggable;
-import org.apache.avalon.framework.logger.Loggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.logger.LogEnabled;
/**
* Default LogTargetFactoryManager implementation. It populates the
LogTargetFactoryManager
* from a configuration file.
*
* @author <a href="mailto:[EMAIL PROTECTED],org">Giacomo Pati</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/08/29 14:38:16 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/11/19 02:15:39 $
* @since 4.0
*/
public class DefaultLogTargetFactoryManager
- extends AbstractLoggable
+ extends AbstractLogEnabled
implements LogTargetFactoryManager, Contextualizable, Configurable
{
/** Map for name to logger mapping */
@@ -99,9 +99,9 @@
throw new ConfigurationException( "cannot access
LogTargetFactory class " + factoryClass, iae );
}
- if( logTargetFactory instanceof Loggable )
+ if( logTargetFactory instanceof LogEnabled )
{
- ((Loggable) logTargetFactory).setLogger( getLogger() );
+ ((LogEnabled) logTargetFactory).enableLogging( getLogger() );
}
if( logTargetFactory instanceof Configurable )
1.3 +3 -3
jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/logger/DefaultLogTargetManager.java
Index: DefaultLogTargetManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/logger/DefaultLogTargetManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultLogTargetManager.java 2001/09/26 11:38:31 1.2
+++ DefaultLogTargetManager.java 2001/11/19 02:15:39 1.3
@@ -15,7 +15,7 @@
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.log.LogTarget;
/**
@@ -23,11 +23,11 @@
* from a configuration file.
*
* @author <a href="mailto:[EMAIL PROTECTED],org">Giacomo Pati</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/09/26 11:38:31 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/11/19 02:15:39 $
* @since 4.0
*/
public class DefaultLogTargetManager
- extends AbstractLoggable
+ extends AbstractLogEnabled
implements LogTargetManager, LogTargetFactoryManageable,
Contextualizable, Configurable
{
/** Map for ID to LogTarget mapping */
1.2 +3 -3
jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/logger/factory/AbstractTargetFactory.java
Index: AbstractTargetFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/logger/factory/AbstractTargetFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractTargetFactory.java 2001/08/29 15:34:07 1.1
+++ AbstractTargetFactory.java 2001/11/19 02:15:39 1.2
@@ -15,7 +15,7 @@
import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.log.LogTarget;
@@ -25,11 +25,11 @@
* This factory implements basic functionality for LogTargetFactories
*
* @author <a href="mailto:[EMAIL PROTECTED],org">Giacomo Pati</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/08/29 15:34:07 $
+ * @version CVS $Revision: 1.2 $ $Date: 2001/11/19 02:15:39 $
* @since 4.0
*/
public abstract class AbstractTargetFactory
- extends AbstractLoggable
+ extends AbstractLogEnabled
implements LogTargetFactory,
Configurable,
Contextualizable
1.14 +4 -4
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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ExcaliburTestCase.java 2001/11/01 14:25:57 1.13
+++ ExcaliburTestCase.java 2001/11/19 02:15:39 1.14
@@ -146,7 +146,7 @@
* </pre>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version $Id: ExcaliburTestCase.java,v 1.13 2001/11/01 14:25:57 bloritsch
Exp $
+ * @version $Id: ExcaliburTestCase.java,v 1.14 2001/11/19 02:15:39 colus Exp
$
*/
public class ExcaliburTestCase
extends TestCase
@@ -411,16 +411,16 @@
throws Exception
{
final DefaultRoleManager roleManager = new DefaultRoleManager();
- roleManager.setLogger( m_logger );
+ roleManager.setLogger( getLogger() );
roleManager.configure( confRM );
final DefaultLogKitManager logKitManager = new
DefaultLogKitManager();
- logKitManager.setLogger( m_logger );
+ logKitManager.enableLogging( getLogEnabledLogger() );
logKitManager.contextualize( context );
logKitManager.configure( confLM );
final ExcaliburComponentManager manager = new
ExcaliburComponentManager();
- manager.setLogger( m_logger );
+ manager.setLogger( getLogger() );
manager.setRoleManager( roleManager );
manager.contextualize( context );
manager.setLogKitManager( logKitManager );
1.4 +3 -2
jakarta-avalon-excalibur/src/test/org/apache/avalon/excalibur/logger/test/LogKitManagementTest.java
Index: LogKitManagementTest.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/src/test/org/apache/avalon/excalibur/logger/test/LogKitManagementTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LogKitManagementTest.java 2001/08/25 15:16:49 1.3
+++ LogKitManagementTest.java 2001/11/19 02:15:39 1.4
@@ -17,6 +17,7 @@
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.DefaultContext;
+import org.apache.avalon.framework.logger.LogKitLogger;
import org.apache.avalon.excalibur.component.DefaultRoleManager;
import org.apache.avalon.excalibur.component.ExcaliburComponentManager;
@@ -34,7 +35,7 @@
* LogKitManagementTest.
*
* @author <a href="mailto:[EMAIL PROTECTED],org">Giacomo Pati</a>
- * @version CVS $Revision: 1.3 $ $Date: 2001/08/25 15:16:49 $
+ * @version CVS $Revision: 1.4 $ $Date: 2001/11/19 02:15:39 $
*/
public class LogKitManagementTest
{
@@ -115,7 +116,7 @@
final Context context = setupContext( conf.getChild( "context" ) );
final DefaultLogKitManager lkm = new DefaultLogKitManager();
- lkm.setLogger( m_logger );
+ lkm.enableLogging( new LogKitLogger( m_logger ) );
lkm.contextualize( context );
lkm.configure( conf );
m_lkm = lkm;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
