Browse Source

Separated Log hierarchy for tasks and engine.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269256 13f79535-47bb-0310-9956-ffa450edef68
master
Peter Donald 24 years ago
parent
commit
bb630e09c3
2 changed files with 17 additions and 5 deletions
  1. +12
    -1
      proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java
  2. +5
    -4
      proposal/myrmidon/src/java/org/apache/myrmidon/frontends/CLIMain.java

+ 12
- 1
proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java View File

@@ -23,7 +23,9 @@ import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.avalon.framework.parameters.ParameterException; import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameterizable; import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.Parameters; import org.apache.avalon.framework.parameters.Parameters;
import org.apache.log.Hierarchy;
import org.apache.log.Logger; import org.apache.log.Logger;
import org.apache.log.LogTarget;
import org.apache.myrmidon.api.DefaultTaskContext; import org.apache.myrmidon.api.DefaultTaskContext;
import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskException;
@@ -56,6 +58,8 @@ public class DefaultWorkspace
private TaskContext m_baseContext; private TaskContext m_baseContext;
private HashMap m_entrys = new HashMap(); private HashMap m_entrys = new HashMap();
private TypeManager m_typeManager; private TypeManager m_typeManager;
private Hierarchy m_hierarchy;
private int m_projectID;


/** /**
* Add a listener to project events. * Add a listener to project events.
@@ -101,6 +105,11 @@ public class DefaultWorkspace
throws Exception throws Exception
{ {
m_baseContext = createBaseContext(); m_baseContext = createBaseContext();

m_hierarchy = new Hierarchy();

final LogTarget target = new LogTargetToListenerAdapter( m_listenerSupport );
m_hierarchy.setDefaultLogTarget( target );
} }


/** /**
@@ -253,8 +262,10 @@ public class DefaultWorkspace


try try
{ {
final Logger logger = m_hierarchy.getLoggerFor( "project" + m_projectID );
m_projectID++;


frame.setLogger( getLogger() );
frame.setLogger( logger );
frame.contextualize( context ); frame.contextualize( context );
frame.compose( componentManager ); frame.compose( componentManager );
} }


+ 5
- 4
proposal/myrmidon/src/java/org/apache/myrmidon/frontends/CLIMain.java View File

@@ -32,6 +32,7 @@ import org.apache.log.Hierarchy;
import org.apache.log.LogTarget; import org.apache.log.LogTarget;
import org.apache.log.Logger; import org.apache.log.Logger;
import org.apache.log.Priority; import org.apache.log.Priority;
import org.apache.log.output.DefaultOutputLogTarget;
import org.apache.myrmidon.Constants; import org.apache.myrmidon.Constants;
import org.apache.myrmidon.api.DefaultTaskContext; import org.apache.myrmidon.api.DefaultTaskContext;
import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskContext;
@@ -40,7 +41,6 @@ import org.apache.myrmidon.components.builder.ProjectBuilder;
import org.apache.myrmidon.components.executor.Executor; import org.apache.myrmidon.components.executor.Executor;
import org.apache.myrmidon.components.embeddor.Embeddor; import org.apache.myrmidon.components.embeddor.Embeddor;
import org.apache.myrmidon.components.embeddor.DefaultEmbeddor; import org.apache.myrmidon.components.embeddor.DefaultEmbeddor;
import org.apache.myrmidon.components.workspace.LogTargetToListenerAdapter;
import org.apache.myrmidon.components.workspace.Workspace; import org.apache.myrmidon.components.workspace.Workspace;
import org.apache.myrmidon.components.model.Project; import org.apache.myrmidon.components.model.Project;
import org.apache.myrmidon.listeners.ProjectListener; import org.apache.myrmidon.listeners.ProjectListener;
@@ -321,9 +321,6 @@ public class CLIMain
final String listenerName = m_parameters.getParameter( "listener", null ); final String listenerName = m_parameters.getParameter( "listener", null );
final ProjectListener listener = createListener( listenerName ); final ProjectListener listener = createListener( listenerName );


final LogTarget target = new LogTargetToListenerAdapter( listener );
getLogger().setLogTargets( new LogTarget[] { target } );

getLogger().warn( "Ant Build File: " + buildFile ); getLogger().warn( "Ant Build File: " + buildFile );
getLogger().info( "Ant Home Directory: " + homeDir ); getLogger().info( "Ant Home Directory: " + homeDir );
//getLogger().info( "Ant Bin Directory: " + m_binDir ); //getLogger().info( "Ant Bin Directory: " + m_binDir );
@@ -432,6 +429,10 @@ public class CLIMain


final Logger logger = Hierarchy.getDefaultHierarchy().getLoggerFor( "myrmidon" ); final Logger logger = Hierarchy.getDefaultHierarchy().getLoggerFor( "myrmidon" );


final DefaultOutputLogTarget target = new DefaultOutputLogTarget();
target.setFormat( "[%8.8{category}] %{message}\\n%{throwable}" );
logger.setLogTargets( new LogTarget[] { target } );

logger.setPriority( priority ); logger.setPriority( priority );


return logger; return logger;


Loading…
Cancel
Save