Author: antoine
Date: Sun Oct 22 06:55:41 2006
New Revision: 466643
URL: http://svn.apache.org/viewvc?view=rev&rev=466643
Log:
Launcher should not depend upon parent package
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/MagicNames.java
ant/core/trunk/src/main/org/apache/tools/ant/launch/Launcher.java
Modified: ant/core/trunk/src/main/org/apache/tools/ant/MagicNames.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/MagicNames.java?view=diff&rev=466643&r1=466642&r2=466643
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/MagicNames.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/MagicNames.java Sun Oct 22
06:55:41 2006
@@ -16,6 +16,7 @@
*
*/
package org.apache.tools.ant;
+import org.apache.tools.ant.launch.Launcher;
/**
* Magic names used within Ant.
@@ -115,7 +116,7 @@
* Property used to store the location of ant.
* @since Ant 1.7
*/
- public static final String ANT_HOME = "ant.home";
+ public static final String ANT_HOME = Launcher.ANTHOME_PROPERTY;
/**
* Property used to store the location of the ant library (typically the
ant.jar file.)
Modified: ant/core/trunk/src/main/org/apache/tools/ant/launch/Launcher.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/launch/Launcher.java?view=diff&rev=466643&r1=466642&r2=466643
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/launch/Launcher.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/launch/Launcher.java Sun Oct
22 06:55:41 2006
@@ -26,7 +26,6 @@
import java.util.ArrayList;
import java.util.Iterator;
-import org.apache.tools.ant.MagicNames;
/**
@@ -39,9 +38,8 @@
/**
* The Ant Home (installation) Directory property.
* [EMAIL PROTECTED]
- * @deprecated since 1.7
*/
- public static final String ANTHOME_PROPERTY = MagicNames.ANT_HOME;
+ public static final String ANTHOME_PROPERTY = "ant.home";
/**
* The Ant Library Directory property.
@@ -157,7 +155,7 @@
*/
private int run(String[] args)
throws LaunchException, MalformedURLException {
- String antHomeProperty = System.getProperty(MagicNames.ANT_HOME);
+ String antHomeProperty = System.getProperty(ANTHOME_PROPERTY);
File antHome = null;
File sourceJar = Locator.getClassSource(getClass());
@@ -170,7 +168,7 @@
if (antHome == null || !antHome.exists()) {
antHome = jarDir.getParentFile();
- System.setProperty(MagicNames.ANT_HOME, antHome.getAbsolutePath());
+ System.setProperty(ANTHOME_PROPERTY, antHome.getAbsolutePath());
}
if (!antHome.exists()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
