Refactoring: rename duplicated Util classes

[jabaws.git] / engine / compbio / engine / local / ExecutableWrapper.java

diff --git a/engine/compbio/engine/local/ExecutableWrapper.java b/engine/compbio/engine/local/ExecutableWrapper.java
index 8718013..b9bf00a 100644 (file)
--- a/engine/compbio/engine/local/ExecutableWrapper.java
+++ b/engine/compbio/engine/local/ExecutableWrapper.java
@@ -38,7 +38,7 @@ import org.apache.log4j.Logger;
 import compbio.engine.client.ConfiguredExecutable;\r
 import compbio.engine.client.PathValidator;\r
 import compbio.engine.client.PipedExecutable;\r
-import compbio.engine.client.Util;\r
+import compbio.engine.client.EngineUtil;\r
 import compbio.engine.client.Executable.ExecProvider;\r
 import compbio.engine.local.StreamGobbler.OutputType;\r
 import compbio.metadata.JobStatus;\r
@@ -77,7 +77,7 @@ public final class ExecutableWrapper implements
        pbuilder = new ProcessBuilder(params);\r
        if (executable.getEnvironment() != null) {\r
                log.debug("Setting command environment variables: " + pbuilder.environment());\r
-               Util.mergeEnvVariables(pbuilder.environment(), executable.getEnvironment());\r
+               EngineUtil.mergeEnvVariables(pbuilder.environment(), executable.getEnvironment());\r
                log.debug("Process environment:" + pbuilder.environment());\r
        }\r
        log.debug("Setting command: " + pbuilder.command());\r
@@ -138,7 +138,7 @@ public final class ExecutableWrapper implements
 \r
     try {\r
                log.info("Calculation started at " + System.nanoTime());\r
-               Util.writeStatFile(confExec.getWorkDirectory(), JobStatus.STARTED.toString());\r
+               EngineUtil.writeStatFile(confExec.getWorkDirectory(), JobStatus.STARTED.toString());\r
                proc = pbuilder.start();\r
 \r
                // store input command and program environment\r
@@ -168,7 +168,7 @@ public final class ExecutableWrapper implements
                // any error???\r
                int exitVal = proc.waitFor();\r
                log.info("Calculation completed at " + System.nanoTime());\r
-               Util.writeStatFile(confExec.getWorkDirectory(), JobStatus.FINISHED.toString());\r
+               EngineUtil.writeStatFile(confExec.getWorkDirectory(), JobStatus.FINISHED.toString());\r
                // Let streams to write for a little more\r
                errorf.get(2, TimeUnit.SECONDS);\r
                outputf.get(2, TimeUnit.SECONDS);\r