From 2579eaa04ea64c67c1c19e32b50c63af76ffe9c8 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Tue, 29 May 2001 06:56:23 +0000 Subject: [PATCH] Migrates ProjectListeners to separate package git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269058 13f79535-47bb-0310-9956-ffa450edef68 --- .../myrmidon/src/java/org/apache/ant/Main.java | 4 ++-- .../apache/ant/project/DefaultProjectEngine.java | 1 + .../ant/project/LogTargetToListenerAdapter.java | 1 + .../org/apache/ant/project/ProjectEngine.java | 7 ++++--- .../ant/project/ProjectListenerSupport.java | 2 ++ .../listeners}/DefaultProjectListener.java | 16 ++++++++-------- .../listeners}/ProjectListener.java | 4 ++-- 7 files changed, 20 insertions(+), 15 deletions(-) rename proposal/myrmidon/src/java/org/apache/{ant/project => myrmidon/listeners}/DefaultProjectListener.java (97%) rename proposal/myrmidon/src/java/org/apache/{ant/project => myrmidon/listeners}/ProjectListener.java (93%) diff --git a/proposal/myrmidon/src/java/org/apache/ant/Main.java b/proposal/myrmidon/src/java/org/apache/ant/Main.java index b17e4baa6..a81d929cd 100644 --- a/proposal/myrmidon/src/java/org/apache/ant/Main.java +++ b/proposal/myrmidon/src/java/org/apache/ant/Main.java @@ -25,7 +25,7 @@ import org.apache.ant.project.LogTargetToListenerAdapter; import org.apache.myrmidon.model.Project; import org.apache.ant.project.ProjectBuilder; import org.apache.ant.project.ProjectEngine; -import org.apache.ant.project.ProjectListener; +import org.apache.myrmidon.listeners.ProjectListener; import org.apache.myrmidon.components.embeddor.Embeddor; import org.apache.myrmidon.components.embeddor.MyrmidonEmbeddor; import org.apache.myrmidon.api.JavaVersion; @@ -70,7 +70,7 @@ public class Main protected final static String DEFAULT_FILENAME = "build.ant"; protected final static String DEFAULT_LISTENER = - "org.apache.ant.project.DefaultProjectListener"; + "org.apache.myrmidon.listeners.DefaultProjectListener"; //defines for the Command Line options private static final int HELP_OPT = 'h'; diff --git a/proposal/myrmidon/src/java/org/apache/ant/project/DefaultProjectEngine.java b/proposal/myrmidon/src/java/org/apache/ant/project/DefaultProjectEngine.java index febf3eddf..53491253a 100644 --- a/proposal/myrmidon/src/java/org/apache/ant/project/DefaultProjectEngine.java +++ b/proposal/myrmidon/src/java/org/apache/ant/project/DefaultProjectEngine.java @@ -24,6 +24,7 @@ import org.apache.log.Logger; import org.apache.myrmidon.api.DefaultTaskContext; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.components.executor.Executor; +import org.apache.myrmidon.listeners.ProjectListener; import org.apache.myrmidon.model.Project; import org.apache.myrmidon.model.Target; diff --git a/proposal/myrmidon/src/java/org/apache/ant/project/LogTargetToListenerAdapter.java b/proposal/myrmidon/src/java/org/apache/ant/project/LogTargetToListenerAdapter.java index ff79637e3..ee152d135 100644 --- a/proposal/myrmidon/src/java/org/apache/ant/project/LogTargetToListenerAdapter.java +++ b/proposal/myrmidon/src/java/org/apache/ant/project/LogTargetToListenerAdapter.java @@ -9,6 +9,7 @@ package org.apache.ant.project; import org.apache.log.LogEvent; import org.apache.log.LogTarget; +import org.apache.myrmidon.listeners.ProjectListener; /** * Adapter between Avalon LogKit and Project listener interfaces. diff --git a/proposal/myrmidon/src/java/org/apache/ant/project/ProjectEngine.java b/proposal/myrmidon/src/java/org/apache/ant/project/ProjectEngine.java index c0cb293e6..6e09cb625 100644 --- a/proposal/myrmidon/src/java/org/apache/ant/project/ProjectEngine.java +++ b/proposal/myrmidon/src/java/org/apache/ant/project/ProjectEngine.java @@ -8,15 +8,16 @@ package org.apache.ant.project; import org.apache.ant.AntException; -import org.apache.myrmidon.api.TaskContext; import org.apache.avalon.framework.component.Component; +import org.apache.myrmidon.api.TaskContext; +import org.apache.myrmidon.listeners.ProjectListener; import org.apache.myrmidon.model.Project; /** * This is the interface between ProjectEngine and rest of the system. - * This is the interface that tasks/frontends must use to interact with + * This is the interface that tasks/frontends must use to interact with * project execution. - * + * * @author Peter Donald */ public interface ProjectEngine diff --git a/proposal/myrmidon/src/java/org/apache/ant/project/ProjectListenerSupport.java b/proposal/myrmidon/src/java/org/apache/ant/project/ProjectListenerSupport.java index 3b9a371e4..0ab02b10f 100644 --- a/proposal/myrmidon/src/java/org/apache/ant/project/ProjectListenerSupport.java +++ b/proposal/myrmidon/src/java/org/apache/ant/project/ProjectListenerSupport.java @@ -7,6 +7,8 @@ */ package org.apache.ant.project; +import org.apache.myrmidon.listeners.ProjectListener; + /** * Support for the project listener event dispatching. * diff --git a/proposal/myrmidon/src/java/org/apache/ant/project/DefaultProjectListener.java b/proposal/myrmidon/src/java/org/apache/myrmidon/listeners/DefaultProjectListener.java similarity index 97% rename from proposal/myrmidon/src/java/org/apache/ant/project/DefaultProjectListener.java rename to proposal/myrmidon/src/java/org/apache/myrmidon/listeners/DefaultProjectListener.java index 51dd9d230..c2ddc5fb2 100644 --- a/proposal/myrmidon/src/java/org/apache/ant/project/DefaultProjectListener.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/listeners/DefaultProjectListener.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE file. */ -package org.apache.ant.project; +package org.apache.myrmidon.listeners; import org.apache.avalon.framework.ExceptionUtil; @@ -25,14 +25,14 @@ public class DefaultProjectListener public void projectStarted() { } - + /** * Notify listener of projectFinished event. */ public void projectFinished() { } - + /** * Notify listener of targetStarted event. * @@ -42,14 +42,14 @@ public class DefaultProjectListener { output( targetName + ":\n" ); } - + /** * Notify listener of targetFinished event. */ public void targetFinished() { } - + /** * Notify listener of taskStarted event. * @@ -59,7 +59,7 @@ public class DefaultProjectListener { setPrefix( taskName ); } - + /** * Notify listener of taskFinished event. */ @@ -67,7 +67,7 @@ public class DefaultProjectListener { setPrefix( null ); } - + /** * Notify listener of log message event. * @@ -77,7 +77,7 @@ public class DefaultProjectListener { output( message ); } - + /** * Notify listener of log message event. * diff --git a/proposal/myrmidon/src/java/org/apache/ant/project/ProjectListener.java b/proposal/myrmidon/src/java/org/apache/myrmidon/listeners/ProjectListener.java similarity index 93% rename from proposal/myrmidon/src/java/org/apache/ant/project/ProjectListener.java rename to proposal/myrmidon/src/java/org/apache/myrmidon/listeners/ProjectListener.java index c2d75d3b5..f721f5028 100644 --- a/proposal/myrmidon/src/java/org/apache/ant/project/ProjectListener.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/listeners/ProjectListener.java @@ -5,10 +5,10 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE file. */ -package org.apache.ant.project; +package org.apache.myrmidon.listeners; /** - * The interface to implement if you want to receive + * The interface to implement if you want to receive * notification of project status. * * @author Peter Donald