From 3d89aa70b257f2c67ce201e10c22c87b948a2860 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Mon, 21 Jan 2002 11:44:24 +0000 Subject: [PATCH] Move the launchers package into the impl package. Move the CommandLauncher interface into the impl package git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270817 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/aut/nativelib/ExecMetaData.java | 12 +++++++----- .../aut/nativelib/{ => impl}/CommandLauncher.java | 4 +++- .../aut/nativelib/impl/DefaultExecManager.java | 9 ++++----- .../{ => impl}/launchers/DefaultCommandLauncher.java | 4 ++-- .../aut/nativelib/{ => impl}/launchers/ExecUtil.java | 2 +- .../{ => impl}/launchers/MacCommandLauncher.java | 4 ++-- .../{ => impl}/launchers/Resources.properties | 0 .../{ => impl}/launchers/ScriptCommandLauncher.java | 4 ++-- .../{ => impl}/launchers/WinNTCommandLauncher.java | 4 ++-- 9 files changed, 23 insertions(+), 20 deletions(-) rename proposal/myrmidon/src/java/org/apache/aut/nativelib/{ => impl}/CommandLauncher.java (91%) rename proposal/myrmidon/src/java/org/apache/aut/nativelib/{ => impl}/launchers/DefaultCommandLauncher.java (97%) rename proposal/myrmidon/src/java/org/apache/aut/nativelib/{ => impl}/launchers/ExecUtil.java (98%) rename proposal/myrmidon/src/java/org/apache/aut/nativelib/{ => impl}/launchers/MacCommandLauncher.java (95%) rename proposal/myrmidon/src/java/org/apache/aut/nativelib/{ => impl}/launchers/Resources.properties (100%) rename proposal/myrmidon/src/java/org/apache/aut/nativelib/{ => impl}/launchers/ScriptCommandLauncher.java (95%) rename proposal/myrmidon/src/java/org/apache/aut/nativelib/{ => impl}/launchers/WinNTCommandLauncher.java (93%) diff --git a/proposal/myrmidon/src/java/org/apache/aut/nativelib/ExecMetaData.java b/proposal/myrmidon/src/java/org/apache/aut/nativelib/ExecMetaData.java index 3c4d958cf..9bd1ccf69 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/nativelib/ExecMetaData.java +++ b/proposal/myrmidon/src/java/org/apache/aut/nativelib/ExecMetaData.java @@ -32,14 +32,16 @@ public class ExecMetaData private String[] m_command; /** - * The array of strings that make up the command line for the command. - * Note that these variables are in the ugly format expected by the - * Runtime.exec() call. For most systems this means that each entry - * must be of the form key=value + * The array of strings that make up the native environment for the + * command. + * + *

Note that these variables are yet to be translated into the ugly + * format expected by the Runtime.exec() call. For most systems this means + * that each entry must be translated into the form key=value.

* *

This set of variables is combined with the environment of current * process if isEnvironmentAdditive=true else it specifies - * full environment. + * full environment.

*/ private Properties m_environment; diff --git a/proposal/myrmidon/src/java/org/apache/aut/nativelib/CommandLauncher.java b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/CommandLauncher.java similarity index 91% rename from proposal/myrmidon/src/java/org/apache/aut/nativelib/CommandLauncher.java rename to proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/CommandLauncher.java index 96266bff8..952c4d6cd 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/nativelib/CommandLauncher.java +++ b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/CommandLauncher.java @@ -5,9 +5,11 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.aut.nativelib; +package org.apache.aut.nativelib.impl; import java.io.IOException; +import org.apache.aut.nativelib.ExecMetaData; +import org.apache.aut.nativelib.ExecException; /** * This is the interface implemented by objects which are capable of diff --git a/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/DefaultExecManager.java b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/DefaultExecManager.java index 25c0a7d57..c38a45098 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/DefaultExecManager.java +++ b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/DefaultExecManager.java @@ -12,16 +12,15 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.Locale; -import org.apache.aut.nativelib.CommandLauncher; import org.apache.aut.nativelib.ExecException; import org.apache.aut.nativelib.ExecManager; import org.apache.aut.nativelib.ExecMetaData; import org.apache.aut.nativelib.ExecOutputHandler; import org.apache.aut.nativelib.Os; -import org.apache.aut.nativelib.launchers.DefaultCommandLauncher; -import org.apache.aut.nativelib.launchers.MacCommandLauncher; -import org.apache.aut.nativelib.launchers.ScriptCommandLauncher; -import org.apache.aut.nativelib.launchers.WinNTCommandLauncher; +import org.apache.aut.nativelib.impl.launchers.DefaultCommandLauncher; +import org.apache.aut.nativelib.impl.launchers.MacCommandLauncher; +import org.apache.aut.nativelib.impl.launchers.ScriptCommandLauncher; +import org.apache.aut.nativelib.impl.launchers.WinNTCommandLauncher; import org.apache.avalon.excalibur.io.FileUtil; /** diff --git a/proposal/myrmidon/src/java/org/apache/aut/nativelib/launchers/DefaultCommandLauncher.java b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/DefaultCommandLauncher.java similarity index 97% rename from proposal/myrmidon/src/java/org/apache/aut/nativelib/launchers/DefaultCommandLauncher.java rename to proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/DefaultCommandLauncher.java index 97c1e9027..749363a01 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/nativelib/launchers/DefaultCommandLauncher.java +++ b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/DefaultCommandLauncher.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.aut.nativelib.launchers; +package org.apache.aut.nativelib.impl.launchers; import java.io.File; import java.io.IOException; @@ -14,7 +14,7 @@ import java.lang.reflect.Method; import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; -import org.apache.aut.nativelib.CommandLauncher; +import org.apache.aut.nativelib.impl.CommandLauncher; import org.apache.aut.nativelib.ExecException; import org.apache.aut.nativelib.ExecMetaData; diff --git a/proposal/myrmidon/src/java/org/apache/aut/nativelib/launchers/ExecUtil.java b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/ExecUtil.java similarity index 98% rename from proposal/myrmidon/src/java/org/apache/aut/nativelib/launchers/ExecUtil.java rename to proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/ExecUtil.java index 6c68d951b..7ff5aa6f8 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/nativelib/launchers/ExecUtil.java +++ b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/ExecUtil.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.aut.nativelib.launchers; +package org.apache.aut.nativelib.impl.launchers; import java.io.File; import java.io.IOException; diff --git a/proposal/myrmidon/src/java/org/apache/aut/nativelib/launchers/MacCommandLauncher.java b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/MacCommandLauncher.java similarity index 95% rename from proposal/myrmidon/src/java/org/apache/aut/nativelib/launchers/MacCommandLauncher.java rename to proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/MacCommandLauncher.java index 9e132aa8f..da1d09f5b 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/nativelib/launchers/MacCommandLauncher.java +++ b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/MacCommandLauncher.java @@ -5,11 +5,11 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.aut.nativelib.launchers; +package org.apache.aut.nativelib.impl.launchers; import java.io.File; import java.io.IOException; -import org.apache.aut.nativelib.CommandLauncher; +import org.apache.aut.nativelib.impl.CommandLauncher; import org.apache.aut.nativelib.ExecException; import org.apache.aut.nativelib.ExecMetaData; diff --git a/proposal/myrmidon/src/java/org/apache/aut/nativelib/launchers/Resources.properties b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/Resources.properties similarity index 100% rename from proposal/myrmidon/src/java/org/apache/aut/nativelib/launchers/Resources.properties rename to proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/Resources.properties diff --git a/proposal/myrmidon/src/java/org/apache/aut/nativelib/launchers/ScriptCommandLauncher.java b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/ScriptCommandLauncher.java similarity index 95% rename from proposal/myrmidon/src/java/org/apache/aut/nativelib/launchers/ScriptCommandLauncher.java rename to proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/ScriptCommandLauncher.java index 8123e1daf..23299d467 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/nativelib/launchers/ScriptCommandLauncher.java +++ b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/ScriptCommandLauncher.java @@ -5,10 +5,10 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.aut.nativelib.launchers; +package org.apache.aut.nativelib.impl.launchers; import java.io.IOException; -import org.apache.aut.nativelib.CommandLauncher; +import org.apache.aut.nativelib.impl.CommandLauncher; import org.apache.aut.nativelib.ExecException; import org.apache.aut.nativelib.ExecMetaData; diff --git a/proposal/myrmidon/src/java/org/apache/aut/nativelib/launchers/WinNTCommandLauncher.java b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/WinNTCommandLauncher.java similarity index 93% rename from proposal/myrmidon/src/java/org/apache/aut/nativelib/launchers/WinNTCommandLauncher.java rename to proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/WinNTCommandLauncher.java index 718bde02b..171e8f19a 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/nativelib/launchers/WinNTCommandLauncher.java +++ b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/WinNTCommandLauncher.java @@ -5,10 +5,10 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.aut.nativelib.launchers; +package org.apache.aut.nativelib.impl.launchers; import java.io.IOException; -import org.apache.aut.nativelib.CommandLauncher; +import org.apache.aut.nativelib.impl.CommandLauncher; import org.apache.aut.nativelib.ExecException; import org.apache.aut.nativelib.ExecMetaData;