diff --git a/proposal/myrmidon/src/java/org/apache/ant/modules/basic/Property.java b/proposal/myrmidon/src/java/org/apache/ant/modules/basic/Property.java
index 1b2d538b7..a7bc72584 100644
--- a/proposal/myrmidon/src/java/org/apache/ant/modules/basic/Property.java
+++ b/proposal/myrmidon/src/java/org/apache/ant/modules/basic/Property.java
@@ -14,7 +14,7 @@ import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.myrmidon.framework.AbstractContainerTask;
-import org.apache.myrmidon.api.DataType;
+import org.apache.myrmidon.framework.DataType;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.components.type.TypeManager;
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/Constants.java b/proposal/myrmidon/src/java/org/apache/myrmidon/Constants.java
index 45a58eda1..5116f0b68 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/Constants.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/Constants.java
@@ -14,7 +14,7 @@ package org.apache.myrmidon;
*/
public interface Constants
{
- //Constants to indicate the build of Ant/Myrmidon
+ //Constants to indicate the build of Myrmidon
String BUILD_DATE = "@@DATE@@";
String BUILD_VERSION = "@@VERSION@@";
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurer.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurer.java
index 79ddc7da5..4ba57dc4e 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurer.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurer.java
@@ -70,7 +70,7 @@ public class DefaultConfigurer
* configurers.
* This one does it by first checking if object implements Configurable
* and if it does will pass the task the configuration - else it will use
- * ants rules to map configuration to types
+ * mapping rules to map configuration to types
*
* @param object the object
* @param configuration the configuration
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultDeployer.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultDeployer.java
index 91fb94c01..c92de1575 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultDeployer.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultDeployer.java
@@ -22,11 +22,11 @@ import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
import org.apache.avalon.framework.logger.AbstractLoggable;
-import org.apache.myrmidon.api.DataType;
import org.apache.myrmidon.api.Task;
import org.apache.myrmidon.components.converter.ConverterRegistry;
import org.apache.myrmidon.components.type.DefaultTypeFactory;
import org.apache.myrmidon.components.type.TypeManager;
+import org.apache.myrmidon.components.role.RoleManager;
import org.apache.myrmidon.converter.Converter;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor/DefaultEmbeddor.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor/DefaultEmbeddor.java
index 3868a5ad0..3881cf0df 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor/DefaultEmbeddor.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor/DefaultEmbeddor.java
@@ -27,7 +27,7 @@ import org.apache.myrmidon.components.converter.ConverterRegistry;
import org.apache.myrmidon.components.converter.MasterConverter;
import org.apache.myrmidon.components.deployer.Deployer;
import org.apache.myrmidon.components.deployer.DeploymentException;
-import org.apache.myrmidon.components.deployer.RoleManager;
+import org.apache.myrmidon.components.role.RoleManager;
import org.apache.myrmidon.components.executor.Executor;
import org.apache.myrmidon.components.manager.ProjectManager;
import org.apache.myrmidon.components.type.TypeFactory;
@@ -228,7 +228,7 @@ public class DefaultEmbeddor
defaults.setParameter( AspectManager.ROLE,
"org.apache.myrmidon.components.aspect.DefaultAspectManager" );
defaults.setParameter( RoleManager.ROLE,
- "org.apache.myrmidon.components.deployer.DefaultRoleManager" );
+ "org.apache.myrmidon.components.role.DefaultRoleManager" );
defaults.setParameter( MasterConverter.ROLE,
"org.apache.myrmidon.components.converter.DefaultMasterConverter" );
defaults.setParameter( ConverterRegistry.ROLE,
@@ -240,9 +240,6 @@ public class DefaultEmbeddor
"org.apache.myrmidon.components.executor.AspectAwareExecutor" );
defaults.setParameter( ProjectManager.ROLE,
"org.apache.myrmidon.components.manager.DefaultProjectManager" );
- //defaults.setParameter( ProjectBuilder.ROLE,
- //"org.apache.myrmidon.components.builder.DefaultProjectBuilder" );
- //"org.apache.myrmidon.components.builder.XSLProjectBuilder" );
defaults.setParameter( Deployer.ROLE,
"org.apache.myrmidon.components.deployer.DefaultDeployer" );
defaults.setParameter( Configurer.ROLE,
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/DefaultExecutionFrame.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/DefaultExecutionFrame.java
index 8b975d4c9..1f08164ed 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/DefaultExecutionFrame.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/DefaultExecutionFrame.java
@@ -22,9 +22,9 @@ import org.apache.myrmidon.components.configurer.Configurer;
import org.apache.myrmidon.components.converter.ConverterRegistry;
import org.apache.myrmidon.components.converter.MasterConverter;
import org.apache.myrmidon.components.deployer.Deployer;
-import org.apache.myrmidon.components.deployer.RoleManager;
import org.apache.myrmidon.components.executor.Executor;
import org.apache.myrmidon.components.manager.ProjectManager;
+import org.apache.myrmidon.components.role.RoleManager;
import org.apache.myrmidon.components.type.TypeManager;
/**
@@ -60,38 +60,6 @@ public class DefaultExecutionFrame
public void compose( final ComponentManager componentManager )
throws ComponentException
{
-/*
- final RoleManager roleManager = (RoleManager)componentManager.lookup( RoleManager.ROLE );
- m_componentManager.put( RoleManager.ROLE, roleManager );
-
- final Configurer configurer = (Configurer)componentManager.lookup( Configurer.ROLE );
- m_componentManager.put( Configurer.ROLE, configurer );
-
- final MasterConverter masterConverter =
- (MasterConverter)componentManager.lookup( MasterConverter.ROLE );
- m_componentManager.put( MasterConverter.ROLE, masterConverter );
-
- final AspectManager aspectManager = (AspectManager)componentManager.lookup( AspectManager.ROLE );
- m_componentManager.put( AspectManager.ROLE, aspectManager );
-
- final Deployer deployer = (Deployer)componentManager.lookup( Deployer.ROLE );
- m_componentManager.put( Deployer.ROLE, deployer );
-
- final Executor executor = (Executor)componentManager.lookup( Executor.ROLE );
- m_componentManager.put( Executor.ROLE, executor );
-
- final ProjectManager projectManager =
- (ProjectManager)componentManager.lookup( ProjectManager.ROLE );
- m_componentManager.put( ProjectManager.ROLE, projectManager );
-
- final ProjectBuilder projectBuilder =
- (ProjectBuilder)componentManager.lookup( ProjectBuilder.ROLE );
- m_componentManager.put( ProjectBuilder.ROLE, projectBuilder );
-
- final ConverterRegistry converterRegistry =
- (ConverterRegistry)componentManager.lookup( ConverterRegistry.ROLE );
- m_componentManager.put( ConverterRegistry.ROLE, converterRegistry );
-*/
m_componentManager = componentManager;
m_typeManager = (TypeManager)componentManager.lookup( TypeManager.ROLE );
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/manager/DefaultProjectManager.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/manager/DefaultProjectManager.java
index 96c24402b..43e39877c 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/manager/DefaultProjectManager.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/manager/DefaultProjectManager.java
@@ -157,7 +157,7 @@ public class DefaultProjectManager
componentManager.put( TypeManager.ROLE, m_typeManager.createChildTypeManager() );
//We need to place projects and ProjectManager
- //in ComponentManager so as to support project-local antcall
+ //in ComponentManager so as to support project-local call()
componentManager.put( ProjectManager.ROLE, this );
componentManager.put( Project.ROLE, project );
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/model/Project.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/model/Project.java
index 7b9ae1a1c..1d22056d3 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/model/Project.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/model/Project.java
@@ -25,13 +25,13 @@ public interface Project
String ROLE = "org.apache.myrmidon.components.model.Project";
// the name of currently executing project
- String PROJECT = "ant.project.name";
+ String PROJECT = "myrmidon.project.name";
// the name of currently executing project
- //String PROJECT_FILE = "ant.project.file";
+ //String PROJECT_FILE = "myrmidon.project.file";
// the name of currently executing target
- //String TARGET = "ant.target.name";
+ //String TARGET = "myrmidon.target.name";
/**
* Get the imports for project.
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultRoleManager.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/role/DefaultRoleManager.java
similarity index 99%
rename from proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultRoleManager.java
rename to proposal/myrmidon/src/java/org/apache/myrmidon/components/role/DefaultRoleManager.java
index c2af9f3e6..ff0c391c1 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultRoleManager.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/role/DefaultRoleManager.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.myrmidon.components.deployer;
+package org.apache.myrmidon.components.role;
import java.net.URL;
import java.util.Enumeration;
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/RoleManager.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/role/RoleManager.java
similarity index 95%
rename from proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/RoleManager.java
rename to proposal/myrmidon/src/java/org/apache/myrmidon/components/role/RoleManager.java
index 978b32930..afc1a5db5 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/RoleManager.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/role/RoleManager.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.myrmidon.components.deployer;
+package org.apache.myrmidon.components.role;
import org.apache.avalon.framework.component.Component;
@@ -23,7 +23,7 @@ public interface RoleManager
{
String ROLE = "org.apache.myrmidon.components.deployer.RoleManager";
- /**
+ /**
* Find Role name based on shorthand name.
*
* @param shorthandName the shorthand name
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractTypeDef.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractTypeDef.java
index acdbd11d9..77a2bfb93 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractTypeDef.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractTypeDef.java
@@ -15,7 +15,7 @@ import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.components.deployer.RoleManager;
+import org.apache.myrmidon.components.role.RoleManager;
import org.apache.myrmidon.components.type.DefaultTypeFactory;
import org.apache.myrmidon.components.type.TypeException;
import org.apache.myrmidon.components.type.TypeManager;
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/api/DataType.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/DataType.java
similarity index 92%
rename from proposal/myrmidon/src/java/org/apache/myrmidon/api/DataType.java
rename to proposal/myrmidon/src/java/org/apache/myrmidon/framework/DataType.java
index af286807e..d64c2e057 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/api/DataType.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/DataType.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.myrmidon.api;
+package org.apache.myrmidon.framework;
/**
* Base class for those classes that can appear inside the build file
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/ItemSet.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/ItemSet.java
index 66d962ac2..4ec5bfeed 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/ItemSet.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/ItemSet.java
@@ -7,8 +7,6 @@
*/
package org.apache.myrmidon.framework;
-import org.apache.myrmidon.api.DataType;
-
/**
* Interface for ItemSet.
* An item set contains a number of items. Example item sets include
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Mapper.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Mapper.java
index 4c14e4565..164489d5c 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Mapper.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Mapper.java
@@ -7,8 +7,6 @@
*/
package org.apache.myrmidon.framework;
-import org.apache.myrmidon.api.DataType;
-
/**
* Interface for Mappers.
* Mappers are responsible for mapping source items to targets items.
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java
index d6ca16460..a2440d1cd 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Pattern.java
@@ -7,7 +7,6 @@
*/
package org.apache.myrmidon.framework;
-import org.apache.myrmidon.api.DataType;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.components.model.Condition;
@@ -44,7 +43,7 @@ public class Pattern
/**
* Setter method for name/value of pattern.
- * Conforms to ant setter patterns
+ * Conforms to setter patterns
*
* @param name the value
*/
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/TypeInstanceTask.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/TypeInstanceTask.java
index c32f6c1f0..5aa025fa3 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/TypeInstanceTask.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/TypeInstanceTask.java
@@ -14,7 +14,6 @@ import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
-import org.apache.myrmidon.api.DataType;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.components.type.TypeException;
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/ant1/TaskAdapter.java b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/ant1/TaskAdapter.java
index b73dd5ac8..db1da691c 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/ant1/TaskAdapter.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/ant1/TaskAdapter.java
@@ -10,7 +10,6 @@ package org.apache.myrmidon.libs.ant1;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.myrmidon.api.DataType;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.components.type.TypeException;
@@ -20,7 +19,7 @@ import org.apache.myrmidon.framework.AbstractContainerTask;
import org.apache.tools.ant.Task;
/**
- * Adapter of Ant1 tasks to ant2.
+ * Adapter of Ant1 tasks to myrmidon.
*
* @author Peter Donald
*/
@@ -28,17 +27,17 @@ public class TaskAdapter
extends AbstractContainerTask
implements Configurable
{
- private Task m_ant1Task;
+ private Task m_task;
private Ant1Project m_project = new Ant1Project();
- public TaskAdapter( final Task ant1Task )
+ public TaskAdapter( final Task task )
{
- m_ant1Task = ant1Task;
+ m_task = task;
}
protected final Task getTask()
{
- return m_ant1Task;
+ return m_task;
}
protected final Ant1Project getProject()
diff --git a/proposal/myrmidon/src/manifest/builtin-ant-roles.xml b/proposal/myrmidon/src/manifest/builtin-ant-roles.xml
index e58c8bc4b..d16b54731 100644
--- a/proposal/myrmidon/src/manifest/builtin-ant-roles.xml
+++ b/proposal/myrmidon/src/manifest/builtin-ant-roles.xml
@@ -1,6 +1,6 @@
-
+