ProjectEngine->ProjectManager (need a better name).

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269063 13f79535-47bb-0310-9956-ffa450edef68

proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor/Embeddor.java

@@ -7,13 +7,13 @@
  */
 package org.apache.myrmidon.components.embeddor;
 
-import org.apache.ant.project.ProjectEngine;
 import org.apache.avalon.framework.activity.Disposable;
 import org.apache.avalon.framework.activity.Initializable;
 import org.apache.avalon.framework.activity.Startable;
 import org.apache.avalon.framework.component.Component;
 import org.apache.avalon.framework.parameters.Parameterizable;
 import org.apache.myrmidon.components.builder.ProjectBuilder;
+import org.apache.myrmidon.components.manager.ProjectManager;
 
 /**
  * Interface through which you embed Myrmidon into applications.
@@ -37,5 +37,5 @@ public interface Embeddor
      *
      * @return the ProjectBuilder
      */
-    ProjectEngine getProjectEngine();
+    ProjectManager getProjectManager();
 }

proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor/MyrmidonEmbeddor.java

@@ -10,7 +10,6 @@ package org.apache.myrmidon.components.embeddor;
 import java.io.File;
 import org.apache.ant.AntException;
 import org.apache.ant.convert.engine.ConverterEngine;
-import org.apache.ant.project.ProjectEngine;
 import org.apache.ant.tasklet.engine.DataTypeEngine;
 import org.apache.ant.tasklet.engine.TskDeployer;
 import org.apache.avalon.excalibur.io.FileUtil;
@@ -29,6 +28,7 @@ import org.apache.myrmidon.api.JavaVersion;
 import org.apache.myrmidon.components.builder.ProjectBuilder;
 import org.apache.myrmidon.components.configurer.Configurer;
 import org.apache.myrmidon.components.executor.Executor;
+import org.apache.myrmidon.components.manager.ProjectManager;
 
 /**
  * Default implementation of Ant runtime.
@@ -42,7 +42,7 @@ public class MyrmidonEmbeddor
     private ConverterEngine          m_converterEngine;
     private DataTypeEngine           m_dataTypeEngine;
     private Executor                 m_executor;
-    private ProjectEngine            m_projectEngine;
+    private ProjectManager            m_projectEngine;
 
     private ProjectBuilder           m_builder;
     private TskDeployer              m_deployer;
@@ -87,7 +87,7 @@ public class MyrmidonEmbeddor
      *
      * @return the ProjectBuilder
      */
-    public ProjectEngine getProjectEngine()
+    public ProjectManager getProjectManager()
     {
         return m_projectEngine;
     }
@@ -174,7 +174,7 @@ public class MyrmidonEmbeddor
         defaults.setParameter( "ant.comp.task",
                                "org.apache.myrmidon.components.executor.DefaultExecutor" );
         defaults.setParameter( "ant.comp.project",
-                               "org.apache.ant.project.DefaultProjectEngine" );
+                               "org.apache.myrmidon.components.manager.DefaultProjectManager" );
         defaults.setParameter( "ant.comp.builder",
                                "org.apache.myrmidon.components.builder.DefaultProjectBuilder" );
         defaults.setParameter( "ant.comp.deployer",
@@ -194,7 +194,7 @@ public class MyrmidonEmbeddor
     {
         final DefaultComponentManager componentManager = new DefaultComponentManager();
 
-        componentManager.put( "org.apache.ant.project.ProjectEngine", m_projectEngine );
+        componentManager.put( "org.apache.myrmidon.components.manager.ProjectManager", m_projectEngine );
         componentManager.put( "org.apache.ant.convert.engine.ConverterEngine",
                               m_converterEngine );
         componentManager.put( "org.apache.ant.convert.Converter", m_converterEngine );
@@ -229,7 +229,7 @@ public class MyrmidonEmbeddor
         m_executor = (Executor)createComponent( component, Executor.class );
 
         component = getParameter( "ant.comp.project" );
-        m_projectEngine = (ProjectEngine)createComponent( component, ProjectEngine.class );
+        m_projectEngine = (ProjectManager)createComponent( component, ProjectManager.class );
 
         component = getParameter( "ant.comp.builder" );
         m_builder =(ProjectBuilder)createComponent( component, ProjectBuilder.class );

proposal/myrmidon/src/java/org/apache/ant/project/DefaultProjectEngine.java → proposal/myrmidon/src/java/org/apache/myrmidon/components/manager/DefaultProjectManager.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.components.manager;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -24,18 +24,18 @@ 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.components.model.Project;
 import org.apache.myrmidon.components.model.Target;
+import org.apache.myrmidon.listeners.ProjectListener;
 
 /**
  * This is the default implementation of ProjectEngine.
  *
  * @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
  */
-public class DefaultProjectEngine
+public class DefaultProjectManager
     extends AbstractLoggable
-    implements ProjectEngine, Composable
+    implements ProjectManager, Composable
 {
     private Executor                 m_executor;
     private ProjectListenerSupport   m_listenerSupport = new ProjectListenerSupport();

proposal/myrmidon/src/java/org/apache/ant/project/LogTargetToListenerAdapter.java → proposal/myrmidon/src/java/org/apache/myrmidon/components/manager/LogTargetToListenerAdapter.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.components.manager;
 
 import org.apache.log.LogEvent;
 import org.apache.log.LogTarget;
@@ -13,7 +13,7 @@ import org.apache.myrmidon.listeners.ProjectListener;
 
 /**
  * Adapter between Avalon LogKit and Project listener interfaces.
- * 
+ *
  * @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
  */
 public class LogTargetToListenerAdapter

proposal/myrmidon/src/java/org/apache/ant/project/ProjectListenerSupport.java → proposal/myrmidon/src/java/org/apache/myrmidon/components/manager/ProjectListenerSupport.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.components.manager;
 
 import org.apache.myrmidon.listeners.ProjectListener;
 
@@ -51,7 +51,7 @@ public class ProjectListenerSupport
         }
 
         if( -1 == found ) return;
-        
+
         final ProjectListener[] listeners = new ProjectListener[ m_listeners.length - 1 ];
         System.arraycopy( m_listeners, 0, listeners, 0, found );
 

proposal/myrmidon/src/java/org/apache/ant/project/ProjectEngine.java → proposal/myrmidon/src/java/org/apache/myrmidon/components/manager/ProjectManager.java

@@ -5,22 +5,21 @@
  * 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.components.manager;
 
 import org.apache.ant.AntException;
 import org.apache.avalon.framework.component.Component;
 import org.apache.myrmidon.api.TaskContext;
-import org.apache.myrmidon.listeners.ProjectListener;
 import org.apache.myrmidon.components.model.Project;
+import org.apache.myrmidon.listeners.ProjectListener;
 
 /**
- * This is the interface between ProjectEngine and rest of the system.
- * This is the interface that tasks/frontends must use to interact with
- * project execution.
+ * This is the abstraction through which Projects are executed.
+ * TODO: Think of better name
  *
  * @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
  */
-public interface ProjectEngine
+public interface ProjectManager
     extends Component
 {
     /**