Migrate ProjectBuilderss to separate package

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

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

@@ -20,21 +20,12 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import org.apache.myrmidon.launcher.LauncherClassLoader;
 import org.apache.ant.project.LogTargetToListenerAdapter;
-import org.apache.myrmidon.model.Project;
-import org.apache.ant.project.ProjectBuilder;
 import org.apache.ant.project.ProjectEngine;
-import org.apache.myrmidon.listeners.ProjectListener;
-import org.apache.myrmidon.components.embeddor.Embeddor;
-import org.apache.myrmidon.components.embeddor.MyrmidonEmbeddor;
-import org.apache.myrmidon.api.JavaVersion;
-import org.apache.myrmidon.api.TaskContext;
-import org.apache.myrmidon.api.DefaultTaskContext;
 import org.apache.avalon.excalibur.cli.CLArgsParser;
 import org.apache.avalon.excalibur.cli.CLOption;
-import org.apache.avalon.excalibur.cli.CLUtil;
 import org.apache.avalon.excalibur.cli.CLOptionDescriptor;
+import org.apache.avalon.excalibur.cli.CLUtil;
 import org.apache.avalon.excalibur.io.ExtensionFileFilter;
 import org.apache.avalon.framework.ExceptionUtil;
 import org.apache.avalon.framework.activity.Disposable;
@@ -45,9 +36,17 @@ import org.apache.avalon.framework.camelot.DeploymentException;
 import org.apache.avalon.framework.logger.AbstractLoggable;
 import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.log.Hierarchy;
-import org.apache.log.Logger;
 import org.apache.log.LogTarget;
+import org.apache.log.Logger;
 import org.apache.log.Priority;
+import org.apache.myrmidon.api.DefaultTaskContext;
+import org.apache.myrmidon.api.TaskContext;
+import org.apache.myrmidon.components.builder.ProjectBuilder;
+import org.apache.myrmidon.components.embeddor.Embeddor;
+import org.apache.myrmidon.components.embeddor.MyrmidonEmbeddor;
+import org.apache.myrmidon.launcher.LauncherClassLoader;
+import org.apache.myrmidon.listeners.ProjectListener;
+import org.apache.myrmidon.model.Project;
 
 /**
  * The class to kick the tires and light the fires.
@@ -227,7 +226,7 @@ public class Main
             System.err.println( "Error: " + parser.getErrorString() );
             return;
         }
-        
+
         final List clOptions = parser.getArguments();
         final int size = clOptions.size();
         final ArrayList targets = new ArrayList();
@@ -408,11 +407,11 @@ public class Main
             throw new AntException( "Unknown log level - " + logLevel );
         }
 
-        final Logger logger = 
+        final Logger logger =
             Hierarchy.getDefaultHierarchy().getLoggerFor( "ant" );
 
         logger.setPriority( priority );
-        
+
         return logger;
     }
 

proposal/myrmidon/src/java/org/apache/ant/project/DefaultProjectBuilder.java → proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java

@@ -5,12 +5,10 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE file.
  */
-package org.apache.ant.project;
-
+package org.apache.myrmidon.components.builder;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Iterator;
 import org.apache.ant.AntException;
 import org.apache.ant.util.Condition;
 import org.apache.avalon.framework.ExceptionUtil;
@@ -110,9 +108,7 @@ public class DefaultProjectBuilder
         //get project-level attributes
         final String baseDirectoryName = configuration.getAttribute( "basedir" );
         final String defaultTarget = configuration.getAttribute( "default" );
-
-        //Ignore Project name in the future ok??
-        //final String projectName = configuration.getAttribute( "name" );
+        //final String name = configuration.getAttribute( "name" );
 
         //determine base directory for project
         final File baseDirectory =
@@ -124,6 +120,7 @@ public class DefaultProjectBuilder
         final DefaultProject project = new DefaultProject();
         project.setDefaultTargetName( defaultTarget );
         project.setBaseDirectory( baseDirectory );
+        //project.setName( name );
 
         //build using all top-level attributes
         buildTopLevelProject( project, configuration );

