diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor/Embeddor.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor/Embeddor.java
index 9908af13d..907d352d5 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor/Embeddor.java
+++ b/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();
}
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor/MyrmidonEmbeddor.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor/MyrmidonEmbeddor.java
index de707b740..8f4da441f 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor/MyrmidonEmbeddor.java
+++ b/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 );
diff --git a/proposal/myrmidon/src/java/org/apache/ant/project/DefaultProjectEngine.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/manager/DefaultProjectManager.java
similarity index 98%
rename from proposal/myrmidon/src/java/org/apache/ant/project/DefaultProjectEngine.java
rename to proposal/myrmidon/src/java/org/apache/myrmidon/components/manager/DefaultProjectManager.java
index 20a21c5bd..bf1d1dcae 100644
--- a/proposal/myrmidon/src/java/org/apache/ant/project/DefaultProjectEngine.java
+++ b/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 Peter Donald
*/
-public class DefaultProjectEngine
+public class DefaultProjectManager
extends AbstractLoggable
- implements ProjectEngine, Composable
+ implements ProjectManager, Composable
{
private Executor m_executor;
private ProjectListenerSupport m_listenerSupport = new ProjectListenerSupport();
diff --git a/proposal/myrmidon/src/java/org/apache/ant/project/LogTargetToListenerAdapter.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/manager/LogTargetToListenerAdapter.java
similarity index 96%
rename from proposal/myrmidon/src/java/org/apache/ant/project/LogTargetToListenerAdapter.java
rename to proposal/myrmidon/src/java/org/apache/myrmidon/components/manager/LogTargetToListenerAdapter.java
index ee152d135..6819405a5 100644
--- a/proposal/myrmidon/src/java/org/apache/ant/project/LogTargetToListenerAdapter.java
+++ b/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 Peter Donald
*/
public class LogTargetToListenerAdapter
diff --git a/proposal/myrmidon/src/java/org/apache/ant/project/ProjectListenerSupport.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/manager/ProjectListenerSupport.java
similarity index 98%
rename from proposal/myrmidon/src/java/org/apache/ant/project/ProjectListenerSupport.java
rename to proposal/myrmidon/src/java/org/apache/myrmidon/components/manager/ProjectListenerSupport.java
index 0ab02b10f..30a2e0bc6 100644
--- a/proposal/myrmidon/src/java/org/apache/ant/project/ProjectListenerSupport.java
+++ b/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 );
diff --git a/proposal/myrmidon/src/java/org/apache/ant/project/ProjectEngine.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/manager/ProjectManager.java
similarity index 84%
rename from proposal/myrmidon/src/java/org/apache/ant/project/ProjectEngine.java
rename to proposal/myrmidon/src/java/org/apache/myrmidon/components/manager/ProjectManager.java
index b97b9e080..dc1f533ec 100644
--- a/proposal/myrmidon/src/java/org/apache/ant/project/ProjectEngine.java
+++ b/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 Peter Donald
*/
-public interface ProjectEngine
+public interface ProjectManager
extends Component
{
/**