git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268703 13f79535-47bb-0310-9956-ffa450edef68master
@@ -28,6 +28,8 @@ import org.apache.ant.project.Project; | |||||
import org.apache.ant.project.ProjectBuilder; | import org.apache.ant.project.ProjectBuilder; | ||||
import org.apache.ant.project.ProjectEngine; | import org.apache.ant.project.ProjectEngine; | ||||
import org.apache.ant.project.ProjectListener; | 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.JavaVersion; | ||||
import org.apache.ant.tasklet.TaskletContext; | import org.apache.ant.tasklet.TaskletContext; | ||||
import org.apache.ant.tasklet.engine.TaskletEngine; | import org.apache.ant.tasklet.engine.TaskletEngine; | ||||
@@ -108,6 +110,7 @@ public class Main | |||||
public static void main( final String[] args ) | public static void main( final String[] args ) | ||||
{ | { | ||||
final Main main = new Main(); | final Main main = new Main(); | ||||
main.setLogger( LogKit.getLoggerFor( "default" ) ); | |||||
try { main.execute( args ); } | try { main.execute( args ); } | ||||
catch( final AntException ae ) | catch( final AntException ae ) | ||||
@@ -436,9 +439,10 @@ public class Main | |||||
{ | { | ||||
//except for a few *special* files add all the | //except for a few *special* files add all the | ||||
//.zip/.jars to classloader | //.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() ); } | try { classLoader.addURL( files[ i ].toURL() ); } | ||||
catch( final MalformedURLException mue ) {} | catch( final MalformedURLException mue ) {} | ||||
@@ -5,7 +5,7 @@ | |||||
* version 1.1, a copy of which has been included with this distribution in | * version 1.1, a copy of which has been included with this distribution in | ||||
* the LICENSE file. | * the LICENSE file. | ||||
*/ | */ | ||||
package org.apache.ant; | |||||
package org.apache.ant.runtime; | |||||
/** | /** | ||||
* Interface that holds constants used to access variables from context. | * Interface that holds constants used to access variables from context. |
@@ -5,7 +5,7 @@ | |||||
* version 1.1, a copy of which has been included with this distribution in | * version 1.1, a copy of which has been included with this distribution in | ||||
* the LICENSE file. | * the LICENSE file. | ||||
*/ | */ | ||||
package org.apache.ant; | |||||
package org.apache.ant.runtime; | |||||
import java.util.Properties; | import java.util.Properties; | ||||
import org.apache.ant.project.ProjectBuilder; | import org.apache.ant.project.ProjectBuilder; |
@@ -5,16 +5,16 @@ | |||||
* version 1.1, a copy of which has been included with this distribution in | * version 1.1, a copy of which has been included with this distribution in | ||||
* the LICENSE file. | * the LICENSE file. | ||||
*/ | */ | ||||
package org.apache.ant; | |||||
package org.apache.ant.runtime; | |||||
import java.io.File; | import java.io.File; | ||||
import java.util.Properties; | import java.util.Properties; | ||||
import org.apache.ant.configuration.Configurer; | import org.apache.ant.configuration.Configurer; | ||||
import org.apache.ant.convert.engine.ConverterEngine; | 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.ProjectBuilder; | ||||
import org.apache.ant.project.ProjectEngine; | import org.apache.ant.project.ProjectEngine; | ||||
import org.apache.ant.tasklet.JavaVersion; | 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.TaskletEngine; | ||||
import org.apache.ant.tasklet.engine.TskDeployer; | import org.apache.ant.tasklet.engine.TskDeployer; | ||||
import org.apache.avalon.AbstractLoggable; | import org.apache.avalon.AbstractLoggable; |