Merge branch 'release-4.0.1' of https://github.com/sleuthkit/autopsy into release-4.0.1

Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/EmbeddedFileExtractorIngestModule.java

@@ -79,7 +79,7 @@ public final class EmbeddedFileExtractorIngestModule implements FileIngestModule
             } catch (SecurityException ex) {
                 logger.log(Level.SEVERE, "Error initializing output dir: " + moduleDirAbsolute, ex); //NON-NLS
                 services.postMessage(IngestMessage.createErrorMessage(EmbeddedFileExtractorModuleFactory.getModuleName(), "Error initializing", "Error initializing output dir: " + moduleDirAbsolute)); //NON-NLS
-                throw new IngestModuleException(ex.getMessage());
+                throw new IngestModuleException(ex.getMessage(), ex);
             }
         }
 
@@ -87,7 +87,7 @@ public final class EmbeddedFileExtractorIngestModule implements FileIngestModule
         try {
             fileTypeDetector = new FileTypeDetector();
         } catch (FileTypeDetector.FileTypeDetectorInitException ex) {
-            throw new IngestModuleException(ex.getMessage());
+            throw new IngestModuleException(ex.getMessage(), ex);
         }
 
         // initialize the extraction modules.

Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/SevenZipExtractor.java

@@ -133,7 +133,7 @@ class SevenZipExtractor {
                 String details = NbBundle.getMessage(SevenZipExtractor.class, "EmbeddedFileExtractorIngestModule.ArchiveExtractor.init.errCantInitLib",
                         e.getMessage());
                 services.postMessage(IngestMessage.createErrorMessage(EmbeddedFileExtractorModuleFactory.getModuleName(), msg, details));
-                throw new IngestModuleException(e.getMessage());
+                throw new IngestModuleException(e.getMessage(), e);
             }
         }
         this.context = context;

Core/src/org/sleuthkit/autopsy/modules/exif/ExifParserFileIngestModule.java

@@ -91,7 +91,7 @@ public final class ExifParserFileIngestModule implements FileIngestModule {
         try {
             fileTypeDetector = new FileTypeDetector();
         } catch (FileTypeDetector.FileTypeDetectorInitException ex) {
-            throw new IngestModuleException(NbBundle.getMessage(this.getClass(), "ExifParserFileIngestModule.startUp.fileTypeDetectorInitializationException.msg"));
+            throw new IngestModuleException(NbBundle.getMessage(this.getClass(), "ExifParserFileIngestModule.startUp.fileTypeDetectorInitializationException.msg"), ex);
         }
     }
 

Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchIngestModule.java

@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011-2014 Basis Technology Corp.
+ * Copyright 2011-2016 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,13 +18,11 @@
  */
 package org.sleuthkit.autopsy.modules.fileextmismatch;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.logging.Level;
-import org.openide.util.Exceptions;
 import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.services.Blackboard;
@@ -40,7 +38,6 @@ import org.sleuthkit.autopsy.modules.filetypeid.FileTypeDetector;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.BlackboardArtifact;
 import org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE;
-import org.sleuthkit.datamodel.BlackboardAttribute;
 import org.sleuthkit.datamodel.TskCoreException;
 import org.sleuthkit.datamodel.TskData;
 import org.sleuthkit.datamodel.TskException;
