Browse Source

Migrates ProjectListeners to separate package

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269058 13f79535-47bb-0310-9956-ffa450edef68
master
Peter Donald 24 years ago
parent
commit
2579eaa04e
7 changed files with 20 additions and 15 deletions
  1. +2
    -2
      proposal/myrmidon/src/java/org/apache/ant/Main.java
  2. +1
    -0
      proposal/myrmidon/src/java/org/apache/ant/project/DefaultProjectEngine.java
  3. +1
    -0
      proposal/myrmidon/src/java/org/apache/ant/project/LogTargetToListenerAdapter.java
  4. +4
    -3
      proposal/myrmidon/src/java/org/apache/ant/project/ProjectEngine.java
  5. +2
    -0
      proposal/myrmidon/src/java/org/apache/ant/project/ProjectListenerSupport.java
  6. +8
    -8
      proposal/myrmidon/src/java/org/apache/myrmidon/listeners/DefaultProjectListener.java
  7. +2
    -2
      proposal/myrmidon/src/java/org/apache/myrmidon/listeners/ProjectListener.java

+ 2
- 2
proposal/myrmidon/src/java/org/apache/ant/Main.java View File

@@ -25,7 +25,7 @@ import org.apache.ant.project.LogTargetToListenerAdapter;
import org.apache.myrmidon.model.Project; import org.apache.myrmidon.model.Project;
import org.apache.ant.project.ProjectBuilder; import org.apache.ant.project.ProjectBuilder;
import org.apache.ant.project.ProjectEngine; 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.Embeddor;
import org.apache.myrmidon.components.embeddor.MyrmidonEmbeddor; import org.apache.myrmidon.components.embeddor.MyrmidonEmbeddor;
import org.apache.myrmidon.api.JavaVersion; 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_FILENAME = "build.ant";


protected final static String DEFAULT_LISTENER = protected final static String DEFAULT_LISTENER =
"org.apache.ant.project.DefaultProjectListener";
"org.apache.myrmidon.listeners.DefaultProjectListener";


//defines for the Command Line options //defines for the Command Line options
private static final int HELP_OPT = 'h'; private static final int HELP_OPT = 'h';


+ 1
- 0
proposal/myrmidon/src/java/org/apache/ant/project/DefaultProjectEngine.java View File

@@ -24,6 +24,7 @@ import org.apache.log.Logger;
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.components.executor.Executor; import org.apache.myrmidon.components.executor.Executor;
import org.apache.myrmidon.listeners.ProjectListener;
import org.apache.myrmidon.model.Project; import org.apache.myrmidon.model.Project;
import org.apache.myrmidon.model.Target; import org.apache.myrmidon.model.Target;




+ 1
- 0
proposal/myrmidon/src/java/org/apache/ant/project/LogTargetToListenerAdapter.java View File

@@ -9,6 +9,7 @@ package org.apache.ant.project;


import org.apache.log.LogEvent; import org.apache.log.LogEvent;
import org.apache.log.LogTarget; import org.apache.log.LogTarget;
import org.apache.myrmidon.listeners.ProjectListener;


/** /**
* Adapter between Avalon LogKit and Project listener interfaces. * Adapter between Avalon LogKit and Project listener interfaces.


+ 4
- 3
proposal/myrmidon/src/java/org/apache/ant/project/ProjectEngine.java View File

@@ -8,15 +8,16 @@
package org.apache.ant.project; package org.apache.ant.project;


import org.apache.ant.AntException; import org.apache.ant.AntException;
import org.apache.myrmidon.api.TaskContext;
import org.apache.avalon.framework.component.Component; 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; import org.apache.myrmidon.model.Project;


/** /**
* This is the interface between ProjectEngine and rest of the system. * 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. * project execution.
*
*
* @author <a href="mailto:donaldp@apache.org">Peter Donald</a> * @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
*/ */
public interface ProjectEngine public interface ProjectEngine


+ 2
- 0
proposal/myrmidon/src/java/org/apache/ant/project/ProjectListenerSupport.java View File

@@ -7,6 +7,8 @@
*/ */
package org.apache.ant.project; package org.apache.ant.project;


import org.apache.myrmidon.listeners.ProjectListener;

/** /**
* Support for the project listener event dispatching. * Support for the project listener event dispatching.
* *


proposal/myrmidon/src/java/org/apache/ant/project/DefaultProjectListener.java → proposal/myrmidon/src/java/org/apache/myrmidon/listeners/DefaultProjectListener.java View File

@@ -5,7 +5,7 @@
* version 1.1, a copy of which has been included with this distribution in * version 1.1, a copy of which has been included with this distribution in
* the LICENSE file. * the LICENSE file.
*/ */
package org.apache.ant.project;
package org.apache.myrmidon.listeners;


import org.apache.avalon.framework.ExceptionUtil; import org.apache.avalon.framework.ExceptionUtil;


@@ -25,14 +25,14 @@ public class DefaultProjectListener
public void projectStarted() public void projectStarted()
{ {
} }
/** /**
* Notify listener of projectFinished event. * Notify listener of projectFinished event.
*/ */
public void projectFinished() public void projectFinished()
{ {
} }
/** /**
* Notify listener of targetStarted event. * Notify listener of targetStarted event.
* *
@@ -42,14 +42,14 @@ public class DefaultProjectListener
{ {
output( targetName + ":\n" ); output( targetName + ":\n" );
} }
/** /**
* Notify listener of targetFinished event. * Notify listener of targetFinished event.
*/ */
public void targetFinished() public void targetFinished()
{ {
} }
/** /**
* Notify listener of taskStarted event. * Notify listener of taskStarted event.
* *
@@ -59,7 +59,7 @@ public class DefaultProjectListener
{ {
setPrefix( taskName ); setPrefix( taskName );
} }
/** /**
* Notify listener of taskFinished event. * Notify listener of taskFinished event.
*/ */
@@ -67,7 +67,7 @@ public class DefaultProjectListener
{ {
setPrefix( null ); setPrefix( null );
} }
/** /**
* Notify listener of log message event. * Notify listener of log message event.
* *
@@ -77,7 +77,7 @@ public class DefaultProjectListener
{ {
output( message ); output( message );
} }
/** /**
* Notify listener of log message event. * Notify listener of log message event.
* *

proposal/myrmidon/src/java/org/apache/ant/project/ProjectListener.java → proposal/myrmidon/src/java/org/apache/myrmidon/listeners/ProjectListener.java View File

@@ -5,10 +5,10 @@
* version 1.1, a copy of which has been included with this distribution in * version 1.1, a copy of which has been included with this distribution in
* the LICENSE file. * 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. * notification of project status.
* *
* @author <a href="mailto:donaldp@apache.org">Peter Donald</a> * @author <a href="mailto:donaldp@apache.org">Peter Donald</a>

Loading…
Cancel
Save