diff --git a/proposal/myrmidon/build.xml b/proposal/myrmidon/build.xml
index fee8f0693..831194e08 100644
--- a/proposal/myrmidon/build.xml
+++ b/proposal/myrmidon/build.xml
@@ -33,7 +33,6 @@ Legal:
developers this part makes no difference.
-->
-
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/aspect/DefaultAspectManager.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/aspect/DefaultAspectManager.java
index d9e76cc94..e59ba4f78 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/aspect/DefaultAspectManager.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/aspect/DefaultAspectManager.java
@@ -18,6 +18,7 @@ import org.apache.myrmidon.api.Task;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.aspects.AspectHandler;
import org.apache.myrmidon.aspects.NoopAspectHandler;
+import org.apache.myrmidon.interfaces.aspect.AspectManager;
/**
* Manage and propogate Aspects.
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java
index d443c7b3f..2edd4e99d 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java
@@ -25,10 +25,11 @@ import org.apache.avalon.framework.parameters.Parameters;
import org.apache.log.Logger;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.components.model.DefaultProject;
-import org.apache.myrmidon.components.model.Project;
-import org.apache.myrmidon.components.model.Target;
-import org.apache.myrmidon.components.model.TypeLib;
import org.apache.myrmidon.framework.Condition;
+import org.apache.myrmidon.interfaces.builder.ProjectBuilder;
+import org.apache.myrmidon.interfaces.model.Project;
+import org.apache.myrmidon.interfaces.model.Target;
+import org.apache.myrmidon.interfaces.model.TypeLib;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
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 1df733479..aed69023f 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
@@ -25,7 +25,8 @@ import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.avalon.framework.logger.Loggable;
import org.apache.log.Logger;
-import org.apache.myrmidon.components.converter.MasterConverter;
+import org.apache.myrmidon.interfaces.converter.MasterConverter;
+import org.apache.myrmidon.interfaces.configurer.Configurer;
import org.apache.myrmidon.converter.Converter;
import org.apache.myrmidon.converter.ConverterException;
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/DefaultConverterRegistry.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/DefaultConverterRegistry.java
index b2d0deff1..f02d1caf7 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/DefaultConverterRegistry.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/DefaultConverterRegistry.java
@@ -8,6 +8,7 @@
package org.apache.myrmidon.components.converter;
import java.util.HashMap;
+import org.apache.myrmidon.interfaces.converter.ConverterRegistry;
/**
* Default implementation of Converter registry.
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/DefaultMasterConverter.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/DefaultMasterConverter.java
index fb71d4f68..f1f44fb77 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/DefaultMasterConverter.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/DefaultMasterConverter.java
@@ -14,10 +14,11 @@ import org.apache.avalon.framework.context.Context;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.logger.AbstractLoggable;
-import org.apache.myrmidon.components.converter.MasterConverter;
-import org.apache.myrmidon.components.type.TypeException;
-import org.apache.myrmidon.components.type.TypeFactory;
-import org.apache.myrmidon.components.type.TypeManager;
+import org.apache.myrmidon.interfaces.converter.MasterConverter;
+import org.apache.myrmidon.interfaces.converter.ConverterRegistry;
+import org.apache.myrmidon.interfaces.type.TypeException;
+import org.apache.myrmidon.interfaces.type.TypeFactory;
+import org.apache.myrmidon.interfaces.type.TypeManager;
import org.apache.myrmidon.converter.Converter;
import org.apache.myrmidon.converter.ConverterException;
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 ee4f5745c..c749490e6 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
@@ -14,6 +14,8 @@ import java.util.Enumeration;
import java.util.HashMap;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
+import org.apache.avalon.excalibur.i18n.ResourceManager;
+import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
@@ -23,15 +25,15 @@ 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.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.apache.myrmidon.interfaces.converter.ConverterRegistry;
+import org.apache.myrmidon.interfaces.deployer.Deployer;
+import org.apache.myrmidon.interfaces.deployer.DeploymentException;
+import org.apache.myrmidon.interfaces.role.RoleManager;
+import org.apache.myrmidon.interfaces.type.TypeManager;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
-import org.apache.avalon.excalibur.i18n.ResourceManager;
-import org.apache.avalon.excalibur.i18n.Resources;
/**
* This class deploys a .tsk file into a registry.
@@ -107,7 +109,7 @@ public class DefaultDeployer
final Deployment deployment = new Deployment( file );
final Configuration descriptor = deployment.getDescriptor();
final URL[] urls = new URL[] { deployment.getURL() };
- final URLClassLoader classLoader =
+ final URLClassLoader classLoader =
new URLClassLoader( urls, Thread.currentThread().getContextClassLoader() );
try
@@ -235,8 +237,8 @@ public class DefaultDeployer
}
}
- private DefaultTypeFactory getFactory( final String role,
- final ClassLoader classLoader,
+ private DefaultTypeFactory getFactory( final String role,
+ final ClassLoader classLoader,
final HashMap factorys )
{
DefaultTypeFactory factory = (DefaultTypeFactory)factorys.get( role );
@@ -309,7 +311,7 @@ public class DefaultDeployer
if( getLogger().isDebugEnabled() )
{
- final String message =
+ final String message =
REZ.getString( "register-converter.notice", name, source, destination );
getLogger().debug( message );
}
@@ -328,7 +330,7 @@ public class DefaultDeployer
if( getLogger().isDebugEnabled() )
{
- final String message =
+ final String message =
REZ.getString( "register-role.notice", role, name, className );
getLogger().debug( message );
}
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/Deployment.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/Deployment.java
index 9b4b1d23d..dd9b15940 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/Deployment.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/Deployment.java
@@ -21,6 +21,7 @@ import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
+import org.apache.myrmidon.interfaces.deployer.DeploymentException;
/**
* This class deploys a .tsk file into a registry.
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 5da0f1907..b5efb6969 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
@@ -22,19 +22,20 @@ import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.myrmidon.api.JavaVersion;
-import org.apache.myrmidon.components.aspect.AspectManager;
-import org.apache.myrmidon.components.builder.ProjectBuilder;
-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.DeploymentException;
-import org.apache.myrmidon.components.executor.Executor;
-import org.apache.myrmidon.components.model.Project;
-import org.apache.myrmidon.components.role.RoleManager;
-import org.apache.myrmidon.components.type.TypeFactory;
-import org.apache.myrmidon.components.type.TypeManager;
-import org.apache.myrmidon.components.workspace.Workspace;
+import org.apache.myrmidon.interfaces.aspect.AspectManager;
+import org.apache.myrmidon.interfaces.builder.ProjectBuilder;
+import org.apache.myrmidon.interfaces.configurer.Configurer;
+import org.apache.myrmidon.interfaces.converter.ConverterRegistry;
+import org.apache.myrmidon.interfaces.converter.MasterConverter;
+import org.apache.myrmidon.interfaces.deployer.Deployer;
+import org.apache.myrmidon.interfaces.deployer.DeploymentException;
+import org.apache.myrmidon.interfaces.executor.Executor;
+import org.apache.myrmidon.interfaces.embeddor.Embeddor;
+import org.apache.myrmidon.interfaces.model.Project;
+import org.apache.myrmidon.interfaces.role.RoleManager;
+import org.apache.myrmidon.interfaces.type.TypeFactory;
+import org.apache.myrmidon.interfaces.type.TypeManager;
+import org.apache.myrmidon.interfaces.workspace.Workspace;
/**
* Default implementation of Embeddor.
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/AspectAwareExecutor.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/AspectAwareExecutor.java
index db548b846..9a575f1a1 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/AspectAwareExecutor.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/AspectAwareExecutor.java
@@ -21,7 +21,8 @@ import org.apache.myrmidon.api.Task;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.aspects.AspectHandler;
-import org.apache.myrmidon.components.aspect.AspectManager;
+import org.apache.myrmidon.interfaces.aspect.AspectManager;
+import org.apache.myrmidon.interfaces.executor.ExecutionFrame;
public class AspectAwareExecutor
extends DefaultExecutor
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 345939ca8..c7c1b79b3 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
@@ -16,15 +16,16 @@ import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.logger.Loggable;
import org.apache.log.Logger;
import org.apache.myrmidon.api.TaskContext;
-import org.apache.myrmidon.components.aspect.AspectManager;
-import org.apache.myrmidon.components.builder.ProjectBuilder;
-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.executor.Executor;
-import org.apache.myrmidon.components.role.RoleManager;
-import org.apache.myrmidon.components.type.TypeManager;
+import org.apache.myrmidon.interfaces.aspect.AspectManager;
+import org.apache.myrmidon.interfaces.builder.ProjectBuilder;
+import org.apache.myrmidon.interfaces.configurer.Configurer;
+import org.apache.myrmidon.interfaces.converter.ConverterRegistry;
+import org.apache.myrmidon.interfaces.converter.MasterConverter;
+import org.apache.myrmidon.interfaces.deployer.Deployer;
+import org.apache.myrmidon.interfaces.executor.Executor;
+import org.apache.myrmidon.interfaces.executor.ExecutionFrame;
+import org.apache.myrmidon.interfaces.role.RoleManager;
+import org.apache.myrmidon.interfaces.type.TypeManager;
/**
* Frames in which tasks are executed.
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/DefaultExecutor.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/DefaultExecutor.java
index 1ebc4cb44..6e9ce7ff6 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/DefaultExecutor.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/DefaultExecutor.java
@@ -27,10 +27,12 @@ import org.apache.myrmidon.api.Task;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.components.configurer.Configurer;
-import org.apache.myrmidon.components.type.TypeException;
-import org.apache.myrmidon.components.type.TypeFactory;
-import org.apache.myrmidon.components.type.TypeManager;
+import org.apache.myrmidon.interfaces.configurer.Configurer;
+import org.apache.myrmidon.interfaces.executor.Executor;
+import org.apache.myrmidon.interfaces.executor.ExecutionFrame;
+import org.apache.myrmidon.interfaces.type.TypeException;
+import org.apache.myrmidon.interfaces.type.TypeFactory;
+import org.apache.myrmidon.interfaces.type.TypeManager;
public class DefaultExecutor
extends AbstractLoggable
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/model/DefaultProject.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/model/DefaultProject.java
index 312bec537..e5b1de34a 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/model/DefaultProject.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/model/DefaultProject.java
@@ -13,6 +13,9 @@ import java.util.ArrayList;
import java.util.HashMap;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
+import org.apache.myrmidon.interfaces.model.Project;
+import org.apache.myrmidon.interfaces.model.Target;
+import org.apache.myrmidon.interfaces.model.TypeLib;
/**
* Default project implementation.
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/role/DefaultRoleManager.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/role/DefaultRoleManager.java
index 6eb1b218a..363d68f22 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/role/DefaultRoleManager.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/role/DefaultRoleManager.java
@@ -18,6 +18,7 @@ import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
+import org.apache.myrmidon.interfaces.role.RoleManager;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/type/DefaultTypeFactory.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/type/DefaultTypeFactory.java
index f6e4c91bf..217af4c50 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/type/DefaultTypeFactory.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/type/DefaultTypeFactory.java
@@ -12,6 +12,8 @@ import java.util.HashMap;
import java.net.URLClassLoader;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
+import org.apache.myrmidon.interfaces.type.TypeFactory;
+import org.apache.myrmidon.interfaces.type.TypeException;
/**
* Create a type instance based on name.
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/type/DefaultTypeManager.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/type/DefaultTypeManager.java
index e078259e6..dc7381835 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/type/DefaultTypeManager.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/type/DefaultTypeManager.java
@@ -10,6 +10,9 @@ package org.apache.myrmidon.components.type;
import java.util.HashMap;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
+import org.apache.myrmidon.interfaces.type.TypeFactory;
+import org.apache.myrmidon.interfaces.type.TypeManager;
+import org.apache.myrmidon.interfaces.type.TypeException;
/**
* The interface that is used to manage types.
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/type/MultiSourceTypeFactory.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/type/MultiSourceTypeFactory.java
index 4422c90d8..6143f2c69 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/type/MultiSourceTypeFactory.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/type/MultiSourceTypeFactory.java
@@ -10,6 +10,8 @@ package org.apache.myrmidon.components.type;
import java.util.HashMap;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
+import org.apache.myrmidon.interfaces.type.TypeFactory;
+import org.apache.myrmidon.interfaces.type.TypeException;
/**
* This factory acts as a proxy to set of object factorys.
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java
index 127cc734c..c8affe458 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java
@@ -31,16 +31,17 @@ import org.apache.log.Logger;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.components.deployer.DefaultDeployer;
-import org.apache.myrmidon.components.deployer.Deployer;
-import org.apache.myrmidon.components.deployer.DeploymentException;
import org.apache.myrmidon.components.executor.DefaultExecutionFrame;
-import org.apache.myrmidon.components.executor.ExecutionFrame;
-import org.apache.myrmidon.components.executor.Executor;
-import org.apache.myrmidon.components.model.Project;
-import org.apache.myrmidon.components.model.Target;
-import org.apache.myrmidon.components.model.TypeLib;
-import org.apache.myrmidon.components.type.TypeManager;
import org.apache.myrmidon.framework.Condition;
+import org.apache.myrmidon.interfaces.deployer.Deployer;
+import org.apache.myrmidon.interfaces.deployer.DeploymentException;
+import org.apache.myrmidon.interfaces.executor.ExecutionFrame;
+import org.apache.myrmidon.interfaces.executor.Executor;
+import org.apache.myrmidon.interfaces.model.Project;
+import org.apache.myrmidon.interfaces.model.Target;
+import org.apache.myrmidon.interfaces.model.TypeLib;
+import org.apache.myrmidon.interfaces.type.TypeManager;
+import org.apache.myrmidon.interfaces.workspace.Workspace;
import org.apache.myrmidon.listeners.ProjectListener;
/**
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/ProjectEntry.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/ProjectEntry.java
index 245c71fd3..945070c86 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/ProjectEntry.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/ProjectEntry.java
@@ -8,8 +8,8 @@
package org.apache.myrmidon.components.workspace;
import java.util.ArrayList;
-import org.apache.myrmidon.components.executor.ExecutionFrame;
-import org.apache.myrmidon.components.model.Project;
+import org.apache.myrmidon.interfaces.executor.ExecutionFrame;
+import org.apache.myrmidon.interfaces.model.Project;
/**
* This contains detaisl for each project that is managed by ProjectManager.
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractContainerTask.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractContainerTask.java
index fe6701d1f..fa624f828 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractContainerTask.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractContainerTask.java
@@ -18,9 +18,9 @@ import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.components.configurer.Configurer;
-import org.apache.myrmidon.components.converter.MasterConverter;
-import org.apache.myrmidon.components.executor.Executor;
+import org.apache.myrmidon.interfaces.configurer.Configurer;
+import org.apache.myrmidon.interfaces.converter.MasterConverter;
+import org.apache.myrmidon.interfaces.executor.Executor;
import org.apache.myrmidon.converter.Converter;
import org.apache.myrmidon.converter.ConverterException;
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 32c739592..e3dca87ca 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractTypeDef.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractTypeDef.java
@@ -17,10 +17,10 @@ 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.role.RoleManager;
+import org.apache.myrmidon.interfaces.role.RoleManager;
import org.apache.myrmidon.components.type.DefaultTypeFactory;
-import org.apache.myrmidon.components.type.TypeException;
-import org.apache.myrmidon.components.type.TypeManager;
+import org.apache.myrmidon.interfaces.type.TypeException;
+import org.apache.myrmidon.interfaces.type.TypeManager;
/**
* Abstract task to extend to define a type.
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 12670be3e..0726b2f3f 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/TypeInstanceTask.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/TypeInstanceTask.java
@@ -18,9 +18,9 @@ import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.components.type.TypeException;
-import org.apache.myrmidon.components.type.TypeFactory;
-import org.apache.myrmidon.components.type.TypeManager;
+import org.apache.myrmidon.interfaces.type.TypeException;
+import org.apache.myrmidon.interfaces.type.TypeFactory;
+import org.apache.myrmidon.interfaces.type.TypeManager;
/**
* This is the property "task" to declare a binding of a datatype to a name.
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/frontends/CLIMain.java b/proposal/myrmidon/src/java/org/apache/myrmidon/frontends/CLIMain.java
index 382337bd1..6026863d7 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/frontends/CLIMain.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/frontends/CLIMain.java
@@ -36,12 +36,12 @@ import org.apache.log.output.DefaultOutputLogTarget;
import org.apache.myrmidon.Constants;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.components.builder.ProjectBuilder;
-import org.apache.myrmidon.components.executor.Executor;
-import org.apache.myrmidon.components.embeddor.Embeddor;
+import org.apache.myrmidon.interfaces.builder.ProjectBuilder;
+import org.apache.myrmidon.interfaces.executor.Executor;
+import org.apache.myrmidon.interfaces.embeddor.Embeddor;
import org.apache.myrmidon.components.embeddor.DefaultEmbeddor;
-import org.apache.myrmidon.components.workspace.Workspace;
-import org.apache.myrmidon.components.model.Project;
+import org.apache.myrmidon.interfaces.workspace.Workspace;
+import org.apache.myrmidon.interfaces.model.Project;
import org.apache.myrmidon.listeners.ProjectListener;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/aspect/AspectManager.java b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/aspect/AspectManager.java
similarity index 90%
rename from proposal/myrmidon/src/java/org/apache/myrmidon/components/aspect/AspectManager.java
rename to proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/aspect/AspectManager.java
index 2706ffd26..aa20a4725 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/aspect/AspectManager.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/aspect/AspectManager.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.aspect;
+package org.apache.myrmidon.interfaces.aspect;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.configuration.Configuration;
@@ -21,7 +21,7 @@ import org.apache.myrmidon.aspects.AspectHandler;
public interface AspectManager
extends Component, AspectHandler
{
- String ROLE = "org.apache.myrmidon.components.aspect.AspectManager";
+ String ROLE = "org.apache.myrmidon.interfaces.aspect.AspectManager";
String[] getNames();
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/ProjectBuilder.java b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/builder/ProjectBuilder.java
similarity index 84%
rename from proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/ProjectBuilder.java
rename to proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/builder/ProjectBuilder.java
index 90167515e..563d405af 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/ProjectBuilder.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/builder/ProjectBuilder.java
@@ -5,12 +5,12 @@
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*/
-package org.apache.myrmidon.components.builder;
+package org.apache.myrmidon.interfaces.builder;
import java.io.File;
import java.io.IOException;
import org.apache.avalon.framework.component.Component;
-import org.apache.myrmidon.components.model.Project;
+import org.apache.myrmidon.interfaces.model.Project;
/**
* Interface implemented by components that build projects from sources.
@@ -20,7 +20,7 @@ import org.apache.myrmidon.components.model.Project;
public interface ProjectBuilder
extends Component
{
- String ROLE = "org.apache.myrmidon.components.builder.ProjectBuilder";
+ String ROLE = "org.apache.myrmidon.interfaces.builder.ProjectBuilder";
/**
* build a project from source.
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/Configurer.java b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/configurer/Configurer.java
similarity index 93%
rename from proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/Configurer.java
rename to proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/configurer/Configurer.java
index 021cb8dc6..7441f236e 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/Configurer.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/configurer/Configurer.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.configurer;
+package org.apache.myrmidon.interfaces.configurer;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.configuration.Configuration;
@@ -20,7 +20,7 @@ import org.apache.avalon.framework.context.Context;
public interface Configurer
extends Component
{
- String ROLE = "org.apache.myrmidon.components.configurer.Configurer";
+ String ROLE = "org.apache.myrmidon.interfaces.configurer.Configurer";
/**
* Configure an object based on a configuration in a particular context.
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/ConverterRegistry.java b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/converter/ConverterRegistry.java
similarity index 91%
rename from proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/ConverterRegistry.java
rename to proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/converter/ConverterRegistry.java
index fffbc618d..7021e3e3a 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/ConverterRegistry.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/converter/ConverterRegistry.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.converter;
+package org.apache.myrmidon.interfaces.converter;
import org.apache.avalon.framework.component.Component;
@@ -17,7 +17,7 @@ import org.apache.avalon.framework.component.Component;
public interface ConverterRegistry
extends Component
{
- String ROLE = "org.apache.myrmidon.components.converter.ConverterRegistry";
+ String ROLE = "org.apache.myrmidon.interfaces.converter.ConverterRegistry";
/**
* Retrieve name of ConverterInfo that describes converter that converts
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/MasterConverter.java b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/converter/MasterConverter.java
similarity index 83%
rename from proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/MasterConverter.java
rename to proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/converter/MasterConverter.java
index 16cf9c0b8..581dd7665 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/MasterConverter.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/converter/MasterConverter.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.converter;
+package org.apache.myrmidon.interfaces.converter;
import org.apache.avalon.framework.component.Component;
import org.apache.myrmidon.converter.Converter;
@@ -18,5 +18,5 @@ import org.apache.myrmidon.converter.Converter;
public interface MasterConverter
extends Component, Converter
{
- String ROLE = "org.apache.myrmidon.components.converter.MasterConverter";
+ String ROLE = "org.apache.myrmidon.interfaces.converter.MasterConverter";
}
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/Deployer.java b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/deployer/Deployer.java
similarity index 88%
rename from proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/Deployer.java
rename to proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/deployer/Deployer.java
index 6c4e87828..432123a00 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/Deployer.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/deployer/Deployer.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.interfaces.deployer;
import java.io.File;
import org.apache.avalon.framework.component.Component;
@@ -18,7 +18,7 @@ import org.apache.avalon.framework.component.Component;
public interface Deployer
extends Component
{
- String ROLE = "org.apache.myrmidon.components.deployer.Deployer";
+ String ROLE = "org.apache.myrmidon.interfaces.deployer.Deployer";
/**
* Deploy a library.
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DeploymentException.java b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/deployer/DeploymentException.java
similarity index 95%
rename from proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DeploymentException.java
rename to proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/deployer/DeploymentException.java
index 78881f8da..582f998bd 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DeploymentException.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/deployer/DeploymentException.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.interfaces.deployer;
import org.apache.avalon.framework.CascadingException;
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor/Embeddor.java b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/embeddor/Embeddor.java
similarity index 85%
rename from proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor/Embeddor.java
rename to proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/embeddor/Embeddor.java
index e844adea9..2321e12f0 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor/Embeddor.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/embeddor/Embeddor.java
@@ -5,17 +5,17 @@
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*/
-package org.apache.myrmidon.components.embeddor;
+package org.apache.myrmidon.interfaces.embeddor;
import java.util.Map;
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.Parameters;
import org.apache.avalon.framework.parameters.Parameterizable;
-import org.apache.myrmidon.components.model.Project;
-import org.apache.myrmidon.components.workspace.Workspace;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.myrmidon.interfaces.model.Project;
+import org.apache.myrmidon.interfaces.workspace.Workspace;
/**
* Interface through which you embed Myrmidon into applications.
@@ -25,7 +25,7 @@ import org.apache.myrmidon.components.workspace.Workspace;
public interface Embeddor
extends Component, Parameterizable, Initializable, Startable, Disposable
{
- String ROLE = "org.apache.myrmidon.components.embeddor.Embeddor";
+ String ROLE = "org.apache.myrmidon.interfaces.embeddor.Embeddor";
/**
* Create a project.
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/ExecutionFrame.java b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/executor/ExecutionFrame.java
similarity index 86%
rename from proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/ExecutionFrame.java
rename to proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/executor/ExecutionFrame.java
index 22f354ced..dd97b5f52 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/ExecutionFrame.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/executor/ExecutionFrame.java
@@ -5,12 +5,12 @@
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*/
-package org.apache.myrmidon.components.executor;
+package org.apache.myrmidon.interfaces.executor;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.log.Logger;
-import org.apache.myrmidon.components.type.TypeManager;
import org.apache.myrmidon.api.TaskContext;
+import org.apache.myrmidon.interfaces.type.TypeManager;
/**
* Frames in which tasks are executed.
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/Executor.java b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/executor/Executor.java
similarity index 88%
rename from proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/Executor.java
rename to proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/executor/Executor.java
index e41dcf9da..91041bac6 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/Executor.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/executor/Executor.java
@@ -5,22 +5,22 @@
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*/
-package org.apache.myrmidon.components.executor;
+package org.apache.myrmidon.interfaces.executor;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
-
+
/**
* Engine inteface that should be implemented by all tasklet engines.
- *
+ *
* @author Peter Donald
*/
public interface Executor
extends Component
{
- String ROLE = "org.apache.myrmidon.components.executor.Executor";
+ String ROLE = "org.apache.myrmidon.interfaces.executor.Executor";
/**
* execute a task.
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/model/Project.java b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/model/Project.java
similarity index 95%
rename from proposal/myrmidon/src/java/org/apache/myrmidon/components/model/Project.java
rename to proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/model/Project.java
index 18ca3e784..92291aeae 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/model/Project.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/model/Project.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.model;
+package org.apache.myrmidon.interfaces.model;
import java.io.File;
import org.apache.avalon.framework.component.Component;
@@ -22,7 +22,7 @@ import org.apache.avalon.framework.component.Component;
public interface Project
extends Component
{
- String ROLE = "org.apache.myrmidon.components.model.Project";
+ String ROLE = "org.apache.myrmidon.interfaces.model.Project";
// the name of currently executing project
String PROJECT = "myrmidon.project.name";
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/model/Target.java b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/model/Target.java
similarity index 92%
rename from proposal/myrmidon/src/java/org/apache/myrmidon/components/model/Target.java
rename to proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/model/Target.java
index 3e88fd225..7a0522160 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/model/Target.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/model/Target.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.model;
+package org.apache.myrmidon.interfaces.model;
import java.util.ArrayList;
import org.apache.avalon.framework.configuration.Configuration;
@@ -27,8 +27,8 @@ public class Target
*
* @param condition the condition
*/
- public Target( final Condition condition,
- final Configuration[] tasks,
+ public Target( final Condition condition,
+ final Configuration[] tasks,
final String[] dependencies )
{
m_condition = condition;
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/model/TypeLib.java b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/model/TypeLib.java
similarity index 93%
rename from proposal/myrmidon/src/java/org/apache/myrmidon/components/model/TypeLib.java
rename to proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/model/TypeLib.java
index 60410a356..59f09777b 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/model/TypeLib.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/model/TypeLib.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.model;
+package org.apache.myrmidon.interfaces.model;
/**
* Imports in a build file.
@@ -36,7 +36,7 @@ public class TypeLib
m_library = library;
m_role = role;
m_name = name;
-
+
//If only one of name or type is null, throw an exception
if( null == m_role || null == m_name )
{
@@ -59,7 +59,7 @@ public class TypeLib
}
/**
- * Get name of imported
+ * Get name of imported
*
* @return the name
*/
@@ -69,7 +69,7 @@ public class TypeLib
}
/**
- * Get name of library
+ * Get name of library
*
* @return the library name
*/
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/role/RoleManager.java b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/role/RoleManager.java
similarity index 90%
rename from proposal/myrmidon/src/java/org/apache/myrmidon/components/role/RoleManager.java
rename to proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/role/RoleManager.java
index afc1a5db5..1ebc34656 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/role/RoleManager.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/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.role;
+package org.apache.myrmidon.interfaces.role;
import org.apache.avalon.framework.component.Component;
@@ -21,7 +21,7 @@ import org.apache.avalon.framework.component.Component;
public interface RoleManager
extends Component
{
- String ROLE = "org.apache.myrmidon.components.deployer.RoleManager";
+ String ROLE = "org.apache.myrmidon.interfaces.role.RoleManager";
/**
* Find Role name based on shorthand name.
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/type/TypeException.java b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/type/TypeException.java
similarity index 95%
rename from proposal/myrmidon/src/java/org/apache/myrmidon/components/type/TypeException.java
rename to proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/type/TypeException.java
index a510be9be..6c26a563c 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/type/TypeException.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/type/TypeException.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.type;
+package org.apache.myrmidon.interfaces.type;
import org.apache.avalon.framework.CascadingException;
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/type/TypeFactory.java b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/type/TypeFactory.java
similarity index 93%
rename from proposal/myrmidon/src/java/org/apache/myrmidon/components/type/TypeFactory.java
rename to proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/type/TypeFactory.java
index 7b88ab18c..5c184d84a 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/type/TypeFactory.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/type/TypeFactory.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.type;
+package org.apache.myrmidon.interfaces.type;
/**
* Create an instance on name.
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/type/TypeManager.java b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/type/TypeManager.java
similarity index 86%
rename from proposal/myrmidon/src/java/org/apache/myrmidon/components/type/TypeManager.java
rename to proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/type/TypeManager.java
index 7cba6eb0e..9233c2533 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/type/TypeManager.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/type/TypeManager.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.type;
+package org.apache.myrmidon.interfaces.type;
import org.apache.avalon.framework.component.Component;
@@ -17,7 +17,7 @@ import org.apache.avalon.framework.component.Component;
public interface TypeManager
extends Component
{
- String ROLE = "org.apache.myrmidon.components.type.TypeManager";
+ String ROLE = "org.apache.myrmidon.interfaces.type.TypeManager";
void registerType( String role, String shorthandName, TypeFactory factory )
throws TypeException;
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/Workspace.java b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/workspace/Workspace.java
similarity index 88%
rename from proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/Workspace.java
rename to proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/workspace/Workspace.java
index 57ae60470..7bd0d209a 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/Workspace.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/workspace/Workspace.java
@@ -5,12 +5,12 @@
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*/
-package org.apache.myrmidon.components.workspace;
+package org.apache.myrmidon.interfaces.workspace;
import java.util.Map;
import org.apache.avalon.framework.component.Component;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.components.model.Project;
+import org.apache.myrmidon.interfaces.model.Project;
import org.apache.myrmidon.listeners.ProjectListener;
/**
@@ -21,7 +21,7 @@ import org.apache.myrmidon.listeners.ProjectListener;
public interface Workspace
extends Component
{
- String ROLE = "org.apache.myrmidon.components.workspace.Workspace";
+ String ROLE = "org.apache.myrmidon.interfaces.workspace.Workspace";
/**
* Add a listener to project events.
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/ant1/Ant1Tasklib.java b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/ant1/Ant1Tasklib.java
index 18b2dbeb6..d07c3cb05 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/ant1/Ant1Tasklib.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/ant1/Ant1Tasklib.java
@@ -19,7 +19,7 @@ import org.apache.myrmidon.api.Task;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
-import org.apache.myrmidon.components.type.TypeManager;
+import org.apache.myrmidon.interfaces.type.TypeManager;
/**
* Method to register a tasklib.
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/ant1/Ant1TypeFactory.java b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/ant1/Ant1TypeFactory.java
index c8537ae27..422f40162 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/ant1/Ant1TypeFactory.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/ant1/Ant1TypeFactory.java
@@ -9,7 +9,7 @@ package org.apache.myrmidon.libs.ant1;
import java.net.URL;
import org.apache.myrmidon.components.type.DefaultTypeFactory;
-import org.apache.myrmidon.components.type.TypeException;
+import org.apache.myrmidon.interfaces.type.TypeException;
import org.apache.tools.ant.Task;
/**
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 db1da691c..dd14c95af 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
@@ -12,9 +12,9 @@ import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.components.type.TypeException;
-import org.apache.myrmidon.components.type.TypeFactory;
-import org.apache.myrmidon.components.type.TypeManager;
+import org.apache.myrmidon.interfaces.type.TypeException;
+import org.apache.myrmidon.interfaces.type.TypeFactory;
+import org.apache.myrmidon.interfaces.type.TypeManager;
import org.apache.myrmidon.framework.AbstractContainerTask;
import org.apache.tools.ant.Task;
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/Property.java b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/Property.java
index 6d080c127..131dc2ead 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/Property.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/core/Property.java
@@ -17,9 +17,9 @@ import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.components.type.TypeException;
-import org.apache.myrmidon.components.type.TypeFactory;
-import org.apache.myrmidon.components.type.TypeManager;
+import org.apache.myrmidon.interfaces.type.TypeException;
+import org.apache.myrmidon.interfaces.type.TypeFactory;
+import org.apache.myrmidon.interfaces.type.TypeManager;
import org.apache.myrmidon.framework.AbstractContainerTask;
import org.apache.myrmidon.framework.DataType;
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/ConverterDef.java b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/ConverterDef.java
index 8f758ca60..6a0277a50 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/ConverterDef.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/ConverterDef.java
@@ -17,9 +17,9 @@ 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.converter.ConverterRegistry;
+import org.apache.myrmidon.interfaces.converter.ConverterRegistry;
import org.apache.myrmidon.components.type.DefaultTypeFactory;
-import org.apache.myrmidon.components.type.TypeManager;
+import org.apache.myrmidon.interfaces.type.TypeManager;
import org.apache.myrmidon.converter.Converter;
/**
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/Facility.java b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/Facility.java
index b1ff4c403..1cceba930 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/Facility.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/Facility.java
@@ -21,10 +21,10 @@ import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.myrmidon.api.AbstractTask;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.aspects.AspectHandler;
-import org.apache.myrmidon.components.aspect.AspectManager;
-import org.apache.myrmidon.components.type.TypeException;
-import org.apache.myrmidon.components.type.TypeFactory;
-import org.apache.myrmidon.components.type.TypeManager;
+import org.apache.myrmidon.interfaces.aspect.AspectManager;
+import org.apache.myrmidon.interfaces.type.TypeException;
+import org.apache.myrmidon.interfaces.type.TypeFactory;
+import org.apache.myrmidon.interfaces.type.TypeManager;
import org.apache.myrmidon.framework.AbstractContainerTask;
/**
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/Import.java b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/Import.java
index 4637873e4..080de50c2 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/Import.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/Import.java
@@ -17,8 +17,8 @@ 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.Deployer;
-import org.apache.myrmidon.components.deployer.DeploymentException;
+import org.apache.myrmidon.interfaces.deployer.Deployer;
+import org.apache.myrmidon.interfaces.deployer.DeploymentException;
/**
* Task to import a tasklib.