@@ -58,6 +55,7 @@ public class FileExtMismatchIngestModule implements FileIngestModule {
     private static final HashMap<Long, IngestJobTotals> totalsForIngestJobs = new HashMap<>();
     private static final IngestModuleReferenceCounter refCounter = new IngestModuleReferenceCounter();
     private static Blackboard blackboard;
+    private FileTypeDetector detector;
 
     private static class IngestJobTotals {
 
@@ -94,6 +92,11 @@ public class FileExtMismatchIngestModule implements FileIngestModule {
 
         FileExtMismatchXML xmlLoader = FileExtMismatchXML.getDefault();
         SigTypeToExtMap = xmlLoader.load();
+        try {
+            this.detector = new FileTypeDetector();
+        } catch (FileTypeDetector.FileTypeDetectorInitException ex) {
+            throw new IngestModuleException("Could not create file type detector.", ex);
+        }
 
     }
 
@@ -157,7 +160,7 @@ public class FileExtMismatchIngestModule implements FileIngestModule {
         if (settings.skipFilesWithNoExtension() && currActualExt.isEmpty()) {
             return false;
         }
-        String currActualSigType = abstractFile.getMIMEType();
+        String currActualSigType = detector.getFileType(abstractFile);
         if (currActualSigType == null) {
             return false;
         }

Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdIngestJobSettingsPanel.form

@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
-  <AuxValues>
-    <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
-    <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
-    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
-    <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
-    <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
-    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
-    <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
-    <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
-    <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
-  </AuxValues>
-
-  <Layout>
-    <DimensionLayout dim="0">
-      <Group type="103" groupAlignment="0" attributes="0">
-          <Group type="102" alignment="0" attributes="0">
-              <EmptySpace min="-2" pref="10" max="-2" attributes="0"/>
-              <Component id="skipKnownCheckBox" min="-2" max="-2" attributes="0"/>
-              <EmptySpace pref="46" max="32767" attributes="0"/>
-          </Group>
-      </Group>
-    </DimensionLayout>
-    <DimensionLayout dim="1">
-      <Group type="103" groupAlignment="0" attributes="0">
-          <Group type="102" alignment="0" attributes="0">
-              <EmptySpace min="-2" pref="11" max="-2" attributes="0"/>
-              <Component id="skipKnownCheckBox" min="-2" max="-2" attributes="0"/>
-              <EmptySpace pref="86" max="32767" attributes="0"/>
-          </Group>
-      </Group>
-    </DimensionLayout>
-  </Layout>
-  <SubComponents>
-    <Component class="javax.swing.JCheckBox" name="skipKnownCheckBox">
-      <Properties>
-        <Property name="selected" type="boolean" value="true"/>
-        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/modules/filetypeid/Bundle.properties" key="FileTypeIdIngestJobSettingsPanel.skipKnownCheckBox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-        </Property>
-        <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/modules/filetypeid/Bundle.properties" key="FileTypeIdIngestJobSettingsPanel.skipKnownCheckBox.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-        </Property>
-      </Properties>
-      <Events>
-        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="skipKnownCheckBoxActionPerformed"/>
-      </Events>
-    </Component>
-  </SubComponents>
-</Form>

Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdIngestJobSettingsPanel.java

@@ -1,99 +0,0 @@
-/*
- * Autopsy Forensic Browser
- * 
- * Copyright 2013 - 2014 Basis Technology Corp.
- * Contact: carrier <at> sleuthkit <dot> org
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.sleuthkit.autopsy.modules.filetypeid;
-
-import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
-import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettingsPanel;
-
-/**
- * UI component used to set ingest job options for file type identifier ingest
- * modules.
- */
-class FileTypeIdIngestJobSettingsPanel extends IngestModuleIngestJobSettingsPanel {
-
-    private final FileTypeIdModuleSettings settings;
-
-    FileTypeIdIngestJobSettingsPanel(FileTypeIdModuleSettings settings) {
-        this.settings = settings;
-        initComponents();
-        customizeComponents();
-    }
-
-    /**
-     * @inheritDoc
-     */
-    @Override
-    public IngestModuleIngestJobSettings getSettings() {
-        return settings;
-    }
-
-    /**
-     * Does child component initialization in addition to that done by the
-     * Matisse generated code.
-     */
-    private void customizeComponents() {
-        skipKnownCheckBox.setSelected(settings.skipKnownFiles());
-    }
-
-    /**
-     * This method is called from within the constructor to initialize the form.
-     * WARNING: Do NOT modify this code. The content of this method is always
-     * regenerated by the Form Editor.
-     */
-    @SuppressWarnings("unchecked")
-    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
-    private void initComponents() {
-
-        skipKnownCheckBox = new javax.swing.JCheckBox();
-
-        skipKnownCheckBox.setSelected(true);
-        skipKnownCheckBox.setText(org.openide.util.NbBundle.getMessage(FileTypeIdIngestJobSettingsPanel.class, "FileTypeIdIngestJobSettingsPanel.skipKnownCheckBox.text")); // NOI18N
-        skipKnownCheckBox.setToolTipText(org.openide.util.NbBundle.getMessage(FileTypeIdIngestJobSettingsPanel.class, "FileTypeIdIngestJobSettingsPanel.skipKnownCheckBox.toolTipText")); // NOI18N
-        skipKnownCheckBox.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                skipKnownCheckBoxActionPerformed(evt);
-            }
-        });
-
-        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
-        this.setLayout(layout);
-        layout.setHorizontalGroup(
-            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(layout.createSequentialGroup()
-                .addGap(10, 10, 10)
-                .addComponent(skipKnownCheckBox)
-                .addContainerGap(46, Short.MAX_VALUE))
-        );
-        layout.setVerticalGroup(
-            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(layout.createSequentialGroup()
-                .addGap(11, 11, 11)
-                .addComponent(skipKnownCheckBox)
-                .addContainerGap(86, Short.MAX_VALUE))
-        );
-    }// </editor-fold>//GEN-END:initComponents
-
-    private void skipKnownCheckBoxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_skipKnownCheckBoxActionPerformed
-        settings.setSkipKnownFiles(skipKnownCheckBox.isSelected());
-    }//GEN-LAST:event_skipKnownCheckBoxActionPerformed
-
-    // Variables declaration - do not modify//GEN-BEGIN:variables
-    private javax.swing.JCheckBox skipKnownCheckBox;
-    // End of variables declaration//GEN-END:variables
-}

Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdIngestModule.java

