donaldp 02/03/12 01:45:10
Modified:
proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace
DefaultWorkspace.java DefaultTaskContext.java
proposal/myrmidon/src/java/org/apache/myrmidon/frontends
BasicLogger.java
Added:
proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace
RoutingLogger.java
Removed:
proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace
LogTargetToListenerAdapter.java
Log:
Remove LogKit dependencies from workspace package by introducing alternate
logger implementation to do routing.
Revision Changes Path
1.31 +2 -12
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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- DefaultWorkspace.java 6 Mar 2002 10:09:45 -0000 1.30
+++ DefaultWorkspace.java 12 Mar 2002 09:45:10 -0000 1.31
@@ -16,7 +16,6 @@
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.configuration.Configuration;
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;
@@ -25,7 +24,6 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
-import org.apache.log.Hierarchy;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.framework.conditions.Condition;
@@ -45,7 +43,7 @@
* This is the default implementation of Workspace.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.30 $ $Date: 2002/03/06 10:09:45 $
+ * @version $Revision: 1.31 $ $Date: 2002/03/12 09:45:10 $
*/
public class DefaultWorkspace
extends AbstractLogEnabled
@@ -62,8 +60,6 @@
private HashMap m_entries = new HashMap();
private TypeManager m_typeManager;
private Deployer m_deployer;
- private Hierarchy m_hierarchy;
- private int m_projectID;
/**
* Add a listener to project events.
@@ -110,11 +106,6 @@
throws Exception
{
m_baseContext = createBaseContext();
-
- m_hierarchy = new Hierarchy();
-
- final LogTargetToListenerAdapter target = new
LogTargetToListenerAdapter( m_listenerSupport );
- m_hierarchy.setDefaultLogTarget( target );
}
/**
@@ -258,8 +249,7 @@
// Create a logger
final Logger logger =
- new LogKitLogger( m_hierarchy.getLoggerFor( "project" +
m_projectID ) );
- m_projectID++;
+ new RoutingLogger( RoutingLogger.LEVEL_DEBUG, m_listenerSupport
);
// Create and configure the context
final DefaultTaskContext context =
1.24 +12 -18
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultTaskContext.java
Index: DefaultTaskContext.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultTaskContext.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- DefaultTaskContext.java 12 Mar 2002 08:41:37 -0000 1.23
+++ DefaultTaskContext.java 12 Mar 2002 09:45:10 -0000 1.24
@@ -15,9 +15,9 @@
import org.apache.avalon.excalibur.io.FileUtil;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.logger.Logger;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.interfaces.model.DefaultNameValidator;
@@ -27,7 +27,7 @@
* Default implementation of TaskContext.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.23 $ $Date: 2002/03/12 08:41:37 $
+ * @version $Revision: 1.24 $ $Date: 2002/03/12 09:45:10 $
*/
public class DefaultTaskContext
implements TaskContext, Context
@@ -36,18 +36,18 @@
ResourceManager.getPackageResources( DefaultTaskContext.class );
// Property name validator allows digits, but no internal whitespace.
- private static DefaultNameValidator m_propertyNameValidator = new
DefaultNameValidator();
+ private static DefaultNameValidator c_propertyNameValidator = new
DefaultNameValidator();
static
{
- m_propertyNameValidator.setAllowInternalWhitespace( false );
+ c_propertyNameValidator.setAllowInternalWhitespace( false );
}
private final Map m_contextData = new Hashtable();
private final TaskContext m_parent;
- private ServiceManager m_serviceManager;
- private Logger m_logger;
- private PropertyResolver m_propertyResolver;
+ private final ServiceManager m_serviceManager;
+ private final Logger m_logger;
+ private final PropertyResolver m_propertyResolver;
/**
* Constructor that takes both parent context and a service directory.
@@ -55,10 +55,12 @@
public DefaultTaskContext( final TaskContext parent,
final ServiceManager serviceManager,
final Logger logger )
+ throws TaskException
{
m_parent = parent;
m_serviceManager = serviceManager;
m_logger = logger;
+ m_propertyResolver = (PropertyResolver)getService(
PropertyResolver.class );
}
/**
@@ -96,7 +98,7 @@
{
// Try this context first
final String name = serviceClass.getName();
- if( m_serviceManager != null && m_serviceManager.hasService( name ) )
+ if( null != m_serviceManager && m_serviceManager.hasService( name ) )
{
try
{
@@ -148,15 +150,8 @@
{
try
{
- // Lazy lookup of the PropertyResolver
- if( m_propertyResolver == null )
- {
- m_propertyResolver = (PropertyResolver)getService(
PropertyResolver.class );
- }
-
final Object object =
m_propertyResolver.resolveProperties( value, this );
-
if( null == object )
{
final String message = REZ.getString(
"null-resolved-value.error", value );
@@ -347,9 +342,8 @@
public TaskContext createSubContext( final String name )
throws TaskException
{
- final Logger logger = m_logger.getChildLogger( name );
final DefaultTaskContext context =
- new DefaultTaskContext( this, m_serviceManager, logger );
+ new DefaultTaskContext( this, m_serviceManager, m_logger );
context.setProperty( TaskContext.NAME, getName() + "." + name );
context.setProperty( TaskContext.BASE_DIRECTORY, getBaseDirectory()
);
@@ -378,7 +372,7 @@
{
try
{
- m_propertyNameValidator.validate( name );
+ c_propertyNameValidator.validate( name );
}
catch( Exception e )
{
1.1
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/RoutingLogger.java
Index: RoutingLogger.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.myrmidon.components.workspace;
import org.apache.myrmidon.frontends.BasicLogger;
/**
* A basic logger that just routes the messages to the ProjectListenerSupport.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
* @version $Revision: 1.1 $ $Date: 2002/03/12 09:45:10 $
*/
final class RoutingLogger
extends BasicLogger
{
/**
* The endpoint of all the logging messages.
*/
private final ProjectListenerSupport m_listenerSupport;
/**
* Create a Logger that routes messages at specified level
* to specified support.
*/
public RoutingLogger( final int logLevel,
final ProjectListenerSupport listenerSupport )
{
super( null, logLevel );
m_listenerSupport = listenerSupport;
}
/**
* Utility method to output messages.
*/
protected void output( final String message, final Throwable throwable )
{
m_listenerSupport.log( message, throwable );
}
}
1.2 +3 -3
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/frontends/BasicLogger.java
Index: BasicLogger.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/frontends/BasicLogger.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BasicLogger.java 12 Mar 2002 09:10:33 -0000 1.1
+++ BasicLogger.java 12 Mar 2002 09:45:10 -0000 1.2
@@ -14,9 +14,9 @@
* A basic logger that just prints out messages to <code>System.out</code>.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.1 $ $Date: 2002/03/12 09:10:33 $
+ * @version $Revision: 1.2 $ $Date: 2002/03/12 09:45:10 $
*/
-class BasicLogger
+public class BasicLogger
implements Logger
{
public final static int LEVEL_DEBUG = 0;
@@ -246,7 +246,7 @@
/**
* Utility method to output messages.
*/
- private void output( final String message, final Throwable throwable )
+ protected void output( final String message, final Throwable throwable )
{
final StringBuffer sb = new StringBuffer( m_prefix );
if( null != message )
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
