From bb630e09c3c336c3eb060a610eeb91be44a33d4c Mon Sep 17 00:00:00 2001
From: Peter Donald <donaldp@apache.org>
Date: Fri, 29 Jun 2001 08:58:41 +0000
Subject: [PATCH] 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
---
 .../components/workspace/DefaultWorkspace.java      | 13 ++++++++++++-
 .../java/org/apache/myrmidon/frontends/CLIMain.java |  9 +++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java
index 697c07d77..3f1cf4218 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java
@@ -23,7 +23,9 @@ import org.apache.avalon.framework.logger.AbstractLoggable;
 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.log.LogTarget;
 import org.apache.myrmidon.api.DefaultTaskContext;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.api.TaskException;
@@ -56,6 +58,8 @@ public class DefaultWorkspace
     private TaskContext              m_baseContext;
     private HashMap                  m_entrys            = new HashMap();
     private TypeManager              m_typeManager;
+    private Hierarchy                m_hierarchy;
+    private int                      m_projectID;
 
     /**
      * Add a listener to project events.
@@ -101,6 +105,11 @@ public class DefaultWorkspace
         throws Exception
     {
         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
         {
+            final Logger logger = m_hierarchy.getLoggerFor( "project" + m_projectID );
+            m_projectID++;
 
-            frame.setLogger( getLogger() );
+            frame.setLogger( logger );
             frame.contextualize( context );
             frame.compose( componentManager );
         }
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/frontends/CLIMain.java b/proposal/myrmidon/src/java/org/apache/myrmidon/frontends/CLIMain.java
index 99eb5d684..662e555a4 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/frontends/CLIMain.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/frontends/CLIMain.java
@@ -32,6 +32,7 @@ import org.apache.log.Hierarchy;
 import org.apache.log.LogTarget;
 import org.apache.log.Logger;
 import org.apache.log.Priority;
+import org.apache.log.output.DefaultOutputLogTarget;
 import org.apache.myrmidon.Constants;
 import org.apache.myrmidon.api.DefaultTaskContext;
 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.embeddor.Embeddor;
 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.model.Project;
 import org.apache.myrmidon.listeners.ProjectListener;
@@ -321,9 +321,6 @@ public class CLIMain
         final String listenerName = m_parameters.getParameter( "listener", null );
         final ProjectListener listener = createListener( listenerName );
 
-        final LogTarget target = new LogTargetToListenerAdapter( listener );
-        getLogger().setLogTargets( new LogTarget[] { target } );
-
         getLogger().warn( "Ant Build File: " + buildFile );
         getLogger().info( "Ant Home Directory: " + homeDir );
         //getLogger().info( "Ant Bin Directory: " + m_binDir );
@@ -432,6 +429,10 @@ public class CLIMain
 
         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 );
 
         return logger;