Merge branch 'develop' of https://www.github.com/sleuthkit/autopsy into develop

Core/nbproject/project.properties

@@ -1,7 +1,10 @@
 file.reference.jdom-2.0.5-contrib.jar=release/modules/ext/jdom-2.0.5-contrib.jar
 file.reference.jdom-2.0.5.jar=release/modules/ext/jdom-2.0.5.jar
+file.reference.metadata-extractor-2.6.2.jar=release/modules/ext/metadata-extractor-2.6.2.jar
 file.reference.sqlite-jdbc-3.8.0-SNAPSHOT.jar=release/modules/ext/sqlite-jdbc-3.8.0-SNAPSHOT.jar
+file.reference.tika-core-1.2.jar=release/modules/ext/tika-core-1.2.jar
 file.reference.Tsk_DataModel.jar=release/modules/ext/Tsk_DataModel.jar
+file.reference.xmpcore.jar=release/modules/ext/xmpcore.jar
 javac.source=1.7
 javac.compilerargs=-Xlint -Xlint:-serial
 license.file=../LICENSE-2.0.txt

Core/nbproject/project.xml

@@ -211,10 +211,22 @@
                 <runtime-relative-path>ext/jdom-2.0.5.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/jdom-2.0.5.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/sevenzipjbinding.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/sevenzipjbinding.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/xmpcore.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/xmpcore.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jdom-2.0.5-contrib.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/jdom-2.0.5-contrib.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/sevenzipjbinding-AllPlatforms.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/sevenzipjbinding-AllPlatforms.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/Tsk_DataModel.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/Tsk_DataModel.jar</binary-origin>
@@ -223,6 +235,14 @@
                 <runtime-relative-path>ext/sqlite-jdbc-3.8.0-SNAPSHOT.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/sqlite-jdbc-3.8.0-SNAPSHOT.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/metadata-extractor-2.6.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/metadata-extractor-2.6.2.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/tika-core-1.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/tika-core-1.2.jar</binary-origin>
+            </class-path-extension>
         </data>
     </configuration>
 </project>

Core/src/org/sleuthkit/autopsy/actions/Bundle.properties

@@ -48,3 +48,4 @@ GetTagNameDialog.unableToAddTagNameToCase.msg=Unable to add the {0} tag name to
 GetTagNameDialog.taggingErr=Tagging Error
 GetTagNameDialog.tagNameAlreadyDef.msg=A {0} tag name has already been defined.
 GetTagNameDialog.dupTagErr=Duplicate Tag Error
+OpenLogFolder.error1=Log File Not Found: {0}

Core/src/org/sleuthkit/autopsy/actions/OpenLogFolderAction.java

@@ -0,0 +1,64 @@
+/*
+ * 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.actions;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.Desktop;
+import java.io.File;
+import java.io.IOException;
+import org.openide.DialogDisplayer;
+import org.openide.NotifyDescriptor;
+import org.openide.awt.ActionID;
+import org.openide.awt.ActionReference;
+import org.openide.awt.ActionRegistration;
+import org.openide.modules.Places;
+import org.openide.util.Exceptions;
+import org.openide.util.NbBundle.Messages;
+
+@ActionID(
+        category = "Help",
+        id = "org.sleuthkit.autopsy.actions.OpenLogFolder")
+@ActionRegistration(
+        displayName = "#CTL_OpenLogFolder")
+@ActionReference(path = "Menu/Help", position = 1750)
+@Messages("CTL_OpenLogFolder=Open Log Folder")
+/**
+ * Action in menu to open the folder containing the log files
+ */
+public final class OpenLogFolderAction implements ActionListener {
+
+    @Override
+    public void actionPerformed(ActionEvent e) {
+        try {
+            File logDir = new File(Places.getUserDirectory().getAbsolutePath() + File.separator + "var" + File.separator + "log");
+            if (logDir.exists() == false) {
+                NotifyDescriptor d =
+                        new NotifyDescriptor.Message(
+                        java.text.MessageFormat.format(java.util.ResourceBundle.getBundle("org/sleuthkit/autopsy/actions/Bundle").getString("OpenLogFolder.error1"), new Object[]{logDir.getAbsolutePath()}),
+                        NotifyDescriptor.ERROR_MESSAGE);
+                DialogDisplayer.getDefault().notify(d);
+            } else {
+                Desktop.getDesktop().open(logDir);
+            }
+        } catch (IOException ex) {
+            Exceptions.printStackTrace(ex);
+        }
+    }
+}

Core/src/org/sleuthkit/autopsy/core/layer.xml

@@ -122,8 +122,13 @@
         </folder>
         <folder name="Help">
             <file name="org-netbeans-core-actions-AboutAction.instance_hidden"/>
-            <file name="org-sleuthkit-autopsy-corecomponents-CustomAboutAction.instance">
+            <file name="org-sleuthkit-autopsy-actions-OpenLogFolder.instance_hidden"/>
-                <attr name="delegate" newvalue="org.sleuthkit.autopsy.corecomponents.CustomAboutAction"/>
+            <file name="org-sleuthkit-autopsy-actions-OpenLogFolderAction.instance">
+                <attr name="instanceCreate" methodvalue="org.openide.awt.Actions.alwaysEnabled"/>
+                <attr name="noIconInMenu" boolvalue="false"/>
+            </file>
+            <file name="org-sleuthkit-autopsy-corecomponents-AboutWindowAction.instance">
+                <attr name="delegate" newvalue="org.sleuthkit.autopsy.corecomponents.AboutWindowAction"/>
                 <attr name="displayName" bundlevalue="org.sleuthkit.autopsy.corecomponents.Bundle#CTL_CustomAboutAction"/>
                 <attr name="instanceCreate" methodvalue="org.openide.awt.Actions.alwaysEnabled"/>
                 <attr name="noIconInMenu" boolvalue="false"/>
@@ -260,7 +265,7 @@
             <file name="org-netbeans-modules-autoupdate-ui-actions-CheckForUpdatesAction.shadow_hidden"/>
             <attr name="master-help.xml/org-sleuthkit-autopsy-corecomponents-CustomAboutAction.shadow" boolvalue="true"/>
             <file name="org-sleuthkit-autopsy-corecomponents-CustomAboutAction.shadow">
-                <attr name="originalFile" stringvalue="Actions/Help/org-sleuthkit-autopsy-corecomponents-CustomAboutAction.instance"/>
+                <attr name="originalFile" stringvalue="Actions/Help/org-sleuthkit-autopsy-corecomponents-AboutWindowAction.instance"/>
                 <attr name="position" intvalue="3000"/>
             </file>
         </folder>

Core/src/org/sleuthkit/autopsy/corecomponents/AboutWindowAction.java

@@ -28,16 +28,16 @@ import org.sleuthkit.autopsy.coreutils.Logger;
 /**
  * Action to open custom implementation of the "About" window from the Help menu.
  */
