From 62bb213b5865336eeefd89d473f14e217dcd559c Mon Sep 17 00:00:00 2001
From: adam-m <amalinowski@basistech.com>
Date: Tue, 21 May 2013 12:49:53 -0400
Subject: [PATCH] Move ExecUtil class to Core utils and simplify Timeline
 dependencies

---
 .../sleuthkit/autopsy/coreutils}/ExecUtil.java | 18 ++----------------
 .../autopsy/recentactivity/ExtractIE.java      |  1 +
 .../recentactivity/ExtractRegistry.java        |  1 +
 Timeline/nbproject/project.xml                 |  9 ---------
 .../sleuthkit/autopsy/timeline/Timeline.java   |  2 +-
 5 files changed, 5 insertions(+), 26 deletions(-)
 rename {RecentActivity/src/org/sleuthkit/autopsy/recentactivity => Core/src/org/sleuthkit/autopsy/coreutils}/ExecUtil.java (94%)

diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExecUtil.java b/Core/src/org/sleuthkit/autopsy/coreutils/ExecUtil.java
similarity index 94%
rename from RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExecUtil.java
rename to Core/src/org/sleuthkit/autopsy/coreutils/ExecUtil.java
index 943030c7af..e5c3b3af27 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExecUtil.java
+++ b/Core/src/org/sleuthkit/autopsy/coreutils/ExecUtil.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.recentactivity;
+package org.sleuthkit.autopsy.coreutils;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -27,7 +27,7 @@ import java.util.logging.Level;
 import org.sleuthkit.autopsy.coreutils.Logger;
 
 /**
- * Takes of forking a process and reading output / error streams to either a
+ * Takes care of forking a process and reading output / error streams to either a
  * string buffer or directly to a file writer
  */
 public final class ExecUtil {
@@ -67,12 +67,6 @@ public final class ExecUtil {
         logger.log(Level.INFO, "Executing " + arrayCommandToLog.toString());
 
         proc = rt.exec(arrayCommand);
-        try {
-            //give time to fully start the process
-            Thread.sleep(2000);
-        } catch (InterruptedException ex) {
-            logger.log(Level.WARNING, "Pause interrupted", ex);
-        }
 
         //stderr redirect
         errorStringRedirect = new ExecUtil.StreamToStringRedirect(proc.getErrorStream(), "ERROR");
@@ -128,14 +122,6 @@ public final class ExecUtil {
         logger.log(Level.INFO, "Executing " + arrayCommandToLog.toString());
 
         proc = rt.exec(arrayCommand);
-       if (false) {
-        try {
-            //give time to fully start the process
-            Thread.sleep(2000);
-        } catch (InterruptedException ex) {
-            logger.log(Level.WARNING, "Pause interrupted", ex);
-        }
-       }
 
         //stderr redirect
         errorStringRedirect = new ExecUtil.StreamToStringRedirect(proc.getErrorStream(), "ERROR");
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractIE.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractIE.java
index 88e28902db..9f022489a2 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractIE.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractIE.java
@@ -23,6 +23,7 @@
 package org.sleuthkit.autopsy.recentactivity;
 
 //IO imports
+import org.sleuthkit.autopsy.coreutils.ExecUtil;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java
index f539197c17..18693786a0 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java
@@ -22,6 +22,7 @@
  */
 package org.sleuthkit.autopsy.recentactivity;
 
+import org.sleuthkit.autopsy.coreutils.ExecUtil;
 import java.io.*;
 import java.io.File;
 import java.sql.ResultSet;
diff --git a/Timeline/nbproject/project.xml b/Timeline/nbproject/project.xml
index eb93ea7619..2c72f21c9a 100644
--- a/Timeline/nbproject/project.xml
+++ b/Timeline/nbproject/project.xml
@@ -106,15 +106,6 @@
                         <specification-version>1.0</specification-version>
                     </run-dependency>
                 </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.recentactivity</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>4</release-version>
-                        <specification-version>2.0</specification-version>
-                    </run-dependency>
-                </dependency>
             </module-dependencies>
             <public-packages/>
         </data>
diff --git a/Timeline/src/org/sleuthkit/autopsy/timeline/Timeline.java b/Timeline/src/org/sleuthkit/autopsy/timeline/Timeline.java
index 30adfea693..bb4f59cc0e 100644
--- a/Timeline/src/org/sleuthkit/autopsy/timeline/Timeline.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/Timeline.java
@@ -97,7 +97,7 @@ import org.sleuthkit.autopsy.datamodel.DisplayableItemNode;
 import org.sleuthkit.autopsy.datamodel.DisplayableItemNodeVisitor;
 import org.sleuthkit.autopsy.datamodel.FileNode;
 import org.sleuthkit.autopsy.ingest.IngestManager;
-import org.sleuthkit.autopsy.recentactivity.ExecUtil;
+import org.sleuthkit.autopsy.coreutils.ExecUtil;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.Directory;
 import org.sleuthkit.datamodel.File;