Fix bugs in https://github.com/sleuthkit/autopsy/issues/52

RecentActivity/nbproject/project.xml

@@ -115,10 +115,6 @@
                 <runtime-relative-path>ext/gson-2.1.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/gson-2.1.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/commons-lang3-3.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-lang3-3.1.jar</binary-origin>
-            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jdom-1.1.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/jdom-1.1.2.jar</binary-origin>

RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java

@@ -28,9 +28,10 @@ import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.sleuthkit.autopsy.casemodule.Case;
+import org.sleuthkit.autopsy.ingest.IngestServiceImage;
 import org.sleuthkit.datamodel.*;
 
-abstract public class Extract {
+abstract public class Extract implements IngestServiceImage{
 
     protected Case currentCase = Case.getCurrentCase(); // get the most updated case
     protected SleuthkitCase tskCase = currentCase.getSleuthkitCase();
@@ -38,6 +39,13 @@ abstract public class Extract {
     protected ArrayList<String> errorMessages = null;
     protected String moduleName = "";
     
+    List<String> getErrorMessages() {
+        if(errorMessages == null) {
+            errorMessages = new ArrayList<String>();
+        }
+        return errorMessages;
+    }
+
     public List<FsContent> extractFiles(Image image, String query) {
 
         Collection<FileSystem> imageFS = tskCase.getFileSystems(image);
@@ -97,6 +105,7 @@ abstract public class Extract {
             tempdbconnect.closeConnection();
         } catch (Exception ex) {
             logger.log(Level.WARNING, "Error while trying to read into a sqlite db." + connectionString, ex);
+            return new ArrayList();
         }
         return list;
     }

RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractIE.java

@@ -370,7 +370,7 @@ public class ExtractIE extends Extract implements IngestServiceImage {
 
         } catch (Exception e) {
             success = false;
-            logger.log(Level.SEVERE, "ExtractIE::executePasco() -> ", e.getMessage());
+            logger.log(Level.SEVERE, "ExtractIE::executePasco() -> ", e);
         }
 
         return success;
@@ -453,7 +453,7 @@ public class ExtractIE extends Extract implements IngestServiceImage {
                                                 ftime = epochtime.longValue();
                                                 ftime = ftime/1000;
                                             } catch (ParseException e) {
-                                                logger.log(Level.SEVERE, "ExtractIE::parsePascosResults() -> ", e.getMessage());
+                                                logger.log(Level.SEVERE, "ExtractIE::parsePascosResults() -> ", e);
                                             }
                                         }
 
@@ -497,7 +497,7 @@ public class ExtractIE extends Extract implements IngestServiceImage {
                         boolean bDelete = file.delete();
                     }
                 } catch (IOException ioex) {
-                    logger.log(Level.SEVERE, "ExtractIE::parsePascosResults() -> ", ioex.getMessage());
+                    logger.log(Level.SEVERE, "ExtractIE::parsePascosResults() -> ", ioex);
                 }
 
             }

RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java

@@ -46,7 +46,7 @@ import org.sleuthkit.datamodel.*;
  *
  * @author Alex \System32\Config
  */
-public class ExtractRegistry implements IngestServiceImage {
+public class ExtractRegistry extends Extract implements IngestServiceImage {
 
     public Logger logger = Logger.getLogger(this.getClass().getName());
     private String RR_PATH;
@@ -56,7 +56,7 @@ public class ExtractRegistry implements IngestServiceImage {
     ExtractRegistry() {
         final File rrRoot = InstalledFileLocator.getDefault().locate("rr", ExtractRegistry.class.getPackage().getName(), false);
         if (rrRoot == null) {
-            logger.log(Level.SEVERE, "RegRipper not found");
+            logger.log(Level.WARNING, "RegRipper not found");
             rrFound = false;
             return;
         } else {
@@ -176,7 +176,7 @@ public class ExtractRegistry implements IngestServiceImage {
 
         } catch (Exception e) {
 
-            logger.log(Level.SEVERE, "ExtractRegistry::executeRegRip() -> ", e.getMessage());
+            logger.log(Level.WARNING, "ExtractRegistry::executeRegRip() -> ", e);
         }
 
         return txtPath;
@@ -222,7 +222,7 @@ public class ExtractRegistry implements IngestServiceImage {
                     String Tempdate = time.toString();
                     time = Long.valueOf(Tempdate)/1000;
                 } catch (ParseException e) {
-                    logger.log(Level.SEVERE, "RegRipper::Conversion on DateTime -> ", e.getMessage());
+                    logger.log(Level.WARNING, "RegRipper::Conversion on DateTime -> ", e);
                 }
                 Element artroot = tempnode.getChild("artifacts");
                 List<Element> artlist = artroot.getChildren();
@@ -253,7 +253,7 @@ public class ExtractRegistry implements IngestServiceImage {
                                 utime = Long.valueOf(Tempdate);
                                 utime = utime;
                             } catch (Exception e) {
-                                logger.log(Level.SEVERE, "RegRipper::Conversion on DateTime -> ", e.getMessage());
+                                logger.log(Level.WARNING, "RegRipper::Conversion on DateTime -> ", e);
                             }
 
                             BlackboardArtifact bbart = tempDb.getContentById(orgId).newArtifact(ARTIFACT_TYPE.TSK_DEVICE_ATTACHED);
@@ -269,7 +269,7 @@ public class ExtractRegistry implements IngestServiceImage {
                                 ftime = epochtime.longValue();
                                 ftime = ftime/1000;
                             } catch (ParseException e) {
-                                logger.log(Level.SEVERE, "RegRipper::Conversion on DateTime -> ", e.getMessage());
+                                logger.log(Level.WARNING, "RegRipper::Conversion on DateTime -> ", e);
                             }
                             bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_LAST_ACCESSED.getTypeID(), "RecentActivity", context, time));
                             bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID(), "RecentActivity", context, value));
@@ -293,7 +293,7 @@ public class ExtractRegistry implements IngestServiceImage {
                                     String Tempdate = installtime.toString();
                                     installtime = Long.valueOf(Tempdate)/1000;
                                 } catch (ParseException e) {
-                                    logger.log(Level.SEVERE, "RegRipper::Conversion on DateTime -> ", e.getMessage());
+                                    logger.log(Level.WARNING, "RegRipper::Conversion on DateTime -> ", e);
                                 }
                                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID(), "RecentActivity", context, winver));
                                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME.getTypeID(), "RecentActivity", context, installtime));

RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestService.java

@@ -21,6 +21,7 @@
 package org.sleuthkit.autopsy.recentactivity;
 
 import java.util.ArrayList;
+import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.sleuthkit.autopsy.ingest.IngestImageWorkerController;
@@ -40,7 +41,7 @@ public final class RAImageIngestService implements IngestServiceImage {
     private static RAImageIngestService defaultInstance = null;
     private IngestManagerProxy managerProxy;
     private static int messageId = 0;
-    private ArrayList<String> errors = null;
+    private ArrayList<String> errors = new ArrayList<String>();
     private StringBuilder subCompleted = new StringBuilder();
 
     //public constructor is required
@@ -59,51 +60,22 @@ public final class RAImageIngestService implements IngestServiceImage {
     @Override
     public void process(Image image, IngestImageWorkerController controller) {
         //logger.log(Level.INFO, "process() " + this.toString());
+        List<Extract> modules = new ArrayList<Extract>();
+        modules.add(new ExtractRegistry());
+        modules.add(new Firefox());
+        modules.add(new Chrome());
+        modules.add(new ExtractIE());
         managerProxy.postMessage(IngestMessage.createMessage(++messageId, MessageType.INFO, this, "Started " + image.getName()));
-        try {
+        controller.switchToDeterminate(modules.size());
-            controller.switchToDeterminate(4);
         controller.progress(0);
         
-            if (controller.isCancelled() == false) {
+        for(int i = 0; i < modules.size(); i++) {
-                ExtractRegistry eree = new ExtractRegistry();
+            Extract module = modules.get(i);
-                eree.process(image, controller);
+            module.process(image, controller);
-                controller.progress(1);
+            controller.progress(i+1);
-                subCompleted.append("Registry extraction complete. <br>");
+            subCompleted.append(module.getName()).append(" complete <br>");
+            errors.addAll(module.getErrorMessages());
         }
-            if (controller.isCancelled() == false) {
-                Firefox ffre = new Firefox();
-                ffre.process(image, controller);
-                controller.progress(2);
-                subCompleted.append("Firefox extraction complete. <br>");
-                if(ffre.errorMessages != null){
-                errors.addAll(ffre.errorMessages);
-                }
-            }
-            if (controller.isCancelled() == false) {
-                Chrome chre = new Chrome();
-                chre.process(image, controller);
-                controller.progress(3);
-                subCompleted.append("Chrome extraction complete. <br>");
-                if(chre.errorMessages != null){
-                errors.addAll(chre.errorMessages);
-                }
-            }
-            if (controller.isCancelled() == false) {
-                ExtractIE eere = new ExtractIE();
-                eere.process(image, controller);
-                if(eere.errorMessages != null){
-                errors.addAll(eere.errorMessages);
-                }
-                subCompleted.append( "Internet Explorer extraction complete. <br>");
-                controller.progress(4);
-            }
-
-
-        } catch (Exception e) {
-            logger.log(Level.SEVERE, "Error extracting recent activity", e);
-            managerProxy.postMessage(IngestMessage.createErrorMessage(++messageId, this, "Error extracting recent activity data", null));
-        }
-
     }
 
     @Override
@@ -113,7 +85,7 @@ public final class RAImageIngestService implements IngestServiceImage {
         String errorsFound = "";
         errorMessage.append(subCompleted);
         int i = 0;
-        if (errors != null) {
+        if (!errors.isEmpty()) {
             errorMessage.append("<br>There were some errors extracting the data: <br>");
             for (String msg : errors) {
                 i++;

installer_autopsy/installer_autopsy.aip

@@ -1439,7 +1439,7 @@
     <ROW File="Juba" Component_="Abidjan" FileName="Juba" Attributes="0" SourcePath="..\dist\autopsy-installer\jre6\lib\zi\Africa\Juba" SelfReg="false" NextFile="Kampala"/>
     <ROW File="Jujuy" Component_="Buenos_Aires" FileName="Jujuy" Attributes="0" SourcePath="..\dist\autopsy-installer\jre6\lib\zi\America\Argentina\Jujuy" SelfReg="false" NextFile="La_Rioja"/>
     <ROW File="Juneau" Component_="Adak" FileName="Juneau" Attributes="0" SourcePath="..\dist\autopsy-installer\jre6\lib\zi\America\Juneau" SelfReg="false" NextFile="Louisville"/>
-    <ROW File="KNOWN_ISSUES.txt" Component_="README.txt" FileName="KNOWN_~1.txt|KNOWN_ISSUES.txt" Attributes="0" SourcePath="..\dist\autopsy-installer\KNOWN_ISSUES.txt" SelfReg="false"/>
+    <ROW File="KNOWN_ISSUES.txt" Component_="README.txt" FileName="KNOWN_~1.txt|KNOWN_ISSUES.txt" Attributes="0" SourcePath="..\dist\autopsy-installer\KNOWN_ISSUES.txt" SelfReg="false" NextFile="dom4j1.6.1.jar"/>
     <ROW File="Kabul" Component_="Aden" FileName="Kabul" Attributes="0" SourcePath="..\dist\autopsy-installer\jre6\lib\zi\Asia\Kabul" SelfReg="false" NextFile="Kamchatka"/>
     <ROW File="Kaliningrad" Component_="Amsterdam" FileName="Kalini~1|Kaliningrad" Attributes="0" SourcePath="..\dist\autopsy-installer\jre6\lib\zi\Europe\Kaliningrad" SelfReg="false" NextFile="Kiev"/>
     <ROW File="Kamchatka" Component_="Aden" FileName="Kamcha~1|Kamchatka" Attributes="0" SourcePath="..\dist\autopsy-installer\jre6\lib\zi\Asia\Kamchatka" SelfReg="false" NextFile="Karachi"/>
@@ -2040,7 +2040,7 @@
     <ROW File="commonslang2.4.jar_1" Component_="apachemime4jcore0.7.jar" FileName="common~6.jar|commons-lang-2.4.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\solr\solr\lib\commons-lang-2.4.jar" SelfReg="false" NextFile="commonslogging1.1.1.jar_1"/>
     <ROW File="commonslang2.4javadoc.jar" Component_="applejavaextensions.jar" FileName="common~4.jar|commons-lang-2.4-javadoc.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\modules\ext\commons-lang-2.4-javadoc.jar" SelfReg="false" NextFile="commonslang2.4sources.jar"/>
     <ROW File="commonslang2.4sources.jar" Component_="applejavaextensions.jar" FileName="common~5.jar|commons-lang-2.4-sources.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\modules\ext\commons-lang-2.4-sources.jar" SelfReg="false" NextFile="commonslang2.4.jar"/>
-    <ROW File="commonslogging1.1.1.jar" Component_="applejavaextensions.jar" FileName="common~8.jar|commons-logging-1.1.1.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\modules\ext\commons-logging-1.1.1.jar" SelfReg="false" NextFile="dom4j1.6.1.jar"/>
+    <ROW File="commonslogging1.1.1.jar" Component_="applejavaextensions.jar" FileName="common~8.jar|commons-logging-1.1.1.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\modules\ext\commons-logging-1.1.1.jar" SelfReg="false" NextFile="gson2.1.jar"/>
     <ROW File="commonslogging1.1.1.jar_1" Component_="apachemime4jcore0.7.jar" FileName="common~7.jar|commons-logging-1.1.1.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\solr\solr\lib\commons-logging-1.1.1.jar" SelfReg="false" NextFile="dom4j1.6.1.jar_1"/>
     <ROW File="compat.h" Component_="compat.h" FileName="compat.h" Attributes="0" SourcePath="..\dist\autopsy-installer\gstreamer\sdk\include\gnutls\compat.h" SelfReg="false" NextFile="crypto.h"/>
     <ROW File="config_types.h" Component_="config_types.h" FileName="config~1.h|config_types.h" Attributes="0" SourcePath="..\dist\autopsy-installer\gstreamer\sdk\include\ogg\config_types.h" SelfReg="false" NextFile="ogg.h"/>
@@ -2122,7 +2122,7 @@
     <ROW File="discoverer.py_2" Component_="discoverer.py_2" FileName="discov~1.py|discoverer.py" Attributes="0" SourcePath="..\dist\autopsy-installer\gstreamer\sdk\bindings\python\v2.6\lib\site-packages\gst-0.10\gst\extend\discoverer.py" SelfReg="false" NextFile="jukebox.py_2"/>
     <ROW File="discoverer.py_3" Component_="discoverer.py_3" FileName="discov~1.py|discoverer.py" Attributes="0" SourcePath="..\dist\autopsy-installer\gstreamer\sdk\bindings\python\v2.7\lib\site-packages\gst-0.10\gst\extend\discoverer.py" SelfReg="false" NextFile="jukebox.py_3"/>
     <ROW File="dnsns.jar" Component_="dnsns.jar" FileName="dnsns.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\jre6\lib\ext\dnsns.jar" SelfReg="false" NextFile="localedata.jar"/>
-    <ROW File="dom4j1.6.1.jar" Component_="applejavaextensions.jar" FileName="dom4j-~1.jar|dom4j-1.6.1.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\modules\ext\dom4j-1.6.1.jar" SelfReg="false" NextFile="gson2.1.jar"/>
+    <ROW File="dom4j1.6.1.jar" Component_="applejavaextensions.jar" FileName="dom4j-~1.jar|dom4j-1.6.1.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\modules\ext\dom4j-1.6.1.jar" SelfReg="false" NextFile="junit3.8.1.jar"/>
     <ROW File="dom4j1.6.1.jar_1" Component_="apachemime4jcore0.7.jar" FileName="dom4j-~1.jar|dom4j-1.6.1.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\solr\solr\lib\dom4j-1.6.1.jar" SelfReg="false" NextFile="fontbox1.6.0.jar"/>
     <ROW File="dsa.h" Component_="aes.h" FileName="dsa.h" Attributes="0" SourcePath="..\dist\autopsy-installer\gstreamer\sdk\include\nettle\dsa.h" SelfReg="false" NextFile="hmac.h"/>
     <ROW File="dt_shmem.dll" Component_="dt_shmem.dll" FileName="dt_shmem.dll" Attributes="0" SourcePath="..\dist\autopsy-installer\jre6\bin\dt_shmem.dll" SelfReg="false" NextFile="dt_socket.dll"/>
@@ -3372,7 +3372,7 @@
     <ROW File="jmorecfg.h" Component_="bzlib.h" FileName="jmorecfg.h" Attributes="0" SourcePath="..\dist\autopsy-installer\gstreamer\sdk\include\jmorecfg.h" SelfReg="false" NextFile="jpeglib.h"/>
     <ROW File="jmxremote.access" Component_="jmxremote.access" FileName="jmxrem~1.acc|jmxremote.access" Attributes="0" SourcePath="..\dist\autopsy-installer\jre6\lib\management\jmxremote.access" SelfReg="false" NextFile="jmxremote.password.template"/>
     <ROW File="jmxremote.password.template" Component_="jmxremote.access" FileName="jmxrem~1.tem|jmxremote.password.template" Attributes="0" SourcePath="..\dist\autopsy-installer\jre6\lib\management\jmxremote.password.template" SelfReg="false" NextFile="management.properties"/>
-    <ROW File="jna.jar" Component_="applejavaextensions.jar" FileName="jna.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\modules\ext\jna.jar" SelfReg="false" NextFile="junit3.8.1.jar"/>
+    <ROW File="jna.jar" Component_="applejavaextensions.jar" FileName="jna.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\modules\ext\jna.jar" SelfReg="false" NextFile="platform.jar"/>
     <ROW File="jna3.2.7.jar" Component_="felix2.0.3.jar" FileName="jna-32~1.jar|jna-3.2.7.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\platform\modules\ext\jna-3.2.7.jar" SelfReg="false" NextFile="nsProxyAutoConfig.js"/>
     <ROW File="jnidispatch.dll" Component_="jnidispatch.dll" FileName="jnidis~1.dll|jnidispatch.dll" Attributes="0" SourcePath="..\dist\autopsy-installer\platform\modules\lib\amd64\jnidispatch.dll" SelfReg="false" NextFile="libjnidispatch.so"/>
     <ROW File="jnidispatch.dll_1" Component_="jnidispatch.dll_1" FileName="jnidis~1.dll|jnidispatch.dll" Attributes="0" SourcePath="..\dist\autopsy-installer\platform\modules\lib\x86\jnidispatch.dll" SelfReg="false" NextFile="orgjdesktoplayout.jar"/>
@@ -3785,7 +3785,7 @@
     <ROW File="localcharset.h" Component_="bzlib.h" FileName="localc~1.h|localcharset.h" Attributes="0" SourcePath="..\dist\autopsy-installer\gstreamer\sdk\include\localcharset.h" SelfReg="false" NextFile="mp4ff.h"/>
     <ROW File="localedata.jar" Component_="dnsns.jar" FileName="locale~1.jar|localedata.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\jre6\lib\ext\localedata.jar" SelfReg="false" NextFile="metaindex"/>
     <ROW File="log.h" Component_="adler32.h" FileName="log.h" Attributes="0" SourcePath="..\dist\autopsy-installer\gstreamer\sdk\include\libavutil\log.h" SelfReg="false" NextFile="lzo.h"/>
-    <ROW File="log4j1.2.13.jar" Component_="applejavaextensions.jar" FileName="log4j-~1.jar|log4j-1.2.13.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\modules\ext\log4j-1.2.13.jar" SelfReg="false" NextFile="platform.jar"/>
+    <ROW File="log4j1.2.13.jar" Component_="applejavaextensions.jar" FileName="log4j-~1.jar|log4j-1.2.13.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\modules\ext\log4j-1.2.13.jar" SelfReg="false" NextFile="poiexcelant3.820120326.jar"/>
     <ROW File="logging.properties" Component_="calendars.properties" FileName="loggin~1.pro|logging.properties" Attributes="0" SourcePath="..\dist\autopsy-installer\jre6\lib\logging.properties" SelfReg="false" NextFile="jmxremote.access"/>
     <ROW File="luceneanalyzers3.5.0.jar" Component_="apachemime4jcore0.7.jar" FileName="lucene~1.jar|lucene-analyzers-3.5.0.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\solr\solr\lib\lucene-analyzers-3.5.0.jar" SelfReg="false" NextFile="lucenecore3.5.0.jar"/>
     <ROW File="lucenecore3.5.0.jar" Component_="apachemime4jcore0.7.jar" FileName="lucene~2.jar|lucene-core-3.5.0.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\solr\solr\lib\lucene-core-3.5.0.jar" SelfReg="false" NextFile="lucenegrouping3.5.0.jar"/>
@@ -4266,14 +4266,14 @@
     <ROW File="png14.lib" Component_="atk1.0.lib" FileName="png14.lib" Attributes="0" SourcePath="..\dist\autopsy-installer\gstreamer\sdk\lib\png14.lib" SelfReg="false" NextFile="pthreadGC2.lib"/>
     <ROW File="pngconf.h" Component_="png.h" FileName="pngconf.h" Attributes="0" SourcePath="..\dist\autopsy-installer\gstreamer\sdk\include\libpng14\pngconf.h" SelfReg="false" NextFile="librsvgenumtypes.h"/>
     <ROW File="pngconf.h_1" Component_="bzlib.h" FileName="pngconf.h" Attributes="0" SourcePath="..\dist\autopsy-installer\gstreamer\sdk\include\pngconf.h" SelfReg="false" NextFile="pthread.h"/>
-    <ROW File="poi3.820120326.jar" Component_="applejavaextensions.jar" FileName="poi-38~1.jar|poi-3.8-20120326.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\modules\ext\poi-3.8-20120326.jar" SelfReg="false" NextFile="poiexcelant3.820120326.jar"/>
+    <ROW File="poi3.820120326.jar" Component_="applejavaextensions.jar" FileName="poi-38~1.jar|poi-3.8-20120326.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\modules\ext\poi-3.8-20120326.jar" SelfReg="false" NextFile="poiooxml3.820120326.jar"/>
     <ROW File="poi3.8beta4.jar" Component_="apachemime4jcore0.7.jar" FileName="poi-38~1.jar|poi-3.8-beta4.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\solr\solr\lib\poi-3.8-beta4.jar" SelfReg="false" NextFile="poiooxml3.8beta4.jar"/>
-    <ROW File="poiexcelant3.820120326.jar" Component_="applejavaextensions.jar" FileName="poi-ex~1.jar|poi-excelant-3.8-20120326.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\modules\ext\poi-excelant-3.8-20120326.jar" SelfReg="false" NextFile="poiooxml3.820120326.jar"/>
+    <ROW File="poiexcelant3.820120326.jar" Component_="applejavaextensions.jar" FileName="poi-ex~1.jar|poi-excelant-3.8-20120326.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\modules\ext\poi-excelant-3.8-20120326.jar" SelfReg="false" NextFile="poiooxmlschemas3.820120326.jar"/>
-    <ROW File="poiooxml3.820120326.jar" Component_="applejavaextensions.jar" FileName="poi-oo~1.jar|poi-ooxml-3.8-20120326.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\modules\ext\poi-ooxml-3.8-20120326.jar" SelfReg="false" NextFile="poiooxmlschemas3.820120326.jar"/>
+    <ROW File="poiooxml3.820120326.jar" Component_="applejavaextensions.jar" FileName="poi-oo~1.jar|poi-ooxml-3.8-20120326.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\modules\ext\poi-ooxml-3.8-20120326.jar" SelfReg="false" NextFile="slf4japi1.6.1.jar"/>
     <ROW File="poiooxml3.8beta4.jar" Component_="apachemime4jcore0.7.jar" FileName="poi-oo~1.jar|poi-ooxml-3.8-beta4.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\solr\solr\lib\poi-ooxml-3.8-beta4.jar" SelfReg="false" NextFile="poiooxmlschemas3.8beta4.jar"/>
     <ROW File="poiooxmlschemas3.820120326.jar" Component_="applejavaextensions.jar" FileName="poi-oo~2.jar|poi-ooxml-schemas-3.8-20120326.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\modules\ext\poi-ooxml-schemas-3.8-20120326.jar" SelfReg="false" NextFile="poiscratchpad3.820120326.jar"/>
     <ROW File="poiooxmlschemas3.8beta4.jar" Component_="apachemime4jcore0.7.jar" FileName="poi-oo~2.jar|poi-ooxml-schemas-3.8-beta4.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\solr\solr\lib\poi-ooxml-schemas-3.8-beta4.jar" SelfReg="false" NextFile="poiscratchpad3.8beta4.jar"/>
-    <ROW File="poiscratchpad3.820120326.jar" Component_="applejavaextensions.jar" FileName="poi-sc~1.jar|poi-scratchpad-3.8-20120326.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\modules\ext\poi-scratchpad-3.8-20120326.jar" SelfReg="false" NextFile="slf4japi1.6.1.jar"/>
+    <ROW File="poiscratchpad3.820120326.jar" Component_="applejavaextensions.jar" FileName="poi-sc~1.jar|poi-scratchpad-3.8-20120326.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\modules\ext\poi-scratchpad-3.8-20120326.jar" SelfReg="false" NextFile="staxapi1.0.1.jar"/>
     <ROW File="poiscratchpad3.8beta4.jar" Component_="apachemime4jcore0.7.jar" FileName="poi-sc~1.jar|poi-scratchpad-3.8-beta4.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\solr\solr\lib\poi-scratchpad-3.8-beta4.jar" SelfReg="false" NextFile="rome0.9.jar"/>
     <ROW File="policytool.exe" Component_="policytool.exe" FileName="policy~1.exe|policytool.exe" Attributes="0" SourcePath="..\dist\autopsy-installer\jre6\bin\policytool.exe" SelfReg="false" NextFile="regutils.dll"/>
     <ROW File="propertyprobe.h" Component_="colorbalance.h" FileName="proper~1.h|propertyprobe.h" Attributes="0" SourcePath="..\dist\autopsy-installer\gstreamer\sdk\include\gstreamer-0.10\gst\interfaces\propertyprobe.h" SelfReg="false" NextFile="streamvolume.h"/>
@@ -4396,7 +4396,7 @@
     <ROW File="solrconfig.xml" Component_="adminextra.html" FileName="solrco~1.xml|solrconfig.xml" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\solr\solr\conf\solrconfig.xml" SelfReg="false" NextFile="spellings.txt"/>
     <ROW File="solrcore3.5.0.jar" Component_="apachemime4jcore0.7.jar" FileName="solr-c~3.jar|solr-core-3.5.0.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\solr\solr\lib\solr-core-3.5.0.jar" SelfReg="false" NextFile="solrnoggit3.5.0.jar"/>
     <ROW File="solrnoggit3.5.0.jar" Component_="apachemime4jcore0.7.jar" FileName="solr-n~1.jar|solr-noggit-3.5.0.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\solr\solr\lib\solr-noggit-3.5.0.jar" SelfReg="false" NextFile="solrsolrj3.5.0.jar_1"/>
-    <ROW File="solrsolrj3.5.0.jar" Component_="applejavaextensions.jar" FileName="solr-s~3.jar|solr-solrj-3.5.0.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\modules\ext\solr-solrj-3.5.0.jar" SelfReg="false" NextFile="sqlitejdbc3.6.20.jar"/>
+    <ROW File="solrsolrj3.5.0.jar" Component_="applejavaextensions.jar" FileName="solr-s~3.jar|solr-solrj-3.5.0.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\modules\ext\solr-solrj-3.5.0.jar" SelfReg="false" NextFile="sqlitejdbc3.7.2.jar"/>
     <ROW File="solrsolrj3.5.0.jar_1" Component_="apachemime4jcore0.7.jar" FileName="solr-s~1.jar|solr-solrj-3.5.0.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\solr\solr\lib\solr-solrj-3.5.0.jar" SelfReg="false" NextFile="tagsoup1.2.1.jar"/>
     <ROW File="solrsolrj3.5.0javadoc.jar" Component_="applejavaextensions.jar" FileName="solr-s~1.jar|solr-solrj-3.5.0-javadoc.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\modules\ext\solr-solrj-3.5.0-javadoc.jar" SelfReg="false" NextFile="solrsolrj3.5.0sources.jar"/>
     <ROW File="solrsolrj3.5.0sources.jar" Component_="applejavaextensions.jar" FileName="solr-s~2.jar|solr-solrj-3.5.0-sources.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\modules\ext\solr-solrj-3.5.0-sources.jar" SelfReg="false" NextFile="solrsolrj3.5.0.jar"/>
@@ -4461,17 +4461,12 @@
     <ROW File="spellings.txt" Component_="adminextra.html" FileName="spelli~1.txt|spellings.txt" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\solr\solr\conf\spellings.txt" SelfReg="false" NextFile="stopwords.txt"/>
     <ROW File="splash.gif" Component_="ffjcext.zip" FileName="splash.gif" Attributes="0" SourcePath="..\dist\autopsy-installer\jre6\lib\deploy\splash.gif" SelfReg="false" NextFile="deploy.jar"/>
     <ROW File="splashscreen.dll" Component_="splashscreen.dll" FileName="splash~1.dll|splashscreen.dll" Attributes="0" SourcePath="..\dist\autopsy-installer\jre6\bin\splashscreen.dll" SelfReg="false" NextFile="ssv.dll"/>
-    <ROW File="sqlite4java.jar" Component_="applejavaextensions.jar" FileName="sqlite~6.jar|sqlite4java.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\modules\ext\sqlite4java.jar" SelfReg="false" NextFile="sqlitejdbcv056.jar"/>
-    <ROW File="sqlitejdbc3.6.20.jar" Component_="applejavaextensions.jar" FileName="sqlite~1.jar|sqlite-jdbc-3.6.20.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\modules\ext\sqlite-jdbc-3.6.20.jar" SelfReg="false" NextFile="sqlitejdbc3.7.2.jar"/>
     <ROW File="sqlitejdbc3.7.2.jar" Component_="applejavaextensions.jar" FileName="sqlite~2.jar|sqlite-jdbc-3.7.2.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\modules\ext\sqlite-jdbc-3.7.2.jar" SelfReg="false" NextFile="sqlitejdbc3.7.6.320110609.0816033.jar"/>
-    <ROW File="sqlitejdbc3.7.6.320110609.0816033.jar" Component_="applejavaextensions.jar" FileName="sqlite~3.jar|sqlite-jdbc-3.7.6.3-20110609.081603-3.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\modules\ext\sqlite-jdbc-3.7.6.3-20110609.081603-3.jar" SelfReg="false" NextFile="sqlitejdbc3.7.7.120110713.0143051.jar"/>
+    <ROW File="sqlitejdbc3.7.6.320110609.0816033.jar" Component_="applejavaextensions.jar" FileName="sqlite~3.jar|sqlite-jdbc-3.7.6.3-20110609.081603-3.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\modules\ext\sqlite-jdbc-3.7.6.3-20110609.081603-3.jar" SelfReg="false" NextFile="swt.jar"/>
-    <ROW File="sqlitejdbc3.7.7.120110713.0143051.jar" Component_="applejavaextensions.jar" FileName="sqlite~4.jar|sqlite-jdbc-3.7.7.1-20110713.014305-1.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\modules\ext\sqlite-jdbc-3.7.7.1-20110713.014305-1.jar" SelfReg="false" NextFile="sqlitejdbc3.7.820111025.0148141.jar"/>
-    <ROW File="sqlitejdbc3.7.820111025.0148141.jar" Component_="applejavaextensions.jar" FileName="sqlite~5.jar|sqlite-jdbc-3.7.8-20111025.014814-1.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\modules\ext\sqlite-jdbc-3.7.8-20111025.014814-1.jar" SelfReg="false" NextFile="sqlite4java.jar"/>
-    <ROW File="sqlitejdbcv056.jar" Component_="applejavaextensions.jar" FileName="sqlite~7.jar|sqlitejdbc-v056.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\modules\ext\sqlitejdbc-v056.jar" SelfReg="false" NextFile="staxapi1.0.1.jar"/>
     <ROW File="ssv.dll" Component_="ssv.dll" FileName="ssv.dll" Attributes="0" SourcePath="..\dist\autopsy-installer\jre6\bin\ssv.dll" SelfReg="false" NextFile="ssvagent.exe"/>
     <ROW File="ssvagent.exe" Component_="ssvagent.exe" FileName="ssvagent.exe" Attributes="0" SourcePath="..\dist\autopsy-installer\jre6\bin\ssvagent.exe" SelfReg="false" NextFile="sunmscapi.dll"/>
     <ROW File="start.jar" Component_="start.jar" FileName="start.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\solr\start.jar" SelfReg="false" NextFile="solr.war"/>
-    <ROW File="staxapi1.0.1.jar" Component_="applejavaextensions.jar" FileName="stax-a~1.jar|stax-api-1.0.1.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\modules\ext\stax-api-1.0.1.jar" SelfReg="false" NextFile="swt.jar"/>
+    <ROW File="staxapi1.0.1.jar" Component_="applejavaextensions.jar" FileName="stax-a~1.jar|stax-api-1.0.1.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\modules\ext\stax-api-1.0.1.jar" SelfReg="false" NextFile="xmlbeans2.3.0.jar"/>
     <ROW File="stdcheaders.h" Component_="curl.h" FileName="stdche~1.h|stdcheaders.h" Attributes="0" SourcePath="..\dist\autopsy-installer\gstreamer\sdk\include\curl\stdcheaders.h" SelfReg="false" NextFile="typecheckgcc.h"/>
     <ROW File="stdint.h" Component_="bzlib.h" FileName="stdint.h" Attributes="0" SourcePath="..\dist\autopsy-installer\gstreamer\sdk\include\stdint.h" SelfReg="false" NextFile="constants.h"/>
     <ROW File="stopwords.txt" Component_="adminextra.html" FileName="stopwo~1.txt|stopwords.txt" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\solr\solr\conf\stopwords.txt" SelfReg="false" NextFile="stopwords_en.txt"/>
@@ -4683,7 +4678,7 @@
     <ROW File="win32_MoveNoDrop32x32.gif" Component_="cursors.properties" FileName="win32_~6.gif|win32_MoveNoDrop32x32.gif" Attributes="0" SourcePath="..\dist\autopsy-installer\jre6\lib\images\cursors\win32_MoveNoDrop32x32.gif" SelfReg="false" NextFile="javaws.jar"/>
     <ROW File="win32_common.h" Component_="constants.h" FileName="win32_~1.h|win32_common.h" Attributes="0" SourcePath="..\dist\autopsy-installer\gstreamer\sdk\include\stun\win32_common.h" SelfReg="false" NextFile="codec.h"/>
     <ROW File="wsdetect.dll" Component_="wsdetect.dll" FileName="wsdetect.dll" Attributes="0" SourcePath="..\dist\autopsy-installer\jre6\bin\wsdetect.dll" SelfReg="false" NextFile="zip.dll"/>
-    <ROW File="wstxasl3.2.7.jar" Component_="applejavaextensions.jar" FileName="wstx-a~1.jar|wstx-asl-3.2.7.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\modules\ext\wstx-asl-3.2.7.jar" SelfReg="false" NextFile="xmlbeans2.3.0.jar"/>
+    <ROW File="wstxasl3.2.7.jar" Component_="applejavaextensions.jar" FileName="wstx-a~1.jar|wstx-asl-3.2.7.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\modules\ext\wstx-asl-3.2.7.jar" SelfReg="false" NextFile="libewf.dll"/>
     <ROW File="wstxasl3.2.7.jar_1" Component_="apachemime4jcore0.7.jar" FileName="wstx-a~1.jar|wstx-asl-3.2.7.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\solr\solr\lib\wstx-asl-3.2.7.jar" SelfReg="false" NextFile="xercesImpl2.8.1.jar"/>
     <ROW File="x509.h" Component_="compat.h" FileName="x509.h" Attributes="0" SourcePath="..\dist\autopsy-installer\gstreamer\sdk\include\gnutls\x509.h" SelfReg="false" NextFile="gpgerror.h"/>
     <ROW File="xercesImpl2.8.1.jar" Component_="apachemime4jcore0.7.jar" FileName="xerces~1.jar|xercesImpl-2.8.1.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\solr\solr\lib\xercesImpl-2.8.1.jar" SelfReg="false" NextFile="xmlapis1.3.03.jar"/>
@@ -4693,7 +4688,7 @@
     <ROW File="xmlIO.h" Component_="c14n.h" FileName="xmlIO.h" Attributes="0" SourcePath="..\dist\autopsy-installer\gstreamer\sdk\include\libxml2\libxml\xmlIO.h" SelfReg="false" NextFile="xmlmemory.h"/>
     <ROW File="xmlapis1.3.03.jar" Component_="apachemime4jcore0.7.jar" FileName="xml-ap~1.jar|xml-apis-1.3.03.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\solr\solr\lib\xml-apis-1.3.03.jar" SelfReg="false" NextFile="xmlbeans2.3.0.jar_1"/>
     <ROW File="xmlautomata.h" Component_="c14n.h" FileName="xmlaut~1.h|xmlautomata.h" Attributes="0" SourcePath="..\dist\autopsy-installer\gstreamer\sdk\include\libxml2\libxml\xmlautomata.h" SelfReg="false" NextFile="xmlerror.h"/>
-    <ROW File="xmlbeans2.3.0.jar" Component_="applejavaextensions.jar" FileName="xmlbea~1.jar|xmlbeans-2.3.0.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\modules\ext\xmlbeans-2.3.0.jar" SelfReg="false" NextFile="libewf.dll"/>
+    <ROW File="xmlbeans2.3.0.jar" Component_="applejavaextensions.jar" FileName="xmlbea~1.jar|xmlbeans-2.3.0.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\modules\ext\xmlbeans-2.3.0.jar" SelfReg="false"/>
     <ROW File="xmlbeans2.3.0.jar_1" Component_="apachemime4jcore0.7.jar" FileName="xmlbea~1.jar|xmlbeans-2.3.0.jar" Attributes="0" SourcePath="..\dist\autopsy-installer\autopsy\solr\solr\lib\xmlbeans-2.3.0.jar" SelfReg="false" NextFile="solr.xml"/>
     <ROW File="xmlerror.h" Component_="c14n.h" FileName="xmlerror.h" Attributes="0" SourcePath="..\dist\autopsy-installer\gstreamer\sdk\include\libxml2\libxml\xmlerror.h" SelfReg="false" NextFile="xmlexports.h"/>
     <ROW File="xmlexports.h" Component_="c14n.h" FileName="xmlexp~1.h|xmlexports.h" Attributes="0" SourcePath="..\dist\autopsy-installer\gstreamer\sdk\include\libxml2\libxml\xmlexports.h" SelfReg="false" NextFile="xmlIO.h"/>