Browse Source

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
master
Peter Donald 23 years ago
parent
commit
3d89aa70b2
9 changed files with 23 additions and 20 deletions
  1. +7
    -5
      proposal/myrmidon/src/java/org/apache/aut/nativelib/ExecMetaData.java
  2. +3
    -1
      proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/CommandLauncher.java
  3. +4
    -5
      proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/DefaultExecManager.java
  4. +2
    -2
      proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/DefaultCommandLauncher.java
  5. +1
    -1
      proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/ExecUtil.java
  6. +2
    -2
      proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/MacCommandLauncher.java
  7. +0
    -0
      proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/Resources.properties
  8. +2
    -2
      proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/ScriptCommandLauncher.java
  9. +2
    -2
      proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/WinNTCommandLauncher.java

+ 7
- 5
proposal/myrmidon/src/java/org/apache/aut/nativelib/ExecMetaData.java View File

@@ -32,14 +32,16 @@ public class ExecMetaData
private String[] m_command; 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 <code>key=value</code>
* The array of strings that make up the native environment for the
* command.
*
* <p>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 <code>key=value</code>.</p>
* *
* <p>This set of variables is combined with the environment of current * <p>This set of variables is combined with the environment of current
* process if <code>isEnvironmentAdditive=true</code> else it specifies * process if <code>isEnvironmentAdditive=true</code> else it specifies
* full environment.
* full environment.</p>
*/ */
private Properties m_environment; private Properties m_environment;




proposal/myrmidon/src/java/org/apache/aut/nativelib/CommandLauncher.java → proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/CommandLauncher.java View File

@@ -5,9 +5,11 @@
* 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.txt file. * the LICENSE.txt file.
*/ */
package org.apache.aut.nativelib;
package org.apache.aut.nativelib.impl;


import java.io.IOException; 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 * This is the interface implemented by objects which are capable of

+ 4
- 5
proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/DefaultExecManager.java View File

@@ -12,16 +12,15 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.util.Locale; import java.util.Locale;
import org.apache.aut.nativelib.CommandLauncher;
import org.apache.aut.nativelib.ExecException; import org.apache.aut.nativelib.ExecException;
import org.apache.aut.nativelib.ExecManager; import org.apache.aut.nativelib.ExecManager;
import org.apache.aut.nativelib.ExecMetaData; import org.apache.aut.nativelib.ExecMetaData;
import org.apache.aut.nativelib.ExecOutputHandler; import org.apache.aut.nativelib.ExecOutputHandler;
import org.apache.aut.nativelib.Os; 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; import org.apache.avalon.excalibur.io.FileUtil;


/** /**


proposal/myrmidon/src/java/org/apache/aut/nativelib/launchers/DefaultCommandLauncher.java → proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/DefaultCommandLauncher.java View File

@@ -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.txt file. * the LICENSE.txt file.
*/ */
package org.apache.aut.nativelib.launchers;
package org.apache.aut.nativelib.impl.launchers;


import java.io.File; import java.io.File;
import java.io.IOException; 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.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources; 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.ExecException;
import org.apache.aut.nativelib.ExecMetaData; import org.apache.aut.nativelib.ExecMetaData;

proposal/myrmidon/src/java/org/apache/aut/nativelib/launchers/ExecUtil.java → proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/ExecUtil.java View File

@@ -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.txt file. * the LICENSE.txt file.
*/ */
package org.apache.aut.nativelib.launchers;
package org.apache.aut.nativelib.impl.launchers;


import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;

proposal/myrmidon/src/java/org/apache/aut/nativelib/launchers/MacCommandLauncher.java → proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/MacCommandLauncher.java View File

@@ -5,11 +5,11 @@
* 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.txt file. * the LICENSE.txt file.
*/ */
package org.apache.aut.nativelib.launchers;
package org.apache.aut.nativelib.impl.launchers;


import java.io.File; import java.io.File;
import java.io.IOException; 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.ExecException;
import org.apache.aut.nativelib.ExecMetaData; import org.apache.aut.nativelib.ExecMetaData;



proposal/myrmidon/src/java/org/apache/aut/nativelib/launchers/Resources.properties → proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/Resources.properties View File


proposal/myrmidon/src/java/org/apache/aut/nativelib/launchers/ScriptCommandLauncher.java → proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/ScriptCommandLauncher.java View File

@@ -5,10 +5,10 @@
* 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.txt file. * the LICENSE.txt file.
*/ */
package org.apache.aut.nativelib.launchers;
package org.apache.aut.nativelib.impl.launchers;


import java.io.IOException; 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.ExecException;
import org.apache.aut.nativelib.ExecMetaData; import org.apache.aut.nativelib.ExecMetaData;



proposal/myrmidon/src/java/org/apache/aut/nativelib/launchers/WinNTCommandLauncher.java → proposal/myrmidon/src/java/org/apache/aut/nativelib/impl/launchers/WinNTCommandLauncher.java View File

@@ -5,10 +5,10 @@
* 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.txt file. * the LICENSE.txt file.
*/ */
package org.apache.aut.nativelib.launchers;
package org.apache.aut.nativelib.impl.launchers;


import java.io.IOException; 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.ExecException;
import org.apache.aut.nativelib.ExecMetaData; import org.apache.aut.nativelib.ExecMetaData;



Loading…
Cancel
Save