From 16bd34a356699a332ad7f6b5fc4597fb358735ca Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Sat, 22 Dec 2001 22:15:49 +0000 Subject: [PATCH] Remove Execute.setEnvironment(String[]) as it is not needed. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270324 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/tools/ant/taskdefs/exec/Execute.java | 11 ----------- .../apache/tools/ant/taskdefs/optional/vss/MSVSS.java | 3 ++- .../org/apache/tools/ant/taskdefs/exec/Execute.java | 11 ----------- .../apache/tools/ant/taskdefs/optional/vss/MSVSS.java | 3 ++- 4 files changed, 4 insertions(+), 24 deletions(-) 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 00ce9b2ae..6f32e9aa3 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 @@ -211,17 +211,6 @@ public class Execute m_command = commandline; } - /** - * Sets the environment variables for the subprocess to launch. - * - * @param env The new EnvironmentData value - */ - public void setEnvironment( String[] env ) - throws TaskException - { - setEnvironment( Environment.createEnvVars( env ) ); - } - public void setEnvironment( final Properties environment ) { m_environment = environment; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java index 19b20483e..5259eb02f 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java @@ -9,6 +9,7 @@ package org.apache.tools.ant.taskdefs.optional.vss; import java.io.IOException; import org.apache.myrmidon.api.TaskException; +import org.apache.myrmidon.framework.exec.Environment; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; import org.apache.tools.ant.taskdefs.exec.Execute; @@ -224,7 +225,7 @@ public abstract class MSVSS extends Task } newEnv[ env.length ] = "SSDIR=" + m_serverPath; - exe.setEnvironment( newEnv ); + exe.setEnvironment( Environment.createEnvVars( newEnv ) ); } exe.setWorkingDirectory( getBaseDirectory() ); 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 00ce9b2ae..6f32e9aa3 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 @@ -211,17 +211,6 @@ public class Execute m_command = commandline; } - /** - * Sets the environment variables for the subprocess to launch. - * - * @param env The new EnvironmentData value - */ - public void setEnvironment( String[] env ) - throws TaskException - { - setEnvironment( Environment.createEnvVars( env ) ); - } - public void setEnvironment( final Properties environment ) { m_environment = environment; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java index 19b20483e..5259eb02f 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java @@ -9,6 +9,7 @@ package org.apache.tools.ant.taskdefs.optional.vss; import java.io.IOException; import org.apache.myrmidon.api.TaskException; +import org.apache.myrmidon.framework.exec.Environment; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; import org.apache.tools.ant.taskdefs.exec.Execute; @@ -224,7 +225,7 @@ public abstract class MSVSS extends Task } newEnv[ env.length ] = "SSDIR=" + m_serverPath; - exe.setEnvironment( newEnv ); + exe.setEnvironment( Environment.createEnvVars( newEnv ) ); } exe.setWorkingDirectory( getBaseDirectory() );