git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270324 13f79535-47bb-0310-9956-ffa450edef68master
| @@ -211,17 +211,6 @@ public class Execute | |||||
| m_command = commandline; | 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 ) | public void setEnvironment( final Properties environment ) | ||||
| { | { | ||||
| m_environment = environment; | m_environment = environment; | ||||
| @@ -9,6 +9,7 @@ package org.apache.tools.ant.taskdefs.optional.vss; | |||||
| import java.io.IOException; | import java.io.IOException; | ||||
| import org.apache.myrmidon.api.TaskException; | import org.apache.myrmidon.api.TaskException; | ||||
| import org.apache.myrmidon.framework.exec.Environment; | |||||
| import org.apache.tools.ant.Project; | import org.apache.tools.ant.Project; | ||||
| import org.apache.tools.ant.Task; | import org.apache.tools.ant.Task; | ||||
| import org.apache.tools.ant.taskdefs.exec.Execute; | import org.apache.tools.ant.taskdefs.exec.Execute; | ||||
| @@ -224,7 +225,7 @@ public abstract class MSVSS extends Task | |||||
| } | } | ||||
| newEnv[ env.length ] = "SSDIR=" + m_serverPath; | newEnv[ env.length ] = "SSDIR=" + m_serverPath; | ||||
| exe.setEnvironment( newEnv ); | |||||
| exe.setEnvironment( Environment.createEnvVars( newEnv ) ); | |||||
| } | } | ||||
| exe.setWorkingDirectory( getBaseDirectory() ); | exe.setWorkingDirectory( getBaseDirectory() ); | ||||
| @@ -211,17 +211,6 @@ public class Execute | |||||
| m_command = commandline; | 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 ) | public void setEnvironment( final Properties environment ) | ||||
| { | { | ||||
| m_environment = environment; | m_environment = environment; | ||||
| @@ -9,6 +9,7 @@ package org.apache.tools.ant.taskdefs.optional.vss; | |||||
| import java.io.IOException; | import java.io.IOException; | ||||
| import org.apache.myrmidon.api.TaskException; | import org.apache.myrmidon.api.TaskException; | ||||
| import org.apache.myrmidon.framework.exec.Environment; | |||||
| import org.apache.tools.ant.Project; | import org.apache.tools.ant.Project; | ||||
| import org.apache.tools.ant.Task; | import org.apache.tools.ant.Task; | ||||
| import org.apache.tools.ant.taskdefs.exec.Execute; | import org.apache.tools.ant.taskdefs.exec.Execute; | ||||
| @@ -224,7 +225,7 @@ public abstract class MSVSS extends Task | |||||
| } | } | ||||
| newEnv[ env.length ] = "SSDIR=" + m_serverPath; | newEnv[ env.length ] = "SSDIR=" + m_serverPath; | ||||
| exe.setEnvironment( newEnv ); | |||||
| exe.setEnvironment( Environment.createEnvVars( newEnv ) ); | |||||
| } | } | ||||
| exe.setWorkingDirectory( getBaseDirectory() ); | exe.setWorkingDirectory( getBaseDirectory() ); | ||||