Moved interfaces outside of main trunk.

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

proposal/myrmidon/build.xml

@@ -33,7 +33,6 @@ Legal:
     developers this part makes no difference.
   -->
   <property name="build.compiler.emacs" value="on"/>
-  <property name="build.compiler.warnings" value="true"/>
   <property name="build.compiler.pedantic" value="true"/>
   <property name="build.compiler.depend" value="true"/>
   <property name="build.compiler.fulldepend" value="true"/>

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.

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;
 

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;
 

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.

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;
 

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 );
         }

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.

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.

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

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.

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

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.

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;
 

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.

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.

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.

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;
 
 /**

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.

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;
 

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.

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.

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;

proposal/myrmidon/src/java/org/apache/myrmidon/components/aspect/AspectManager.java → 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();
 

proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/ProjectBuilder.java → 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.

proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/Configurer.java → 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.

proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/ConverterRegistry.java → 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

proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/MasterConverter.java → 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";
 }

proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/Deployer.java → 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.

proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DeploymentException.java → 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;
 

proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor/Embeddor.java → 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.

proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/ExecutionFrame.java → 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.

proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/Executor.java → 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 <a href="mailto:donaldp@apache.org">Peter Donald</a>
  */
 public interface Executor
     extends Component
 {
-    String ROLE = "org.apache.myrmidon.components.executor.Executor";
+    String ROLE = "org.apache.myrmidon.interfaces.executor.Executor";
 
     /**
      * execute a task.

proposal/myrmidon/src/java/org/apache/myrmidon/components/model/Project.java → 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";

proposal/myrmidon/src/java/org/apache/myrmidon/components/model/Target.java → 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;

proposal/myrmidon/src/java/org/apache/myrmidon/components/model/TypeLib.java → 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
      */

proposal/myrmidon/src/java/org/apache/myrmidon/components/role/RoleManager.java → 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.

proposal/myrmidon/src/java/org/apache/myrmidon/components/type/TypeException.java → 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;
 

proposal/myrmidon/src/java/org/apache/myrmidon/components/type/TypeFactory.java → 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.

proposal/myrmidon/src/java/org/apache/myrmidon/components/type/TypeManager.java → 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;

proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/Workspace.java → 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.

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.

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;
 
 /**

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;
 

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;
 

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;
 
 /**

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;
 
 /**

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.