Update to use LogEnabled interface rather than Loggable interface.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270018 13f79535-47bb-0310-9956-ffa450edef68

proposal/myrmidon/src/java/org/apache/myrmidon/api/AbstractTask.java

@@ -11,7 +11,7 @@ import org.apache.avalon.framework.activity.Disposable;
 import org.apache.avalon.framework.activity.Initializable;
 import org.apache.avalon.framework.context.Context;
 import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
 
 /**
  * This is the class that Task writers should extend to provide custom tasks.
@@ -19,7 +19,7 @@ import org.apache.avalon.framework.logger.AbstractLoggable;
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  */
 public abstract class AbstractTask
-    extends AbstractLoggable
+    extends AbstractLogEnabled
     implements Task, Contextualizable, Initializable, Disposable
 {
     ///Variable to hold context for use by sub-classes

proposal/myrmidon/src/java/org/apache/myrmidon/api/Task.java

@@ -11,7 +11,7 @@ package org.apache.myrmidon.api;
  * This is the interface that tasks implement to be executed in Myrmidon runtime.
  * 
  * Instances can also implement the Avalon lifecycle methods 
- * Loggable, Contextualizable, Composable, Initializable and Disposable.
+ * LogEnabled, Contextualizable, Composable, Initializable and Disposable.
  * Each of these lifecycle stages will be executed at appropriate time.
  *
  * Tasks can also choose to implement Configurable if they wish to directly

proposal/myrmidon/src/java/org/apache/myrmidon/api/TaskContext.java

@@ -15,7 +15,7 @@ import org.apache.avalon.framework.context.Context;
  * This interface represents the <em>Context</em> in which Task is executed.
  * Like other Component APIs the TaskContext represents the communication
  * path between the container and the Task.
- * Unlike other APIs the Logging is provided through another interface (Loggable)
+ * Unlike other APIs the Logging is provided through another interface (LogEnabled)
  * as is access to Peer components (via Composable).
  *
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>

proposal/myrmidon/src/java/org/apache/myrmidon/aspects/AbstractAspectHandler.java

@@ -9,7 +9,7 @@ package org.apache.myrmidon.aspects;
 
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.log.Logger;
+import org.apache.avalon.framework.logger.Logger;
 import org.apache.myrmidon.api.Task;
 import org.apache.myrmidon.api.TaskException;
 
@@ -48,7 +48,7 @@ public abstract class AbstractAspectHandler
         m_task = task;
     }
 
-    public void preLoggable( final Logger logger )
+    public void preLogEnabled( final Logger logger )
         throws TaskException
     {
         m_logger = logger;

proposal/myrmidon/src/java/org/apache/myrmidon/aspects/AspectHandler.java

@@ -9,7 +9,7 @@ package org.apache.myrmidon.aspects;
 
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.log.Logger;
+import org.apache.avalon.framework.logger.Logger;
 import org.apache.myrmidon.api.Task;
 import org.apache.myrmidon.api.TaskException;
 
@@ -32,7 +32,7 @@ public interface AspectHandler
     void postCreate( Task task )
         throws TaskException;
 
-    void preLoggable( Logger logger )
+    void preLogEnabled( Logger logger )
         throws TaskException;
 
     void preConfigure( Configuration taskModel )

proposal/myrmidon/src/java/org/apache/myrmidon/components/aspect/DefaultAspectManager.java

@@ -13,7 +13,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
 import org.apache.avalon.framework.activity.Initializable;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.log.Logger;
+import org.apache.avalon.framework.logger.Logger;
 import org.apache.myrmidon.api.Task;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.aspects.AspectHandler;
@@ -120,13 +120,13 @@ public class DefaultAspectManager
         }
     }
 
-    public void preLoggable( final Logger logger )
+    public void preLogEnabled( final Logger logger )
         throws TaskException
     {
         final AspectHandler[] aspects = m_aspects;
         for( int i = 0; i < aspects.length; i++ )
         {
-            aspects[ i ].preLoggable( logger );
+            aspects[ i ].preLogEnabled( logger );
         }
     }
 

proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java

@@ -21,7 +21,7 @@ import org.apache.avalon.framework.ExceptionUtil;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
 import org.apache.avalon.framework.configuration.ClassicSAXConfigurationHandler;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.log.Logger;
 import org.apache.myrmidon.api.TaskContext;
@@ -40,7 +40,7 @@ import org.xml.sax.XMLReader;
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  */
 public class DefaultProjectBuilder
