From 0c6f46d68503ab0283574bb98982ed0f4eb16959 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Sat, 2 Feb 2002 05:10:36 +0000 Subject: [PATCH] Move CommandLauncher into Launchers package to remove circular dependency between impl and impl.launchers packages. Detected by JDepend git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271056 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/aut/nativelib/impl/DefaultExecManager.java | 1 + .../aut/nativelib/impl/{ => launchers}/CommandLauncher.java | 2 +- .../aut/nativelib/impl/launchers/DefaultCommandLauncher.java | 1 - .../apache/aut/nativelib/impl/launchers/MacCommandLauncher.java | 1 - .../aut/nativelib/impl/launchers/ScriptCommandLauncher.java | 1 - .../aut/nativelib/impl/launchers/WinNTCommandLauncher.java | 1 - 6 files changed, 2 insertions(+), 5 deletions(-) rename proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/{ => launchers}/CommandLauncher.java (96%) 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 a5def7996..69ad66b20 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 @@ -21,6 +21,7 @@ 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.aut.nativelib.impl.launchers.CommandLauncher; import org.apache.avalon.excalibur.io.FileUtil; import org.apache.avalon.excalibur.io.IOUtil; diff --git a/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/CommandLauncher.java b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/CommandLauncher.java similarity index 96% rename from proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/CommandLauncher.java rename to proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/CommandLauncher.java index 952c4d6cd..8c7a5ad7a 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/CommandLauncher.java +++ b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/CommandLauncher.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.impl; +package org.apache.aut.nativelib.impl.launchers; import java.io.IOException; import org.apache.aut.nativelib.ExecMetaData; diff --git a/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/DefaultCommandLauncher.java b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/DefaultCommandLauncher.java index 749363a01..f8ecca178 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/DefaultCommandLauncher.java +++ b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/DefaultCommandLauncher.java @@ -14,7 +14,6 @@ import java.lang.reflect.Method; import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; -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/impl/launchers/MacCommandLauncher.java b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/MacCommandLauncher.java index da1d09f5b..5a7588310 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/MacCommandLauncher.java +++ b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/MacCommandLauncher.java @@ -9,7 +9,6 @@ package org.apache.aut.nativelib.impl.launchers; import java.io.File; import java.io.IOException; -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/impl/launchers/ScriptCommandLauncher.java b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/ScriptCommandLauncher.java index 23299d467..433be6555 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/ScriptCommandLauncher.java +++ b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/ScriptCommandLauncher.java @@ -8,7 +8,6 @@ package org.apache.aut.nativelib.impl.launchers; import java.io.IOException; -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/impl/launchers/WinNTCommandLauncher.java b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/WinNTCommandLauncher.java index 171e8f19a..74a6b0269 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/WinNTCommandLauncher.java +++ b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/WinNTCommandLauncher.java @@ -8,7 +8,6 @@ package org.apache.aut.nativelib.impl.launchers; import java.io.IOException; -import org.apache.aut.nativelib.impl.CommandLauncher; import org.apache.aut.nativelib.ExecException; import org.apache.aut.nativelib.ExecMetaData;