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 1c86274a9..6d13d94e5 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 @@ -140,7 +140,7 @@ public class ExecuteOn extends ExecTask { throw new TaskException( getName() + " doesn\'t support multiple srcfile elements." ); } - srcFilePos = cmdl.createMarker(); + srcFilePos = getCommand().createMarker(); return srcFilePos; } @@ -157,7 +157,7 @@ public class ExecuteOn extends ExecTask { throw new TaskException( getName() + " doesn\'t support multiple targetfile elements." ); } - targetFilePos = cmdl.createMarker(); + targetFilePos = getCommand().createMarker(); srcIsFirst = ( srcFilePos != null ); return targetFilePos; } @@ -205,7 +205,7 @@ public class ExecuteOn extends ExecTask String[] targetFiles = new String[ targets.size() ]; targetFiles = (String[])targets.toArray( targetFiles ); - String[] orig = cmdl.getCommandline(); + String[] orig = getCommand().getCommandline(); String[] result = new String[ orig.length + srcFiles.length + targetFiles.length ]; int srcIndex = orig.length; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java index f7fb5b7a8..504c6c2ec 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java @@ -238,7 +238,6 @@ public class GenerateKey cmd.createArg().setValue( "" + validity ); } - cmd.setFailonerror( true ); cmd.execute(); } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SignJar.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SignJar.java index 1ad90b413..0bbd9bbf8 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SignJar.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SignJar.java @@ -328,9 +328,7 @@ public class SignJar extends Task cmd.createArg().setValue( alias ); getLogger().info( "Signing Jar : " + jarSource.getAbsolutePath() ); - cmd.setFailonerror( true ); cmd.execute(); } - } 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 a754c8dce..bfa9334d2 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 @@ -153,7 +153,6 @@ public class Cab extends MatchingTask File outFile = null; // die if cabarc fails - exec.setFailonerror( true ); exec.setDir( baseDir ); if( !doVerbose ) 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 b65c55dc8..fabf57524 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 @@ -163,7 +163,7 @@ public class Chmod extends ExecuteOn Execute execute = prepareExec(); try { - execute.setCommandline( cmdl.getCommandline() ); + execute.setCommandline( getCommand().getCommandline() ); runExecute( execute ); } catch( IOException e ) 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 1c86274a9..6d13d94e5 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 @@ -140,7 +140,7 @@ public class ExecuteOn extends ExecTask { throw new TaskException( getName() + " doesn\'t support multiple srcfile elements." ); } - srcFilePos = cmdl.createMarker(); + srcFilePos = getCommand().createMarker(); return srcFilePos; } @@ -157,7 +157,7 @@ public class ExecuteOn extends ExecTask { throw new TaskException( getName() + " doesn\'t support multiple targetfile elements." ); } - targetFilePos = cmdl.createMarker(); + targetFilePos = getCommand().createMarker(); srcIsFirst = ( srcFilePos != null ); return targetFilePos; } @@ -205,7 +205,7 @@ public class ExecuteOn extends ExecTask String[] targetFiles = new String[ targets.size() ]; targetFiles = (String[])targets.toArray( targetFiles ); - String[] orig = cmdl.getCommandline(); + String[] orig = getCommand().getCommandline(); String[] result = new String[ orig.length + srcFiles.length + targetFiles.length ]; int srcIndex = orig.length; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/GenerateKey.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/GenerateKey.java index f7fb5b7a8..504c6c2ec 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/GenerateKey.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/GenerateKey.java @@ -238,7 +238,6 @@ public class GenerateKey cmd.createArg().setValue( "" + validity ); } - cmd.setFailonerror( true ); cmd.execute(); } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SignJar.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SignJar.java index 1ad90b413..0bbd9bbf8 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SignJar.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SignJar.java @@ -328,9 +328,7 @@ public class SignJar extends Task cmd.createArg().setValue( alias ); getLogger().info( "Signing Jar : " + jarSource.getAbsolutePath() ); - cmd.setFailonerror( true ); cmd.execute(); } - } 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 a754c8dce..bfa9334d2 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 @@ -153,7 +153,6 @@ public class Cab extends MatchingTask File outFile = null; // die if cabarc fails - exec.setFailonerror( true ); exec.setDir( baseDir ); if( !doVerbose ) 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 b65c55dc8..fabf57524 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 @@ -163,7 +163,7 @@ public class Chmod extends ExecuteOn Execute execute = prepareExec(); try { - execute.setCommandline( cmdl.getCommandline() ); + execute.setCommandline( getCommand().getCommandline() ); runExecute( execute ); } catch( IOException e )