-    extends AbstractLoggable
+    extends AbstractLogEnabled
     implements ProjectBuilder
 {
     private static final Resources REZ =

proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurer.java

@@ -22,8 +22,8 @@ import org.apache.avalon.framework.configuration.Configurable;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
 import org.apache.avalon.framework.context.Context;
-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;
 import org.apache.log.Logger;
 import org.apache.myrmidon.interfaces.converter.MasterConverter;
 import org.apache.myrmidon.interfaces.configurer.Configurer;
@@ -36,8 +36,8 @@ import org.apache.myrmidon.converter.ConverterException;
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  */
 public class DefaultConfigurer
-    extends AbstractLoggable
-    implements Configurer, Composable, Loggable
+    extends AbstractLogEnabled
+    implements Configurer, Composable, LogEnabled
 {
     private static final Resources REZ =
         ResourceManager.getPackageResources( DefaultConfigurer.class );

proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/DefaultMasterConverter.java

@@ -13,7 +13,7 @@ import org.apache.avalon.framework.component.Composable;
 import org.apache.avalon.framework.context.Context;
 import org.apache.avalon.excalibur.i18n.ResourceManager;
 import org.apache.avalon.excalibur.i18n.Resources;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.myrmidon.interfaces.converter.MasterConverter;
 import org.apache.myrmidon.interfaces.converter.ConverterRegistry;
 import org.apache.myrmidon.interfaces.type.TypeException;
@@ -28,7 +28,7 @@ import org.apache.myrmidon.converter.ConverterException;
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  */
 public class DefaultMasterConverter
-    extends AbstractLoggable
+    extends AbstractLogEnabled
     implements MasterConverter, Composable
 {
     private static final Resources REZ =

proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultDeployer.java

@@ -31,7 +31,7 @@ import org.apache.avalon.framework.component.Composable;
 import org.apache.avalon.framework.configuration.ClassicSAXConfigurationHandler;
 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.AbstractLogEnabled;
 import org.apache.myrmidon.api.Task;
 import org.apache.myrmidon.converter.Converter;
 import org.apache.myrmidon.interfaces.converter.ConverterRegistry;
@@ -50,7 +50,7 @@ import org.xml.sax.XMLReader;
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  */
 public class DefaultDeployer
-    extends AbstractLoggable
+    extends AbstractLogEnabled
     implements Deployer, Initializable, Composable
 {
     private static final Resources REZ =

proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor/DefaultEmbeddor.java

@@ -18,7 +18,7 @@ import org.apache.avalon.framework.activity.Initializable;
 import org.apache.avalon.framework.component.Component;
 import org.apache.avalon.framework.component.Composable;
 import org.apache.avalon.framework.component.DefaultComponentManager;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.parameters.Parameterizable;
 import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.myrmidon.api.JavaVersion;
@@ -45,7 +45,7 @@ import org.apache.myrmidon.interfaces.workspace.Workspace;
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  */
 public class DefaultEmbeddor
-    extends AbstractLoggable
+    extends AbstractLogEnabled
     implements Embeddor
 {
     private static final Resources REZ =

proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/AspectAwareExecutor.java

@@ -16,7 +16,7 @@ import org.apache.avalon.framework.component.ComponentManager;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.DefaultConfiguration;
 import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.log.Logger;
+import org.apache.avalon.framework.logger.Logger;
 import org.apache.myrmidon.api.Task;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.api.TaskException;
@@ -83,8 +83,8 @@ public class AspectAwareExecutor
 
         debug( "logger.notice" );
         final Logger logger = frame.getLogger();
-        getAspectManager().preLoggable( logger );
-        doLoggable( task, taskModel, logger );
+        getAspectManager().preLogEnabled( logger );
+        doLogEnabled( task, taskModel, logger );
 
         debug( "contextualizing.notice" );
         doContextualize( task, taskModel, frame.getContext() );

proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/DefaultExecutionFrame.java

@@ -13,8 +13,8 @@ import org.apache.avalon.framework.component.Composable;
 import org.apache.avalon.framework.component.DefaultComponentManager;
 import org.apache.avalon.framework.context.Context;
 import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.logger.Loggable;
-import org.apache.log.Logger;
+import org.apache.avalon.framework.logger.LogEnabled;
+import org.apache.avalon.framework.logger.Logger;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.interfaces.aspect.AspectManager;
 import org.apache.myrmidon.interfaces.builder.ProjectBuilder;
@@ -33,7 +33,7 @@ import org.apache.myrmidon.interfaces.type.TypeManager;
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  */
 public class DefaultExecutionFrame
-    implements ExecutionFrame, Loggable, Contextualizable, Composable
+    implements ExecutionFrame, LogEnabled, Contextualizable, Composable
 {
     private TypeManager              m_typeManager;
 
@@ -41,7 +41,7 @@ public class DefaultExecutionFrame
     private TaskContext              m_context;
     private ComponentManager         m_componentManager;
 
-    public void setLogger( final Logger logger )
+    public void enableLogging( final Logger logger )
     {
         m_logger = logger;
     }

proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/DefaultExecutor.java

@@ -20,22 +20,22 @@ import org.apache.avalon.framework.configuration.Configurable;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.context.Context;
 import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.logger.AbstractLoggable;
-import org.apache.avalon.framework.logger.Loggable;
-import org.apache.log.Logger;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.logger.LogEnabled;
+import org.apache.avalon.framework.logger.Logger;
 import org.apache.myrmidon.api.Task;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.interfaces.configurer.Configurer;
-import org.apache.myrmidon.interfaces.executor.Executor;
 import org.apache.myrmidon.interfaces.executor.ExecutionFrame;
+import org.apache.myrmidon.interfaces.executor.Executor;
 import org.apache.myrmidon.interfaces.type.TypeException;
 import org.apache.myrmidon.interfaces.type.TypeFactory;
 import org.apache.myrmidon.interfaces.type.TypeManager;
 
 public class DefaultExecutor
-    extends AbstractLoggable
+    extends AbstractLogEnabled
     implements Executor, Composable
 {
     private static final Resources REZ =
@@ -62,7 +62,7 @@ public class DefaultExecutor
         final Task task = createTask( taskModel.getName(), frame );
 
         debug( "logger.notice" );
-        doLoggable( task, taskModel, frame.getLogger() );
+        doLogEnabled( task, taskModel, frame.getLogger() );
 
         debug( "contextualizing.notice" );
         doContextualize( task, taskModel, frame.getContext() );
@@ -185,14 +185,14 @@ public class DefaultExecutor
         }
     }
 
-    protected final void doLoggable( final Task task,
-                                     final Configuration taskModel,
-                                     final Logger logger )
+    protected final void doLogEnabled( final Task task,
+                                       final Configuration taskModel,
+                                       final Logger logger )
         throws TaskException
     {
-        if( task instanceof Loggable )
+        if( task instanceof LogEnabled )
         {
-            try { ((Loggable)task).setLogger( logger ); }
+            try { ((LogEnabled)task).enableLogging( logger ); }
             catch( final Throwable throwable )
             {
                 final String message =

proposal/myrmidon/src/java/org/apache/myrmidon/components/extensions/DefaultExtensionManager.java

@@ -12,14 +12,12 @@ import org.apache.avalon.excalibur.extension.DefaultPackageRepository;
 import org.apache.avalon.excalibur.util.StringUtil;
 import org.apache.avalon.framework.activity.Disposable;
 import org.apache.avalon.framework.activity.Initializable;
-import org.apache.avalon.framework.logger.Loggable;
-//import org.apache.avalon.framework.logger.LogEnabled;
-//import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.logger.LogEnabled;
+import org.apache.avalon.framework.logger.Logger;
 import org.apache.avalon.framework.parameters.ParameterException;
 import org.apache.avalon.framework.parameters.Parameterizable;
 import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.myrmidon.interfaces.extensions.ExtensionManager;
-import org.apache.log.Logger;
 
 /**
  * PhoenixPackageRepository
@@ -29,7 +27,7 @@ import org.apache.log.Logger;
  */
 public class DefaultExtensionManager
     extends DefaultPackageRepository
-    implements Loggable, Parameterizable, Initializable, Disposable, ExtensionManager
+    implements LogEnabled, Parameterizable, Initializable, Disposable, ExtensionManager
 {
     private Logger m_logger;
 
@@ -40,8 +38,7 @@ public class DefaultExtensionManager
         super( new File[ 0 ] );
     }
 
-    //enableLogging
-    public void setLogger( final Logger logger )
+    public void enableLogging( final Logger logger )
     {
         m_logger = logger;
     }

proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java

@@ -22,12 +22,13 @@ import org.apache.avalon.framework.component.Composable;
 import org.apache.avalon.framework.component.DefaultComponentManager;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.logger.LogKitLogger;
+import org.apache.avalon.framework.logger.Logger;
 import org.apache.avalon.framework.parameters.ParameterException;
 import org.apache.avalon.framework.parameters.Parameterizable;
 import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.log.Hierarchy;
-import org.apache.log.Logger;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.components.deployer.DefaultDeployer;
@@ -50,7 +51,7 @@ import org.apache.myrmidon.listeners.ProjectListener;
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  */
 public class DefaultWorkspace
-    extends AbstractLoggable
+    extends AbstractLogEnabled
     implements Workspace, Composable, Parameterizable, Initializable
 {
     private static final Resources REZ =
@@ -236,7 +237,7 @@ public class DefaultWorkspace
         //We need to create a new deployer so that it deploys
         //to project specific TypeManager
         final DefaultDeployer deployer = new DefaultDeployer();
-        deployer.setLogger( getLogger() );
+        deployer.enableLogging( getLogger() );
 
         try { deployer.compose( componentManager ); }
         catch( final ComponentException ce )
@@ -270,10 +271,10 @@ public class DefaultWorkspace
 
         try
         {
-            final Logger logger = m_hierarchy.getLoggerFor( "project" + m_projectID );
+            final Logger logger = new LogKitLogger( m_hierarchy.getLoggerFor( "project" + m_projectID ) );
             m_projectID++;
 
-            frame.setLogger( logger );
+            frame.enableLogging( logger );
             frame.contextualize( context );
             frame.compose( componentManager );
         }

proposal/myrmidon/src/java/org/apache/myrmidon/frontends/CLIMain.java

@@ -26,7 +26,8 @@ import org.apache.avalon.excalibur.cli.CLOptionDescriptor;
 import org.apache.avalon.excalibur.cli.CLUtil;
 import org.apache.avalon.excalibur.io.ExtensionFileFilter;
 import org.apache.avalon.framework.ExceptionUtil;
-import org.apache.avalon.framework.logger.AbstractLoggable;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.logger.LogKitLogger;
 import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.log.Hierarchy;
 import org.apache.log.LogTarget;
@@ -54,7 +55,7 @@ import org.apache.avalon.excalibur.i18n.Resources;
  * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  */
 public class CLIMain
-    extends AbstractLoggable
+    extends AbstractLogEnabled
 {
     private static final Resources REZ =
         ResourceManager.getPackageResources( CLIMain.class );
@@ -297,7 +298,7 @@ public class CLIMain
 
         //handle logging...
         final String logLevel = m_parameters.getParameter( "log.level", null );
-        setLogger( createLogger( logLevel ) );
+        enableLogging( new LogKitLogger( createLogger( logLevel ) ) );
 
         final String home = m_parameters.getParameter( "myrmidon.home", null );
         final File homeDir = (new File( home )).getAbsoluteFile();

proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/executor/ExecutionFrame.java

@@ -8,7 +8,7 @@
 package org.apache.myrmidon.interfaces.executor;
 
 import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.log.Logger;
+import org.apache.avalon.framework.logger.Logger;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.interfaces.type.TypeManager;
 

proposal/myrmidon/src/java/org/apache/myrmidon/libs/ant1/Ant1Project.java

@@ -10,22 +10,22 @@ package org.apache.myrmidon.libs.ant1;
 import java.io.File;
 import org.apache.avalon.framework.context.Context;
 import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.logger.Loggable;
-import org.apache.log.Logger;
+import org.apache.avalon.framework.logger.LogEnabled;
+import org.apache.avalon.framework.logger.Logger;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.tools.ant.*;
 import org.apache.tools.ant.Project;
 
 public class Ant1Project
     extends Project
-    implements Loggable, Contextualizable
+    implements LogEnabled, Contextualizable
 {
     private Logger   m_logger;
 
     ///Variable to hold context for use by sub-classes
     private TaskContext            m_context;
 
-    public void setLogger( final Logger logger )
+    public void enableLogging( final Logger logger )
     {
         m_logger = logger;
     }

proposal/myrmidon/src/java/org/apache/myrmidon/libs/ant1/TaskAdapter.java

@@ -59,7 +59,7 @@ public class TaskAdapter
     {
         try
         {
-            getProject().setLogger( getLogger() );
+            getProject().enableLogging( getLogger() );
             getProject().contextualize( getContext() );
             getProject().init();