Use Execute.isFailure

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274951 13f79535-47bb-0310-9956-ffa450edef68

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

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());
             }

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
  * }
  * </pre>

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 {

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) {

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) {

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();

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) {

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());
         }

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());
         }

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());
         }

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());
         }

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());
         }

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);
         }

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";
 
 
-}
+}

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);
         }

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);
         }

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);
         }

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());
         }

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);
         }

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());
         }

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 {

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());

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) {

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) {

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) {

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) {

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());
             }

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) {

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 + ")");
             }

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) {

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());