From a00fa243becff6d062b1e9491d7cada4c552c3ba Mon Sep 17 00:00:00 2001
From: Peter Donald <donaldp@apache.org>
Date: Tue, 20 Feb 2001 06:04:25 +0000
Subject: [PATCH] Rearranged packages

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268703 13f79535-47bb-0310-9956-ffa450edef68
---
 proposal/myrmidon/src/java/org/apache/ant/Main.java    | 10 +++++++---
 .../apache/ant/{ => runtime}/AntContextResources.java  |  2 +-
 .../java/org/apache/ant/{ => runtime}/AntEngine.java   |  2 +-
 .../org/apache/ant/{ => runtime}/DefaultAntEngine.java |  4 ++--
 4 files changed, 11 insertions(+), 7 deletions(-)
 rename proposal/myrmidon/src/java/org/apache/ant/{ => runtime}/AntContextResources.java (96%)
 rename proposal/myrmidon/src/java/org/apache/ant/{ => runtime}/AntEngine.java (97%)
 rename proposal/myrmidon/src/java/org/apache/ant/{ => runtime}/DefaultAntEngine.java (99%)

diff --git a/proposal/myrmidon/src/java/org/apache/ant/Main.java b/proposal/myrmidon/src/java/org/apache/ant/Main.java
index 1b0affd29..31ba69d7a 100644
--- a/proposal/myrmidon/src/java/org/apache/ant/Main.java
+++ b/proposal/myrmidon/src/java/org/apache/ant/Main.java
@@ -28,6 +28,8 @@ import org.apache.ant.project.Project;
 import org.apache.ant.project.ProjectBuilder;
 import org.apache.ant.project.ProjectEngine;
 import org.apache.ant.project.ProjectListener;
+import org.apache.ant.runtime.AntEngine;
+import org.apache.ant.runtime.DefaultAntEngine;
 import org.apache.ant.tasklet.JavaVersion;
 import org.apache.ant.tasklet.TaskletContext;
 import org.apache.ant.tasklet.engine.TaskletEngine;
@@ -108,6 +110,7 @@ public class Main
     public static void main( final String[] args )
     {
         final Main main = new Main();
+        main.setLogger( LogKit.getLoggerFor( "default" ) );
 
         try { main.execute( args ); }
         catch( final AntException ae )
@@ -436,9 +439,10 @@ public class Main
         {
             //except for a few *special* files add all the 
             //.zip/.jars to classloader
-            if( !files[ i ].getName().equals( "ant.jar" ) &&
-                !files[ i ].getName().equals( "myrmidon.jar" ) &&
-                !files[ i ].getName().equals( "avalonapi.jar" ) )
+            final String name = files[ i ].getName();
+            if( !name.equals( "ant.jar" ) &&
+                !name.equals( "myrmidon.jar" ) &&
+                !name.equals( "avalonapi.jar" ) )
             {                
                 try { classLoader.addURL( files[ i ].toURL() ); }
                 catch( final MalformedURLException mue ) {}
diff --git a/proposal/myrmidon/src/java/org/apache/ant/AntContextResources.java b/proposal/myrmidon/src/java/org/apache/ant/runtime/AntContextResources.java
similarity index 96%
rename from proposal/myrmidon/src/java/org/apache/ant/AntContextResources.java
rename to proposal/myrmidon/src/java/org/apache/ant/runtime/AntContextResources.java
index c43186240..20f43f40b 100644
--- a/proposal/myrmidon/src/java/org/apache/ant/AntContextResources.java
+++ b/proposal/myrmidon/src/java/org/apache/ant/runtime/AntContextResources.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;
+package org.apache.ant.runtime;
 
 /**
  * Interface that holds constants used to access variables from context.
diff --git a/proposal/myrmidon/src/java/org/apache/ant/AntEngine.java b/proposal/myrmidon/src/java/org/apache/ant/runtime/AntEngine.java
similarity index 97%
rename from proposal/myrmidon/src/java/org/apache/ant/AntEngine.java
rename to proposal/myrmidon/src/java/org/apache/ant/runtime/AntEngine.java
index 38d8c372b..dd1f9ab8e 100644
--- a/proposal/myrmidon/src/java/org/apache/ant/AntEngine.java
+++ b/proposal/myrmidon/src/java/org/apache/ant/runtime/AntEngine.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;
+package org.apache.ant.runtime;
 
 import java.util.Properties;
 import org.apache.ant.project.ProjectBuilder;
diff --git a/proposal/myrmidon/src/java/org/apache/ant/DefaultAntEngine.java b/proposal/myrmidon/src/java/org/apache/ant/runtime/DefaultAntEngine.java
similarity index 99%
rename from proposal/myrmidon/src/java/org/apache/ant/DefaultAntEngine.java
rename to proposal/myrmidon/src/java/org/apache/ant/runtime/DefaultAntEngine.java
index cd41fe2d7..58b0c9265 100644
--- a/proposal/myrmidon/src/java/org/apache/ant/DefaultAntEngine.java
+++ b/proposal/myrmidon/src/java/org/apache/ant/runtime/DefaultAntEngine.java
@@ -5,16 +5,16 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE file.
  */
-package org.apache.ant;
+package org.apache.ant.runtime;
 
 import java.io.File;
 import java.util.Properties;
 import org.apache.ant.configuration.Configurer;
 import org.apache.ant.convert.engine.ConverterEngine;
-import org.apache.ant.tasklet.engine.DataTypeEngine;
 import org.apache.ant.project.ProjectBuilder;
 import org.apache.ant.project.ProjectEngine;
 import org.apache.ant.tasklet.JavaVersion;
+import org.apache.ant.tasklet.engine.DataTypeEngine;
 import org.apache.ant.tasklet.engine.TaskletEngine;
 import org.apache.ant.tasklet.engine.TskDeployer;
 import org.apache.avalon.AbstractLoggable;