diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/ExecUtil.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/ExecUtil.java index eff2f7898..59b8de032 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/ExecUtil.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/ExecUtil.java @@ -79,7 +79,7 @@ class ExecUtil return file.getCanonicalFile().equals( getCwd() ); } - protected static String[] toNativeEnvironment( final Properties environment ) + private static String[] toNativeEnvironment( final Properties environment ) throws ExecException { if( null == environment ) diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/MacCommandLauncher.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/MacCommandLauncher.java index ed4713591..757a55b83 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/MacCommandLauncher.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/MacCommandLauncher.java @@ -36,7 +36,7 @@ public class MacCommandLauncher final File directory = metaData.getWorkingDirectory().getCanonicalFile(); if( ExecUtil.isCwd( directory ) ) { - final String[] env = ExecUtil.toNativeEnvironment( metaData.getEnvironment() ); + final String[] env = ExecUtil.getEnvironmentSpec( metaData ); return Runtime.getRuntime().exec( metaData.getCommand(), env ); } @@ -46,7 +46,7 @@ public class MacCommandLauncher try { System.setProperty( "user.dir", directory.toString() ); - final String[] env = ExecUtil.toNativeEnvironment( metaData.getEnvironment() ); + final String[] env = ExecUtil.getEnvironmentSpec( metaData ); return Runtime.getRuntime().exec( metaData.getCommand(), env ); } finally diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/ScriptCommandLauncher.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/ScriptCommandLauncher.java index 9b585cd4c..2df374cb1 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/ScriptCommandLauncher.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/ScriptCommandLauncher.java @@ -70,7 +70,7 @@ public class ScriptCommandLauncher prefix[ m_script.length ] = metaData.getWorkingDirectory().getCanonicalPath(); final ExecMetaData newMetaData = ExecUtil.prepend( metaData, prefix ); - final String[] env = ExecUtil.toNativeEnvironment( metaData.getEnvironment() ); + final String[] env = ExecUtil.getEnvironmentSpec( metaData ); return Runtime.getRuntime().exec( newMetaData.getCommand(), env ); } } diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/WinNTCommandLauncher.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/WinNTCommandLauncher.java index f83abeb74..04d2008d5 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/WinNTCommandLauncher.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/exec/launchers/WinNTCommandLauncher.java @@ -41,7 +41,7 @@ public class WinNTCommandLauncher prefix[ 5 ] = "&&"; final ExecMetaData newMetaData = ExecUtil.prepend( metaData, prefix ); - final String[] env = ExecUtil.toNativeEnvironment( metaData.getEnvironment() ); + final String[] env = ExecUtil.getEnvironmentSpec( metaData ); return Runtime.getRuntime().exec( newMetaData.getCommand(), env ); } }