Implemented "ROLE attribute is role name in interfaces" pattern.

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

proposal/myrmidon/src/java/org/apache/ant/modules/basic/AntCall.java

@@ -45,9 +45,8 @@ public class AntCall
         throws ComponentException
     {
         m_componentManager = componentManager;
-        m_projectEngine = (ProjectManager)componentManager.
-            lookup( "org.apache.myrmidon.components.manager.ProjectManager" );
-        m_project = (Project)componentManager.lookup( "org.apache.ant.project.Project" );
+        m_projectEngine = (ProjectManager)componentManager.lookup( ProjectManager.ROLE );
+        m_project = (Project)componentManager.lookup( Project.ROLE );
     }
 
     public void setTarget( final String target )

proposal/myrmidon/src/java/org/apache/ant/modules/basic/Property.java

@@ -42,8 +42,7 @@ public class Property
     public void compose( final ComponentManager componentManager )
         throws ComponentException
     {
-        m_configurer = (Configurer)componentManager.
-            lookup( "org.apache.myrmidon.components.configurer.Configurer" );
+        m_configurer = (Configurer)componentManager.lookup( Configurer.ROLE );
 
         m_engine = (DataTypeEngine)componentManager.
             lookup( "org.apache.ant.tasklet.engine.DataTypeEngine" );

proposal/myrmidon/src/java/org/apache/ant/modules/core/AbstractResourceRegisterer.java

@@ -39,11 +39,8 @@ public abstract class AbstractResourceRegisterer
     public void compose( final ComponentManager componentManager )
         throws ComponentException
     {
-        m_engine = (Executor)componentManager.
-            lookup( "org.apache.myrmidon.components.executor.Executor" );
-
-        m_tskDeployer = (TskDeployer)componentManager.
-            lookup( "org.apache.myrmidon.components.deployer.TskDeployer" );
+        m_engine = (Executor)componentManager.lookup( Executor.ROLE );
+        m_tskDeployer = (TskDeployer)componentManager.lookup( TskDeployer.ROLE );
 
         m_dataTypeEngine = (DataTypeEngine)componentManager.
             lookup( "org.apache.ant.tasklet.engine.DataTypeEngine" );

proposal/myrmidon/src/java/org/apache/ant/modules/core/RegisterConverter.java

@@ -41,8 +41,7 @@ public class RegisterConverter
     public void compose( final ComponentManager componentManager )
         throws ComponentException
     {
-        m_tskDeployer = (TskDeployer)componentManager.
-            lookup( "org.apache.myrmidon.components.deployer.TskDeployer" );
+        m_tskDeployer = (TskDeployer)componentManager.lookup( TskDeployer.ROLE );
 
         m_converterEngine = (ConverterEngine)componentManager.
             lookup( "org.apache.ant.convert.engine.ConverterEngine" );

proposal/myrmidon/src/java/org/apache/ant/modules/core/RegisterTasklib.java

@@ -33,8 +33,7 @@ public class RegisterTasklib
     public void compose( final ComponentManager componentManager )
         throws ComponentException
     {
-        m_tskDeployer = (TskDeployer)componentManager.
-            lookup( "org.apache.ant.tasklet.engine.TskDeployer" );
+        m_tskDeployer = (TskDeployer)componentManager.lookup( TskDeployer.ROLE );
     }
 
     public void setLib( final String lib )

proposal/myrmidon/src/java/org/apache/myrmidon/Main.java

@@ -41,7 +41,6 @@ import org.apache.myrmidon.components.embeddor.MyrmidonEmbeddor;
 import org.apache.myrmidon.components.manager.LogTargetToListenerAdapter;
 import org.apache.myrmidon.components.manager.ProjectManager;
 import org.apache.myrmidon.components.model.Project;
-import org.apache.myrmidon.launcher.LauncherClassLoader;
 import org.apache.myrmidon.listeners.ProjectListener;
 
 /**
@@ -282,8 +281,6 @@ public class Main
             throw new Exception( "myrmidon-home (" + homeDir + ") is not a directory" );
         }
 
-        final File libDir = new File( homeDir, "lib" );
-
         final String filename = m_parameters.getParameter( "filename", null );
         final File buildFile = (new File( filename )).getCanonicalFile();
         if( !buildFile.isFile() )

proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/ProjectBuilder.java

@@ -20,6 +20,8 @@ import org.apache.myrmidon.components.model.Project;
 public interface ProjectBuilder
     extends Component
 {
+    String ROLE = "org.apache.myrmidon.components.builder.ProjectBuilder";
+
     /**
      * build a project from source.
      *

proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/Configurer.java

@@ -20,6 +20,8 @@ import org.apache.avalon.framework.context.Context;
 public interface Configurer
     extends Component
 {
+    String ROLE = "org.apache.myrmidon.components.configurer.Configurer";
+
     /**
      * Configure an object based on a configuration in a particular context.
      * This configuring can be done in different ways for different

proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/DefaultTskDeployer.java

@@ -73,8 +73,7 @@ public class DefaultTskDeployer
         throws ComponentException
     {
         //UGLY HACK alert !!!
-        final Executor executor = (Executor)componentManager.
-            lookup( "org.apache.myrmidon.components.executor.Executor" );
+        final Executor executor = (Executor)componentManager.lookup( Executor.ROLE );
         m_taskRegistry = executor.getRegistry();
 
         final ConverterEngine converterEngine = (ConverterEngine)componentManager.

proposal/myrmidon/src/java/org/apache/myrmidon/components/deployer/TskDeployer.java

@@ -10,8 +10,6 @@ package org.apache.myrmidon.components.deployer;
 import java.net.URL;
 import org.apache.avalon.framework.camelot.Deployer;
 import org.apache.avalon.framework.camelot.DeploymentException;
-import org.apache.avalon.framework.logger.Loggable;
-import org.apache.log.Logger;
 
 /**
  * This class deploys a .tsk file into a registry.
@@ -21,6 +19,8 @@ import org.apache.log.Logger;
 public interface TskDeployer
     extends Deployer
 {
+    String ROLE = "org.apache.myrmidon.components.deployer.TskDeployer";
+
     void deployConverter( String name, String location, URL url )
         throws DeploymentException;
 

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

@@ -23,6 +23,8 @@ import org.apache.myrmidon.components.manager.ProjectManager;
 public interface Embeddor
     extends Component, Parameterizable, Initializable, Startable, Disposable
 {
+    String ROLE = "org.apache.myrmidon.components.embeddor.Embeddor";
+
     /**
      * Retrieve builder for runtime.
      * Valid after initialize() call

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

@@ -200,15 +200,15 @@ public class MyrmidonEmbeddor
         componentManager.put( "org.apache.avalon.framework.camelot.Factory", m_factory );
 
         //Following components required when Myrmidon is used as build tool
-        componentManager.put( "org.apache.myrmidon.components.manager.ProjectManager", m_projectManager );
-        componentManager.put( "org.apache.myrmidon.components.builder.ProjectBuilder", m_builder );
+        componentManager.put( ProjectManager.ROLE, m_projectManager );
+        componentManager.put( ProjectBuilder.ROLE, m_builder );
 
         //Following components required when Myrmidon allows user deployment of tasks etal.
-        componentManager.put( "org.apache.myrmidon.components.deployer.TskDeployer", m_deployer );
+        componentManager.put( TskDeployer.ROLE, m_deployer );
 
         //Following components required when allowing Container tasks
-        componentManager.put( "org.apache.myrmidon.components.configurer.Configurer", m_configurer );
-        componentManager.put( "org.apache.myrmidon.components.executor.Executor", m_executor );
+        componentManager.put( Configurer.ROLE, m_configurer );
+        componentManager.put( Executor.ROLE, m_executor );
 
         return componentManager;
     }

proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/DefaultExecutor.java

@@ -64,8 +64,7 @@ public class DefaultExecutor
 
         m_factory = (Factory)componentManager.lookup( "org.apache.avalon.framework.camelot.Factory" );
 
-        m_configurer = (Configurer)componentManager.
-            lookup( "org.apache.myrmidon.components.configurer.Configurer" );
+        m_configurer = (Configurer)componentManager.lookup( Configurer.ROLE );
     }
 
     public void execute( final Configuration taskData, final TaskContext context )

proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/Executor.java

@@ -21,6 +21,8 @@ import org.apache.myrmidon.api.TaskException;
 public interface Executor
     extends Component
 {
+    String ROLE = "org.apache.myrmidon.components.executor.Executor";
+
     /**
      * Retrieve locator registry associated with engine.
      * TODO: Remove this as it violates IOC

proposal/myrmidon/src/java/org/apache/myrmidon/components/manager/DefaultProjectManager.java

@@ -70,8 +70,7 @@ public class DefaultProjectManager
         throws ComponentException
     {
         m_componentManager = (DefaultComponentManager)componentManager;
-        m_executor = (Executor)componentManager.
-            lookup( "org.apache.myrmidon.components.executor.Executor" );
+        m_executor = (Executor)componentManager.lookup( Executor.ROLE );
     }
 
     /**
@@ -86,7 +85,7 @@ public class DefaultProjectManager
         throws TaskException
     {
         //HACK: should do this a better way !!!!!!
-        m_componentManager.put( "org.apache.ant.project.Project", project );
+        m_componentManager.put( Project.ROLE, project );
 
         m_listenerSupport.projectStarted();
 

proposal/myrmidon/src/java/org/apache/myrmidon/components/manager/ProjectManager.java

@@ -22,6 +22,8 @@ import org.apache.myrmidon.listeners.ProjectListener;
 public interface ProjectManager
     extends Component
 {
+    String ROLE = "org.apache.myrmidon.components.manager.ProjectManager";
+
     /**
      * Add a listener to project events.
      *

proposal/myrmidon/src/java/org/apache/myrmidon/components/model/Project.java

@@ -22,6 +22,8 @@ import org.apache.avalon.framework.component.Component;
 public interface Project
     extends Component
 {
+    String ROLE = "org.apache.myrmidon.components.model.Project";
+
     // the name of currently executing project
     String PROJECT          = "ant.project.name";
 

proposal/myrmidon/src/java/org/apache/myrmidon/components/model/Target.java

@@ -19,6 +19,8 @@ import org.apache.avalon.framework.configuration.Configuration;
 public interface Target
     extends Component
 {
+    String ROLE = "org.apache.myrmidon.components.model.Target";
+
     /**
      * Get dependencies of target
      *