diff --git a/proposal/myrmidon/src/java/org/apache/antlib/nativelib/LoadEnvironment.java b/proposal/myrmidon/src/java/org/apache/antlib/nativelib/LoadEnvironment.java index 99e34479d..ed1a1472b 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/nativelib/LoadEnvironment.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/nativelib/LoadEnvironment.java @@ -14,8 +14,8 @@ import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.exec.Environment; -import org.apache.myrmidon.framework.exec.ExecException; +import org.apache.aut.nativelib.Environment; +import org.apache.aut.nativelib.ExecException; /** * This task is responsible for loading that OS-specific environment diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/CommandLauncher.java b/proposal/myrmidon/src/java/org/apache/aut/nativelib/CommandLauncher.java similarity index 97% rename from proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/CommandLauncher.java rename to proposal/myrmidon/src/java/org/apache/aut/nativelib/CommandLauncher.java index a27252aa9..96266bff8 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/CommandLauncher.java +++ b/proposal/myrmidon/src/java/org/apache/aut/nativelib/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.myrmidon.framework.exec; +package org.apache.aut.nativelib; import java.io.IOException; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/DefaultExecOutputHandler.java b/proposal/myrmidon/src/java/org/apache/aut/nativelib/DefaultExecOutputHandler.java similarity index 95% rename from proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/DefaultExecOutputHandler.java rename to proposal/myrmidon/src/java/org/apache/aut/nativelib/DefaultExecOutputHandler.java index ca18c7e07..c2ce7f5ab 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/DefaultExecOutputHandler.java +++ b/proposal/myrmidon/src/java/org/apache/aut/nativelib/DefaultExecOutputHandler.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.myrmidon.framework.exec; +package org.apache.aut.nativelib; import org.apache.avalon.framework.logger.AbstractLogEnabled; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/Environment.java b/proposal/myrmidon/src/java/org/apache/aut/nativelib/Environment.java similarity index 98% rename from proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/Environment.java rename to proposal/myrmidon/src/java/org/apache/aut/nativelib/Environment.java index f0b7cc178..fe2cb02e3 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/Environment.java +++ b/proposal/myrmidon/src/java/org/apache/aut/nativelib/Environment.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.myrmidon.framework.exec; +package org.apache.aut.nativelib; import java.io.BufferedReader; import java.io.ByteArrayOutputStream; @@ -16,7 +16,6 @@ import java.util.Locale; import java.util.Properties; import org.apache.avalon.excalibur.util.StringUtil; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.Os; import org.apache.tools.ant.taskdefs.exec.Execute; /** diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/ExecException.java b/proposal/myrmidon/src/java/org/apache/aut/nativelib/ExecException.java similarity index 96% rename from proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/ExecException.java rename to proposal/myrmidon/src/java/org/apache/aut/nativelib/ExecException.java index 0e506e2b5..77aa7f513 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/ExecException.java +++ b/proposal/myrmidon/src/java/org/apache/aut/nativelib/ExecException.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.myrmidon.framework.exec; +package org.apache.aut.nativelib; import org.apache.avalon.framework.CascadingException; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/ExecManager.java b/proposal/myrmidon/src/java/org/apache/aut/nativelib/ExecManager.java similarity index 98% rename from proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/ExecManager.java rename to proposal/myrmidon/src/java/org/apache/aut/nativelib/ExecManager.java index 8f95e4e0b..2a11912df 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/ExecManager.java +++ b/proposal/myrmidon/src/java/org/apache/aut/nativelib/ExecManager.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.myrmidon.framework.exec; +package org.apache.aut.nativelib; import java.io.IOException; import java.io.InputStream; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/ExecMetaData.java b/proposal/myrmidon/src/java/org/apache/aut/nativelib/ExecMetaData.java similarity index 98% rename from proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/ExecMetaData.java rename to proposal/myrmidon/src/java/org/apache/aut/nativelib/ExecMetaData.java index 33c2ac053..3c4d958cf 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/ExecMetaData.java +++ b/proposal/myrmidon/src/java/org/apache/aut/nativelib/ExecMetaData.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.myrmidon.framework.exec; +package org.apache.aut.nativelib; import java.io.File; import java.util.Properties; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/ExecOutputHandler.java b/proposal/myrmidon/src/java/org/apache/aut/nativelib/ExecOutputHandler.java similarity index 94% rename from proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/ExecOutputHandler.java rename to proposal/myrmidon/src/java/org/apache/aut/nativelib/ExecOutputHandler.java index 3094c5a5e..1b41f1476 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/ExecOutputHandler.java +++ b/proposal/myrmidon/src/java/org/apache/aut/nativelib/ExecOutputHandler.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.myrmidon.framework.exec; +package org.apache.aut.nativelib; /** * This class is used to receive notifications of what the native diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Os.java b/proposal/myrmidon/src/java/org/apache/aut/nativelib/Os.java similarity index 74% rename from proposal/myrmidon/src/java/org/apache/myrmidon/framework/Os.java rename to proposal/myrmidon/src/java/org/apache/aut/nativelib/Os.java index e16adcf35..57aa867f2 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Os.java +++ b/proposal/myrmidon/src/java/org/apache/aut/nativelib/Os.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.myrmidon.framework; +package org.apache.aut.nativelib; import java.util.Locale; import org.apache.avalon.excalibur.i18n.ResourceManager; @@ -32,18 +32,20 @@ public class Os private final static String PATH_SEP = System.getProperty( "path.separator" ); - private String m_arch; - private String m_family; - private String m_name; - private String m_version; - - public Os() + /** + * Private constructor to block instantiation. + */ + private Os() { } - public Os( final String family ) + /** + * Determines if the OS on which Ant is executing matches the given OS + * version. + */ + public static boolean isVersion( final String version ) { - setFamily( family ); + return isOs( null, null, null, version ); } /** @@ -93,10 +95,10 @@ public class Os * @param version The OS version * @return The Os value */ - private static boolean isOs( final String family, - final String name, - final String arch, - final String version ) + public static boolean isOs( final String family, + final String name, + final String arch, + final String version ) { if( family != null || name != null || arch != null || version != null ) { @@ -181,74 +183,4 @@ public class Os } return isFamily; } - - /** - * Determines if the OS on which Ant is executing matches the given OS - * version. - */ - public static boolean isVersion( final String version ) - { - return isOs( null, null, null, version ); - } - - /** - * Sets the desired OS architecture - * - * @param arch The OS architecture - */ - public void setArch( final String arch ) - { - m_arch = arch.toLowerCase( Locale.US ); - } - - /** - * Sets the desired OS family type - * - * @param f The OS family type desired
- * Possible values:
- * - * - */ - public void setFamily( String f ) - { - m_family = f.toLowerCase( Locale.US ); - } - - /** - * Sets the desired OS name - * - * @param name The OS name - */ - public void setName( String name ) - { - m_name = name.toLowerCase( Locale.US ); - } - - /** - * Sets the desired OS version - * - * @param version The OS version - */ - public void setVersion( String version ) - { - m_version = version.toLowerCase( Locale.US ); - } - - /** - * Determines if the OS on which Ant is executing matches the type of that - * set in setFamily. - * - * @see Os#setFamily(String) - */ - public boolean eval() - { - return isOs( m_family, m_name, m_arch, m_version ); - } } diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/impl/DefaultExecManager.java b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/DefaultExecManager.java similarity index 89% rename from proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/impl/DefaultExecManager.java rename to proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/DefaultExecManager.java index 2a74602a4..0ce1b7b62 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/impl/DefaultExecManager.java +++ b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/DefaultExecManager.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.myrmidon.framework.exec.impl; +package org.apache.aut.nativelib.impl; import java.io.File; import java.io.IOException; @@ -13,16 +13,16 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.Locale; import org.apache.avalon.excalibur.io.FileUtil; -import org.apache.myrmidon.framework.Os; -import org.apache.myrmidon.framework.exec.CommandLauncher; -import org.apache.myrmidon.framework.exec.ExecException; -import org.apache.myrmidon.framework.exec.ExecManager; -import org.apache.myrmidon.framework.exec.ExecMetaData; -import org.apache.myrmidon.framework.exec.ExecOutputHandler; -import org.apache.myrmidon.framework.exec.launchers.DefaultCommandLauncher; -import org.apache.myrmidon.framework.exec.launchers.MacCommandLauncher; -import org.apache.myrmidon.framework.exec.launchers.ScriptCommandLauncher; -import org.apache.myrmidon.framework.exec.launchers.WinNTCommandLauncher; +import org.apache.aut.nativelib.Os; +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.launchers.DefaultCommandLauncher; +import org.apache.aut.nativelib.launchers.MacCommandLauncher; +import org.apache.aut.nativelib.launchers.ScriptCommandLauncher; +import org.apache.aut.nativelib.launchers.WinNTCommandLauncher; /** * Default implementation of ExecManager. diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/impl/LogOutputStream.java b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/LogOutputStream.java similarity index 95% rename from proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/impl/LogOutputStream.java rename to proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/LogOutputStream.java index 724fe6721..76959b485 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/impl/LogOutputStream.java +++ b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/LogOutputStream.java @@ -5,12 +5,12 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.framework.exec.impl; +package org.apache.aut.nativelib.impl; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; -import org.apache.myrmidon.framework.exec.ExecOutputHandler; +import org.apache.aut.nativelib.ExecOutputHandler; import org.apache.avalon.framework.logger.Logger; /** diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/impl/ProcessDestroyer.java b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/ProcessDestroyer.java similarity index 97% rename from proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/impl/ProcessDestroyer.java rename to proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/ProcessDestroyer.java index 0c38fc273..f52f4032f 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/impl/ProcessDestroyer.java +++ b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/ProcessDestroyer.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.myrmidon.framework.exec.impl; +package org.apache.aut.nativelib.impl; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/impl/ProcessMonitor.java b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/ProcessMonitor.java similarity index 99% rename from proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/impl/ProcessMonitor.java rename to proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/ProcessMonitor.java index 5fe48fdc1..bedafc2e3 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/impl/ProcessMonitor.java +++ b/proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/ProcessMonitor.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.myrmidon.framework.exec.impl; +package org.apache.aut.nativelib.impl; import java.io.IOException; import java.io.InputStream; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/DefaultCommandLauncher.java b/proposal/myrmidon/src/java/org/apache/aut/nativelib/launchers/DefaultCommandLauncher.java similarity index 93% rename from proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/DefaultCommandLauncher.java rename to proposal/myrmidon/src/java/org/apache/aut/nativelib/launchers/DefaultCommandLauncher.java index f1e2c0d0f..91df732e7 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/DefaultCommandLauncher.java +++ b/proposal/myrmidon/src/java/org/apache/aut/nativelib/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.myrmidon.framework.exec.launchers; +package org.apache.aut.nativelib.launchers; import java.io.File; import java.io.IOException; @@ -14,10 +14,10 @@ import java.lang.reflect.Method; import java.util.Properties; import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; -import org.apache.myrmidon.framework.exec.CommandLauncher; -import org.apache.myrmidon.framework.exec.Environment; -import org.apache.myrmidon.framework.exec.ExecException; -import org.apache.myrmidon.framework.exec.ExecMetaData; +import org.apache.aut.nativelib.CommandLauncher; +import org.apache.aut.nativelib.Environment; +import org.apache.aut.nativelib.ExecException; +import org.apache.aut.nativelib.ExecMetaData; /** * A command launcher for a particular JVM/OS platform. This class is a diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/ExecUtil.java b/proposal/myrmidon/src/java/org/apache/aut/nativelib/launchers/ExecUtil.java similarity index 94% rename from proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/ExecUtil.java rename to proposal/myrmidon/src/java/org/apache/aut/nativelib/launchers/ExecUtil.java index 59b8de032..5c2f83a5d 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/ExecUtil.java +++ b/proposal/myrmidon/src/java/org/apache/aut/nativelib/launchers/ExecUtil.java @@ -5,16 +5,16 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.framework.exec.launchers; +package org.apache.aut.nativelib.launchers; import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; import java.util.Properties; -import org.apache.myrmidon.framework.exec.Environment; -import org.apache.myrmidon.framework.exec.ExecException; -import org.apache.myrmidon.framework.exec.ExecMetaData; +import org.apache.aut.nativelib.Environment; +import org.apache.aut.nativelib.ExecException; +import org.apache.aut.nativelib.ExecMetaData; /** * A set of utility functions useful when writing CommandLaunchers. diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/MacCommandLauncher.java b/proposal/myrmidon/src/java/org/apache/aut/nativelib/launchers/MacCommandLauncher.java similarity index 89% rename from proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/MacCommandLauncher.java rename to proposal/myrmidon/src/java/org/apache/aut/nativelib/launchers/MacCommandLauncher.java index 757a55b83..9e132aa8f 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/MacCommandLauncher.java +++ b/proposal/myrmidon/src/java/org/apache/aut/nativelib/launchers/MacCommandLauncher.java @@ -5,13 +5,13 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.framework.exec.launchers; +package org.apache.aut.nativelib.launchers; import java.io.File; import java.io.IOException; -import org.apache.myrmidon.framework.exec.CommandLauncher; -import org.apache.myrmidon.framework.exec.ExecException; -import org.apache.myrmidon.framework.exec.ExecMetaData; +import org.apache.aut.nativelib.CommandLauncher; +import org.apache.aut.nativelib.ExecException; +import org.apache.aut.nativelib.ExecMetaData; /** * A command launcher for Mac that uses a dodgy mechanism to change working diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/Resources.properties b/proposal/myrmidon/src/java/org/apache/aut/nativelib/launchers/Resources.properties similarity index 100% rename from proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/Resources.properties rename to proposal/myrmidon/src/java/org/apache/aut/nativelib/launchers/Resources.properties diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/ScriptCommandLauncher.java b/proposal/myrmidon/src/java/org/apache/aut/nativelib/launchers/ScriptCommandLauncher.java similarity index 91% rename from proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/ScriptCommandLauncher.java rename to proposal/myrmidon/src/java/org/apache/aut/nativelib/launchers/ScriptCommandLauncher.java index 2df374cb1..8123e1daf 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/ScriptCommandLauncher.java +++ b/proposal/myrmidon/src/java/org/apache/aut/nativelib/launchers/ScriptCommandLauncher.java @@ -5,12 +5,12 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.framework.exec.launchers; +package org.apache.aut.nativelib.launchers; import java.io.IOException; -import org.apache.myrmidon.framework.exec.CommandLauncher; -import org.apache.myrmidon.framework.exec.ExecException; -import org.apache.myrmidon.framework.exec.ExecMetaData; +import org.apache.aut.nativelib.CommandLauncher; +import org.apache.aut.nativelib.ExecException; +import org.apache.aut.nativelib.ExecMetaData; /** * A command launcher that uses an auxiliary script to launch commands in diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/WinNTCommandLauncher.java b/proposal/myrmidon/src/java/org/apache/aut/nativelib/launchers/WinNTCommandLauncher.java similarity index 86% rename from proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/WinNTCommandLauncher.java rename to proposal/myrmidon/src/java/org/apache/aut/nativelib/launchers/WinNTCommandLauncher.java index 04d2008d5..718bde02b 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/WinNTCommandLauncher.java +++ b/proposal/myrmidon/src/java/org/apache/aut/nativelib/launchers/WinNTCommandLauncher.java @@ -5,12 +5,12 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.framework.exec.launchers; +package org.apache.aut.nativelib.launchers; import java.io.IOException; -import org.apache.myrmidon.framework.exec.CommandLauncher; -import org.apache.myrmidon.framework.exec.ExecException; -import org.apache.myrmidon.framework.exec.ExecMetaData; +import org.apache.aut.nativelib.CommandLauncher; +import org.apache.aut.nativelib.ExecException; +import org.apache.aut.nativelib.ExecMetaData; /** * A command launcher for Windows 2000/NT that uses 'cmd.exe' when launching diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/DependSet.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/DependSet.java index 0121d1683..a831b5c36 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/DependSet.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/DependSet.java @@ -12,7 +12,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.Iterator; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.Os; +import org.apache.aut.nativelib.Os; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.types.FileList; import org.apache.tools.ant.types.FileSet; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java index 854d6a393..410f8efb5 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java @@ -12,7 +12,6 @@ import java.lang.reflect.Method; import java.net.URL; import java.net.URLClassLoader; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.Project; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.SysProperties; @@ -43,11 +42,11 @@ public class ExecuteJava m_sysProperties = sysProperties; } - public void execute( Project project ) + public void execute() throws TaskException { final String classname = m_javaCommand.getExecutable(); - final Object[] argument = {m_javaCommand.getArguments()}; + final Object[] argument = new Object[]{m_javaCommand.getArguments()}; try { diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java index 4886bf1ee..02aae979b 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java @@ -31,7 +31,6 @@ import org.apache.tools.ant.util.SourceFileScanner; */ public class ExecuteOn extends ExecTask { - protected ArrayList filesets = new ArrayList(); private boolean relative = false; private boolean parallel = false; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java index 1a67dadbe..2bc381c75 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java @@ -12,7 +12,7 @@ import java.util.ArrayList; import java.util.Iterator; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.JavaVersion; -import org.apache.myrmidon.framework.Os; +import org.apache.aut.nativelib.Os; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.taskdefs.compilers.CompilerAdapter; import org.apache.tools.ant.taskdefs.compilers.CompilerAdapterFactory; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/Execute.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/Execute.java index e4d4a0b60..cde925b23 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/Execute.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/Execute.java @@ -12,9 +12,9 @@ import java.io.IOException; import java.io.OutputStream; import java.util.Properties; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.exec.ExecException; -import org.apache.myrmidon.framework.exec.ExecMetaData; -import org.apache.myrmidon.framework.exec.impl.DefaultExecManager; +import org.apache.aut.nativelib.ExecException; +import org.apache.aut.nativelib.ExecMetaData; +import org.apache.aut.nativelib.impl.DefaultExecManager; /** * Runs an external program. diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/Execute2.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/Execute2.java index 4171d4362..0d561fab5 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/Execute2.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/Execute2.java @@ -12,11 +12,11 @@ import java.io.IOException; import java.util.Properties; import org.apache.avalon.framework.logger.AbstractLogEnabled; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.exec.DefaultExecOutputHandler; -import org.apache.myrmidon.framework.exec.ExecException; -import org.apache.myrmidon.framework.exec.ExecMetaData; -import org.apache.myrmidon.framework.exec.ExecOutputHandler; -import org.apache.myrmidon.framework.exec.impl.DefaultExecManager; +import org.apache.aut.nativelib.DefaultExecOutputHandler; +import org.apache.aut.nativelib.ExecException; +import org.apache.aut.nativelib.ExecMetaData; +import org.apache.aut.nativelib.ExecOutputHandler; +import org.apache.aut.nativelib.impl.DefaultExecManager; /** * Runs an external program. diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java index 2286c7737..05d133534 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java @@ -16,8 +16,8 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.StringTokenizer; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.Os; -import org.apache.myrmidon.framework.exec.ExecOutputHandler; +import org.apache.aut.nativelib.Os; +import org.apache.aut.nativelib.ExecOutputHandler; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Task; import org.apache.tools.ant.taskdefs.exec.Execute2; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java index d3c0854ed..6d793819f 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java @@ -15,7 +15,7 @@ import java.io.PrintWriter; import java.util.ArrayList; import java.util.Iterator; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.Os; +import org.apache.aut.nativelib.Os; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.taskdefs.MatchingTask; import org.apache.tools.ant.taskdefs.exec.ExecTask; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java index 16049b911..6f90d29b3 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java @@ -8,7 +8,7 @@ package org.apache.tools.ant.taskdefs.optional.ccm; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.exec.ExecOutputHandler; +import org.apache.aut.nativelib.ExecOutputHandler; import org.apache.tools.ant.types.Commandline; /** diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java index de724bcf5..7d82fb710 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java @@ -11,7 +11,7 @@ import java.io.File; import java.io.IOException; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.exec.ExecOutputHandler; +import org.apache.aut.nativelib.ExecOutputHandler; import org.apache.tools.ant.taskdefs.exec.Execute2; import org.apache.tools.ant.types.Commandline; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditStreamHandler.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditStreamHandler.java index c166a44fe..a3c407285 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditStreamHandler.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditStreamHandler.java @@ -20,7 +20,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import org.apache.avalon.framework.logger.AbstractLogEnabled; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.exec.ExecOutputHandler; +import org.apache.aut.nativelib.ExecOutputHandler; import org.apache.tools.ant.taskdefs.exec.ExecuteStreamHandler; import org.apache.tools.ant.util.DOMElementWriter; import org.apache.tools.ant.util.regexp.RegexpMatcher; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java index 20bdd6666..acfa2f56c 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java @@ -9,7 +9,7 @@ package org.apache.tools.ant.taskdefs.optional.perforce; import java.io.IOException; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.exec.ExecOutputHandler; +import org.apache.aut.nativelib.ExecOutputHandler; import org.apache.oro.text.perl.Perl5Util; import org.apache.tools.ant.taskdefs.exec.Execute2; import org.apache.tools.ant.types.Commandline; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Sync.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Sync.java index 349d9faf4..dcfdad640 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Sync.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Sync.java @@ -82,19 +82,19 @@ import org.apache.myrmidon.api.TaskException; * * @author Les Hughes */ -public class P4Sync extends P4Base +public class P4Sync + extends P4Base { private String m_syncCmd = ""; private String m_label; - public void setForce( final String force ) + public void setForce( final boolean force ) throws TaskException { - if( force == null && !m_label.equals( "" ) ) + if( force ) { - throw new TaskException( "P4Sync: If you want to force, set force to non-null string!" ); + m_p4CmdOpts = "-f"; } - m_p4CmdOpts = "-f"; } public void setLabel( String label ) diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/unix/Chmod.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/unix/Chmod.java index 7c608c9ee..d8557b5f8 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/unix/Chmod.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/unix/Chmod.java @@ -10,7 +10,7 @@ package org.apache.tools.ant.taskdefs.unix; import java.io.File; import java.io.IOException; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.Os; +import org.apache.aut.nativelib.Os; import org.apache.tools.ant.taskdefs.ExecuteOn; import org.apache.tools.ant.taskdefs.exec.Execute; import org.apache.tools.ant.types.FileSet; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/DependSet.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/DependSet.java index 0121d1683..a831b5c36 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/DependSet.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/DependSet.java @@ -12,7 +12,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.Iterator; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.Os; +import org.apache.aut.nativelib.Os; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.types.FileList; import org.apache.tools.ant.types.FileSet; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ExecuteJava.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ExecuteJava.java index 854d6a393..410f8efb5 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ExecuteJava.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ExecuteJava.java @@ -12,7 +12,6 @@ import java.lang.reflect.Method; import java.net.URL; import java.net.URLClassLoader; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.Project; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.SysProperties; @@ -43,11 +42,11 @@ public class ExecuteJava m_sysProperties = sysProperties; } - public void execute( Project project ) + public void execute() throws TaskException { final String classname = m_javaCommand.getExecutable(); - final Object[] argument = {m_javaCommand.getArguments()}; + final Object[] argument = new Object[]{m_javaCommand.getArguments()}; try { diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ExecuteOn.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ExecuteOn.java index 4886bf1ee..02aae979b 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ExecuteOn.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ExecuteOn.java @@ -31,7 +31,6 @@ import org.apache.tools.ant.util.SourceFileScanner; */ public class ExecuteOn extends ExecTask { - protected ArrayList filesets = new ArrayList(); private boolean relative = false; private boolean parallel = false; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javac.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javac.java index 1a67dadbe..2bc381c75 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javac.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javac.java @@ -12,7 +12,7 @@ import java.util.ArrayList; import java.util.Iterator; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.JavaVersion; -import org.apache.myrmidon.framework.Os; +import org.apache.aut.nativelib.Os; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.taskdefs.compilers.CompilerAdapter; import org.apache.tools.ant.taskdefs.compilers.CompilerAdapterFactory; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/Execute.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/Execute.java index e4d4a0b60..cde925b23 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/Execute.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/Execute.java @@ -12,9 +12,9 @@ import java.io.IOException; import java.io.OutputStream; import java.util.Properties; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.exec.ExecException; -import org.apache.myrmidon.framework.exec.ExecMetaData; -import org.apache.myrmidon.framework.exec.impl.DefaultExecManager; +import org.apache.aut.nativelib.ExecException; +import org.apache.aut.nativelib.ExecMetaData; +import org.apache.aut.nativelib.impl.DefaultExecManager; /** * Runs an external program. diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/Execute2.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/Execute2.java index 4171d4362..0d561fab5 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/Execute2.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/Execute2.java @@ -12,11 +12,11 @@ import java.io.IOException; import java.util.Properties; import org.apache.avalon.framework.logger.AbstractLogEnabled; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.exec.DefaultExecOutputHandler; -import org.apache.myrmidon.framework.exec.ExecException; -import org.apache.myrmidon.framework.exec.ExecMetaData; -import org.apache.myrmidon.framework.exec.ExecOutputHandler; -import org.apache.myrmidon.framework.exec.impl.DefaultExecManager; +import org.apache.aut.nativelib.DefaultExecOutputHandler; +import org.apache.aut.nativelib.ExecException; +import org.apache.aut.nativelib.ExecMetaData; +import org.apache.aut.nativelib.ExecOutputHandler; +import org.apache.aut.nativelib.impl.DefaultExecManager; /** * Runs an external program. diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java index 2286c7737..05d133534 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java @@ -16,8 +16,8 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.StringTokenizer; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.Os; -import org.apache.myrmidon.framework.exec.ExecOutputHandler; +import org.apache.aut.nativelib.Os; +import org.apache.aut.nativelib.ExecOutputHandler; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Task; import org.apache.tools.ant.taskdefs.exec.Execute2; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Cab.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Cab.java index d3c0854ed..6d793819f 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Cab.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Cab.java @@ -15,7 +15,7 @@ import java.io.PrintWriter; import java.util.ArrayList; import java.util.Iterator; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.Os; +import org.apache.aut.nativelib.Os; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.taskdefs.MatchingTask; import org.apache.tools.ant.taskdefs.exec.ExecTask; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java index 16049b911..6f90d29b3 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java @@ -8,7 +8,7 @@ package org.apache.tools.ant.taskdefs.optional.ccm; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.exec.ExecOutputHandler; +import org.apache.aut.nativelib.ExecOutputHandler; import org.apache.tools.ant.types.Commandline; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java index de724bcf5..7d82fb710 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java @@ -11,7 +11,7 @@ import java.io.File; import java.io.IOException; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.exec.ExecOutputHandler; +import org.apache.aut.nativelib.ExecOutputHandler; import org.apache.tools.ant.taskdefs.exec.Execute2; import org.apache.tools.ant.types.Commandline; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MAuditStreamHandler.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MAuditStreamHandler.java index c166a44fe..a3c407285 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MAuditStreamHandler.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MAuditStreamHandler.java @@ -20,7 +20,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import org.apache.avalon.framework.logger.AbstractLogEnabled; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.exec.ExecOutputHandler; +import org.apache.aut.nativelib.ExecOutputHandler; import org.apache.tools.ant.taskdefs.exec.ExecuteStreamHandler; import org.apache.tools.ant.util.DOMElementWriter; import org.apache.tools.ant.util.regexp.RegexpMatcher; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java index 20bdd6666..acfa2f56c 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java @@ -9,7 +9,7 @@ package org.apache.tools.ant.taskdefs.optional.perforce; import java.io.IOException; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.exec.ExecOutputHandler; +import org.apache.aut.nativelib.ExecOutputHandler; import org.apache.oro.text.perl.Perl5Util; import org.apache.tools.ant.taskdefs.exec.Execute2; import org.apache.tools.ant.types.Commandline; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Sync.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Sync.java index 349d9faf4..dcfdad640 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Sync.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Sync.java @@ -82,19 +82,19 @@ import org.apache.myrmidon.api.TaskException; * * @author Les Hughes */ -public class P4Sync extends P4Base +public class P4Sync + extends P4Base { private String m_syncCmd = ""; private String m_label; - public void setForce( final String force ) + public void setForce( final boolean force ) throws TaskException { - if( force == null && !m_label.equals( "" ) ) + if( force ) { - throw new TaskException( "P4Sync: If you want to force, set force to non-null string!" ); + m_p4CmdOpts = "-f"; } - m_p4CmdOpts = "-f"; } public void setLabel( String label ) diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/unix/Chmod.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/unix/Chmod.java index 7c608c9ee..d8557b5f8 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/unix/Chmod.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/unix/Chmod.java @@ -10,7 +10,7 @@ package org.apache.tools.ant.taskdefs.unix; import java.io.File; import java.io.IOException; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.framework.Os; +import org.apache.aut.nativelib.Os; import org.apache.tools.ant.taskdefs.ExecuteOn; import org.apache.tools.ant.taskdefs.exec.Execute; import org.apache.tools.ant.types.FileSet;