Moved copy errors to the trace

Author: PaulLodge

core/src/main/groovy/noe/common/utils/Cmd.groovy

@@ -240,8 +240,23 @@ public class Cmd {
    *
    * @deprecated args
    */
-  public static int executeCommand(command, File targetDir, Map args = null, Map tmpProps = null) {
-    return executeCommandRedirectIO(command, targetDir, null, System.out, System.err, args, tmpProps)
+  static int executeCommand(command, File targetDir, Map args = null, Map tmpProps = null) {
+
+    if (command instanceof String || command instanceof GString) {
+      if (command.length() > 2 && command[0] == "[" && command[command.length() - 1] == "]") {
+        command = command[1..command.length() - 2]
+      }
+      command = command.tokenize(", ")
+    }
+
+    Map rv = executeCommandConsumeStreams(command as List, targetDir, null, 60000L, tmpProps)
+      if (!rv.stdOut.isEmpty()) {
+        log.info(rv.stdOut)
+      }
+      if (!rv.stdErr.isEmpty()) {
+        log.trace(rv.stdErr)
+      }
+      return rv.exitValue
   }
 
   /**

core/src/main/groovy/noe/server/ServerAbstract.groovy

@@ -32,7 +32,7 @@ abstract class ServerAbstract implements IApp {
   //TODO: EWS specific, pls remove.
   Boolean ignoreShutdownPort ///
   def start ///standard startup command (apachectl start)
-  def stop ///standard shutdown command (apachectl stop)
+  String stop ///standard shutdown command (apachectl stop)
   String binPath // relative path (server root) to dir where stop handler is stored
   List configDirs = [] // relative paths to dir where server config files are stored
   List logDirs = [] // relative paths to dir where server logs are stored