donaldp 01/11/26 03:35:52
Modified: proposal/myrmidon/src/java/org/apache/myrmidon/api
AbstractTask.java Task.java TaskContext.java
proposal/myrmidon/src/java/org/apache/myrmidon/aspects
AbstractAspectHandler.java AspectHandler.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/aspect
DefaultAspectManager.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/builder
DefaultProjectBuilder.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer
DefaultConfigurer.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/converter
DefaultMasterConverter.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer
DefaultDeployer.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor
DefaultEmbeddor.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/executor
AspectAwareExecutor.java DefaultExecutionFrame.java
DefaultExecutor.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/extensions
DefaultExtensionManager.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace
DefaultWorkspace.java
proposal/myrmidon/src/java/org/apache/myrmidon/frontends
CLIMain.java
proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/executor
ExecutionFrame.java
proposal/myrmidon/src/java/org/apache/myrmidon/libs/ant1
Ant1Project.java TaskAdapter.java
Log:
Update to use LogEnabled interface rather than Loggable interface.
Revision Changes Path
1.6 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/api/AbstractTask.java
Index: AbstractTask.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/api/AbstractTask.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractTask.java 2001/11/19 12:37:24 1.5
+++ AbstractTask.java 2001/11/26 11:35:51 1.6
@@ -11,7 +11,7 @@
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 @@
* @author <a href="mailto:[EMAIL PROTECTED]">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
1.7 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/api/Task.java
Index: Task.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/api/Task.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Task.java 2001/11/19 12:37:24 1.6
+++ Task.java 2001/11/26 11:35:51 1.7
@@ -11,7 +11,7 @@
* 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
1.9 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/api/TaskContext.java
Index: TaskContext.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/api/TaskContext.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TaskContext.java 2001/11/19 12:37:24 1.8
+++ TaskContext.java 2001/11/26 11:35:51 1.9
@@ -15,7 +15,7 @@
* 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:[EMAIL PROTECTED]">Peter Donald</a>
1.5 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/aspects/AbstractAspectHandler.java
Index: AbstractAspectHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/aspects/AbstractAspectHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractAspectHandler.java 2001/11/19 12:37:25 1.4
+++ AbstractAspectHandler.java 2001/11/26 11:35:51 1.5
@@ -9,7 +9,7 @@
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 @@
m_task = task;
}
- public void preLoggable( final Logger logger )
+ public void preLogEnabled( final Logger logger )
throws TaskException
{
m_logger = logger;
1.6 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/aspects/AspectHandler.java
Index: AspectHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/aspects/AspectHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AspectHandler.java 2001/11/19 12:37:25 1.5
+++ AspectHandler.java 2001/11/26 11:35:51 1.6
@@ -9,7 +9,7 @@
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 @@
void postCreate( Task task )
throws TaskException;
- void preLoggable( Logger logger )
+ void preLogEnabled( Logger logger )
throws TaskException;
void preConfigure( Configuration taskModel )
1.7 +3 -3
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/aspect/DefaultAspectManager.java
Index: DefaultAspectManager.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/aspect/DefaultAspectManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultAspectManager.java 2001/11/19 12:37:25 1.6
+++ DefaultAspectManager.java 2001/11/26 11:35:51 1.7
@@ -13,7 +13,7 @@
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 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 );
}
}
1.18 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java
Index: DefaultProjectBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- DefaultProjectBuilder.java 2001/11/26 09:35:57 1.17
+++ DefaultProjectBuilder.java 2001/11/26 11:35:51 1.18
@@ -21,7 +21,7 @@
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 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
public class DefaultProjectBuilder
- extends AbstractLoggable
+ extends AbstractLogEnabled
implements ProjectBuilder
{
private static final Resources REZ =
1.10 +4 -4
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurer.java
Index: DefaultConfigurer.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DefaultConfigurer.java 2001/11/19 12:37:25 1.9
+++ DefaultConfigurer.java 2001/11/26 11:35:51 1.10
@@ -22,8 +22,8 @@
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 @@
* @author <a href="mailto:[EMAIL PROTECTED]">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 );
1.7 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/DefaultMasterConverter.java
Index: DefaultMasterConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/DefaultMasterConverter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultMasterConverter.java 2001/11/19 12:37:25 1.6
+++ DefaultMasterConverter.java 2001/11/26 11:35:51 1.7
@@ -13,7 +13,7 @@
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 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
public class DefaultMasterConverter
- extends AbstractLoggable
+ extends AbstractLogEnabled
implements MasterConverter, Composable
{
private static final Resources REZ =
1.9 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultDeployer.java
Index: DefaultDeployer.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultDeployer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DefaultDeployer.java 2001/11/26 11:11:43 1.8
+++ DefaultDeployer.java 2001/11/26 11:35:51 1.9
@@ -31,7 +31,7 @@
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 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
public class DefaultDeployer
- extends AbstractLoggable
+ extends AbstractLogEnabled
implements Deployer, Initializable, Composable
{
private static final Resources REZ =
1.14 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor/DefaultEmbeddor.java
Index: DefaultEmbeddor.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor/DefaultEmbeddor.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DefaultEmbeddor.java 2001/11/26 09:35:57 1.13
+++ DefaultEmbeddor.java 2001/11/26 11:35:51 1.14
@@ -18,7 +18,7 @@
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 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
public class DefaultEmbeddor
- extends AbstractLoggable
+ extends AbstractLogEnabled
implements Embeddor
{
private static final Resources REZ =
1.8 +3 -3
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/AspectAwareExecutor.java
Index: AspectAwareExecutor.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/AspectAwareExecutor.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AspectAwareExecutor.java 2001/11/04 21:58:16 1.7
+++ AspectAwareExecutor.java 2001/11/26 11:35:51 1.8
@@ -16,7 +16,7 @@
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 @@
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() );
1.7 +4 -4
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/DefaultExecutionFrame.java
Index: DefaultExecutionFrame.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/DefaultExecutionFrame.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultExecutionFrame.java 2001/11/19 12:37:25 1.6
+++ DefaultExecutionFrame.java 2001/11/26 11:35:51 1.7
@@ -13,8 +13,8 @@
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 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
public class DefaultExecutionFrame
- implements ExecutionFrame, Loggable, Contextualizable, Composable
+ implements ExecutionFrame, LogEnabled, Contextualizable, Composable
{
private TypeManager m_typeManager;
@@ -41,7 +41,7 @@
private TaskContext m_context;
private ComponentManager m_componentManager;
- public void setLogger( final Logger logger )
+ public void enableLogging( final Logger logger )
{
m_logger = logger;
}
1.13 +11 -11
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/DefaultExecutor.java
Index: DefaultExecutor.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/DefaultExecutor.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DefaultExecutor.java 2001/11/04 21:58:16 1.12
+++ DefaultExecutor.java 2001/11/26 11:35:51 1.13
@@ -20,22 +20,22 @@
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 @@
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 @@
}
}
- 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 =
1.2 +5 -8
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/extensions/DefaultExtensionManager.java
Index: DefaultExtensionManager.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/extensions/DefaultExtensionManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultExtensionManager.java 2001/11/26 09:35:57 1.1
+++ DefaultExtensionManager.java 2001/11/26 11:35:51 1.2
@@ -12,24 +12,22 @@
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
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.1 $ $Date: 2001/11/26 09:35:57 $
+ * @version $Revision: 1.2 $ $Date: 2001/11/26 11:35:51 $
*/
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 @@
super( new File[ 0 ] );
}
- //enableLogging
- public void setLogger( final Logger logger )
+ public void enableLogging( final Logger logger )
{
m_logger = logger;
}
1.9 +7 -6
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java
Index: DefaultWorkspace.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DefaultWorkspace.java 2001/11/19 12:37:26 1.8
+++ DefaultWorkspace.java 2001/11/26 11:35:51 1.9
@@ -22,12 +22,13 @@
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 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
public class DefaultWorkspace
- extends AbstractLoggable
+ extends AbstractLogEnabled
implements Workspace, Composable, Parameterizable, Initializable
{
private static final Resources REZ =
@@ -236,7 +237,7 @@
//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 @@
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 );
}
1.13 +4 -3
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/frontends/CLIMain.java
Index: CLIMain.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/frontends/CLIMain.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- CLIMain.java 2001/11/19 12:37:27 1.12
+++ CLIMain.java 2001/11/26 11:35:51 1.13
@@ -26,7 +26,8 @@
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 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
*/
public class CLIMain
- extends AbstractLoggable
+ extends AbstractLogEnabled
{
private static final Resources REZ =
ResourceManager.getPackageResources( CLIMain.class );
@@ -297,7 +298,7 @@
//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();
1.3 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/executor/ExecutionFrame.java
Index: ExecutionFrame.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/executor/ExecutionFrame.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ExecutionFrame.java 2001/11/19 12:37:27 1.2
+++ ExecutionFrame.java 2001/11/26 11:35:51 1.3
@@ -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;
1.2 +4 -4
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/libs/ant1/Ant1Project.java
Index: Ant1Project.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/libs/ant1/Ant1Project.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Ant1Project.java 2001/06/16 03:22:21 1.1
+++ Ant1Project.java 2001/11/26 11:35:52 1.2
@@ -10,22 +10,22 @@
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;
}
1.5 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/libs/ant1/TaskAdapter.java
Index: TaskAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/libs/ant1/TaskAdapter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TaskAdapter.java 2001/11/19 12:37:28 1.4
+++ TaskAdapter.java 2001/11/26 11:35:52 1.5
@@ -59,7 +59,7 @@
{
try
{
- getProject().setLogger( getLogger() );
+ getProject().enableLogging( getLogger() );
getProject().contextualize( getContext() );
getProject().init();
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
