From d47dfcbc98b247c96b409f811a8a5a045e58cdc7 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Fri, 25 Jul 2003 12:14:44 +0000 Subject: [PATCH] Use Execute.isFailure git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274951 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/tools/ant/taskdefs/AbstractCvsTask.java | 2 +- src/main/org/apache/tools/ant/taskdefs/Execute.java | 2 +- .../org/apache/tools/ant/taskdefs/ExecuteWatchdog.java | 4 ++-- src/main/org/apache/tools/ant/taskdefs/Java.java | 3 ++- src/main/org/apache/tools/ant/taskdefs/Javadoc.java | 2 +- .../apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java | 4 ++-- .../org/apache/tools/ant/taskdefs/optional/ANTLR.java | 2 +- src/main/org/apache/tools/ant/taskdefs/optional/Cab.java | 2 +- .../apache/tools/ant/taskdefs/optional/ccm/CCMCheck.java | 3 ++- .../tools/ant/taskdefs/optional/ccm/CCMCreateTask.java | 5 +++-- .../tools/ant/taskdefs/optional/ccm/CCMReconfigure.java | 3 ++- .../tools/ant/taskdefs/optional/clearcase/CCCheckin.java | 8 +++----- .../ant/taskdefs/optional/clearcase/CCCheckout.java | 5 +++-- .../tools/ant/taskdefs/optional/clearcase/CCLock.java | 3 ++- .../tools/ant/taskdefs/optional/clearcase/CCMkbl.java | 5 +++-- .../tools/ant/taskdefs/optional/clearcase/CCMklabel.java | 3 ++- .../ant/taskdefs/optional/clearcase/CCMklbtype.java | 3 ++- .../tools/ant/taskdefs/optional/clearcase/CCRmtype.java | 3 ++- .../ant/taskdefs/optional/clearcase/CCUnCheckout.java | 8 +++----- .../tools/ant/taskdefs/optional/clearcase/CCUnlock.java | 3 ++- .../tools/ant/taskdefs/optional/clearcase/CCUpdate.java | 9 +++------ .../tools/ant/taskdefs/optional/dotnet/NetCommand.java | 2 +- .../ant/taskdefs/optional/ejb/BorlandDeploymentTool.java | 2 +- .../apache/tools/ant/taskdefs/optional/javacc/JJDoc.java | 2 +- .../tools/ant/taskdefs/optional/javacc/JJTree.java | 2 +- .../taskdefs/optional/metamata/AbstractMetamataTask.java | 2 +- .../tools/ant/taskdefs/optional/metamata/MParse.java | 2 +- .../apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java | 2 +- .../tools/ant/taskdefs/optional/sitraka/CovMerge.java | 2 +- .../tools/ant/taskdefs/optional/sitraka/CovReport.java | 2 +- .../tools/ant/taskdefs/optional/sitraka/Coverage.java | 2 +- .../apache/tools/ant/taskdefs/optional/vss/MSVSS.java | 2 +- 32 files changed, 54 insertions(+), 50 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java b/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java index d19ca4f4b..55440512f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java @@ -372,7 +372,7 @@ public abstract class AbstractCvsTask extends Task { int retCode = exe.execute(); log("retCode=" + retCode, Project.MSG_DEBUG); /*Throw an exception if cvs exited with error. (Iulian)*/ - if (failOnError && retCode != 0) { + if (failOnError && Execute.isFailure(retCode)) { throw new BuildException("cvs exited with error code " + retCode + StringUtils.LINE_SEP diff --git a/src/main/org/apache/tools/ant/taskdefs/Execute.java b/src/main/org/apache/tools/ant/taskdefs/Execute.java index 88e4eee00..740c93558 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Execute.java +++ b/src/main/org/apache/tools/ant/taskdefs/Execute.java @@ -577,7 +577,7 @@ public class Execute { exe.setAntRun(task.getProject()); exe.setCommandline(cmdline); int retval = exe.execute(); - if (retval != 0) { + if (isFailure(retval)) { throw new BuildException(cmdline[0] + " failed with return code " + retval, task.getLocation()); } diff --git a/src/main/org/apache/tools/ant/taskdefs/ExecuteWatchdog.java b/src/main/org/apache/tools/ant/taskdefs/ExecuteWatchdog.java index 255362d79..6d2115183 100644 --- a/src/main/org/apache/tools/ant/taskdefs/ExecuteWatchdog.java +++ b/src/main/org/apache/tools/ant/taskdefs/ExecuteWatchdog.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2000-2002 The Apache Software Foundation. All rights + * Copyright (c) 2000-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -66,7 +66,7 @@ import org.apache.tools.ant.util.Watchdog; * Execute exec = new Execute(myloghandler, watchdog); * exec.setCommandLine(mycmdline); * int exitvalue = exec.execute(); - * if (exitvalue != SUCCESS && watchdog.killedProcess()) { + * if (Execute.isFailure(exitvalue) && watchdog.killedProcess()) { * // it was killed on purpose by the watchdog * } * diff --git a/src/main/org/apache/tools/ant/taskdefs/Java.java b/src/main/org/apache/tools/ant/taskdefs/Java.java index f513bd144..ae300c0e5 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Java.java +++ b/src/main/org/apache/tools/ant/taskdefs/Java.java @@ -102,7 +102,8 @@ public class Java extends Task { int err = -1; try { - if ((err = executeJava()) != 0) { + err = executeJava(); + if (fork && Execute.isFailure(err)) { if (failOnError) { throw new BuildException("Java returned: " + err, getLocation()); } else { diff --git a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java index 314f51d70..58004819c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java +++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java @@ -1984,7 +1984,7 @@ public class Javadoc extends Task { try { exe.setCommandline(toExecute.getCommandline()); int ret = exe.execute(); - if (ret != 0 && failOnError) { + if (Execute.isFailure(ret) && failOnError) { throw new BuildException("Javadoc returned " + ret, getLocation()); } } catch (IOException e) { diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java index 03952b7dc..fbf188e45 100644 --- a/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2002 The Apache Software Foundation. All rights + * Copyright (c) 2002-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -286,7 +286,7 @@ public class ChangeLogTask extends Task { try { final int resultCode = exe.execute(); - if (0 != resultCode) { + if (Execute.isFailure(resultCode)) { throw new BuildException("Error running cvs log"); } } catch (final IOException ioe) { diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java b/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java index 0d1d82c2c..5d7a719b3 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java @@ -318,7 +318,7 @@ public class ANTLR extends Task { log(commandline.describeCommand(), Project.MSG_VERBOSE); int err = run(commandline.getCommandline()); - if (err == 1) { + if (Execute.isFailure(err)) { throw new BuildException("ANTLR returned: " + err, getLocation()); } else { String output = bos.toString(); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java b/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java index e36013bac..6c24803d2 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java @@ -303,7 +303,7 @@ public class Cab extends MatchingTask { } // Informative summary message in case of errors - if (result != 0) { + if (Execute.isFailure(result)) { log("Error executing listcab; error code: " + result); } } catch (IOException ex) { diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.java b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.java index 5ee559708..b5b9b53d8 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.java @@ -60,6 +60,7 @@ import java.util.Vector; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; +import org.apache.tools.ant.taskdefs.Execute; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.FileSet; @@ -197,7 +198,7 @@ public class CCMCheck extends Continuus { checkOptions(commandLine); int result = run(commandLine); - if (result != 0) { + if (Execute.isFailure(0)) { String msg = "Failed executing: " + commandLine.toString(); throw new BuildException(msg, getLocation()); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java index 1d0ec8ab9..85ab21075 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2001-2002 The Apache Software Foundation. All rights + * Copyright (c) 2001-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -62,6 +62,7 @@ import java.io.InputStreamReader; import java.io.OutputStream; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; +import org.apache.tools.ant.taskdefs.Execute; import org.apache.tools.ant.taskdefs.ExecuteStreamHandler; import org.apache.tools.ant.types.Commandline; @@ -107,7 +108,7 @@ public class CCMCreateTask extends Continuus implements ExecuteStreamHandler { checkOptions(commandLine); result = run(commandLine, this); - if (result != 0) { + if (Execute.isFailure(result)) { String msg = "Failed executing: " + commandLine.toString(); throw new BuildException(msg, getLocation()); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMReconfigure.java b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMReconfigure.java index 538f286ed..99d889dd7 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMReconfigure.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMReconfigure.java @@ -56,6 +56,7 @@ package org.apache.tools.ant.taskdefs.optional.ccm; import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.taskdefs.Execute; import org.apache.tools.ant.types.Commandline; @@ -94,7 +95,7 @@ public class CCMReconfigure extends Continuus { checkOptions(commandLine); result = run(commandLine); - if (result != 0) { + if (Execute.isFailure(result)) { String msg = "Failed executing: " + commandLine.toString(); throw new BuildException(msg, getLocation()); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckin.java b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckin.java index d8074eeef..404521d5f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckin.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckin.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2000,2002 The Apache Software Foundation. All rights + * Copyright (c) 2000,2002-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -56,11 +56,9 @@ package org.apache.tools.ant.taskdefs.optional.clearcase; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; +import org.apache.tools.ant.taskdefs.Execute; import org.apache.tools.ant.types.Commandline; - - - /** * Performs ClearCase checkin. * @@ -144,7 +142,7 @@ public class CCCheckin extends ClearCase { checkOptions(commandLine); result = run(commandLine); - if (result != 0) { + if (Execute.isFailure(result)) { String msg = "Failed executing: " + commandLine.toString(); throw new BuildException(msg, getLocation()); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java index eb3869ff2..92d58598c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2000,2002 The Apache Software Foundation. All rights + * Copyright (c) 2000,2002-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -56,6 +56,7 @@ package org.apache.tools.ant.taskdefs.optional.clearcase; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; +import org.apache.tools.ant.taskdefs.Execute; import org.apache.tools.ant.types.Commandline; @@ -156,7 +157,7 @@ public class CCCheckout extends ClearCase { checkOptions(commandLine); result = run(commandLine); - if (result != 0) { + if (Execute.isFailure(result)) { String msg = "Failed executing: " + commandLine.toString(); throw new BuildException(msg, getLocation()); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCLock.java b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCLock.java index 69dafa331..e570b5ffc 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCLock.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCLock.java @@ -56,6 +56,7 @@ package org.apache.tools.ant.taskdefs.optional.clearcase; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; +import org.apache.tools.ant.taskdefs.Execute; import org.apache.tools.ant.types.Commandline; @@ -148,7 +149,7 @@ public class CCLock extends ClearCase { System.out.println(commandLine.toString()); result = run(commandLine); - if (result != 0) { + if (Execute.isFailure(result)) { String msg = "Failed executing: " + commandLine.toString(); throw new BuildException(msg, location); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkbl.java b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkbl.java index 1b8513218..7062994ff 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkbl.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkbl.java @@ -56,6 +56,7 @@ package org.apache.tools.ant.taskdefs.optional.clearcase; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; +import org.apache.tools.ant.taskdefs.Execute; import org.apache.tools.ant.types.Commandline; /** @@ -145,7 +146,7 @@ public class CCMkbl extends ClearCase { checkOptions(commandLine); result = run(commandLine); - if (result != 0) { + if (Execute.isFailure(result)) { String msg = "Failed executing: " + commandLine.toString(); throw new BuildException(msg, location); } @@ -393,4 +394,4 @@ public class CCMkbl extends ClearCase { public static final String FLAG_NLABEL = "-nlabel"; -} \ No newline at end of file +} diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMklabel.java b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMklabel.java index c760cd417..f99f47f0a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMklabel.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMklabel.java @@ -56,6 +56,7 @@ package org.apache.tools.ant.taskdefs.optional.clearcase; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; +import org.apache.tools.ant.taskdefs.Execute; import org.apache.tools.ant.types.Commandline; /** @@ -151,7 +152,7 @@ public class CCMklabel extends ClearCase { checkOptions(commandLine); result = run(commandLine); - if (result != 0) { + if (Execute.isFailure(result)) { String msg = "Failed executing: " + commandLine.toString(); throw new BuildException(msg, location); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMklbtype.java b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMklbtype.java index 025560a81..4572f149a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMklbtype.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCMklbtype.java @@ -56,6 +56,7 @@ package org.apache.tools.ant.taskdefs.optional.clearcase; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; +import org.apache.tools.ant.taskdefs.Execute; import org.apache.tools.ant.types.Commandline; /** @@ -160,7 +161,7 @@ public class CCMklbtype extends ClearCase { checkOptions(commandLine); result = run(commandLine); - if (result != 0) { + if (Execute.isFailure(result)) { String msg = "Failed executing: " + commandLine.toString(); throw new BuildException(msg, location); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCRmtype.java b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCRmtype.java index 698136c2d..98bbff44d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCRmtype.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCRmtype.java @@ -56,6 +56,7 @@ package org.apache.tools.ant.taskdefs.optional.clearcase; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; +import org.apache.tools.ant.taskdefs.Execute; import org.apache.tools.ant.types.Commandline; /** @@ -153,7 +154,7 @@ public class CCRmtype extends ClearCase { checkOptions(commandLine); result = run(commandLine); - if (result != 0) { + if (Execute.isFailure(result)) { String msg = "Failed executing: " + commandLine.toString(); throw new BuildException(msg, location); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnCheckout.java b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnCheckout.java index 08ad952d6..310a09417 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnCheckout.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnCheckout.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2000,2002 The Apache Software Foundation. All rights + * Copyright (c) 2000,2002-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -56,11 +56,9 @@ package org.apache.tools.ant.taskdefs.optional.clearcase; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; +import org.apache.tools.ant.taskdefs.Execute; import org.apache.tools.ant.types.Commandline; - - - /** * Performs ClearCase UnCheckout command. * @@ -114,7 +112,7 @@ public class CCUnCheckout extends ClearCase { checkOptions(commandLine); result = run(commandLine); - if (result != 0) { + if (Execute.isFailure(result)) { String msg = "Failed executing: " + commandLine.toString(); throw new BuildException(msg, getLocation()); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnlock.java b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnlock.java index 1844318f1..80d0bf94c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnlock.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnlock.java @@ -56,6 +56,7 @@ package org.apache.tools.ant.taskdefs.optional.clearcase; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; +import org.apache.tools.ant.taskdefs.Execute; import org.apache.tools.ant.types.Commandline; /** @@ -128,7 +129,7 @@ public class CCUnlock extends ClearCase { System.out.println(commandLine.toString()); result = run(commandLine); - if (result != 0) { + if (Execute.isFailure(result)) { String msg = "Failed executing: " + commandLine.toString(); throw new BuildException(msg, location); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUpdate.java b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUpdate.java index da272fe2d..d92fc1a49 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUpdate.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/CCUpdate.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2000,2002 The Apache Software Foundation. All rights + * Copyright (c) 2000,2002-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -56,12 +56,9 @@ package org.apache.tools.ant.taskdefs.optional.clearcase; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; +import org.apache.tools.ant.taskdefs.Execute; import org.apache.tools.ant.types.Commandline; - - - - /** * Performs a ClearCase Update command. * @@ -151,7 +148,7 @@ public class CCUpdate extends ClearCase { System.out.println(commandLine.toString()); result = run(commandLine); - if (result != 0) { + if (Execute.isFailure(result)) { String msg = "Failed executing: " + commandLine.toString(); throw new BuildException(msg, getLocation()); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java index ae5ffc78e..e0ceeb695 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java @@ -251,7 +251,7 @@ public class NetCommand { } executable.setCommandline(commandLine.getCommandline()); err = executable.execute(); - if (err != 0) { + if (Execute.isFailure(err)) { if (failOnError) { throw new BuildException(title + " returned: " + err, owner.getLocation()); } else { diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java index 4de7073af..7b3ff1c5d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java @@ -460,7 +460,7 @@ public class BorlandDeploymentTool extends GenericDeploymentTool log(commandline.describeCommand(), Project.MSG_DEBUG); execTask.setCommandline(commandline.getCommandline()); int result = execTask.execute(); - if (result != 0) { + if (Execute.isFailure(result)) { String msg = "Failed executing java2iiop (ret code is " + result + ")"; throw new BuildException(msg, getTask().getLocation()); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJDoc.java b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJDoc.java index 3260bfd99..07aa534fe 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJDoc.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJDoc.java @@ -194,7 +194,7 @@ public class JJDoc extends Task { process.setCommandline(cmdl.getCommandline()); try { - if (process.execute() != 0) { + if (Execute.isFailure(process.execute())) { throw new BuildException("JJDoc failed."); } } catch (IOException e) { diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java index 9b1377973..fa8002baa 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java @@ -290,7 +290,7 @@ public class JJTree extends Task { process.setCommandline(cmdl.getCommandline()); try { - if (process.execute() != 0) { + if (Execute.isFailure(process.execute())) { throw new BuildException("JJTree failed."); } } catch (IOException e) { diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java index 88a238fe3..2399f4535 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java @@ -246,7 +246,7 @@ public abstract class AbstractMetamataTask extends Task { log(cmdl.describeCommand(), Project.MSG_VERBOSE); process.setCommandline(cmdl.getCommandline()); try { - if (process.execute() != 0) { + if (Execute.isFailure(process.execute())) { throw new BuildException("Metamata task failed."); } } catch (IOException e) { diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java index e3027d6e8..3627bc33c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java @@ -183,7 +183,7 @@ public class MParse extends AbstractMetamataTask { log(cmdl.describeCommand(), Project.MSG_VERBOSE); process.setCommandline(cmdl.getCommandline()); try { - if (process.execute() != 0) { + if (Execute.isFailure(process.execute())) { throw new BuildException("Metamata task failed."); } } catch (IOException e) { diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java b/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java index f49bfba3d..ef0c99521 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java @@ -236,7 +236,7 @@ public class Pvcs extends org.apache.tools.ant.Task { fos.close(); } - if (result != 0 && !ignorerc) { + if (Execute.isFailure(result) && !ignorerc) { String msg = "Failed executing: " + commandLine.toString(); throw new BuildException(msg, getLocation()); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java index ba057c714..e5eb25e4b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java @@ -139,7 +139,7 @@ public class CovMerge extends CovBase { // JProbe process always return 0 so we will not be // able to check for failure ! :-( int exitValue = exec.execute(); - if (exitValue != 0) { + if (Execute.isFailure(exitValue)) { throw new BuildException("JProbe Coverage Merging failed (" + exitValue + ")"); } } catch (IOException e) { diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java index 54663c7fa..46c626c52 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java @@ -300,7 +300,7 @@ public class CovReport extends CovBase { log(cmdl.describeCommand(), Project.MSG_VERBOSE); exec.setCommandline(cmdl.getCommandline()); int exitValue = exec.execute(); - if (exitValue != 0) { + if (Execute.isFailure(exitValue)) { throw new BuildException("JProbe Coverage Report failed (" + exitValue + ")"); } diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java index 93ce61781..c9c7020d6 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java @@ -331,7 +331,7 @@ public class Coverage extends CovBase { log(cmdl.describeCommand(), Project.MSG_VERBOSE); exec.setCommandline(cmdl.getCommandline()); int exitValue = exec.execute(); - if (exitValue != 0) { + if (Execute.isFailure(exitValue)) { throw new BuildException("JProbe Coverage failed (" + exitValue + ")"); } } catch (IOException e) { diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java index f95e3f5f9..d79454b78 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java @@ -222,7 +222,7 @@ public abstract class MSVSS extends Task implements MSVSSConstants { int result = 0; Commandline commandLine = buildCmdLine(); result = run(commandLine); - if (result != 0 && getFailOnError()) { + if (Execute.isFailure(result) && getFailOnError()) { String msg = "Failed executing: " + formatCommandLine(commandLine) + " With a return code of " + result; throw new BuildException(msg, getLocation());