proposal/myrmidon/src/java/org/apache/ant/project/ProjectBuilder.java → proposal/myrmidon/src/java/org/apache/myrmidon/components/builder/ProjectBuilder.java

@@ -5,7 +5,7 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE file.
  */
-package org.apache.ant.project;
+package org.apache.myrmidon.components.builder;
 
 import java.io.File;
 import java.io.IOException;

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

@@ -7,12 +7,12 @@
  */
 package org.apache.myrmidon.components.embeddor;
 
-import org.apache.ant.project.ProjectBuilder;
 import org.apache.ant.project.ProjectEngine;
 import org.apache.avalon.framework.activity.Disposable;
 import org.apache.avalon.framework.activity.Initializable;
 import org.apache.avalon.framework.component.Component;
 import org.apache.avalon.framework.parameters.Parameterizable;
+import org.apache.myrmidon.components.builder.ProjectBuilder;
 
 /**
  * Interface through which you embed Myrmidon into applications.

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

@@ -10,7 +10,6 @@ package org.apache.myrmidon.components.embeddor;
 import java.io.File;
 import org.apache.ant.AntException;
 import org.apache.ant.convert.engine.ConverterEngine;
-import org.apache.ant.project.ProjectBuilder;
 import org.apache.ant.project.ProjectEngine;
 import org.apache.ant.tasklet.engine.DataTypeEngine;
 import org.apache.ant.tasklet.engine.TskDeployer;
@@ -27,6 +26,7 @@ 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.builder.ProjectBuilder;
 import org.apache.myrmidon.components.configurer.Configurer;
 import org.apache.myrmidon.components.executor.Executor;
 
@@ -159,19 +159,19 @@ public class MyrmidonEmbeddor
 
         //create all the default properties for components
         defaults.setParameter( "ant.comp.converter",
-                              "org.apache.ant.convert.engine.DefaultConverterEngine" );
+                               "org.apache.ant.convert.engine.DefaultConverterEngine" );
         defaults.setParameter( "ant.comp.datatype",
-                              "org.apache.ant.tasklet.engine.DefaultDataTypeEngine" );
+                               "org.apache.ant.tasklet.engine.DefaultDataTypeEngine" );
         defaults.setParameter( "ant.comp.task",
-                              "org.apache.myrmidon.components.executor.DefaultExecutor" );
+                               "org.apache.myrmidon.components.executor.DefaultExecutor" );
         defaults.setParameter( "ant.comp.project",
-                              "org.apache.ant.project.DefaultProjectEngine" );
+                               "org.apache.ant.project.DefaultProjectEngine" );
         defaults.setParameter( "ant.comp.builder",
-                              "org.apache.ant.project.DefaultProjectBuilder" );
+                               "org.apache.myrmidon.components.builder.DefaultProjectBuilder" );
         defaults.setParameter( "ant.comp.deployer",
-                              "org.apache.ant.tasklet.engine.DefaultTskDeployer" );
+                               "org.apache.ant.tasklet.engine.DefaultTskDeployer" );
         defaults.setParameter( "ant.comp.configurer",
-                              "org.apache.myrmidon.components.configurer.DefaultConfigurer" );
+                               "org.apache.myrmidon.components.configurer.DefaultConfigurer" );
 
         return defaults;
     }
@@ -190,7 +190,7 @@ public class MyrmidonEmbeddor
                               m_converterEngine );
         componentManager.put( "org.apache.ant.convert.Converter", m_converterEngine );
         componentManager.put( "org.apache.ant.tasklet.engine.DataTypeEngine", m_dataTypeEngine );
-        componentManager.put( "org.apache.ant.project.ProjectBuilder", m_builder );
+        componentManager.put( "org.apache.myrmidon.components.builder.ProjectBuilder", m_builder );
         componentManager.put( "org.apache.ant.tasklet.engine.TskDeployer", m_deployer );
         componentManager.put( "org.apache.avalon.framework.camelot.Factory", m_factory );