@@ -27,7 +27,6 @@ import org.sleuthkit.autopsy.ingest.IngestJobContext;
 import org.sleuthkit.autopsy.ingest.IngestMessage;
 import org.sleuthkit.autopsy.ingest.IngestServices;
 import org.sleuthkit.datamodel.AbstractFile;
-import org.sleuthkit.datamodel.TskData.FileKnown;
 import org.sleuthkit.autopsy.ingest.IngestModule.ProcessResult;
 import org.sleuthkit.autopsy.ingest.IngestModuleReferenceCounter;
 
@@ -38,7 +37,6 @@ import org.sleuthkit.autopsy.ingest.IngestModuleReferenceCounter;
 public class FileTypeIdIngestModule implements FileIngestModule {
 
     private static final Logger logger = Logger.getLogger(FileTypeIdIngestModule.class.getName());
-    private final FileTypeIdModuleSettings settings;
     private long jobId;
     private static final HashMap<Long, IngestJobTotals> totalsForIngestJobs = new HashMap<>();
     private static final IngestModuleReferenceCounter refCounter = new IngestModuleReferenceCounter();
@@ -66,11 +64,8 @@ public class FileTypeIdIngestModule implements FileIngestModule {
     /**
      * Creates an ingest module that detects the type of a file based on
      * signature (magic) values. Posts results to the blackboard.
-     *
-     * @param settings The ingest module settings.
      */
-    FileTypeIdIngestModule(FileTypeIdModuleSettings settings) {
+    FileTypeIdIngestModule() {
-        this.settings = settings;
     }
 
     /**
@@ -83,7 +78,7 @@ public class FileTypeIdIngestModule implements FileIngestModule {
         try {
             fileTypeDetector = new FileTypeDetector();
         } catch (FileTypeDetector.FileTypeDetectorInitException ex) {
-            throw new IngestModuleException(NbBundle.getMessage(this.getClass(), "FileTypeIdIngestModule.startUp.fileTypeDetectorInitializationException.msg"));
+            throw new IngestModuleException(NbBundle.getMessage(this.getClass(), "FileTypeIdIngestModule.startUp.fileTypeDetectorInitializationException.msg"), ex);
         }
     }
 
@@ -93,13 +88,6 @@ public class FileTypeIdIngestModule implements FileIngestModule {
     @Override
     public ProcessResult process(AbstractFile file) {
 
-        /**
-         * Skip known files if configured to do so.
-         */
-        if (settings.skipKnownFiles() && (file.getKnown() == FileKnown.KNOWN)) {
-            return ProcessResult.OK;
-        }
-
         /**
          * Attempt to detect the file type. Do it within an exception firewall,
          * so that any issues with reading file content or complaints from tika

Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdModuleFactory.java

@@ -26,7 +26,6 @@ import org.sleuthkit.autopsy.ingest.IngestModuleFactory;
 import org.sleuthkit.autopsy.ingest.IngestModuleFactoryAdapter;
 import org.sleuthkit.autopsy.ingest.IngestModuleGlobalSettingsPanel;
 import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
-import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettingsPanel;
 
 /**
  * A factory that creates file ingest modules that determine the types of files.
@@ -92,35 +91,6 @@ public class FileTypeIdModuleFactory extends IngestModuleFactoryAdapter {
         return globalSettingsPanel;
     }
 
-    /**
-     * @inheritDoc
-     */
-    @Override
-    public IngestModuleIngestJobSettings getDefaultIngestJobSettings() {
-        return new FileTypeIdModuleSettings();
-    }
-
-    /**
-     * @inheritDoc
-     */
-    @Override
-    public boolean hasIngestJobSettingsPanel() {
-        return true;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    @Override
-    public IngestModuleIngestJobSettingsPanel getIngestJobSettingsPanel(IngestModuleIngestJobSettings settings) {
-        assert settings instanceof FileTypeIdModuleSettings;
-        if (!(settings instanceof FileTypeIdModuleSettings)) {
-            throw new IllegalArgumentException(NbBundle.getMessage(this.getClass(),
-                    "FileTypeIdModuleFactory.getIngestJobSettingsPanel.exception.msg"));
-        }
-        return new FileTypeIdIngestJobSettingsPanel((FileTypeIdModuleSettings) settings);
-    }
-
     /**
      * @inheritDoc
      */
@@ -134,11 +104,6 @@ public class FileTypeIdModuleFactory extends IngestModuleFactoryAdapter {
      */
     @Override
     public FileIngestModule createFileIngestModule(IngestModuleIngestJobSettings settings) {
-        assert settings instanceof FileTypeIdModuleSettings;
+        return new FileTypeIdIngestModule();
-        if (!(settings instanceof FileTypeIdModuleSettings)) {
-            throw new IllegalArgumentException(
-                    NbBundle.getMessage(this.getClass(), "FileTypeIdModuleFactory.createFileIngestModule.exception.msg"));
-        }
-        return new FileTypeIdIngestModule((FileTypeIdModuleSettings) settings);
     }
 }

Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdModuleSettings.java

@@ -1,56 +0,0 @@
-/*
- * Autopsy Forensic Browser
- *
- * Copyright 2014 Basis Technology Corp.
- * Contact: carrier <at> sleuthkit <dot> org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.sleuthkit.autopsy.modules.filetypeid;
-
-import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
-
-/**
- * Ingest job options for the file type identifier ingest module instances.
- */
-// TODO: This class does not need to be public.
-public class FileTypeIdModuleSettings implements IngestModuleIngestJobSettings {
-
-    private static final long serialVersionUID = 1L;
-    private boolean skipKnownFiles = true;
-    private boolean skipSmallFiles = false; // No longer used.
-
-    FileTypeIdModuleSettings() {
-    }
-
-    FileTypeIdModuleSettings(boolean skipKnownFiles) {
-        this.skipKnownFiles = skipKnownFiles;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    @Override
-    public long getVersionNumber() {
-        return serialVersionUID;
-    }
-
-    void setSkipKnownFiles(boolean enabled) {
-        skipKnownFiles = enabled;
-    }
-
-    boolean skipKnownFiles() {
-        return skipKnownFiles;
-    }
-
-}

Core/src/org/sleuthkit/autopsy/modules/photoreccarver/PhotoRecCarverFileIngestModule.java

@@ -152,7 +152,7 @@ final class PhotoRecCarverFileIngestModule implements FileIngestModule {
                 // Initialize job totals
                 initTotalsForIngestJob(jobId);
             } catch (SecurityException | IOException | UnsupportedOperationException ex) {
-                throw new IngestModule.IngestModuleException(NbBundle.getMessage(PhotoRecCarverFileIngestModule.class, "cannotCreateOutputDir.message", ex.getLocalizedMessage()));
+                throw new IngestModule.IngestModuleException(NbBundle.getMessage(PhotoRecCarverFileIngestModule.class, "cannotCreateOutputDir.message", ex.getLocalizedMessage()), ex);
             }
         }
     }
@@ -396,7 +396,7 @@ final class PhotoRecCarverFileIngestModule implements FileIngestModule {
         } catch (FileAlreadyExistsException ex) {
             // No worries.
         } catch (IOException | SecurityException | UnsupportedOperationException ex) {
-            throw new IngestModule.IngestModuleException(NbBundle.getMessage(PhotoRecCarverFileIngestModule.class, "cannotCreateOutputDir.message", ex.getLocalizedMessage()));
+            throw new IngestModule.IngestModuleException(NbBundle.getMessage(PhotoRecCarverFileIngestModule.class, "cannotCreateOutputDir.message", ex.getLocalizedMessage()), ex);
         }
         return path;
     }

KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java

@@ -142,7 +142,7 @@ public final class KeywordSearchIngestModule implements FileIngestModule {
         try {
             fileTypeDetector = new FileTypeDetector();
         } catch (FileTypeDetector.FileTypeDetectorInitException ex) {
-            throw new IngestModuleException(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.startUp.fileTypeDetectorInitializationException.msg"));
+            throw new IngestModuleException(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.startUp.fileTypeDetectorInitializationException.msg"), ex);
         }
         ingester = Server.getIngester();
         this.context = context;
@@ -162,7 +162,7 @@ public final class KeywordSearchIngestModule implements FileIngestModule {
                     String details = NbBundle.getMessage(this.getClass(), "SolrConnectionCheck.Port");
                     logger.log(Level.SEVERE, "{0}: {1} {2}", new Object[]{msg, details, ex.toString()});
                     services.postMessage(IngestMessage.createErrorMessage(KeywordSearchModuleFactory.getModuleName(), msg, details));
-                    throw new IngestModuleException(msg);
+                    throw new IngestModuleException(msg, ex);
                 }
                 try {
                     kwsService.tryConnect(UserPreferences.getIndexingServerHost(), port);
@@ -171,7 +171,7 @@ public final class KeywordSearchIngestModule implements FileIngestModule {
                     String details = ex.getMessage();
                     logger.log(Level.SEVERE, "{0}: {1} {2}", new Object[]{msg, details, ex.toString()});
                     services.postMessage(IngestMessage.createErrorMessage(KeywordSearchModuleFactory.getModuleName(), msg, details));
-                    throw new IngestModuleException(msg);
+                    throw new IngestModuleException(msg, ex);
                 }
             } else {
                 // for single-user cases need to verify connection to local SOLR service
@@ -189,7 +189,7 @@ public final class KeywordSearchIngestModule implements FileIngestModule {
                     String msg = NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.init.badInitMsg");
                     String details = NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.init.tryStopSolrMsg", msg);
                     services.postMessage(IngestMessage.createErrorMessage(KeywordSearchModuleFactory.getModuleName(), msg, details));
-                    throw new IngestModuleException(msg);
+                    throw new IngestModuleException(msg, ex);
                 }
                 try {
                     // make an actual query to verify that server is responding
@@ -198,7 +198,7 @@ public final class KeywordSearchIngestModule implements FileIngestModule {
                 } catch (KeywordSearchModuleException | NoOpenCoreException ex) {
                     throw new IngestModuleException(
                             NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.init.exception.errConnToSolr.msg",
-                                    ex.getMessage()));
+                                    ex.getMessage()), ex);
                 }
 
                 // check if this job has any searchable keywords    

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

@@ -161,11 +161,11 @@ class SearchEngineURLQueryAnalyzer extends Extract {
             }
 
         } catch (IOException e) {
-            throw new IngestModuleException("Was not able to load SEUQAMappings.xml: " + e.getLocalizedMessage()); //NON-NLS
+            throw new IngestModuleException("Was not able to load SEUQAMappings.xml: " + e.getLocalizedMessage(), e); //NON-NLS
         } catch (ParserConfigurationException pce) {
-            throw new IngestModuleException("Unable to build XML parser: " + pce.getLocalizedMessage()); //NON-NLS
+            throw new IngestModuleException("Unable to build XML parser: " + pce.getLocalizedMessage(), pce); //NON-NLS
         } catch (SAXException sxe) {
-            throw new IngestModuleException("Unable to parse XML file: " + sxe.getLocalizedMessage()); //NON-NLS
+            throw new IngestModuleException("Unable to parse XML file: " + sxe.getLocalizedMessage(), sxe); //NON-NLS
         }
 
         NodeList nlist = xmlinput.getElementsByTagName("SearchEngine"); //NON-NLS
@@ -394,7 +394,7 @@ class SearchEngineURLQueryAnalyzer extends Extract {
             String message = NbBundle
                     .getMessage(this.getClass(), "SearchEngineURLQueryAnalyzer.init.exception.msg", XMLFILE);
             logger.log(Level.SEVERE, message, e);
-            throw new IngestModuleException(message);
+            throw new IngestModuleException(message, e);
         }
 
         loadConfigFile();

ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/ScalpelCarverIngestModule.java

@@ -106,7 +106,7 @@ class ScalpelCarverIngestModule implements FileIngestModule {
         } catch (IOException ex) {
             String message = NbBundle.getMessage(this.getClass(), "ScalpelCarverIngestModule.startUp.exception.msg4");
             logger.log(Level.SEVERE, message, ex);
-            throw new IngestModuleException(message);
+            throw new IngestModuleException(message, ex);
         }
 
         initialized = true;