- class CustomAboutAction extends AboutAction {
+ class AboutWindowAction extends AboutAction {
 
     @Override
     public void performAction() {
         Logger.noteAction(this.getClass());
 
-        ProductInformationPanel pip = new ProductInformationPanel();
+        AboutWindowPanel pip = new AboutWindowPanel();
         DialogDescriptor descriptor = new DialogDescriptor(
                 pip,
-                NbBundle.getMessage(CustomAboutAction.class, "CTL_CustomAboutAction"),
+                NbBundle.getMessage(AboutWindowAction.class, "CTL_CustomAboutAction"),
                 true,
                 new Object[0],
                 null,

Core/src/org/sleuthkit/autopsy/corecomponents/AboutWindowPanel.java

@@ -35,7 +35,6 @@ import org.netbeans.core.actions.HTMLViewAction;
 import org.openide.awt.HtmlBrowser;
 import org.openide.modules.Places;
 import org.openide.util.NbBundle;
-import org.sleuthkit.autopsy.coreutils.ModuleSettings;
 import org.sleuthkit.autopsy.coreutils.PlatformUtil;
 import org.sleuthkit.autopsy.coreutils.Version;
 import org.sleuthkit.datamodel.SleuthkitJNI;
@@ -43,17 +42,17 @@ import org.sleuthkit.datamodel.SleuthkitJNI;
 /**
  * Custom "About" window panel.
  */
-public class ProductInformationPanel extends JPanel implements HyperlinkListener {
+public class AboutWindowPanel extends JPanel implements HyperlinkListener {
 
     private URL url = null;
     private Icon about;
     private boolean verboseLogging;
 
-    public ProductInformationPanel() {
+    public AboutWindowPanel() {
         about = new ImageIcon(org.netbeans.core.startup.Splash.loadContent(true));
         initComponents();
         jLabel1.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
-        description.setText(org.openide.util.NbBundle.getMessage(ProductInformationPanel.class,
+        description.setText(org.openide.util.NbBundle.getMessage(AboutWindowPanel.class,
                 "LBL_Description", new Object[]{getProductVersionValue(), getJavaValue(), getVMValue(),
                     getOperatingSystemValue(), getEncodingValue(), getSystemLocaleValue(), getUserDirValue(), getSleuthKitVersionValue(), Version.getNetbeansBuild(), Version.getBuildType().toString()}));
         description.addHyperlinkListener(this);
@@ -96,7 +95,7 @@ public class ProductInformationPanel extends JPanel implements HyperlinkListener
         copyright.setBorder(null);
         copyright.setContentType("text/html"); // NOI18N
         copyright.setEditable(false);
-        copyright.setText(org.openide.util.NbBundle.getBundle(ProductInformationPanel.class).getString("LBL_Copyright")); // NOI18N
+        copyright.setText(org.openide.util.NbBundle.getBundle(AboutWindowPanel.class).getString("LBL_Copyright")); // NOI18N
         copyright.addMouseListener(new java.awt.event.MouseAdapter() {
             public void mouseClicked(java.awt.event.MouseEvent evt) {
                 copyrightMouseClicked(evt);
@@ -109,8 +108,7 @@ public class ProductInformationPanel extends JPanel implements HyperlinkListener
         jScrollPane2.setViewportView(description);
 
         verboseLoggingButton.setBackground(new java.awt.Color(255, 255, 255));
-        verboseLoggingButton.setText(
+        verboseLoggingButton.setText("Activate verbose logging");
-                NbBundle.getMessage(this.getClass(), "ProductInformationPanel.actVerboseLogging.text"));
         verboseLoggingButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 activateVerboseLogging(evt);
@@ -118,7 +116,7 @@ public class ProductInformationPanel extends JPanel implements HyperlinkListener
         });
 
         jButton2.setBackground(new java.awt.Color(255, 255, 255));
-        jButton2.setText(NbBundle.getMessage(ProductInformationPanel.class, "LBL_Close")); // NOI18N
+        jButton2.setText(NbBundle.getMessage(AboutWindowPanel.class, "LBL_Close")); // NOI18N
         jButton2.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 jButton2ActionPerformed(evt);
@@ -172,7 +170,7 @@ private void jButton2ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRS
 
 private void jLabel1MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_jLabel1MouseClicked
     try {
-        url = new URL(NbBundle.getMessage(ProductInformationPanel.class, "URL_ON_IMG")); // NOI18N
+        url = new URL(NbBundle.getMessage(AboutWindowPanel.class, "URL_ON_IMG")); // NOI18N
         showUrl();
     } catch (MalformedURLException ex) {
         //ignore
@@ -226,29 +224,29 @@ private void jLabel1MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:eve
     }
 
     private static String getOperatingSystemValue() {
-        return NbBundle.getMessage(ProductInformationPanel.class, "Format_OperatingSystem_Value",
+        return NbBundle.getMessage(AboutWindowPanel.class, "Format_OperatingSystem_Value",
                                    System.getProperty("os.name",
-                                                      NbBundle.getMessage(ProductInformationPanel.class,
+                                                      NbBundle.getMessage(AboutWindowPanel.class,
                                                                           "ProductInformationPanel.propertyUnknown.text")),
                                    System.getProperty("os.version",
-                                                      NbBundle.getMessage(ProductInformationPanel.class,
+                                                      NbBundle.getMessage(AboutWindowPanel.class,
                                                                           "ProductInformationPanel.propertyUnknown.text")),
                                    System.getProperty("os.arch",
-                                                      NbBundle.getMessage(ProductInformationPanel.class,
+                                                      NbBundle.getMessage(AboutWindowPanel.class,
                                                                           "ProductInformationPanel.propertyUnknown.text")));
     }
 
     private static String getJavaValue() {
         return System.getProperty("java.version",
-                                  NbBundle.getMessage(ProductInformationPanel.class,
+                                  NbBundle.getMessage(AboutWindowPanel.class,
                                                       "ProductInformationPanel.propertyUnknown.text"));
     }
 
     private static String getVMValue() {
-        return NbBundle.getMessage(ProductInformationPanel.class,
+        return NbBundle.getMessage(AboutWindowPanel.class,
                                    "ProductInformationPanel.getVMValue.text",
                                    System.getProperty("java.vm.name",
-                                                      NbBundle.getMessage(ProductInformationPanel.class,
+                                                      NbBundle.getMessage(AboutWindowPanel.class,
                                                                           "ProductInformationPanel.propertyUnknown.text")),
                                    System.getProperty("java.vm.version", ""));
     }
@@ -264,7 +262,7 @@ private void jLabel1MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:eve
 
     private static String getEncodingValue() {
         return System.getProperty("file.encoding",
-                                  NbBundle.getMessage(ProductInformationPanel.class, "ProductInformationPanel.propertyUnknown.text"));
+                                  NbBundle.getMessage(AboutWindowPanel.class, "ProductInformationPanel.propertyUnknown.text"));
     }
     
     public void setCopyright(String text) {

Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestModule.java

@@ -22,11 +22,13 @@ import org.sleuthkit.datamodel.Content;
 
 /**
  * Interface that must be implemented by all data source ingest modules.
+ * See description of IngestModule for more details on interface behavior.
  */
 public interface DataSourceIngestModule extends IngestModule {
 
     /**
-     * Processes a data source.
+     * Processes a data source. Called once between calls to startUp()
+     * and shutDown().
      *
      * @param dataSource The data source to process.
      * @param statusHelper A status helper to be used to report progress and

Core/src/org/sleuthkit/autopsy/ingest/FileIngestModule.java

@@ -22,13 +22,15 @@ import org.sleuthkit.datamodel.AbstractFile;
 
 /**
  * Interface that must be implemented by all file ingest modules. 
+ * See description of IngestModule for more details on interface behavior.
  */
 public interface FileIngestModule extends IngestModule {
 
     /**
-     * Processes a file.
+     * Processes a file. Called between calls to startUp() and shutDown().
+     * Will be called for each file in a data source.
      *
-     * @param file The file.
+     * @param file The file to analyze.
      * @return A result code indicating success or failure of the processing.
      */
     ProcessResult process(AbstractFile file);

Core/src/org/sleuthkit/autopsy/ingest/IngestModule.java

@@ -20,27 +20,29 @@ package org.sleuthkit.autopsy.ingest;
 
 /**
  * The interface that must be implemented by all ingest modules.
- * <p>
+ * 
  * Autopsy will generally use several instances of an ingest module for each
- * ingest job it performs. Completing an ingest job entails processing a single
+ * ingest job it performs (one for each thread that it is using). 
- * data source (e.g., a disk image) and all of the files from the data source,
+ * 
- * including files extracted from archives and any unallocated space (made to
+ * Autopsy will call startUp() before any data is processed, will pass any
- * look like a series of files). The data source is passed through one or more
+ * data to be analyzed into the process() method (FileIngestModule.process() or DataSourceIngestModule.process()),
- * pipelines of data source ingest modules. The files are passed through one or
+ * and call shutDown() after
- * more pipelines of file ingest modules.
+ * either all data is analyzed or the has has cancelled the job.
- * <p>
+ *
  * Autopsy may use multiple threads to complete an ingest job, but it is
- * guaranteed that there will be no more than one module instance per thread.
+ * guaranteed that a module instance will always be called from a single thread. 
- * However, if the module instances must share resources, the modules are
+ * Therefore, you can easily have thread-safe code by not using any static 
+ * member variables.
+ *
+ * If the module instances must share resources, the modules are
  * responsible for synchronizing access to the shared resources and doing
  * reference counting as required to release those resources correctly. Also,
  * more than one ingest job may be in progress at any given time. This must also
  * be taken into consideration when sharing resources between module instances.
- * <p>
+ *
  * TIP: An ingest module that does not require initialization or clean up may
  * extend the abstract IngestModuleAdapter class to get a default "do nothing"
  * implementation of this interface.
- *
  */
 public interface IngestModule {
 
@@ -70,27 +72,13 @@ public interface IngestModule {
      * Invoked by Autopsy to allow an ingest module instance to set up any
      * internal data structures and acquire any private resources it will need
      * during an ingest job.
-     * <p>
+     *
-     * Autopsy will generally use several instances of an ingest module for each
+     * If the module depends on loading any resources, it should do so in this 
-     * ingest job it performs. Completing an ingest job entails processing a
+     * method so that it can throw an exception in the case of an error and 
-     * single data source (e.g., a disk image) and all of the files from the
+     * alert the user.  Exceptions that are thrown from process() and shutDown()
-     * data source, including files extracted from archives and any unallocated
+     * are logged, but do not stop processing of the data source. 
-     * space (made to look like a series of files). The data source is passed
+     *
-     * through one or more pipelines of data source ingest modules. The files
+     * On error, throw a IngestModuleException.
-     * are passed through one or more pipelines of file ingest modules.
-     * <p>
-     * Autopsy may use multiple threads to complete an ingest job, but it is
-     * guaranteed that there will be no more than one module instance per
-     * thread. However, if the module instances must share resources, the
-     * modules are responsible for synchronizing access to the shared resources
-     * and doing reference counting as required to release those resources
-     * correctly. Also, more than one ingest job may be in progress at any given
-     * time. This must also be taken into consideration when sharing resources
-     * between module instances.
-     * <p>
-     * An ingest module that does not require initialization may extend the
-     * abstract IngestModuleAdapter class to get a default "do nothing"
-     * implementation of this method.
      *
      * @param context Provides data and services specific to the ingest job and
      * the ingest pipeline of which the module is a part.
@@ -99,31 +87,13 @@ public interface IngestModule {
     void startUp(IngestJobContext context) throws IngestModuleException;
 
     /**
-     * Invoked by Autopsy when an ingest job is completed, before the ingest
+     * Invoked by Autopsy when an ingest job is completed (either because the
+     * data has been analyzed or because the job was cancelled), before the ingest
      * module instance is discarded. The module should respond by doing things
      * like releasing private resources, submitting final results, and posting a
      * final ingest message.
-     * <p>
+     * @param ingestJobWasCancelled True if this is being called because the user
-     * Autopsy will generally use several instances of an ingest module for each
+     * cancelled the job. 
-     * ingest job it performs. Completing an ingest job entails processing a
-     * single data source (e.g., a disk image) and all of the files from the
-     * data source, including files extracted from archives and any unallocated
-     * space (made to look like a series of files). The data source is passed
-     * through one or more pipelines of data source ingest modules. The files
-     * are passed through one or more pipelines of file ingest modules.
-     * <p>
-     * Autopsy may use multiple threads to complete an ingest job, but it is
-     * guaranteed that there will be no more than one module instance per
-     * thread. However, if the module instances must share resources, the
-     * modules are responsible for synchronizing access to the shared resources
-     * and doing reference counting as required to release those resources
-     * correctly. Also, more than one ingest job may be in progress at any given
-     * time. This must also be taken into consideration when sharing resources
-     * between module instances.
-     * <p>
-     * An ingest module that does not require initialization may extend the
-     * abstract IngestModuleAdapter class to get a default "do nothing"
-     * implementation of this method.
      */
     void shutDown(boolean ingestJobWasCancelled);
 }

Core/src/org/sleuthkit/autopsy/ingest/pipeline_config.xml

@@ -4,12 +4,12 @@ Contains only the core ingest modules that ship with Autopsy -->
 <PIPELINE_CONFIG>
     <PIPELINE type="FileAnalysis">
       <MODULE order="1" type="plugin" location="org.sleuthkit.autopsy.hashdatabase.HashDbIngestModule" arguments="" />
-      <MODULE order="2" type="plugin" location="org.sleuthkit.autopsy.filetypeid.FileTypeIdIngestModule" arguments=""/>
+      <MODULE order="2" type="plugin" location="org.sleuthkit.autopsy.modules.filetypeid.FileTypeIdIngestModule" arguments=""/>
-      <MODULE order="3" type="plugin" location="org.sleuthkit.autopsy.sevenzip.SevenZipIngestModule" arguments="" />
+      <MODULE order="3" type="plugin" location="org.sleuthkit.autopsy.modules.sevenzip.SevenZipIngestModule" arguments="" />
-      <MODULE order="4" type="plugin" location="org.sleuthkit.autopsy.exifparser.ExifParserFileIngestModule"/>
+      <MODULE order="4" type="plugin" location="org.sleuthkit.autopsy.modules.exifparser.ExifParserFileIngestModule"/>
       <MODULE order="5" type="plugin" location="org.sleuthkit.autopsy.keywordsearch.KeywordSearchIngestModule"/>
       <MODULE order="6" type="plugin" location="org.sleuthkit.autopsy.thunderbirdparser.ThunderbirdMboxFileIngestModule" arguments=""/>
-      <MODULE order="7" type="plugin" location="org.sleuthkit.autopsy.fileextmismatch.FileExtMismatchIngestModule" arguments=""/>
+      <MODULE order="7" type="plugin" location="org.sleuthkit.autopsy.modules.fileextmismatch.FileExtMismatchIngestModule" arguments=""/>
     </PIPELINE>
 
     <PIPELINE type="ImageAnalysis">

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

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.exifparser;
+package org.sleuthkit.autopsy.modules.exif;
 
 import com.drew.imaging.ImageMetadataReader;
 import com.drew.imaging.ImageProcessingException;

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

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.exifparser;
+package org.sleuthkit.autopsy.modules.exif;
 
 import org.openide.util.lookup.ServiceProvider;
 import org.sleuthkit.autopsy.coreutils.Version;

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

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.fileextmismatch;
+package org.sleuthkit.autopsy.modules.fileextmismatch;
 
 import org.openide.util.NbBundle;
 import java.awt.event.ActionEvent;

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

@@ -18,7 +18,7 @@
  */
 
 
-package org.sleuthkit.autopsy.fileextmismatch;
+package org.sleuthkit.autopsy.modules.fileextmismatch;
 
 import java.util.ArrayList;
 import java.util.Arrays;

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

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.fileextmismatch;
+package org.sleuthkit.autopsy.modules.fileextmismatch;
 
 import org.openide.util.NbBundle;
 import org.openide.util.lookup.ServiceProvider;

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

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.fileextmismatch;
+package org.sleuthkit.autopsy.modules.fileextmismatch;
 
 import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
 

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

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.fileextmismatch;
+package org.sleuthkit.autopsy.modules.fileextmismatch;
 
 import java.util.ArrayList;
 import java.util.Arrays;

Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchModuleSettingsPanel.form

@@ -42,7 +42,7 @@
       <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/fileextmismatch/Bundle.properties" key="FileExtMismatchModuleSettingsPanel.skipNoExtCheckBox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties" key="FileExtMismatchModuleSettingsPanel.skipNoExtCheckBox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>
@@ -52,7 +52,7 @@
     <Component class="javax.swing.JCheckBox" name="skipTextPlain">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/fileextmismatch/Bundle.properties" key="FileExtMismatchModuleSettingsPanel.skipTextPlain.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties" key="FileExtMismatchModuleSettingsPanel.skipTextPlain.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>

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

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.fileextmismatch;
+package org.sleuthkit.autopsy.modules.fileextmismatch;
 
 import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
 import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettingsPanel;

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

@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.sleuthkit.autopsy.fileextmismatch;
+package org.sleuthkit.autopsy.modules.fileextmismatch;
 
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
@@ -17,7 +17,7 @@ import org.sleuthkit.autopsy.coreutils.Logger;
 
 @OptionsPanelController.TopLevelRegistration(
         categoryName = "#OptionsCategory_Name_FileExtMismatchOptions",
-        iconBase = "org/sleuthkit/autopsy/fileextmismatch/options-icon.png",
+        iconBase = "org/sleuthkit/autopsy/modules/fileextmismatch/options-icon.png",
         position = 4,
         keywords = "#OptionsCategory_FileExtMismatch",
         keywordsCategory = "KeywordSearchOptions")

Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.form

@@ -50,10 +50,10 @@
     <Component class="javax.swing.JButton" name="saveButton">
       <Properties>
         <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-          <Image iconType="3" name="/org/sleuthkit/autopsy/fileextmismatch/save16.png"/>
+          <Image iconType="3" name="/org/sleuthkit/autopsy/modules/fileextmismatch/save16.png"/>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.saveButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.saveButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
         <Property name="enabled" type="boolean" value="false"/>
       </Properties>
@@ -128,7 +128,7 @@
             <Component class="javax.swing.JLabel" name="jLabel1">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="org/sleuthkit/autopsy/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
             </Component>
@@ -148,7 +148,7 @@
             <Component class="javax.swing.JTextField" name="userTypeTextField">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="org/sleuthkit/autopsy/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.userTypeTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.userTypeTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
               <Events>
@@ -158,7 +158,7 @@
             <Component class="javax.swing.JButton" name="addTypeButton">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="org/sleuthkit/autopsy/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.addTypeButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.addTypeButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
               <Events>
@@ -168,7 +168,7 @@
             <Component class="javax.swing.JButton" name="removeTypeButton">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="org/sleuthkit/autopsy/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.removeTypeButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.removeTypeButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
               <Events>
@@ -181,14 +181,14 @@
                   <Color blue="0" green="0" red="ff" type="rgb"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="org/sleuthkit/autopsy/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.mimeErrLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.mimeErrLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
             </Component>
             <Component class="javax.swing.JLabel" name="mimeRemoveErrLabel">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="org/sleuthkit/autopsy/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.mimeRemoveErrLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.mimeRemoveErrLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
             </Component>
@@ -254,7 +254,7 @@
             <Component class="javax.swing.JTextField" name="userExtTextField">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="org/sleuthkit/autopsy/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.userExtTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.userExtTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
               <Events>
@@ -264,7 +264,7 @@
             <Component class="javax.swing.JButton" name="addExtButton">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="org/sleuthkit/autopsy/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.addExtButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.addExtButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
               <Events>
@@ -287,7 +287,7 @@
             <Component class="javax.swing.JButton" name="removeExtButton">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="org/sleuthkit/autopsy/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.removeExtButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.removeExtButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
               <Events>
@@ -297,7 +297,7 @@
             <Component class="javax.swing.JLabel" name="extHeaderLabel">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="org/sleuthkit/autopsy/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.extHeaderLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.extHeaderLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
             </Component>
@@ -307,14 +307,14 @@
                   <Color blue="0" green="0" red="ff" type="rgb"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="org/sleuthkit/autopsy/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.extErrorLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.extErrorLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
             </Component>
             <Component class="javax.swing.JLabel" name="extRemoveErrLabel">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="org/sleuthkit/autopsy/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.extRemoveErrLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                  <ResourceString bundle="org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.extRemoveErrLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
                 </Property>
               </Properties>
             </Component>
@@ -328,7 +328,7 @@
           <Color blue="ff" green="0" red="0" type="rgb"/>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.saveMsgLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties" key="FileExtMismatchSettingsPanel.saveMsgLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
     </Component>

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

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.fileextmismatch;
+package org.sleuthkit.autopsy.modules.fileextmismatch;
 
 import java.awt.Color;
 import java.util.ArrayList;
@@ -32,7 +32,7 @@ import javax.swing.table.AbstractTableModel;
 import org.sleuthkit.autopsy.ingest.IngestModuleGlobalSetttingsPanel;
 import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
-import org.sleuthkit.autopsy.filetypeid.FileTypeIdIngestModule;
+import org.sleuthkit.autopsy.modules.filetypeid.FileTypeIdIngestModule;
 import org.sleuthkit.autopsy.corecomponents.OptionsPanel;
 
 /**
@@ -154,7 +154,7 @@ final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSetttingsPane
         extRemoveErrLabel = new javax.swing.JLabel();
         saveMsgLabel = new javax.swing.JLabel();
 
-        saveButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/fileextmismatch/save16.png"))); // NOI18N
+        saveButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/modules/fileextmismatch/save16.png"))); // NOI18N
         saveButton.setText(org.openide.util.NbBundle.getMessage(FileExtMismatchSettingsPanel.class, "FileExtMismatchSettingsPanel.saveButton.text")); // NOI18N
         saveButton.setEnabled(false);
         saveButton.addActionListener(new java.awt.event.ActionListener() {

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

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-package org.sleuthkit.autopsy.fileextmismatch;
+package org.sleuthkit.autopsy.modules.fileextmismatch;
 
 import java.io.File;
 import java.io.IOException;

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

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.filetypeid;
+package org.sleuthkit.autopsy.modules.filetypeid;
 
 import org.sleuthkit.datamodel.AbstractFile;
 

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

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.filetypeid;
+package org.sleuthkit.autopsy.modules.filetypeid;
 
 import java.util.logging.Level;
 

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

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.filetypeid;
+package org.sleuthkit.autopsy.modules.filetypeid;
 
 import org.openide.util.NbBundle;
 import org.openide.util.lookup.ServiceProvider;

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

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.filetypeid;
+package org.sleuthkit.autopsy.modules.filetypeid;
 
 import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
 

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

@@ -38,13 +38,13 @@
       <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/filetypeid/Bundle.properties" key="FileTypeIdModuleSettingsPanel.skipKnownCheckBox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/modules/filetypeid/Bundle.properties" key="FileTypeIdModuleSettingsPanel.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/filetypeid/Bundle.properties" key="FileTypeIdModuleSettingsPanel.skipKnownCheckBox.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/modules/filetypeid/Bundle.properties" key="FileTypeIdModuleSettingsPanel.skipKnownCheckBox.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
         <Property name="label" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/filetypeid/Bundle.properties" key="FileTypeIdModuleSettingsPanel.skipKnownCheckBox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+          <ResourceString bundle="org/sleuthkit/autopsy/modules/filetypeid/Bundle.properties" key="FileTypeIdModuleSettingsPanel.skipKnownCheckBox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
       <Events>

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

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.filetypeid;
+package org.sleuthkit.autopsy.modules.filetypeid;
 
 import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
 import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettingsPanel;

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

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.filetypeid;
+package org.sleuthkit.autopsy.modules.filetypeid;
 
 import java.util.SortedSet;
 import org.apache.tika.Tika;
@@ -35,7 +35,8 @@ class TikaFileTypeDetector implements FileTypeDetectionInterface {
             FileTypeDetectionInterface.FileIdInfo ret = new FileTypeDetectionInterface.FileIdInfo();
             final int maxBytesInitial = 100; //how many bytes to read on first pass
             byte buffer[] = new byte[maxBytesInitial];
-
+            int len = abstractFile.read(buffer, 0, maxBytesInitial);
+            
             boolean found = false;
             try {
                 // the xml detection in Tika tries to parse the entire file and throws exceptions
@@ -49,7 +50,7 @@ class TikaFileTypeDetector implements FileTypeDetectionInterface {
                 }
                 catch (IndexOutOfBoundsException e) {
                     // do nothing
-                }
+                } 
                 
                 if (found == false) {
                     String mimetype = tikaInst.detect(buffer);

Core/src/org/sleuthkit/autopsy/modules/sevenzip/ArchiveFileExtractorModuleFactory.java

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.sevenzip;
+package org.sleuthkit.autopsy.modules.sevenzip;
 
 import org.openide.util.NbBundle;
 import org.openide.util.lookup.ServiceProvider;

Core/src/org/sleuthkit/autopsy/modules/sevenzip/SevenZipContentReadStream.java

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.sevenzip;
+package org.sleuthkit.autopsy.modules.sevenzip;
 
 import java.io.IOException;
 import java.util.logging.Level;

Core/src/org/sleuthkit/autopsy/modules/sevenzip/SevenZipIngestModule.java

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.sevenzip;
+package org.sleuthkit.autopsy.modules.sevenzip;
 
 import java.io.BufferedOutputStream;
 import java.io.File;

ExifParser/build.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
-<!-- for some information on what you could do (e.g. targets to override). -->
-<!-- If you delete this file and reopen the project it will be recreated. -->
-<project name="org.sleuthkit.autopsy.exifparser" default="netbeans" basedir=".">
-    <description>Builds, tests, and runs the project org.sleuthkit.autopsy.exifextract.</description>
-    <import file="nbproject/build-impl.xml"/>
-</project>

ExifParser/manifest.mf

@@ -1,6 +0,0 @@
-Manifest-Version: 1.0
-AutoUpdate-Show-In-Client: true
-OpenIDE-Module: org.sleuthkit.autopsy.exifparser/3
-OpenIDE-Module-Implementation-Version: 10
-OpenIDE-Module-Layer: org/sleuthkit/autopsy/exifparser/layer.xml
-OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/exifparser/Bundle.properties

ExifParser/nbproject/build-impl.xml

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT  ***
-***         EDIT ../build.xml INSTEAD         ***
--->
-<project name="org.sleuthkit.autopsy.exifextract-impl" basedir="..">
-    <fail message="Please build using Ant 1.7.1 or higher.">
-        <condition>
-            <not>
-                <antversion atleast="1.7.1"/>
-            </not>
-        </condition>
-    </fail>
-    <property file="nbproject/private/suite-private.properties"/>
-    <property file="nbproject/suite.properties"/>
-    <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
-    <property file="${suite.dir}/nbproject/private/platform-private.properties"/>
-    <property file="${suite.dir}/nbproject/platform.properties"/>
-    <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2">
-        <attribute name="name"/>
-        <attribute name="value"/>
-        <sequential>
-            <property name="@{name}" value="${@{value}}"/>
-        </sequential>
-    </macrodef>
-    <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
-        <attribute name="property"/>
-        <attribute name="value"/>
-        <sequential>
-            <property name="@{property}" value="@{value}"/>
-        </sequential>
-    </macrodef>
-    <property file="${user.properties.file}"/>
-    <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
-        <condition>
-            <not>
-                <contains string="${cluster.path.evaluated}" substring="platform"/>
-            </not>
-        </condition>
-    </fail>
-    <import file="${harness.dir}/build.xml"/>
-</project>

ExifParser/nbproject/project.properties

@@ -1,6 +0,0 @@
-javac.source=1.7
-javac.compilerargs=-Xlint -Xlint:-serial
-license.file=../LICENSE-2.0.txt
-nbm.homepage=http://www.sleuthkit.org/autopsy/
-nbm.needs.restart=true
-spec.version.base=1.1

ExifParser/nbproject/project.xml

@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.apisupport.project</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
-            <code-name-base>org.sleuthkit.autopsy.exifparser</code-name-base>
-            <suite-component/>
-            <module-dependencies>
-                <dependency>
-                    <code-name-base>org.openide.util</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>8.29.3</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util.lookup</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>8.19.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.core</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>9</release-version>
-                        <specification-version>7.1</specification-version>
-                    </run-dependency>
-                </dependency>
-            </module-dependencies>
-            <public-packages/>
-            <class-path-extension>
-                <runtime-relative-path>ext/xmpcore.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/xmpcore.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/metadata-extractor-2.6.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/metadata-extractor-2.6.2.jar</binary-origin>
-            </class-path-extension>
-        </data>
-    </configuration>
-</project>

ExifParser/nbproject/suite.properties

@@ -1 +0,0 @@
-suite.dir=${basedir}/..

FileExtMismatch/build.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
-<!-- for some information on what you could do (e.g. targets to override). -->
-<!-- If you delete this file and reopen the project it will be recreated. -->
-<project name="org.sleuthkit.autopsy.fileextmismatch" default="netbeans" basedir=".">
-    <description>Builds, tests, and runs the project org.sleuthkit.autopsy.fileextmismatch.</description>
-    <import file="nbproject/build-impl.xml"/>
-</project>

FileExtMismatch/manifest.mf

@@ -1,5 +0,0 @@
-Manifest-Version: 1.0
-OpenIDE-Module: org.sleuthkit.autopsy.fileextmismatch/3
-OpenIDE-Module-Implementation-Version: 1
-OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/fileextmismatch/Bundle.properties
-

FileExtMismatch/nbproject/build-impl.xml

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT  ***
-***         EDIT ../build.xml INSTEAD         ***
--->
-<project name="org.sleuthkit.autopsy.fileextmismatch-impl" basedir="..">
-    <fail message="Please build using Ant 1.7.1 or higher.">
-        <condition>
-            <not>
-                <antversion atleast="1.7.1"/>
-            </not>
-        </condition>
-    </fail>
-    <property file="nbproject/private/suite-private.properties"/>
-    <property file="nbproject/suite.properties"/>
-    <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
-    <property file="${suite.dir}/nbproject/private/platform-private.properties"/>
-    <property file="${suite.dir}/nbproject/platform.properties"/>
-    <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2">
-        <attribute name="name"/>
-        <attribute name="value"/>
-        <sequential>
-            <property name="@{name}" value="${@{value}}"/>
-        </sequential>
-    </macrodef>
-    <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
-        <attribute name="property"/>
-        <attribute name="value"/>
-        <sequential>
-            <property name="@{property}" value="@{value}"/>
-        </sequential>
-    </macrodef>
-    <property file="${user.properties.file}"/>
-    <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
-        <condition>
-            <not>
-                <contains string="${cluster.path.evaluated}" substring="platform"/>
-            </not>
-        </condition>
-    </fail>
-    <import file="${harness.dir}/build.xml"/>
-</project>

FileExtMismatch/nbproject/platform.properties

@@ -1,120 +0,0 @@
-branding.token=autopsy
-netbeans-plat-version=7.3.1
-suite.dir=${basedir}
-nbplatform.active.dir=${suite.dir}/netbeans-plat/${netbeans-plat-version}
-harness.dir=${nbplatform.active.dir}/harness
-bootstrap.url=http://deadlock.netbeans.org/hudson/job/nbms-and-javadoc/lastStableBuild/artifact/nbbuild/netbeans/harness/tasks.jar
-autoupdate.catalog.url=http://dlc.sun.com.edgesuite.net/netbeans/updates/${netbeans-plat-version}/uc/final/distribution/catalog.xml.gz
-cluster.path=\
-    ${nbplatform.active.dir}/harness:\
-    ${nbplatform.active.dir}/java:\
-    ${nbplatform.active.dir}/platform
-disabled.modules=\
-    org.apache.tools.ant.module,\
-    org.netbeans.api.debugger.jpda,\
-    org.netbeans.api.java,\
-    org.netbeans.lib.nbjavac,\
-    org.netbeans.libs.cglib,\
-    org.netbeans.libs.javacapi,\
-    org.netbeans.libs.javacimpl,\
-    org.netbeans.libs.springframework,\
-    org.netbeans.modules.ant.browsetask,\
-    org.netbeans.modules.ant.debugger,\
-    org.netbeans.modules.ant.freeform,\
-    org.netbeans.modules.ant.grammar,\
-    org.netbeans.modules.ant.kit,\
-    org.netbeans.modules.beans,\
-    org.netbeans.modules.classfile,\
-    org.netbeans.modules.dbschema,\
-    org.netbeans.modules.debugger.jpda,\
-    org.netbeans.modules.debugger.jpda.ant,\
-    org.netbeans.modules.debugger.jpda.kit,\
-    org.netbeans.modules.debugger.jpda.projects,\
-    org.netbeans.modules.debugger.jpda.ui,\
-    org.netbeans.modules.debugger.jpda.visual,\
-    org.netbeans.modules.findbugs.installer,\
-    org.netbeans.modules.form,\
-    org.netbeans.modules.form.binding,\
-    org.netbeans.modules.form.j2ee,\
-    org.netbeans.modules.form.kit,\
-    org.netbeans.modules.form.nb,\
-    org.netbeans.modules.form.refactoring,\
-    org.netbeans.modules.hibernate,\
-    org.netbeans.modules.hibernatelib,\
-    org.netbeans.modules.hudson.ant,\
-    org.netbeans.modules.hudson.maven,\
-    org.netbeans.modules.i18n,\
-    org.netbeans.modules.i18n.form,\
-    org.netbeans.modules.j2ee.core.utilities,\
-    org.netbeans.modules.j2ee.eclipselink,\
-    org.netbeans.modules.j2ee.eclipselinkmodelgen,\
-    org.netbeans.modules.j2ee.jpa.refactoring,\
-    org.netbeans.modules.j2ee.jpa.verification,\
-    org.netbeans.modules.j2ee.metadata,\
-    org.netbeans.modules.j2ee.metadata.model.support,\
-    org.netbeans.modules.j2ee.persistence,\
-    org.netbeans.modules.j2ee.persistence.kit,\
-    org.netbeans.modules.j2ee.persistenceapi,\
-    org.netbeans.modules.java.api.common,\
-    org.netbeans.modules.java.debug,\
-    org.netbeans.modules.java.editor,\
-    org.netbeans.modules.java.editor.lib,\
-    org.netbeans.modules.java.examples,\
-    org.netbeans.modules.java.freeform,\
-    org.netbeans.modules.java.guards,\
-    org.netbeans.modules.java.helpset,\
-    org.netbeans.modules.java.hints,\
-    org.netbeans.modules.java.hints.declarative,\
-    org.netbeans.modules.java.hints.declarative.test,\
-    org.netbeans.modules.java.hints.legacy.spi,\
-    org.netbeans.modules.java.hints.test,\
-    org.netbeans.modules.java.hints.ui,\
-    org.netbeans.modules.java.j2seplatform,\
-    org.netbeans.modules.java.j2seproject,\
-    org.netbeans.modules.java.kit,\
-    org.netbeans.modules.java.lexer,\
-    org.netbeans.modules.java.navigation,\
-    org.netbeans.modules.java.platform,\
-    org.netbeans.modules.java.preprocessorbridge,\
-    org.netbeans.modules.java.project,\
-    org.netbeans.modules.java.source,\
-    org.netbeans.modules.java.source.ant,\
-    org.netbeans.modules.java.source.queries,\
-    org.netbeans.modules.java.source.queriesimpl,\
-    org.netbeans.modules.java.sourceui,\
-    org.netbeans.modules.java.testrunner,\
-    org.netbeans.modules.javadoc,\
-    org.netbeans.modules.javawebstart,\
-    org.netbeans.modules.junit,\
-    org.netbeans.modules.maven,\
-    org.netbeans.modules.maven.checkstyle,\
-    org.netbeans.modules.maven.coverage,\
-    org.netbeans.modules.maven.embedder,\
-    org.netbeans.modules.maven.grammar,\
-    org.netbeans.modules.maven.graph,\
-    org.netbeans.modules.maven.hints,\
-    org.netbeans.modules.maven.indexer,\
-    org.netbeans.modules.maven.junit,\
-    org.netbeans.modules.maven.kit,\
-    org.netbeans.modules.maven.model,\
-    org.netbeans.modules.maven.osgi,\
-    org.netbeans.modules.maven.persistence,\
-    org.netbeans.modules.maven.refactoring,\
-    org.netbeans.modules.maven.repository,\
-    org.netbeans.modules.maven.search,\
-    org.netbeans.modules.maven.spring,\
-    org.netbeans.modules.projectimport.eclipse.core,\
-    org.netbeans.modules.projectimport.eclipse.j2se,\
-    org.netbeans.modules.refactoring.java,\
-    org.netbeans.modules.spellchecker.bindings.java,\
-    org.netbeans.modules.spring.beans,\
-    org.netbeans.modules.testng,\
-    org.netbeans.modules.testng.ant,\
-    org.netbeans.modules.testng.maven,\
-    org.netbeans.modules.websvc.jaxws21,\
-    org.netbeans.modules.websvc.jaxws21api,\
-    org.netbeans.modules.websvc.saas.codegen.java,\
-    org.netbeans.modules.xml.jaxb,\
-    org.netbeans.modules.xml.tools.java,\
-    org.netbeans.spi.java.hints
-

FileExtMismatch/nbproject/project.properties

@@ -1,3 +0,0 @@
-javac.source=1.7
-javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=1.3

FileExtMismatch/nbproject/project.xml

@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.apisupport.project</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
-            <code-name-base>org.sleuthkit.autopsy.fileextmismatch</code-name-base>
-            <suite-component/>
-            <module-dependencies>
-                <dependency>
-                    <code-name-base>org.netbeans.api.progress</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.32.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.options.api</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.31.2</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.awt</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.55.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.dialogs</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.28.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.explorer</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>6.50.3</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.nodes</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.33.2</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>8.29.3</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util.lookup</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>8.19.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.windows</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>6.60.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.core</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>9</release-version>
-                        <specification-version>7.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.corelibs</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>3</release-version>
-                        <specification-version>1.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.filetypeid</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
-            </module-dependencies>
-            <public-packages>
-                <package>org.sleuthkit.autopsy.fileextmismatch</package>
-            </public-packages>
-        </data>
-    </configuration>
-</project>

FileExtMismatch/nbproject/suite.properties

@@ -1 +0,0 @@
-suite.dir=${basedir}/..

FileTypeId/build.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
-<!-- for some information on what you could do (e.g. targets to override). -->
-<!-- If you delete this file and reopen the project it will be recreated. -->
-<project name="org.sleuthkit.autopsy.filetypeid" default="netbeans" basedir=".">
-    <description>Builds, tests, and runs the project org.sleuthkit.autopsy.filetypeid.</description>
-    <import file="nbproject/build-impl.xml"/>
-</project>

FileTypeId/manifest.mf

@@ -1,5 +0,0 @@
-Manifest-Version: 1.0
-OpenIDE-Module: org.sleuthkit.autopsy.filetypeid
-OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/filetypeid/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.0
-

FileTypeId/nbproject/build-impl.xml

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT  ***
-***         EDIT ../build.xml INSTEAD         ***
--->
-<project name="org.sleuthkit.autopsy.filetypeid-impl" basedir="..">
-    <fail message="Please build using Ant 1.7.1 or higher.">
-        <condition>
-            <not>
-                <antversion atleast="1.7.1"/>
-            </not>
-        </condition>
-    </fail>
-    <property file="nbproject/private/suite-private.properties"/>
-    <property file="nbproject/suite.properties"/>
-    <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
-    <property file="${suite.dir}/nbproject/private/platform-private.properties"/>
-    <property file="${suite.dir}/nbproject/platform.properties"/>
-    <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2">
-        <attribute name="name"/>
-        <attribute name="value"/>
-        <sequential>
-            <property name="@{name}" value="${@{value}}"/>
-        </sequential>
-    </macrodef>
-    <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
-        <attribute name="property"/>
-        <attribute name="value"/>
-        <sequential>
-            <property name="@{property}" value="@{value}"/>
-        </sequential>
-    </macrodef>
-    <property file="${user.properties.file}"/>
-    <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
-        <condition>
-            <not>
-                <contains string="${cluster.path.evaluated}" substring="platform"/>
-            </not>
-        </condition>
-    </fail>
-    <import file="${harness.dir}/build.xml"/>
-</project>

FileTypeId/nbproject/platform.properties

@@ -1,120 +0,0 @@
-branding.token=autopsy
-netbeans-plat-version=7.3.1
-suite.dir=${basedir}
-nbplatform.active.dir=${suite.dir}/netbeans-plat/${netbeans-plat-version}
-harness.dir=${nbplatform.active.dir}/harness
-bootstrap.url=http://deadlock.netbeans.org/hudson/job/nbms-and-javadoc/lastStableBuild/artifact/nbbuild/netbeans/harness/tasks.jar
-autoupdate.catalog.url=http://dlc.sun.com.edgesuite.net/netbeans/updates/${netbeans-plat-version}/uc/final/distribution/catalog.xml.gz
-cluster.path=\
-    ${nbplatform.active.dir}/harness:\
-    ${nbplatform.active.dir}/java:\
-    ${nbplatform.active.dir}/platform
-disabled.modules=\
-    org.apache.tools.ant.module,\
-    org.netbeans.api.debugger.jpda,\
-    org.netbeans.api.java,\
-    org.netbeans.lib.nbjavac,\
-    org.netbeans.libs.cglib,\
-    org.netbeans.libs.javacapi,\
-    org.netbeans.libs.javacimpl,\
-    org.netbeans.libs.springframework,\
-    org.netbeans.modules.ant.browsetask,\
-    org.netbeans.modules.ant.debugger,\
-    org.netbeans.modules.ant.freeform,\
-    org.netbeans.modules.ant.grammar,\
-    org.netbeans.modules.ant.kit,\
-    org.netbeans.modules.beans,\
-    org.netbeans.modules.classfile,\
-    org.netbeans.modules.dbschema,\
-    org.netbeans.modules.debugger.jpda,\
-    org.netbeans.modules.debugger.jpda.ant,\
-    org.netbeans.modules.debugger.jpda.kit,\
-    org.netbeans.modules.debugger.jpda.projects,\
-    org.netbeans.modules.debugger.jpda.ui,\
-    org.netbeans.modules.debugger.jpda.visual,\
-    org.netbeans.modules.findbugs.installer,\
-    org.netbeans.modules.form,\
-    org.netbeans.modules.form.binding,\
-    org.netbeans.modules.form.j2ee,\
-    org.netbeans.modules.form.kit,\
-    org.netbeans.modules.form.nb,\
-    org.netbeans.modules.form.refactoring,\
-    org.netbeans.modules.hibernate,\
-    org.netbeans.modules.hibernatelib,\
-    org.netbeans.modules.hudson.ant,\
-    org.netbeans.modules.hudson.maven,\
-    org.netbeans.modules.i18n,\
-    org.netbeans.modules.i18n.form,\
-    org.netbeans.modules.j2ee.core.utilities,\
-    org.netbeans.modules.j2ee.eclipselink,\
-    org.netbeans.modules.j2ee.eclipselinkmodelgen,\
-    org.netbeans.modules.j2ee.jpa.refactoring,\
-    org.netbeans.modules.j2ee.jpa.verification,\
-    org.netbeans.modules.j2ee.metadata,\
-    org.netbeans.modules.j2ee.metadata.model.support,\
-    org.netbeans.modules.j2ee.persistence,\
-    org.netbeans.modules.j2ee.persistence.kit,\
-    org.netbeans.modules.j2ee.persistenceapi,\
-    org.netbeans.modules.java.api.common,\
-    org.netbeans.modules.java.debug,\
-    org.netbeans.modules.java.editor,\
-    org.netbeans.modules.java.editor.lib,\
-    org.netbeans.modules.java.examples,\
-    org.netbeans.modules.java.freeform,\
-    org.netbeans.modules.java.guards,\
-    org.netbeans.modules.java.helpset,\
-    org.netbeans.modules.java.hints,\
-    org.netbeans.modules.java.hints.declarative,\
-    org.netbeans.modules.java.hints.declarative.test,\
-    org.netbeans.modules.java.hints.legacy.spi,\
-    org.netbeans.modules.java.hints.test,\
-    org.netbeans.modules.java.hints.ui,\
-    org.netbeans.modules.java.j2seplatform,\
-    org.netbeans.modules.java.j2seproject,\
-    org.netbeans.modules.java.kit,\
-    org.netbeans.modules.java.lexer,\
-    org.netbeans.modules.java.navigation,\
-    org.netbeans.modules.java.platform,\
-    org.netbeans.modules.java.preprocessorbridge,\
-    org.netbeans.modules.java.project,\
-    org.netbeans.modules.java.source,\
-    org.netbeans.modules.java.source.ant,\
-    org.netbeans.modules.java.source.queries,\
-    org.netbeans.modules.java.source.queriesimpl,\
-    org.netbeans.modules.java.sourceui,\
-    org.netbeans.modules.java.testrunner,\
-    org.netbeans.modules.javadoc,\
-    org.netbeans.modules.javawebstart,\
-    org.netbeans.modules.junit,\
-    org.netbeans.modules.maven,\
-    org.netbeans.modules.maven.checkstyle,\
-    org.netbeans.modules.maven.coverage,\
-    org.netbeans.modules.maven.embedder,\
-    org.netbeans.modules.maven.grammar,\
-    org.netbeans.modules.maven.graph,\
-    org.netbeans.modules.maven.hints,\
-    org.netbeans.modules.maven.indexer,\
-    org.netbeans.modules.maven.junit,\
-    org.netbeans.modules.maven.kit,\
-    org.netbeans.modules.maven.model,\
-    org.netbeans.modules.maven.osgi,\
-    org.netbeans.modules.maven.persistence,\
-    org.netbeans.modules.maven.refactoring,\
-    org.netbeans.modules.maven.repository,\
-    org.netbeans.modules.maven.search,\
-    org.netbeans.modules.maven.spring,\
-    org.netbeans.modules.projectimport.eclipse.core,\
-    org.netbeans.modules.projectimport.eclipse.j2se,\
-    org.netbeans.modules.refactoring.java,\
-    org.netbeans.modules.spellchecker.bindings.java,\
-    org.netbeans.modules.spring.beans,\
-    org.netbeans.modules.testng,\
-    org.netbeans.modules.testng.ant,\
-    org.netbeans.modules.testng.maven,\
-    org.netbeans.modules.websvc.jaxws21,\
-    org.netbeans.modules.websvc.jaxws21api,\
-    org.netbeans.modules.websvc.saas.codegen.java,\
-    org.netbeans.modules.xml.jaxb,\
-    org.netbeans.modules.xml.tools.java,\
-    org.netbeans.spi.java.hints
-

FileTypeId/nbproject/project.properties

@@ -1,3 +0,0 @@
-file.reference.tika-core-1.2.jar=release/modules/ext/tika-core-1.2.jar
-javac.source=1.7
-javac.compilerargs=-Xlint -Xlint:-serial

FileTypeId/nbproject/project.xml

@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.apisupport.project</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
-            <code-name-base>org.sleuthkit.autopsy.filetypeid</code-name-base>
-            <suite-component/>
-            <module-dependencies>
-                <dependency>
-                    <code-name-base>org.netbeans.api.progress</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.32.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.options.api</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.31.2</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.awt</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.55.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.dialogs</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.28.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.nodes</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.33.2</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>8.29.3</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util.lookup</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>8.19.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.windows</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>6.60.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.core</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>9</release-version>
-                        <specification-version>7.0</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.corelibs</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>3</release-version>
-                        <specification-version>1.1</specification-version>
-                    </run-dependency>
-                </dependency>
-            </module-dependencies>
-            <public-packages>
-                <package>org.sleuthkit.autopsy.filetypeid</package>
-            </public-packages>
-            <class-path-extension>
-                <runtime-relative-path>ext/tika-core-1.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/tika-core-1.2.jar</binary-origin>
-            </class-path-extension>
-        </data>
-    </configuration>
-</project>

FileTypeId/nbproject/suite.properties

@@ -1 +0,0 @@
-suite.dir=${basedir}/..

FileTypeId/src-alt/JMimeMagicFileTypeDetector.java

@@ -1,68 +0,0 @@
-/*
- * Autopsy Forensic Browser
- *
- * Copyright 2011 - 2013 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.filetypeid;
-
-import org.sleuthkit.datamodel.AbstractFile;
-import net.sf.jmimemagic.Magic;
-import net.sf.jmimemagic.MagicMatch;
-import net.sf.jmimemagic.MagicMatchNotFoundException;
-import org.openide.util.Exceptions;
-
-/**
- *
- */
-public class JMimeMagicFileTypeDetector implements FileTypeDetectionInterface {
-
-    @Override
-    public FileIdInfo attemptMatch(AbstractFile abstractFile) {
-        try {        
-            FileIdInfo ret = new FileIdInfo();
-            final int maxBytesInitial = 3000; //how many bytes to read on first pass
-            byte buffer[] = new byte[maxBytesInitial];
-            ///@todo decide to use max bytes or give the whole file
-            int len = abstractFile.read(buffer, 0, maxBytesInitial);        
-            
-            try {
-                MagicMatch match = Magic.getMagicMatch(buffer);
-                if (match != null) {
-                    String matchStr = match.getMimeType();
-                    if (matchStr.equals("???")) {
-                        String desc = match.getDescription();
-                        if (!desc.isEmpty()) {
-                            ret.type = desc;
-                        }
-                    } else {
-                        ret.type = matchStr;
-                    }
-                    ret.extension = match.getExtension();
-                }
-            } catch (MagicMatchNotFoundException ex) {
-                //do nothing
-            }
-
-            return ret;
-
-        } catch (Exception ex) {
-            Exceptions.printStackTrace(ex);
-            return new FileIdInfo();
-        }        
-    }
-
-}

FileTypeId/src-alt/MimeUtilFileTypeDetector.java

@@ -1,67 +0,0 @@
-/*
- * Autopsy Forensic Browser
- *
- * Copyright 2011 - 2013 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.filetypeid;
-
-import eu.medsea.mimeutil.MimeException;
-import eu.medsea.mimeutil.MimeType;
-import eu.medsea.mimeutil.detector.MagicMimeMimeDetector;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import org.openide.util.Exceptions;
-import org.sleuthkit.datamodel.AbstractFile;
-
-/**
- *
- */
-public class MimeUtilFileTypeDetector implements FileTypeDetectionInterface {
-    private static MagicMimeMimeDetector mimeUtil = new MagicMimeMimeDetector();
-    
-    
-    @Override
-    public FileIdInfo attemptMatch(AbstractFile abstractFile) {
-        try {        
-            FileIdInfo ret = new FileIdInfo();
-            final int maxBytesInitial = 3000; //how many bytes to read on first pass
-            byte buffer[] = new byte[maxBytesInitial];
-            int len = abstractFile.read(buffer, 0, maxBytesInitial);        
-            
-            try {
-                LinkedHashSet mimeSet = (LinkedHashSet)mimeUtil.getMimeTypesByteArray(buffer);
-
-                Iterator it =  mimeSet.iterator(); 
-                while (it.hasNext()) {
-                    MimeType mt = (MimeType)it.next();
-                    ret.type = mt.getMediaType() + "/" + mt.getSubType();
-                    break; //just take the first one for now
-                }
-
-            } catch (MimeException ex) {
-                //do nothing
-            }
-
-            return ret;
-
-        } catch (Exception ex) {
-            Exceptions.printStackTrace(ex);
-            return new FileIdInfo();
-        }        
-    }    
-    
-}

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

@@ -385,9 +385,9 @@ public class Server {
                 logger.log(Level.INFO, "Finished starting Solr");
 
                 try {
-                    //block, give time to fully start the process
+                    //block for 10 seconds, give time to fully start the process
                     //so if it's restarted solr operations can be resumed seamlessly
-                    Thread.sleep(10000);
+                    Thread.sleep(10 * 1000);
                 } catch (InterruptedException ex) {
                     logger.log(Level.WARNING, "Timer interrupted");
                 }
@@ -398,19 +398,17 @@ public class Server {
 
                 final List<Long> pids = this.getSolrPIDs();
                 logger.log(Level.INFO, "New Solr process PID: " + pids);
-
-
             } catch (SecurityException ex) {
-                logger.log(Level.WARNING, "Could not start Solr process!", ex);
+                logger.log(Level.SEVERE, "Could not start Solr process!", ex);
                 throw new KeywordSearchModuleException(
                         NbBundle.getMessage(this.getClass(), "Server.start.exception.cantStartSolr.msg"), ex);
             } catch (IOException ex) {
-                logger.log(Level.WARNING, "Could not start Solr server process!", ex);
+                logger.log(Level.SEVERE, "Could not start Solr server process!", ex);
                 throw new KeywordSearchModuleException(
                         NbBundle.getMessage(this.getClass(), "Server.start.exception.cantStartSolr.msg2"), ex);
             }
         } else {
-            logger.log(Level.WARNING, "Could not start Solr server process, port [" + currentSolrServerPort + "] not available!");
+            logger.log(Level.SEVERE, "Could not start Solr server process, port [" + currentSolrServerPort + "] not available!");
             throw new SolrServerNoPortException(currentSolrServerPort);
         }
     }

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

@@ -38,7 +38,7 @@ import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.coreutils.PlatformUtil;
 import org.sleuthkit.autopsy.datamodel.ContentUtils;
 import org.sleuthkit.autopsy.ingest.DataSourceIngestModuleStatusHelper;
-import org.sleuthkit.autopsy.recentactivity.ExtractUSB.USBInfo;
+import org.sleuthkit.autopsy.recentactivity.UsbDeviceIdMapper.USBInfo;
 import org.sleuthkit.datamodel.*;
 import org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE;
 import org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE;
@@ -153,7 +153,7 @@ class ExtractRegistry extends Extract {
             java.util.logging.Logger.getLogger(ExtractRegistry.class.getName()).log(Level.SEVERE, null, ex);
         }
         
-        ExtractUSB extrctr = new ExtractUSB();
+        UsbDeviceIdMapper usbMapper = new UsbDeviceIdMapper();
         
         int j = 0;
         for (AbstractFile regFile : allRegistryFiles) {
@@ -193,7 +193,7 @@ class ExtractRegistry extends Extract {
             
             // parse the autopsy-specific output
             if (regOutputFiles.autopsyPlugins.isEmpty() == false) {
-                if (parseAutopsyPluginOutput(regOutputFiles.autopsyPlugins, regFile.getId(), extrctr) == false) {
+                if (parseAutopsyPluginOutput(regOutputFiles.autopsyPlugins, regFile.getId(), usbMapper) == false) {
                     this.addErrorMessage(
                             NbBundle.getMessage(this.getClass(), "ExtractRegistry.analyzeRegFiles.failedParsingResults",
                                                 this.getName(), regFileName));
@@ -365,7 +365,7 @@ class ExtractRegistry extends Extract {
     }
     
     // @@@ VERIFY that we are doing the right thing when we parse multiple NTUSER.DAT
-    private boolean parseAutopsyPluginOutput(String regRecord, long orgId, ExtractUSB extrctr) {
+    private boolean parseAutopsyPluginOutput(String regRecord, long orgId, UsbDeviceIdMapper extrctr) {
         FileInputStream fstream = null;
         try {
             SleuthkitCase tempDb = currentCase.getSleuthkitCase();
@@ -448,7 +448,7 @@ class ExtractRegistry extends Extract {
                                 String dev = artnode.getAttribute("dev");       
                                 String model = dev; 
                                 if (dev.toLowerCase().contains("vid")) {
-                                    USBInfo info = extrctr.get(dev);
+                                    USBInfo info = extrctr.parseAndLookup(dev);
                                     if(info.getVendor()!=null)
                                         bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DEVICE_MAKE.getTypeID(),
                                                                                  NbBundle.getMessage(this.getClass(),

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

@@ -38,14 +38,13 @@ import org.sleuthkit.autopsy.coreutils.PlatformUtil;
 
 /**
  * Loads a file that maps USB IDs to names of makes and models. Uses Linux USB info. 
- * This should be renamed because it isn't extracting.  It's just mapping IDs to names. 
  */
-class ExtractUSB {
+class UsbDeviceIdMapper {
-    private static final Logger logger = Logger.getLogger(ExtractUSB.class.getName());
+    private static final Logger logger = Logger.getLogger(UsbDeviceIdMapper.class.getName());
     private HashMap<String, USBInfo> devices;
     private static final String DataFile = "USB_DATA.txt";
 
-    public ExtractUSB() {
+    public UsbDeviceIdMapper() {
         try {
             loadDeviceMap();
         } catch (FileNotFoundException ex) {
@@ -57,12 +56,12 @@ class ExtractUSB {
     }
     
     /**
-     * Example inputs:
+     * Parses the passed in device ID and returns info that includes make and model. 
-     * Vid_XXXX&Pid_XXXX
+     * 
-     * @param dev
+     * @param dev String to parse (i.e.: Vid_XXXX&Pid_XXXX)
      * @return 
      */
-    public USBInfo get(String dev) {
+    public USBInfo parseAndLookup(String dev) {
         String[] dtokens = dev.split("[_&]");
         String vID = dtokens[1];
         String pID;
@@ -72,6 +71,7 @@ class ExtractUSB {
             pID = dtokens[3];
         }
         String key = vID + pID;
+        key = key.toUpperCase();
         if (!devices.containsKey(key)) {
             return new USBInfo(null, null);
         } else {
@@ -80,11 +80,8 @@ class ExtractUSB {
     }
 
     /**
-     * Reads the USB file.  Syntax of file: 
+     * Reads the local USB txt file and stores in map.
-     *
+     * 
-     * # vendor  vendor_name
-     * #	device  device_name				<-- single tab
-     * #		interface  interface_name		<-- two tabs
      * @throws FileNotFoundException
      * @throws IOException 
      */
@@ -92,50 +89,69 @@ class ExtractUSB {
         devices = new HashMap<>();
         PlatformUtil.extractResourceToUserConfigDir(this.getClass(), DataFile);
         try (Scanner dat = new Scanner(new FileInputStream(new java.io.File(PlatformUtil.getUserConfigDirectory() + File.separator + "USB_DATA.txt")))) {
+            /* Syntax of file: 
+             *
+             * # vendor  vendor_name
+             * #	device  device_name				<-- single tab
+             * #		interface  interface_name		<-- two tabs
+             */
             String line = dat.nextLine();
             while (dat.hasNext()) {
-                String dvc = "";
+                
-                if (!(line.startsWith("#") || (line.equals("")))) {
+                // comments
-                    String[] tokens = line.split("[\\t\\s]+");
+                if ((line.startsWith("#")) || (line.equals(""))) {
-                    String vID = tokens[0];
-                    for (int n = 1; n < tokens.length; n++) {
-                        dvc += tokens[n] + " ";
-                    }
-                    String pID = vID + "0000";
-                    USBInfo info = new USBInfo(dvc, null);
-                    
-                    // make an entry with just the vendor ID
-                    devices.put(pID, info);
-                    
-                    // get the later lines that have specific products
-                    line = dat.nextLine();
-                    if (line.startsWith("\t")) {
-                        while (dat.hasNext() && line.startsWith("\t")) {
-                            tokens = line.split("[\\t\\s]+");
-                            pID = vID + tokens[1];
-                            String device = "";
-                            line = dat.nextLine();
-                            for (int n = 2; n < tokens.length; n++) {
-                                device += tokens[n] + " ";
-                            }
-                            
-                            info = new USBInfo(dvc, device);
-                            //make an entry where the key is both the vendor and product IDs concatenated
-                            devices.put(pID, info);
-                        }
-                    }
-                } else {
                     line = dat.nextLine();
+                    continue;
                 }
+                
+                // stop once we've hitten the part of the file that starts to talk about class types
                 if (line.startsWith("C 00")) {
                     return;
                 }
+                
+                String dvc = "";
+                String[] tokens = line.split("[\\t\\s]+");
+                String vID = tokens[0];
+                for (int n = 1; n < tokens.length; n++) {
+                    dvc += tokens[n] + " ";
+                }
+                
+                // make an entry with just the vendor ID
+                String pID = vID + "0000";
+                pID = pID.toUpperCase();
+                USBInfo info = new USBInfo(dvc, null);
+                devices.put(pID, info);
+
+                // parseAndLookup the later lines that have specific products
+                line = dat.nextLine();
+                if (line.startsWith("\t")) {
+                    while (dat.hasNext() && line.startsWith("\t")) {
+                        tokens = line.split("[\\t\\s]+");
+
+                        // make key based on upper case version of vendor and product IDs
+                        pID = vID + tokens[1];
+                        pID = pID.toUpperCase();
+
+                        String device = "";
+                        line = dat.nextLine();
+                        for (int n = 2; n < tokens.length; n++) {
+                            device += tokens[n] + " ";
+                        }
+
+                        info = new USBInfo(dvc, device);
+
+                        // store based on the previously generated key
+                        devices.put(pID, info);
+                    }
+                }
             }
         }
     }
 
+    /**
+     * Stores the vendor information about a USB device 
+     */
     public class USBInfo {
-
         private String vendor;
         private String product;
 
@@ -144,10 +160,18 @@ class ExtractUSB {
             product = prod;
         }
 
+        /**
+         * Get Vendor (make) information
+         * @return 
+         */
         public String getVendor() {
             return vendor;
         }
 
+        /**
+         * Get product (model) information
+         * @return 
+         */
         public String getProduct() {
             return product;
         }

SevenZip/build.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
-<!-- for some information on what you could do (e.g. targets to override). -->
-<!-- If you delete this file and reopen the project it will be recreated. -->
-<project name="org.sleuthkit.autopsy.sevenzip" default="netbeans" basedir=".">
-    <description>Builds, tests, and runs the project org.sleuthkit.autopsy.sevenzip.</description>
-    <import file="nbproject/build-impl.xml"/>
-</project>

SevenZip/manifest.mf

@@ -1,6 +0,0 @@
-Manifest-Version: 1.0
-OpenIDE-Module: org.sleuthkit.autopsy.sevenzip/1
-OpenIDE-Module-Implementation-Version: 4
-OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/sevenzip/Bundle.properties
-
-

SevenZip/nbproject/build-impl.xml

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT  ***
-***         EDIT ../build.xml INSTEAD         ***
--->
-<project name="org.sleuthkit.autopsy.sevenzip-impl" basedir="..">
-    <fail message="Please build using Ant 1.7.1 or higher.">
-        <condition>
-            <not>
-                <antversion atleast="1.7.1"/>
-            </not>
-        </condition>
-    </fail>
-    <property file="nbproject/private/suite-private.properties"/>
-    <property file="nbproject/suite.properties"/>
-    <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
-    <property file="${suite.dir}/nbproject/private/platform-private.properties"/>
-    <property file="${suite.dir}/nbproject/platform.properties"/>
-    <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2">
-        <attribute name="name"/>
-        <attribute name="value"/>
-        <sequential>
-            <property name="@{name}" value="${@{value}}"/>
-        </sequential>
-    </macrodef>
-    <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
-        <attribute name="property"/>
-        <attribute name="value"/>
-        <sequential>
-            <property name="@{property}" value="@{value}"/>
-        </sequential>
-    </macrodef>
-    <property file="${user.properties.file}"/>
-    <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
-        <condition>
-            <not>
-                <contains string="${cluster.path.evaluated}" substring="platform"/>
-            </not>
-        </condition>
-    </fail>
-    <import file="${harness.dir}/build.xml"/>
-</project>

SevenZip/nbproject/project.properties

@@ -1,8 +0,0 @@
-javac.source=1.7
-javac.compilerargs=-Xlint -Xlint:-serial
-license.file=../LICENSE-2.0.txt
-nbm.homepage=http://www.sleuthkit.org/autopsy/
-nbm.module.author=Brian Carrier
-nbm.needs.restart=true
-spec.version.base=1.0
-

SevenZip/nbproject/project.xml

@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.apisupport.project</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
-            <code-name-base>org.sleuthkit.autopsy.sevenzip</code-name-base>
-            <suite-component/>
-            <module-dependencies>
-                <dependency>
-                    <code-name-base>org.netbeans.api.progress</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.32.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util.lookup</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>8.19.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>8.25.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.core</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>9</release-version>
-                        <specification-version>7.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.sleuthkit.autopsy.corelibs</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>3</release-version>
-                        <specification-version>1.1</specification-version>
-                    </run-dependency>
-                </dependency>
-            </module-dependencies>
-            <public-packages/>
-            <class-path-extension>
-                <runtime-relative-path>ext/sevenzipjbinding.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/sevenzipjbinding.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/sevenzipjbinding-AllPlatforms.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/sevenzipjbinding-AllPlatforms.jar</binary-origin>
-            </class-path-extension>
-        </data>
-    </configuration>
-</project>

SevenZip/nbproject/suite.properties

@@ -1 +0,0 @@
-suite.dir=${basedir}/..

Timeline/build.xml

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
-<!-- for some information on what you could do (e.g. targets to override). -->
-<!-- If you delete this file and reopen the project it will be recreated. -->
-<project name="org.sleuthkit.autopsy.timeline" default="netbeans" basedir=".">
-    <description>Builds, tests, and runs the project org.sleuthkit.autopsy.timeline.</description>
-    <import file="nbproject/build-impl.xml"/>
-    
-    <condition property="os.family.unix">
-        <os family="unix"/>
-    </condition>
-    
-    <!-- Verify that the TSK_HOME env variable is set -->
-    <target name="findTSK">
-        <property environment="env"/>
-        <condition property="tskFound">
-            <isset property="env.TSK_HOME"/>
-        </condition>
-        <fail unless="tskFound" message="TSK_HOME must be set as an environment variable."/>
-        <echo> TSK_HOME: ${env.TSK_HOME}</echo>
-    </target>  
-    
-    <target name="getMacTime" depends="findTSK" if="os.family.unix">
-        <property environment="env"/>
-        <copy file="${env.TSK_HOME}/tools/timeline/mactime" tofile="${basedir}/release/mactime/mactime.pl"/>
-    </target>
-    
-    
-    <target name="init" depends="basic-init,files-init,build-init,-javac-init">
-        <!-- get additional deps -->
-        <!-- This should only be done on non-Windows systems. <antcall target="getMacTime" /> -->
-    </target>
-</project>

Timeline/manifest.mf

@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-OpenIDE-Module: org.sleuthkit.autopsy.timeline/1
-OpenIDE-Module-Layer: org/sleuthkit/autopsy/timeline/layer.xml
-OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/timeline/Bundle.properties
-OpenIDE-Module-Requires: org.openide.windows.WindowManager
-OpenIDE-Module-Implementation-Version: 3
-

Timeline/nbproject/build-impl.xml

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT  ***
-***         EDIT ../build.xml INSTEAD         ***
--->
-<project name="org.sleuthkit.autopsy.timeline-impl" basedir="..">
-    <fail message="Please build using Ant 1.7.1 or higher.">
-        <condition>
-            <not>
-                <antversion atleast="1.7.1"/>
-            </not>
-        </condition>
-    </fail>
-    <property file="nbproject/private/suite-private.properties"/>
-    <property file="nbproject/suite.properties"/>
-    <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
-    <property file="${suite.dir}/nbproject/private/platform-private.properties"/>
-    <property file="${suite.dir}/nbproject/platform.properties"/>
-    <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2">
-        <attribute name="name"/>
-        <attribute name="value"/>
-        <sequential>
-            <property name="@{name}" value="${@{value}}"/>
-        </sequential>
-    </macrodef>
-    <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
-        <attribute name="property"/>
-        <attribute name="value"/>
-        <sequential>
-            <property name="@{property}" value="@{value}"/>
-        </sequential>
-    </macrodef>
-    <property file="${user.properties.file}"/>
-    <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
-    <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
-        <condition>
-            <not>
-                <contains string="${cluster.path.evaluated}" substring="platform"/>
-            </not>
-        </condition>
-    </fail>
-    <import file="${harness.dir}/build.xml"/>
-</project>