From 5d13bdbb31a67ae579bc132ce8e7812075bef500 Mon Sep 17 00:00:00 2001
From: adam-m <amalinowski@basistech.com>
Date: Tue, 19 Mar 2013 12:10:12 -0400
Subject: [PATCH 01/14] much better thumbnail viewer: add support for bmp,
 faster thumnail generation and better quality looking.  Simplified code, by
 using scalr.

---
 .../corecomponents/ThumbnailViewChildren.java |  14 ++-
 .../corecomponents/ThumbnailViewNode.java     | 112 ++++++------------
 .../autopsy/corelibs/ScalrWrapper.java        |  10 +-
 3 files changed, 59 insertions(+), 77 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewChildren.java b/Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewChildren.java
index ed3d29553d..0f4508ac0b 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewChildren.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewChildren.java
@@ -22,6 +22,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
+import java.util.logging.Level;
+import javax.imageio.ImageIO;
 import org.openide.nodes.AbstractNode;
 import org.openide.nodes.Children;
 import org.openide.nodes.Node;
@@ -154,7 +156,17 @@ class ThumbnailViewChildren extends Children.Keys<Integer> {
 
     private static class IsSupportedContentVisitor extends ContentVisitor.Default<Boolean> {
 
-        private static final List<String> SUPP_EXTENSIONS = Arrays.asList(".jpeg", ".jpg", ".gif", ".png");
+        private final List<String> SUPP_EXTENSIONS;
+
+        IsSupportedContentVisitor() {
+            String[] supportedImagesSuffixes = ImageIO.getReaderFileSuffixes();
+
+            SUPP_EXTENSIONS = new ArrayList<String>(supportedImagesSuffixes.length);
+            for (int i = 0; i < supportedImagesSuffixes.length; ++i) {
+                String suffix = supportedImagesSuffixes[i];
+                SUPP_EXTENSIONS.add("." + suffix);
+            }
+        }
 
         @Override
         public Boolean visit(DerivedFile f) {
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewNode.java b/Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewNode.java
index 97d23f267f..0acf0f9334 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewNode.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewNode.java
@@ -26,6 +26,7 @@ import java.awt.Toolkit;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 import java.lang.ref.SoftReference;
 import java.util.logging.Level;
 import javax.imageio.ImageIO;
@@ -35,32 +36,39 @@ import org.openide.nodes.Children;
 import org.openide.nodes.FilterNode;
 import org.openide.nodes.Node;
 import org.sleuthkit.autopsy.casemodule.Case;
+import org.sleuthkit.autopsy.corelibs.ScalrWrapper;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.datamodel.Content;
+import org.sleuthkit.datamodel.ReadContentInputStream;
 import org.sleuthkit.datamodel.TskException;
 
 /**
- * Node that wraps around original node and adds the bitmap icon representing the picture
+ * Node that wraps around original node and adds the bitmap icon representing
+ * the picture
  */
 class ThumbnailViewNode extends FilterNode {
 
     private SoftReference<Image> iconCache;
-    
     private static final Image defaultIcon = new ImageIcon("/org/sleuthkit/autopsy/images/file-icon.png").getImage();
+    private static final Logger logger = Logger.getLogger(ThumbnailViewNode.class.getName());
+    //private final BufferedImage defaultIconBI;
 
-    /** the constructor */
+    /**
+     * the constructor
+     */
     ThumbnailViewNode(Node arg) {
         super(arg, Children.LEAF);
     }
 
     @Override
-    public String getDisplayName(){
-        if(super.getDisplayName().length() > 15)
+    public String getDisplayName() {
+        if (super.getDisplayName().length() > 15) {
             return super.getDisplayName().substring(0, 15).concat("...");
-        else
+        } else {
             return super.getDisplayName();
+        }
     }
-    
+
     @Override
     public Image getIcon(int type) {
         Image icon = null;
@@ -68,12 +76,11 @@ class ThumbnailViewNode extends FilterNode {
         if (iconCache != null) {
             icon = iconCache.get();
         }
-        
-        
-        
+
+
         if (icon == null) {
             Content content = this.getLookup().lookup(Content.class);
-            
+
             if (content != null) {
                 if (getFile(content.getId()).exists()) {
                     try {
@@ -84,85 +91,44 @@ class ThumbnailViewNode extends FilterNode {
                 } else {
                     try {
                         icon = generateIcon(content);
-                        ImageIO.write(toBufferedImage(icon), "jpg", getFile(content.getId()));
-                    } catch (TskException ex) {
-                        icon = ThumbnailViewNode.defaultIcon;
+                        if (icon == null) {
+                            icon = ThumbnailViewNode.defaultIcon;
+                        }
+                        else {
+                            ImageIO.write((BufferedImage) icon, "jpg", getFile(content.getId()));
+                        }
                     } catch (IOException ex) {
+                        logger.log(Level.WARNING, "Could not write cache thumbnail: " + content, ex);
                     }
                 }
             } else {
                 icon = ThumbnailViewNode.defaultIcon;
             }
-            
+
             iconCache = new SoftReference<Image>(icon);
         }
 
         return icon;
     }
 
-    static private Image generateIcon(Content content) throws TskException {
-        byte[] data = new byte[(int)content.getSize()];
-        int bytesRead = content.read(data, 0, content.getSize());
-        
-        if (bytesRead < 1)
+    /*
+     * Generate a scaled image
+     */
+    static private BufferedImage generateIcon(Content content) {
+
+        try {
+            final InputStream inputStream = new ReadContentInputStream(content);
+            BufferedImage bi = ImageIO.read(inputStream);
+
+            BufferedImage biScaled = ScalrWrapper.resizeFast(bi, 100, 100);
+            return biScaled;
+        } catch (Exception e) {
+            logger.log(Level.WARNING, "Could not scale image: " + content.getName(), e);
             return null;
-        
-        Image result = Toolkit.getDefaultToolkit().createImage(data);
-
-        // scale the image
-        MediaTracker mTracker = new MediaTracker(new JFrame());
-        mTracker.addImage(result, 1);
-        try {
-            mTracker.waitForID(1);
-        } catch (InterruptedException ex) {
-            // TODO: maybe make bubble instead
-            Logger.getLogger(ThumbnailViewNode.class.getName()).log(Level.WARNING, "Error while trying to scale the icon.", ex);
         }
-        int width = result.getWidth(null);
-        int height = result.getHeight(null);
-
-        int max = Math.max(width, height);
-        double scale = (75 * 100) / max;
-
-        // getScaledInstance can't take have width or height be 0, so round
-        // up by adding 1 after truncating to int.
-        width = (int) ((width * scale) / 100) + 1;
-        height = (int) ((height * scale) / 100) + 1;
-
-        result = result.getScaledInstance(width, height, Image.SCALE_SMOOTH);
-
-        // load the image completely
-        mTracker.addImage(result, 1);
-        try {
-            mTracker.waitForID(1);
-        } catch (InterruptedException ex) {
-            // TODO: maybe make bubble instead
-            Logger.getLogger(ThumbnailViewNode.class.getName()).log(Level.WARNING, "Error while trying to load the icon.", ex);
-        }
-
-        // create 75x75 image for the icon with the icon on the center
-        BufferedImage combined = new BufferedImage(75, 75, BufferedImage.TYPE_INT_ARGB);
-        Graphics2D g = (Graphics2D) combined.getGraphics();
-        g.setColor(Color.WHITE);
-        g.setBackground(Color.WHITE);
-        g.drawImage(result, (75 - width) / 2, (75 - height) / 2, null);
-
-        return Toolkit.getDefaultToolkit().createImage(combined.getSource());
     }
 
-    private static BufferedImage toBufferedImage(Image src) {
-        int w = src.getWidth(null);
-        int h = src.getHeight(null);
-        int type = BufferedImage.TYPE_INT_RGB;  // other options
-        BufferedImage dest = new BufferedImage(w, h, type);
-        Graphics2D g2 = dest.createGraphics();
-        g2.drawImage(src, 0, 0, null);
-        g2.dispose();
-        return dest;
-    }
-    
     private static File getFile(long id) {
         return new File(Case.getCurrentCase().getCacheDirectory() + File.separator + id + ".jpg");
     }
-    
 }
diff --git a/CoreLibs/src/org/sleuthkit/autopsy/corelibs/ScalrWrapper.java b/CoreLibs/src/org/sleuthkit/autopsy/corelibs/ScalrWrapper.java
index 7b74ee1f10..3884133984 100644
--- a/CoreLibs/src/org/sleuthkit/autopsy/corelibs/ScalrWrapper.java
+++ b/CoreLibs/src/org/sleuthkit/autopsy/corelibs/ScalrWrapper.java
@@ -30,11 +30,11 @@ import org.imgscalr.Scalr.Method;
 public class ScalrWrapper {
 
     public static synchronized BufferedImage resize(BufferedImage input, int width, int height) {
-        return Scalr.resize(input, width, height);
+        return Scalr.resize(input, width, height, Scalr.OP_ANTIALIAS);
     }
 
     public static synchronized BufferedImage resize(BufferedImage input, int size) {
-        return Scalr.resize(input, size);
+        return Scalr.resize(input, size, Scalr.OP_ANTIALIAS);
     }
 
     public static synchronized BufferedImage resizeHighQuality(BufferedImage input, int width, int height) {
@@ -42,6 +42,10 @@ public class ScalrWrapper {
     }
 
     public static synchronized BufferedImage resizeFast(BufferedImage input, int size) {
-        return Scalr.resize(input, Method.SPEED, size, Scalr.OP_ANTIALIAS);
+        return Scalr.resize(input, Method.SPEED, Scalr.Mode.FIT_TO_WIDTH, size, Scalr.OP_ANTIALIAS);
+    }
+    
+     public static synchronized BufferedImage resizeFast(BufferedImage input, int width, int height) {
+        return Scalr.resize(input, Method.SPEED, Scalr.Mode.AUTOMATIC, width, height, Scalr.OP_ANTIALIAS);
     }
 }

From fa52bcd708b1fb3741edd2216a0312180f8411a2 Mon Sep 17 00:00:00 2001
From: adam-m <amalinowski@basistech.com>
Date: Tue, 19 Mar 2013 12:18:32 -0400
Subject: [PATCH 02/14] updated news

---
 NEWS.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/NEWS.txt b/NEWS.txt
index bc41caccee..8faa11f448 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -15,6 +15,7 @@ Bugfixes:
 - fixed directory tree history being reset when tree is refreshed.
 - exif module better jpeg detection using signature and not only file extension.
 - The "media view" tab is inactive for deleted files (#165)
+- improved image loading in Media View and Thumbnail View (faster loading, handles large files better)
 
 ---------------- VERSION 3.0.4 --------------
 

From 555a15016fda06d2cc307a664a13a98130389c4c Mon Sep 17 00:00:00 2001
From: adam-m <amalinowski@basistech.com>
Date: Tue, 19 Mar 2013 12:18:42 -0400
Subject: [PATCH 03/14] updated scalr wrapper

---
 CoreLibs/src/org/sleuthkit/autopsy/corelibs/ScalrWrapper.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CoreLibs/src/org/sleuthkit/autopsy/corelibs/ScalrWrapper.java b/CoreLibs/src/org/sleuthkit/autopsy/corelibs/ScalrWrapper.java
index 3884133984..fce800e30b 100644
--- a/CoreLibs/src/org/sleuthkit/autopsy/corelibs/ScalrWrapper.java
+++ b/CoreLibs/src/org/sleuthkit/autopsy/corelibs/ScalrWrapper.java
@@ -42,7 +42,7 @@ public class ScalrWrapper {
     }
 
     public static synchronized BufferedImage resizeFast(BufferedImage input, int size) {
-        return Scalr.resize(input, Method.SPEED, Scalr.Mode.FIT_TO_WIDTH, size, Scalr.OP_ANTIALIAS);
+        return Scalr.resize(input, Method.SPEED, Scalr.Mode.AUTOMATIC, size, Scalr.OP_ANTIALIAS);
     }
     
      public static synchronized BufferedImage resizeFast(BufferedImage input, int width, int height) {

From 33a308a75524a8f475427bc3a062d13de7ac4dcb Mon Sep 17 00:00:00 2001
From: adam-m <amalinowski@basistech.com>
Date: Tue, 19 Mar 2013 15:01:12 -0400
Subject: [PATCH 04/14] Keyword search changes to use tika mime type detection
 rather than file extensions. TODO fine-tune mime types.

---
 .../keywordsearch/AbstractFileExtract.java    | 90 +++++++++++++++----
 .../AbstractFileHtmlExtract.java              | 33 ++++---
 .../AbstractFileStringExtract.java            | 38 ++++----
 .../AbstractFileTikaTextExtract.java          | 56 +++++-------
 .../KeywordSearchIngestModule.java            | 79 +++++++++++-----
 NEWS.txt                                      |  4 +-
 6 files changed, 194 insertions(+), 106 deletions(-)

diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileExtract.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileExtract.java
index c196533875..dcb8b25728 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileExtract.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileExtract.java
@@ -16,9 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.sleuthkit.autopsy.keywordsearch;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import org.sleuthkit.autopsy.coreutils.StringExtract.StringExtractUnicodeTable.SCRIPT;
@@ -29,72 +29,124 @@ import org.sleuthkit.datamodel.AbstractFile;
  * chunks
  */
 interface AbstractFileExtract {
-    
+
     /**
      * Common options that can be used by some extractors
      */
     enum ExtractOptions {
+
         EXTRACT_UTF16, ///< extract UTF16 text, possible values Boolean.TRUE.toString(), Boolean.FALSE.toString()
         EXTRACT_UTF8, ///< extract UTF8 text, possible values Boolean.TRUE.toString(), Boolean.FALSE.toString()
     };
+    
+    //generally text extractors should ignore archives
+    //and let unpacking modules take case of them
+    static final List<String> ARCHIVE_MIME_TYPES =
+            Arrays.asList(
+            //ignore unstructured binary and compressed data, for which string extraction or unzipper works better
+            "application/x-7z-compressed",
+            "application/x-ace-compressed",
+            "application/x-alz-compressed",
+            "application/x-arj",
+            "application/vnd.ms-cab-compressed",
+            "application/x-cfs-compressed",
+            "application/x-dgc-compressed",
+            "application/x-apple-diskimage",
+            "application/x-gca-compressed",
+            "application/x-dar",
+            "application/x-lzx",
+            "application/x-lzh",
+            "application/x-rar-compressed",
+            "application/x-stuffit",
+            "application/x-stuffitx",
+            "application/x-gtar",
+            "application/x-archive",
+            "application/x-executable",
+            "application/x-gzip",
+            "application/zip",
+            "application/x-zoo",
+            "application/x-cpio",
+            "application/x-shar",
+            "application/x-tar",
+            "application/x-bzip",
+            "application/x-bzip2",
+            "application/x-lzip",
+            "application/x-lzma",
+            "application/x-lzop",
+            "application/x-z",
+            "application/x-compress");
 
     /**
      * Get number of chunks resulted from extracting this AbstractFile
+     *
      * @return the number of chunks produced
      */
     int getNumChunks();
 
     /**
      * Get the source file associated with this extraction
+     *
      * @return the source AbstractFile
      */
     AbstractFile getSourceFile();
 
     /**
      * Index the Abstract File
+     *
      * @param sourceFile file to index
      * @return true if indexed successfully, false otherwise
-     * @throws org.sleuthkit.autopsy.keywordsearch.Ingester.IngesterException 
+     * @throws org.sleuthkit.autopsy.keywordsearch.Ingester.IngesterException
      */
     boolean index(AbstractFile sourceFile) throws Ingester.IngesterException;
-    
+
     /**
      * Sets the scripts to use for the extraction
+     *
      * @param extractScripts scripts to use
-     * @return true if extractor supports script - specific extraction, false otherwise
+     * @return true if extractor supports script - specific extraction, false
+     * otherwise
      */
     boolean setScripts(List<SCRIPT> extractScript);
-    
+
     /**
      * Get the currently used scripts for extraction
+     *
      * @return scripts currently used or null if not supported
      */
     List<SCRIPT> getScripts();
-    
+
     /**
      * Get current options
-     * @return currently used, extractor specific options, or null of not supported
+     *
+     * @return currently used, extractor specific options, or null of not
+     * supported
      */
-    Map<String,String> getOptions();
-    
+    Map<String, String> getOptions();
+
     /**
      * Set extractor specific options
+     *
      * @param options options to use
      */
-    void setOptions(Map<String,String> options);
-    
+    void setOptions(Map<String, String> options);
+
     /**
-     * Determines if the extractor works only for specified types
-     * is supportedTypes() or whether is a generic content extractor (such as string extractor)
-     * @return 
+     * Determines if the extractor works only for specified types is
+     * supportedTypes() or whether is a generic content extractor (such as
+     * string extractor)
+     *
+     * @return
      */
     boolean isContentTypeSpecific();
-    
+
     /**
-     * Determines if the file content is supported by the extractor, 
-     * if isContentTypeSpecific() returns true.
+     * Determines if the file content is supported by the extractor if
+     * isContentTypeSpecific() returns true.
+     *
      * @param file to test if its content should be supported
+     * @param detectedFormat mime-type with detected format (such as text/plain)
+     * or null if not detected
      * @return true if the file content is supported, false otherwise
      */
-    boolean isSupported(AbstractFile file);
+    boolean isSupported(AbstractFile file, String detectedFormat);
 }
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileHtmlExtract.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileHtmlExtract.java
index 3891fb8e98..1f5d9a57e8 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileHtmlExtract.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileHtmlExtract.java
@@ -22,6 +22,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
 import java.nio.charset.Charset;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Level;
@@ -49,9 +50,15 @@ public class AbstractFileHtmlExtract implements AbstractFileExtract {
     private AbstractFile sourceFile;
     private int numChunks = 0;
     //private static final String UTF16BOM = "\uFEFF"; disabled prepending of BOM
-    private static final String[] SUPPORTED_EXTENSIONS = {
-        "htm", "html", "xhtml", "shtml", "xhtm", "shtm", "css", "js", "php", "jsp"
-    };
+    static final List<String> WEB_MIME_TYPES = Arrays.asList(
+            "application/javascript",
+            "application/xhtml+xml",
+            "application/json",
+            "text/css",
+            "text/html",
+            "text/javascript" //"application/xml",
+            //"application/xml-dtd",
+            );
 
     AbstractFileHtmlExtract() {
         this.module = KeywordSearchIngestModule.getDefault();
@@ -67,7 +74,7 @@ public class AbstractFileHtmlExtract implements AbstractFileExtract {
     public List<SCRIPT> getScripts() {
         return null;
     }
-    
+
     @Override
     public Map<String, String> getOptions() {
         return null;
@@ -75,7 +82,6 @@ public class AbstractFileHtmlExtract implements AbstractFileExtract {
 
     @Override
     public void setOptions(Map<String, String> options) {
-
     }
 
     @Override
@@ -207,13 +213,16 @@ public class AbstractFileHtmlExtract implements AbstractFileExtract {
     }
 
     @Override
-    public boolean isSupported(AbstractFile file) {
-        String fileNameLower = file.getName().toLowerCase();
-        for (int i = 0; i < SUPPORTED_EXTENSIONS.length; ++i) {
-            if (fileNameLower.endsWith(SUPPORTED_EXTENSIONS[i])) {
-                return true;
-            }
+    public boolean isSupported(AbstractFile file, String detectedFormat) {
+        if (detectedFormat == null) {
+            return false;
         }
-        return false;
+        else if (WEB_MIME_TYPES.contains(detectedFormat) ) {
+            return true;
+        }
+        else {
+            return false;
+        }
+        
     }
 }
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringExtract.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringExtract.java
index 071e3334d0..2fe4f3e63f 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringExtract.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringExtract.java
@@ -51,13 +51,7 @@ class AbstractFileStringExtract implements AbstractFileExtract {
     private static final SCRIPT DEFAULT_SCRIPT = SCRIPT.LATIN_2;
     private final List<SCRIPT> extractScripts = new ArrayList<SCRIPT>();
     private Map<String, String> extractOptions = new HashMap<String, String>();
-    //string extractor extracts from all other than archives
-    //TODO use content type detection mechanism
-    static final String[] UNSUPPORTED_EXTENSIONS = {
-        //Archives 
-        //Note: archive unpacker module will process these instead
-        "tar", "jar", "zip", "7z", "gzip", "bzip", "bzip2", "gz", "tgz", "cab", "rar", "arj", "dmg", "iso"
-    };
+    
 
     //disabled prepending of BOM
     //static {
@@ -185,18 +179,26 @@ class AbstractFileStringExtract implements AbstractFileExtract {
     }
 
     @Override
-    public boolean isSupported(AbstractFile file) {
-        String fileNameLower = file.getName().toLowerCase();
-        int dotI = fileNameLower.lastIndexOf(".");
-        if (dotI == -1 || dotI == fileNameLower.length() - 1) {
-            return true; //no extension
+    public boolean isSupported(AbstractFile file, String detectedFormat) {
+        if (detectedFormat == null) {
+            return true;
         }
-        final String extension = fileNameLower.substring(dotI + 1);
-        for (int i = 0; i < UNSUPPORTED_EXTENSIONS.length; ++i) {
-            if (extension.equals(UNSUPPORTED_EXTENSIONS[i])) {
-                return false;
-            }
+        else if (detectedFormat.equals("application/octet-stream")) {
+            //any binary unstructured blobs (string extraction will be used)
+            return true;
+        }
+        else if (AbstractFileExtract.ARCHIVE_MIME_TYPES.contains(detectedFormat)) {
+            return false; //let unzipper take care of it
+        }
+        //skip images/video/audio
+        else if (detectedFormat.contains("image/")
+                || detectedFormat.contains("audio/")
+                || detectedFormat.contains("video/")
+                ) {
+            return false;
+        }
+        else {
+            return true;
         }
-        return true;
     }
 }
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileTikaTextExtract.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileTikaTextExtract.java
index 0b386c93d1..eb09cf0c7f 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileTikaTextExtract.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileTikaTextExtract.java
@@ -66,30 +66,6 @@ public class AbstractFileTikaTextExtract implements AbstractFileExtract {
     private int numChunks = 0;
     //private static final String UTF16BOM = "\uFEFF"; disabled prepending of BOM
     private final ExecutorService tikaParseExecutor = Executors.newSingleThreadExecutor();
-    // TODO: use type detection mechanism instead, and maintain supported MimeTypes, not extensions
-    // supported extensions list from http://www.lucidimagination.com/devzone/technical-articles/content-extraction-tika
-    static final String[] SUPPORTED_EXTENSIONS = {
-        //Archive (to be removed when we have archive module
-        /// handled by 7zip module now "tar", "jar", "zip", "gzip", "bzip2", "gz", "tgz", "ar", "cpio", 
-        //MS Office
-        "doc", "dot", "docx", "docm", "dotx", "dotm",
-        "xls", "xlw", "xlt", "xlsx", "xlsm", "xltx", "xltm",
-        "ppt", "pps", "pot", "pptx", "pptm", "potx", "potm",
-        //Open Office
-        "odf", "odt", "ott", "ods", "ots", "odp", "otp",
-        "sxw", "stw", "sxc", "stc", "sxi", "sxi",
-        "sdw", "sdc", "vor", "sgl",
-        //rich text, pdf
-        "rtf", "pdf",
-        //html (other extractors take priority)
-        "html", "htm", "xhtml",
-        //text
-        "txt", "log", "manifest",
-        //code
-        "class",
-        //images, media, other
-        "bmp", "gif", "png", "jpeg", "jpg", "tiff", "mp3", "flv", "aiff", "au", "midi", "wav",
-        "pst", "xml", "class", "dwg", "eml", "emlx", "mbox", "mht"};
 
     AbstractFileTikaTextExtract() {
         this.module = KeywordSearchIngestModule.getDefault();
@@ -282,19 +258,27 @@ public class AbstractFileTikaTextExtract implements AbstractFileExtract {
     }
 
     @Override
-    public boolean isSupported(AbstractFile file) {
-        String fileNameLower = file.getName().toLowerCase();
-        int dotI = fileNameLower.lastIndexOf(".");
-        if (dotI == -1 || dotI == fileNameLower.length() - 1) {
-            return false; //no extension
+    public boolean isSupported(AbstractFile file, String detectedFormat) {
+        if (detectedFormat == null) {
+            return false;
+        } else if (detectedFormat.equals("application/octet-stream")) {
+            //any binary unstructured blobs (string extraction will be used)
+            return false;
+        } else if (AbstractFileExtract.ARCHIVE_MIME_TYPES.contains(detectedFormat)) {
+            return false;
+        } //skip video other than flv (tika supports flv only)
+        else if (detectedFormat.contains("video/")
+                && !detectedFormat.equals("video/x-flv")) {
+            return false;
         }
-        final String extension = fileNameLower.substring(dotI + 1);
-        for (int i = 0; i < SUPPORTED_EXTENSIONS.length; ++i) {
-            if (extension.equals(SUPPORTED_EXTENSIONS[i])) {
-                return true;
-            }
-        }
-        return false;
+
+        //TODO might need to add more mime-types to ignore
+
+        //default to true, which includes
+        //text, docs, pdf and others
+
+        return true;
+
     }
 
     /**
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java
index 4bb259b9b7..5a0e9ea6eb 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java
@@ -20,6 +20,8 @@ package org.sleuthkit.autopsy.keywordsearch;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.io.IOException;
+import java.io.InputStream;
 import java.lang.Long;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -37,10 +39,12 @@ import org.sleuthkit.autopsy.coreutils.Logger;
 import javax.swing.SwingUtilities;
 import javax.swing.SwingWorker;
 import javax.swing.Timer;
+import org.apache.tika.Tika;
 import org.netbeans.api.progress.aggregate.AggregateProgressFactory;
 import org.netbeans.api.progress.aggregate.AggregateProgressHandle;
 import org.netbeans.api.progress.aggregate.ProgressContributor;
 import org.openide.util.Cancellable;
+import org.openide.util.Exceptions;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.coreutils.EscapeUtil;
 import org.sleuthkit.autopsy.coreutils.StopWatch;
@@ -57,6 +61,7 @@ import org.sleuthkit.datamodel.BlackboardArtifact;
 import org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE;
 import org.sleuthkit.datamodel.BlackboardAttribute;
 import org.sleuthkit.datamodel.AbstractFile;
+import org.sleuthkit.datamodel.ReadContentInputStream;
 import org.sleuthkit.datamodel.SleuthkitCase;
 import org.sleuthkit.datamodel.TskCoreException;
 import org.sleuthkit.datamodel.TskData;
@@ -123,6 +128,7 @@ public final class KeywordSearchIngestModule implements IngestModuleAbstractFile
     private static AbstractFileStringExtract stringExtractor;
     private boolean initialized = false;
     private KeywordSearchConfigurationPanel panel;
+    private Tika tikaFormatDetector;
 
     private enum IngestStatus {
 
@@ -147,7 +153,7 @@ public final class KeywordSearchIngestModule implements IngestModuleAbstractFile
     }
 
     @Override
-    public ProcessResult process(PipelineContext<IngestModuleAbstractFile>pipelineContext, AbstractFile abstractFile) {
+    public ProcessResult process(PipelineContext<IngestModuleAbstractFile> pipelineContext, AbstractFile abstractFile) {
 
         if (initialized == false) //error initializing indexing/Solr
         {
@@ -189,7 +195,6 @@ public final class KeywordSearchIngestModule implements IngestModuleAbstractFile
         return ProcessResult.OK;
     }
 
-
     /**
      * After all files are ingested, execute final index commit and final search
      * Cleanup resources, threads, timers
@@ -297,6 +302,8 @@ public final class KeywordSearchIngestModule implements IngestModuleAbstractFile
         keywordLists.clear();
         keywordToList.clear();
 
+        tikaFormatDetector = null;
+
         initialized = false;
     }
 
@@ -338,6 +345,8 @@ public final class KeywordSearchIngestModule implements IngestModuleAbstractFile
 
         caseHandle = Case.getCurrentCase().getSleuthkitCase();
 
+        tikaFormatDetector = new Tika();
+
         ingester = Server.getIngester();
 
         final Server server = KeywordSearch.getServer();
@@ -659,18 +668,20 @@ public final class KeywordSearchIngestModule implements IngestModuleAbstractFile
          * index
          * @param stringsOnly true if use string extraction, false if to use a
          * content-type specific text extractor
+         * @param detectedFormat mime-type detected, or null if none detected
          * @return true if the file was indexed, false otherwise
          * @throws IngesterException exception thrown if indexing failed
          */
-        private boolean extractIndex(AbstractFile aFile, boolean stringsOnly) throws IngesterException {
+        private boolean extractIndex(AbstractFile aFile, boolean stringsOnly, String detectedFormat) throws IngesterException {
             AbstractFileExtract fileExtract = null;
 
-            if (stringsOnly && stringExtractor.isSupported(aFile)) {
+            if (stringsOnly && stringExtractor.isSupported(aFile, detectedFormat)) {
                 fileExtract = stringExtractor;
             } else {
-                //go over available text extractors and pick the first one (most specific one)
+                //not only strings
+                //go over available text extractors in order, and pick the first one (most specific one)
                 for (AbstractFileExtract fe : textExtractors) {
-                    if (fe.isSupported(aFile)) {
+                    if (fe.isSupported(aFile, detectedFormat)) {
                         fileExtract = fe;
                         break;
                     }
@@ -678,7 +689,8 @@ public final class KeywordSearchIngestModule implements IngestModuleAbstractFile
             }
 
             if (fileExtract == null) {
-                logger.log(Level.INFO, "No supported file extractor found for file: " + aFile.getId() + " " + aFile.getName());
+                logger.log(Level.INFO, "No text extractor found for file id:" 
+                        + aFile.getId() + ", name: " + aFile.getName() + ", detected format: " + detectedFormat);
                 return false;
             }
 
@@ -688,10 +700,16 @@ public final class KeywordSearchIngestModule implements IngestModuleAbstractFile
             return fileExtract.index(aFile);
         }
 
-        private boolean isTextExtractSupported(AbstractFile aFile) {
+        /**
+         * Check with every extractor if it supports the file with the detected format
+         * @param aFile file to check for
+         * @param detectedFormat mime-type with detected format (such as text/plain) or null if not detected
+         * @return true if text extraction is supported
+         */
+        private boolean isTextExtractSupported(AbstractFile aFile, String detectedFormat) {
             for (AbstractFileExtract extractor : textExtractors) {
                 if (extractor.isContentTypeSpecific() == true
-                        && extractor.isSupported(aFile)) {
+                        && extractor.isSupported(aFile, detectedFormat)) {
                     return true;
                 }
             }
@@ -706,8 +724,8 @@ public final class KeywordSearchIngestModule implements IngestModuleAbstractFile
             if (aType.equals(TskData.TSK_DB_FILES_TYPE_ENUM.VIRTUAL_DIR)) {
                 //skip indexing of virtual dirs (no content, no real name) - will index children files
                 return;
-            } 
-            
+            }
+
             boolean isUnallocFile = aType.equals(TskData.TSK_DB_FILES_TYPE_ENUM.UNALLOC_BLOCKS);
 
             final long size = aFile.getSize();
@@ -725,18 +743,39 @@ public final class KeywordSearchIngestModule implements IngestModuleAbstractFile
                 return;
             }
 
-            boolean extractTextSupported = isTextExtractSupported(aFile);
+            //use Tika to detect the format
+            String detectedFormat = null;
+            InputStream is = null;
+            try {
+                is = new ReadContentInputStream(aFile);
+                detectedFormat = tikaFormatDetector.detect(is, aFile.getName());
+
+            } catch (Exception e) {
+                logger.log(Level.WARNING, "Could not detect format using tika for file: " + aFile, e);
+            } finally {
+                if (is != null) {
+                    try {
+                        is.close();
+                    } catch (IOException ex) {
+                        logger.log(Level.WARNING, "Could not close stream after detecting format using tika for file: " 
+                                + aFile, ex);
+                    }
+                }
+            }
+            logger.log(Level.INFO, "Detected format: " + aFile.getName() + " " +  detectedFormat);
+
+            boolean extractTextSupported = isTextExtractSupported(aFile, detectedFormat);
             if (isUnallocFile == false && extractTextSupported) {
                 //we know it's an allocated FS file 
                 //extract text with one of the extractors, divide into chunks and index with Solr
                 try {
                     //logger.log(Level.INFO, "indexing: " + aFile.getName());
-                    if (!extractIndex(aFile, false)) {
+                    if (!extractIndex(aFile, false, detectedFormat)) {
                         logger.log(Level.WARNING, "Failed to extract text and ingest, file '" + aFile.getName() + "' (id: " + aFile.getId() + ").");
                         ingestStatus.put(aFile.getId(), IngestStatus.SKIPPED);
                         //try to extract strings, if a file
                         if (aFile.isFile() == true) {
-                            processNonIngestible(aFile);
+                            processNonIngestible(aFile, detectedFormat);
                         }
 
                     } else {
@@ -749,7 +788,7 @@ public final class KeywordSearchIngestModule implements IngestModuleAbstractFile
                     ingestStatus.put(aFile.getId(), IngestStatus.SKIPPED);
                     //try to extract strings, if a file
                     if (aFile.isFile() == true) {
-                        processNonIngestible(aFile);
+                        processNonIngestible(aFile, detectedFormat);
                     }
 
                 } catch (Exception e) {
@@ -758,18 +797,18 @@ public final class KeywordSearchIngestModule implements IngestModuleAbstractFile
                     ingestStatus.put(aFile.getId(), IngestStatus.SKIPPED);
                     //try to extract strings if a file
                     if (aFile.isFile() == true) {
-                        processNonIngestible(aFile);
+                        processNonIngestible(aFile, detectedFormat);
                     }
                 }
             } else {
                 //unallocated file or unsupported content type by Solr
-                processNonIngestible(aFile);
+                processNonIngestible(aFile, detectedFormat);
             }
         }
 
-        private boolean processNonIngestible(AbstractFile aFile) {
+        private boolean processNonIngestible(AbstractFile aFile, String detectedFormat) {
             try {
-                if (!extractIndex(aFile, true)) {
+                if (!extractIndex(aFile, true, detectedFormat)) {
                     logger.log(Level.WARNING, "Failed to extract strings and ingest, file '" + aFile.getName() + "' (id: " + aFile.getId() + ").");
                     ingestStatus.put(aFile.getId(), IngestStatus.SKIPPED);
                     return false;
@@ -1025,7 +1064,7 @@ public final class KeywordSearchIngestModule implements IngestModuleAbstractFile
                                 detailsSb.append("<tr>");
                                 detailsSb.append("<th>File</th>");
                                 detailsSb.append("<td>").append(hitFile.getParentPath()).append(hitFile.getName()).append("</td>");
-                                
+
                                 detailsSb.append("</tr>");
 
 
diff --git a/NEWS.txt b/NEWS.txt
index 8faa11f448..0a174b445f 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -6,6 +6,8 @@ New features:
 
 Improvements:
 - Sleuthkit-4.0.2 and libewf-20130128
+- improved image loading in Media View and Thumbnail View (faster loading, handles large files better)
+- improve Keyword Search file indexing (decision whether to index using detected mime-type instead of file extension)
 - show children counts in directory tree
 
 Bugfixes:
@@ -15,7 +17,7 @@ Bugfixes:
 - fixed directory tree history being reset when tree is refreshed.
 - exif module better jpeg detection using signature and not only file extension.
 - The "media view" tab is inactive for deleted files (#165)
-- improved image loading in Media View and Thumbnail View (faster loading, handles large files better)
+
 
 ---------------- VERSION 3.0.4 --------------
 

From 8b730b79f0a7734e0d246cf4459f3e9805c8c24e Mon Sep 17 00:00:00 2001
From: adam-m <amalinowski@basistech.com>
Date: Tue, 19 Mar 2013 16:32:34 -0400
Subject: [PATCH 05/14] close streams after resizing pictures

---
 .../corecomponents/DataContentViewerMedia.java  |  7 +++++++
 .../corecomponents/ThumbnailViewNode.java       | 17 +++++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerMedia.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerMedia.java
index d44324d048..0416c92e68 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerMedia.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerMedia.java
@@ -325,6 +325,13 @@ public class DataContentViewerMedia extends javax.swing.JPanel implements DataCo
                     MessageNotifyUtil.Notify.warn("Could not load image file (too large): " +  file.getName(), ex.getMessage());
                     return;
                 }
+                finally {
+                    try {
+                        inputStream.close();
+                    } catch (IOException ex) {
+                        logger.log(Level.WARNING, "Could not close input stream after loading image in media view: " + fileName, ex);
+                    }
+                }
                 
                 if (fxImage == null) {
                     logger.log(Level.WARNING, "Could not load image file into media view: " + fileName);
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewNode.java b/Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewNode.java
index 0acf0f9334..362fccb7b4 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewNode.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewNode.java
@@ -35,6 +35,7 @@ import javax.swing.JFrame;
 import org.openide.nodes.Children;
 import org.openide.nodes.FilterNode;
 import org.openide.nodes.Node;
+import org.openide.util.Exceptions;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.corelibs.ScalrWrapper;
 import org.sleuthkit.autopsy.coreutils.Logger;
@@ -93,8 +94,7 @@ class ThumbnailViewNode extends FilterNode {
                         icon = generateIcon(content);
                         if (icon == null) {
                             icon = ThumbnailViewNode.defaultIcon;
-                        }
-                        else {
+                        } else {
                             ImageIO.write((BufferedImage) icon, "jpg", getFile(content.getId()));
                         }
                     } catch (IOException ex) {
@@ -116,15 +116,24 @@ class ThumbnailViewNode extends FilterNode {
      */
     static private BufferedImage generateIcon(Content content) {
 
+        InputStream inputStream = null;
         try {
-            final InputStream inputStream = new ReadContentInputStream(content);
+            inputStream = new ReadContentInputStream(content);
             BufferedImage bi = ImageIO.read(inputStream);
-
             BufferedImage biScaled = ScalrWrapper.resizeFast(bi, 100, 100);
             return biScaled;
         } catch (Exception e) {
             logger.log(Level.WARNING, "Could not scale image: " + content.getName(), e);
             return null;
+        } finally {
+            if (inputStream != null) {
+                try {
+                    inputStream.close();
+                } catch (IOException ex) {
+                    logger.log(Level.WARNING, "Could not close input stream after resizing thumbnail: " + content.getName(), ex);
+                }
+            }
+
         }
     }
 

From 62c71e42323238fa62ba156c62f8c9a0547bba2c Mon Sep 17 00:00:00 2001
From: adam-m <amalinowski@basistech.com>
Date: Tue, 19 Mar 2013 17:43:22 -0400
Subject: [PATCH 06/14] handle the case when can't generate a thumbnail on a
 huge image cleanly (still load other thumbnails)

---
 .../sleuthkit/autopsy/corecomponents/ThumbnailViewNode.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewNode.java b/Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewNode.java
index 362fccb7b4..92ee76109f 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewNode.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewNode.java
@@ -122,7 +122,11 @@ class ThumbnailViewNode extends FilterNode {
             BufferedImage bi = ImageIO.read(inputStream);
             BufferedImage biScaled = ScalrWrapper.resizeFast(bi, 100, 100);
             return biScaled;
-        } catch (Exception e) {
+        }catch (OutOfMemoryError e) {
+            logger.log(Level.WARNING, "Could not scale image (too large): " + content.getName(), e);
+            return null;
+        } 
+        catch (Exception e) {
             logger.log(Level.WARNING, "Could not scale image: " + content.getName(), e);
             return null;
         } finally {

From 6a160fa34bdb936260a6adea45795b6e4ab6ee39 Mon Sep 17 00:00:00 2001
From: adam-m <amalinowski@basistech.com>
Date: Tue, 19 Mar 2013 22:57:32 -0400
Subject: [PATCH 07/14] media view: faster / smoother image swapping if already
 in image mode

---
 .../DataContentViewerMedia.java               | 73 +++++++++++--------
 1 file changed, 42 insertions(+), 31 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerMedia.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerMedia.java
index 0416c92e68..7b5f833b47 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerMedia.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerMedia.java
@@ -93,6 +93,7 @@ public class DataContentViewerMedia extends javax.swing.JPanel implements DataCo
     private BufferedImage currentImage = null;
     private boolean gstInited = false;
     private AbstractFile lastFile;
+    private boolean inImageMode; //keeps track if already in image mode to minimize UI setup
 
     /**
      * Creates new form DataContentViewerVideo
@@ -103,6 +104,7 @@ public class DataContentViewerMedia extends javax.swing.JPanel implements DataCo
     }
 
     private void customizeComponents() {
+        inImageMode = false;
 
         Platform.setImplicitExit(false);
         PlatformImpl.startup(new Runnable() {
@@ -112,17 +114,17 @@ public class DataContentViewerMedia extends javax.swing.JPanel implements DataCo
             }
         });
         logger.log(Level.INFO, "Supported image formats by javafx image viewer: ");
-        
+
         //initialize supported image types
         //TODO use mime-types instead once we have support
         String[] fxSupportedImagesSuffixes = ImageIO.getReaderFileSuffixes();
         IMAGES = new String[fxSupportedImagesSuffixes.length];
-        for (int i=0; i<fxSupportedImagesSuffixes.length; ++i) {
+        for (int i = 0; i < fxSupportedImagesSuffixes.length; ++i) {
             String suffix = fxSupportedImagesSuffixes[i];
             logger.log(Level.INFO, "suffix: " + suffix);
             IMAGES[i] = "." + suffix;
         }
-        
+
         try {
             logger.log(Level.INFO, "Initializing gstreamer for video/audio viewing");
             Gst.init();
@@ -261,7 +263,7 @@ public class DataContentViewerMedia extends javax.swing.JPanel implements DataCo
         if (selectedNode == null) {
             return;
         }
-        
+
         AbstractFile file = selectedNode.getLookup().lookup(AbstractFile.class);
         if (file == null) {
             return;
@@ -275,7 +277,7 @@ public class DataContentViewerMedia extends javax.swing.JPanel implements DataCo
 
         reset();
         setComponentsVisibility(false);
-        
+
         // get rid of any existing videoProgressWorker thread
         if (videoProgressWorker != null) {
             videoProgressWorker.cancel(true);
@@ -288,6 +290,7 @@ public class DataContentViewerMedia extends javax.swing.JPanel implements DataCo
             showImageFx(file);
         } else if (gstInited
                 && (containsExt(file.getName(), VIDEOS) || containsExt(file.getName(), AUDIOS))) {
+            inImageMode = false;
             setupVideo(file);
         }
     }
@@ -299,13 +302,13 @@ public class DataContentViewerMedia extends javax.swing.JPanel implements DataCo
      */
     private void showImageFx(final AbstractFile file) {
         final String fileName = file.getName();
-        
+
         // load the image
         PlatformImpl.runLater(new Runnable() {
             @Override
             public void run() {
                 Dimension dims = DataContentViewerMedia.this.getSize();
-                
+
                 final InputStream inputStream = new ReadContentInputStream(file);
 
                 final Image fxImage;
@@ -313,26 +316,24 @@ public class DataContentViewerMedia extends javax.swing.JPanel implements DataCo
                     //original input stream
                     BufferedImage bi = ImageIO.read(inputStream);
                     //scale image using Scalr
-                    BufferedImage biScaled = ScalrWrapper.resizeHighQuality(bi, (int)dims.getWidth(), (int)dims.getHeight());
+                    BufferedImage biScaled = ScalrWrapper.resizeHighQuality(bi, (int) dims.getWidth(), (int) dims.getHeight());
                     //convert from awt imageto fx image
                     fxImage = SwingFXUtils.toFXImage(biScaled, null);
                 } catch (IOException ex) {
                     logger.log(Level.WARNING, "Could not load image file into media view: " + fileName, ex);
                     return;
-                }
-                catch (OutOfMemoryError ex) {
+                } catch (OutOfMemoryError ex) {
                     logger.log(Level.WARNING, "Could not load image file into media view (too large): " + fileName, ex);
-                    MessageNotifyUtil.Notify.warn("Could not load image file (too large): " +  file.getName(), ex.getMessage());
+                    MessageNotifyUtil.Notify.warn("Could not load image file (too large): " + file.getName(), ex.getMessage());
                     return;
-                }
-                finally {
+                } finally {
                     try {
                         inputStream.close();
                     } catch (IOException ex) {
                         logger.log(Level.WARNING, "Could not close input stream after loading image in media view: " + fileName, ex);
                     }
                 }
-                
+
                 if (fxImage == null) {
                     logger.log(Level.WARNING, "Could not load image file into media view: " + fileName);
                     return;
@@ -353,27 +354,37 @@ public class DataContentViewerMedia extends javax.swing.JPanel implements DataCo
                 Group fxRoot = new Group();
 
                 //Scene fxScene = new Scene(fxRoot, dims.getWidth(), dims.getHeight(), javafx.scene.paint.Color.BLACK);
-                Scene fxScene = new Scene(fxRoot,javafx.scene.paint.Color.BLACK);
+                Scene fxScene = new Scene(fxRoot, javafx.scene.paint.Color.BLACK);
                 fxRoot.getChildren().add(fxImageView);
 
-                final JFXPanel fxPanel = new JFXPanel();
-                fxPanel.setScene(fxScene);
+                if (inImageMode) {
+                    final JFXPanel fxPanel = (JFXPanel) videoPanel.getComponent(0);
+                    fxPanel.setScene(fxScene);
+                    videoPanel.setVisible(true);
+                } else {
+                    final JFXPanel fxPanel = new JFXPanel();
+                    fxPanel.setScene(fxScene);
+                    
 
-                //when done, join with the swing panel
-                EventQueue.invokeLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        videoPanel.removeAll();
-                        videoPanel.setLayout(new BoxLayout(videoPanel, BoxLayout.Y_AXIS));
-                        videoPanel.add(fxPanel);
-                        videoPanel.setVisible(true);
-                        
-                        if (fxImage.isError() ) {
-                            logger.log(Level.WARNING, "Could not load image file into media view: " + fileName);
-                            //MessageNotifyUtil.Message.warn("Could not load image file: " +  file.getName());
+                    //when done, join with the swing panel
+                    EventQueue.invokeLater(new Runnable() {
+                        @Override
+                        public void run() {
+                            inImageMode = true;
+                            //remove video panels and recreate image view panel
+                            //TODO use swing layered pane to switch between different modes
+                            videoPanel.removeAll();
+                            videoPanel.setLayout(new BoxLayout(videoPanel, BoxLayout.Y_AXIS));
+                            videoPanel.add(fxPanel);
+                            videoPanel.setVisible(true);
+
+                            if (fxImage.isError()) {
+                                logger.log(Level.WARNING, "Could not load image file into media view: " + fileName);
+                                //MessageNotifyUtil.Message.warn("Could not load image file: " +  file.getName());
+                            }
                         }
-                    }
-                });
+                    });
+                }
             }
         });
 

From 297b84d50217e3d06bed4d1449bb930820eb2c16 Mon Sep 17 00:00:00 2001
From: adam-m <amalinowski@basistech.com>
Date: Tue, 19 Mar 2013 23:25:20 -0400
Subject: [PATCH 08/14] update timeline module description and category

---
 .../src/org/sleuthkit/autopsy/timeline/Bundle.properties     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Timeline/src/org/sleuthkit/autopsy/timeline/Bundle.properties b/Timeline/src/org/sleuthkit/autopsy/timeline/Bundle.properties
index 3260202540..ac06311ca1 100644
--- a/Timeline/src/org/sleuthkit/autopsy/timeline/Bundle.properties
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/Bundle.properties
@@ -1,4 +1,9 @@
+OpenIDE-Module-Display-Category=External Viewers
+OpenIDE-Module-Long-Description=\
+    Displays user activity as an interactive timeline chart with year, month and day granularity. \n\
+    Events for a selected day are viewable in the built-in result and content viewers.
 OpenIDE-Module-Name=Timeline
 CTL_MakeTimeline="Make Timeline (Beta)"
+OpenIDE-Module-Short-Description=Displays user activity timeline
 TimelineProgressDialog.jLabel1.text=Creating timeline . . .
 TimelineFrame.title=Timeline

From 53b6631edc5cf9d27461c858149cca0d99580a6a Mon Sep 17 00:00:00 2001
From: adam-m <amalinowski@basistech.com>
Date: Wed, 20 Mar 2013 09:26:50 -0400
Subject: [PATCH 09/14] close tsk files are file pipeline is done

---
 .../org/sleuthkit/autopsy/ingest/IngestManager.java   | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
index a903fa14fa..518ab920d6 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
@@ -899,7 +899,10 @@ public class IngestManager {
                         logger.log(Level.SEVERE, "Error: unexpected exception from module: " + module.getName(), e);
                         stats.addError(module);
                     }
-                }
+                } //end for every module
+                
+                //free the internal file resource after done with every module
+                fileToProcess.close();
 
                 int newTotalEnqueuedFiles = fileScheduler.getFilesEnqueuedEst();
                 if (newTotalEnqueuedFiles > totalEnqueuedFiles) {
@@ -915,7 +918,8 @@ public class IngestManager {
                 }
                 //--totalEnqueuedFiles;
                 
-            } //end of this AbstractFile
+                
+            } //end of for every AbstractFile
             logger.log(Level.INFO, "IngestManager: Finished processing files");
             return null;
         }
@@ -933,8 +937,7 @@ public class IngestManager {
                 }
                 
                 logger.log(Level.INFO, PlatformUtil.getAllMemUsageInfo());
-                logger.log(Level.INFO, "Freeing resources post file pipeline run");
-                System.gc();
+                logger.log(Level.INFO, "Freeing jvm heap resources post file pipeline run");
                 System.gc();
                 logger.log(Level.INFO, PlatformUtil.getAllMemUsageInfo());
 

From b0fd6b2e9de0ad2c35048b560dc378481b59f8b8 Mon Sep 17 00:00:00 2001
From: adam-m <amalinowski@basistech.com>
Date: Wed, 20 Mar 2013 12:40:07 -0400
Subject: [PATCH 10/14] image viewer: handle condition when case is being
 closed and image had been selected earlier

---
 .../autopsy/corecomponents/DataContentViewerMedia.java   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerMedia.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerMedia.java
index 7b5f833b47..2611fe275d 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerMedia.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerMedia.java
@@ -303,6 +303,12 @@ public class DataContentViewerMedia extends javax.swing.JPanel implements DataCo
     private void showImageFx(final AbstractFile file) {
         final String fileName = file.getName();
 
+        if (!Case.isCaseOpen()) {
+            //handle in-between condition when case is being closed
+            //and an image was previously selected
+            return;
+        }
+        
         // load the image
         PlatformImpl.runLater(new Runnable() {
             @Override
@@ -362,15 +368,14 @@ public class DataContentViewerMedia extends javax.swing.JPanel implements DataCo
                     fxPanel.setScene(fxScene);
                     videoPanel.setVisible(true);
                 } else {
+                    inImageMode = true;
                     final JFXPanel fxPanel = new JFXPanel();
                     fxPanel.setScene(fxScene);
                     
-
                     //when done, join with the swing panel
                     EventQueue.invokeLater(new Runnable() {
                         @Override
                         public void run() {
-                            inImageMode = true;
                             //remove video panels and recreate image view panel
                             //TODO use swing layered pane to switch between different modes
                             videoPanel.removeAll();

From 2ce9fa67d40f7a942d5cbc8253f0a04b268a2dd4 Mon Sep 17 00:00:00 2001
From: adam-m <amalinowski@basistech.com>
Date: Wed, 20 Mar 2013 12:45:15 -0400
Subject: [PATCH 11/14] add a check if case is still open before calling
 setNode() to help eliminate case closing issues when old irrelevant selection
 events are being pumped

---
 .../AbstractDataResultViewer.java             | 30 +++++++++++--------
 .../DirectoryTreeTopComponent.java            | 12 +++++---
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/AbstractDataResultViewer.java b/Core/src/org/sleuthkit/autopsy/corecomponents/AbstractDataResultViewer.java
index 1f7228b212..3387065d1d 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/AbstractDataResultViewer.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/AbstractDataResultViewer.java
@@ -30,6 +30,7 @@ import org.openide.explorer.ExplorerManager;
 import org.openide.explorer.ExplorerManager.Provider;
 import org.openide.nodes.Node;
 import org.openide.util.Lookup;
+import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataContent;
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataResultViewer;
 import org.sleuthkit.autopsy.coreutils.Logger;
@@ -43,10 +44,9 @@ public abstract class AbstractDataResultViewer extends JPanel implements
     private static final Logger logger = Logger.getLogger(AbstractDataResultViewer.class.getName());
     protected transient ExplorerManager em = new ExplorerManager();
     private PropertyChangeListener nodeSelListener;
-    
     /**
-     * Content viewer to respond to selection events
-     * Either the main one, or custom one if set
+     * Content viewer to respond to selection events Either the main one, or
+     * custom one if set
      */
     protected DataContent contentViewer;
 
@@ -54,17 +54,22 @@ public abstract class AbstractDataResultViewer extends JPanel implements
 
         //DataContent is designed to return only the default viewer from lookup
         //use the default one unless set otherwise
-       contentViewer = Lookup.getDefault().lookup(DataContent.class);
-        
+        contentViewer = Lookup.getDefault().lookup(DataContent.class);
+
         //property listener to send nodes to content viewer    
         nodeSelListener = new PropertyChangeListener() {
-                        
             /**
              * Propagates changes in the current select node from the
              * DataResultViewer to the DataContentTopComponent
              */
             @Override
             public void propertyChange(PropertyChangeEvent evt) {
+                if (!Case.isCaseOpen()) {
+                    //handle in-between condition when case is being closed
+                    //and legacy selection events are pumped
+                    return;
+                }
+
                 String changed = evt.getPropertyName();
 
                 // change that should affect view
@@ -77,10 +82,10 @@ public abstract class AbstractDataResultViewer extends JPanel implements
                     setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
                     try {
                         Node selectedNode = getSelectedNode();
-                        
+
                         nodeSelected(selectedNode);
 
-                        
+
 
                         if (selectedNode != null) {
                             // there's a new/changed node to display
@@ -142,10 +147,11 @@ public abstract class AbstractDataResultViewer extends JPanel implements
     @Override
     public void resetComponent() {
     }
-    
+
     /**
-     * Called when a new node has been selected in the result viewer
-     * Can update the viewer, etc.
+     * Called when a new node has been selected in the result viewer Can update
+     * the viewer, etc.
+     *
      * @param selectedNode the new node currently selected
      */
     public abstract void nodeSelected(Node selectedNode);
@@ -168,7 +174,7 @@ public abstract class AbstractDataResultViewer extends JPanel implements
             logger.log(Level.WARNING, "Couldn't set selected nodes.", ex);
         }
     }
-    
+
     @Override
     public void setContentViewer(DataContent contentViewer) {
         this.contentViewer = contentViewer;
diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java
index ed779dcca4..ec74c5a212 100644
--- a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java
@@ -595,14 +595,18 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
 
     /**
      * Event handler to run when selection changed
-     * 
+     *
      * TODO this needs to be revised
-     * 
+     *
      * @param oldNodes
-     * @param newNodes 
+     * @param newNodes
      */
     private void respondSelection(final Node[] oldNodes, final Node[] newNodes) {
-        
+        if (!Case.isCaseOpen()) {
+            //handle in-between condition when case is being closed
+            //and legacy selection events are pumped
+            return;
+        }
         //this looks redundant?
 //        if (getSelectedNode() == null && oldNodes != null) {         
 //            try {

From fd9324f63d7c69a00e5e2b01283b725c9ef9c11a Mon Sep 17 00:00:00 2001
From: adam-m <amalinowski@basistech.com>
Date: Wed, 20 Mar 2013 12:46:48 -0400
Subject: [PATCH 12/14] update news for release

---
 NEWS.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/NEWS.txt b/NEWS.txt
index 0a174b445f..cd2c3f4533 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -1,4 +1,4 @@
----------------- VERSION Current (development) --------------
+---------------- VERSION 3.0.5 --------------
 
 New features:
 - Archive extractor ingest module (uses 7zip)
@@ -7,7 +7,7 @@ New features:
 Improvements:
 - Sleuthkit-4.0.2 and libewf-20130128
 - improved image loading in Media View and Thumbnail View (faster loading, handles large files better)
-- improve Keyword Search file indexing (decision whether to index using detected mime-type instead of file extension)
+- improve Keyword Search file indexing (use detected mime-type instead of file extension)
 - show children counts in directory tree
 
 Bugfixes:

From 5287e9b0531ec18e302cc02ee0185095874d99a2 Mon Sep 17 00:00:00 2001
From: adam-m <amalinowski@basistech.com>
Date: Wed, 20 Mar 2013 12:49:40 -0400
Subject: [PATCH 13/14] catch out of memory error from modules in file ingest
 pipeline, in addition to Exception, since they are different

---
 Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
index 518ab920d6..848aef6b82 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
@@ -899,6 +899,10 @@ public class IngestManager {
                         logger.log(Level.SEVERE, "Error: unexpected exception from module: " + module.getName(), e);
                         stats.addError(module);
                     }
+                    catch (OutOfMemoryError e) {
+                        logger.log(Level.SEVERE, "Error: out of memory from module: " + module.getName(), e);
+                        stats.addError(module);
+                    }
                 } //end for every module
                 
                 //free the internal file resource after done with every module

From ee8ef11882409ac8a6ac20017d3619722e88b4df Mon Sep 17 00:00:00 2001
From: adam-m <amalinowski@basistech.com>
Date: Wed, 20 Mar 2013 15:13:07 -0400
Subject: [PATCH 14/14] update modules versions for the release

---
 Core/manifest.mf                               | 2 +-
 Core/nbproject/project.properties              | 2 +-
 ExifParser/manifest.mf                         | 2 +-
 ExifParser/nbproject/project.properties        | 2 +-
 ExifParser/nbproject/project.xml               | 2 +-
 HashDatabase/manifest.mf                       | 2 +-
 HashDatabase/nbproject/project.properties      | 2 +-
 HashDatabase/nbproject/project.xml             | 2 +-
 KeywordSearch/manifest.mf                      | 2 +-
 KeywordSearch/nbproject/project.properties     | 2 +-
 KeywordSearch/nbproject/project.xml            | 2 +-
 RecentActivity/manifest.mf                     | 2 +-
 RecentActivity/nbproject/project.properties    | 2 +-
 RecentActivity/nbproject/project.xml           | 2 +-
 SevenZip/nbproject/project.xml                 | 2 +-
 Testing/manifest.mf                            | 2 +-
 Testing/nbproject/project.properties           | 2 +-
 Testing/nbproject/project.xml                  | 2 +-
 Timeline/manifest.mf                           | 1 +
 Timeline/nbproject/project.xml                 | 2 +-
 thunderbirdparser/manifest.mf                  | 2 +-
 thunderbirdparser/nbproject/project.properties | 2 +-
 thunderbirdparser/nbproject/project.xml        | 4 ++--
 23 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/Core/manifest.mf b/Core/manifest.mf
index a671f42879..049f93c861 100644
--- a/Core/manifest.mf
+++ b/Core/manifest.mf
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 OpenIDE-Module: org.sleuthkit.autopsy.core/7
 OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/core/Bundle.properties
 OpenIDE-Module-Layer: org/sleuthkit/autopsy/core/layer.xml
-OpenIDE-Module-Implementation-Version: 6
+OpenIDE-Module-Implementation-Version: 7
 OpenIDE-Module-Requires: org.openide.windows.WindowManager, org.netbeans.api.javahelp.Help
 AutoUpdate-Show-In-Client: true
 AutoUpdate-Essential-Module: true
diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties
index 73d8710d32..fcae93871e 100644
--- a/Core/nbproject/project.properties
+++ b/Core/nbproject/project.properties
@@ -6,5 +6,5 @@ license.file=../LICENSE-2.0.txt
 nbm.homepage=http://www.sleuthkit.org/
 nbm.module.author=Brian Carrier
 nbm.needs.restart=true
-spec.version.base=5.1
+spec.version.base=5.2
 
diff --git a/ExifParser/manifest.mf b/ExifParser/manifest.mf
index 63167f23a4..bed881d309 100644
--- a/ExifParser/manifest.mf
+++ b/ExifParser/manifest.mf
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 AutoUpdate-Show-In-Client: true
 OpenIDE-Module: org.sleuthkit.autopsy.exifparser/3
-OpenIDE-Module-Implementation-Version: 6
+OpenIDE-Module-Implementation-Version: 7
 OpenIDE-Module-Layer: org/sleuthkit/autopsy/exifparser/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/exifparser/Bundle.properties
diff --git a/ExifParser/nbproject/project.properties b/ExifParser/nbproject/project.properties
index 6f48597d02..f278b6de1b 100644
--- a/ExifParser/nbproject/project.properties
+++ b/ExifParser/nbproject/project.properties
@@ -3,4 +3,4 @@ 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.0
+spec.version.base=1.1
diff --git a/ExifParser/nbproject/project.xml b/ExifParser/nbproject/project.xml
index 6f5571f491..8bc8dc2781 100644
--- a/ExifParser/nbproject/project.xml
+++ b/ExifParser/nbproject/project.xml
@@ -12,7 +12,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>7</release-version>
-                        <specification-version>5.0</specification-version>
+                        <specification-version>5.2</specification-version>
                     </run-dependency>
                 </dependency>
             </module-dependencies>
diff --git a/HashDatabase/manifest.mf b/HashDatabase/manifest.mf
index afdd2b92bd..3b7e745580 100644
--- a/HashDatabase/manifest.mf
+++ b/HashDatabase/manifest.mf
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 AutoUpdate-Show-In-Client: true
 OpenIDE-Module: org.sleuthkit.autopsy.hashdatabase/3
-OpenIDE-Module-Implementation-Version: 6
+OpenIDE-Module-Implementation-Version: 7
 OpenIDE-Module-Layer: org/sleuthkit/autopsy/hashdatabase/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/hashdatabase/Bundle.properties
 
diff --git a/HashDatabase/nbproject/project.properties b/HashDatabase/nbproject/project.properties
index f278b6de1b..0735c621fa 100644
--- a/HashDatabase/nbproject/project.properties
+++ b/HashDatabase/nbproject/project.properties
@@ -3,4 +3,4 @@ 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
+spec.version.base=1.2
diff --git a/HashDatabase/nbproject/project.xml b/HashDatabase/nbproject/project.xml
index fb4111eff7..373b6a39f7 100644
--- a/HashDatabase/nbproject/project.xml
+++ b/HashDatabase/nbproject/project.xml
@@ -78,7 +78,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>7</release-version>
-                        <specification-version>5.0</specification-version>
+                        <specification-version>5.2</specification-version>
                     </run-dependency>
                 </dependency>
             </module-dependencies>
diff --git a/KeywordSearch/manifest.mf b/KeywordSearch/manifest.mf
index 4965047fae..693f2caa22 100644
--- a/KeywordSearch/manifest.mf
+++ b/KeywordSearch/manifest.mf
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 AutoUpdate-Show-In-Client: true
 OpenIDE-Module: org.sleuthkit.autopsy.keywordsearch/5
-OpenIDE-Module-Implementation-Version: 6
+OpenIDE-Module-Implementation-Version: 7
 OpenIDE-Module-Install: org/sleuthkit/autopsy/keywordsearch/Installer.class
 OpenIDE-Module-Layer: org/sleuthkit/autopsy/keywordsearch/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/keywordsearch/Bundle.properties
diff --git a/KeywordSearch/nbproject/project.properties b/KeywordSearch/nbproject/project.properties
index 48e8b51efd..080c464e8a 100644
--- a/KeywordSearch/nbproject/project.properties
+++ b/KeywordSearch/nbproject/project.properties
@@ -3,4 +3,4 @@ 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=3.0
+spec.version.base=3.1
diff --git a/KeywordSearch/nbproject/project.xml b/KeywordSearch/nbproject/project.xml
index 28c7220f9b..7684af33da 100644
--- a/KeywordSearch/nbproject/project.xml
+++ b/KeywordSearch/nbproject/project.xml
@@ -96,7 +96,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>7</release-version>
-                        <specification-version>5.0</specification-version>
+                        <specification-version>5.2</specification-version>
                     </run-dependency>
                 </dependency>
             </module-dependencies>
diff --git a/RecentActivity/manifest.mf b/RecentActivity/manifest.mf
index e4538b9a0d..1a039f7b59 100644
--- a/RecentActivity/manifest.mf
+++ b/RecentActivity/manifest.mf
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.sleuthkit.autopsy.recentactivity/4
-OpenIDE-Module-Implementation-Version: 6
+OpenIDE-Module-Implementation-Version: 7
 OpenIDE-Module-Layer: org/sleuthkit/autopsy/recentactivity/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/recentactivity/Bundle.properties
 OpenIDE-Module-Requires: 
diff --git a/RecentActivity/nbproject/project.properties b/RecentActivity/nbproject/project.properties
index dc281ec309..8f5a495086 100644
--- a/RecentActivity/nbproject/project.properties
+++ b/RecentActivity/nbproject/project.properties
@@ -4,4 +4,4 @@ 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=2.0
+spec.version.base=2.1
diff --git a/RecentActivity/nbproject/project.xml b/RecentActivity/nbproject/project.xml
index 3642a61775..edb627a7c3 100644
--- a/RecentActivity/nbproject/project.xml
+++ b/RecentActivity/nbproject/project.xml
@@ -36,7 +36,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>7</release-version>
-                        <specification-version>5.0</specification-version>
+                        <specification-version>5.2</specification-version>
                     </run-dependency>
                 </dependency>
             </module-dependencies>
diff --git a/SevenZip/nbproject/project.xml b/SevenZip/nbproject/project.xml
index e2c3999e3f..3260919c48 100644
--- a/SevenZip/nbproject/project.xml
+++ b/SevenZip/nbproject/project.xml
@@ -21,7 +21,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>7</release-version>
-                        <specification-version>5.0</specification-version>
+                        <specification-version>5.2</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/Testing/manifest.mf b/Testing/manifest.mf
index 95a13fd230..8c10f74029 100644
--- a/Testing/manifest.mf
+++ b/Testing/manifest.mf
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 AutoUpdate-Show-In-Client: false
 OpenIDE-Module: org.sleuthkit.autopsy.testing/3
-OpenIDE-Module-Implementation-Version: 5
+OpenIDE-Module-Implementation-Version: 6
 OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/testing/Bundle.properties
 
diff --git a/Testing/nbproject/project.properties b/Testing/nbproject/project.properties
index f278b6de1b..0735c621fa 100644
--- a/Testing/nbproject/project.properties
+++ b/Testing/nbproject/project.properties
@@ -3,4 +3,4 @@ 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
+spec.version.base=1.2
diff --git a/Testing/nbproject/project.xml b/Testing/nbproject/project.xml
index 6b7be2ee79..f5c0b17983 100644
--- a/Testing/nbproject/project.xml
+++ b/Testing/nbproject/project.xml
@@ -12,7 +12,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>7</release-version>
-                        <specification-version>5.0</specification-version>
+                        <specification-version>5.2</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/Timeline/manifest.mf b/Timeline/manifest.mf
index 9b3f1ece3d..8aeb1a6102 100644
--- a/Timeline/manifest.mf
+++ b/Timeline/manifest.mf
@@ -4,4 +4,5 @@ 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-Specification-Version: 1.0
+OpenIDE-Module-Implementation-Version: 1
 
diff --git a/Timeline/nbproject/project.xml b/Timeline/nbproject/project.xml
index 70436e4da4..eb93ea7619 100644
--- a/Timeline/nbproject/project.xml
+++ b/Timeline/nbproject/project.xml
@@ -94,7 +94,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>7</release-version>
-                        <specification-version>3.0</specification-version>
+                        <specification-version>5.2</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/thunderbirdparser/manifest.mf b/thunderbirdparser/manifest.mf
index 01f897fda3..ceb5c83656 100644
--- a/thunderbirdparser/manifest.mf
+++ b/thunderbirdparser/manifest.mf
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 AutoUpdate-Show-In-Client: true
 OpenIDE-Module: org.sleuthkit.autopsy.thunderbirdparser/3
-OpenIDE-Module-Implementation-Version: 6
+OpenIDE-Module-Implementation-Version: 7
 OpenIDE-Module-Layer: org/sleuthkit/autopsy/thunderbirdparser/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/thunderbirdparser/Bundle.properties
 
diff --git a/thunderbirdparser/nbproject/project.properties b/thunderbirdparser/nbproject/project.properties
index 6f48597d02..f278b6de1b 100644
--- a/thunderbirdparser/nbproject/project.properties
+++ b/thunderbirdparser/nbproject/project.properties
@@ -3,4 +3,4 @@ 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.0
+spec.version.base=1.1
diff --git a/thunderbirdparser/nbproject/project.xml b/thunderbirdparser/nbproject/project.xml
index d6205e03cd..6a76a94f15 100644
--- a/thunderbirdparser/nbproject/project.xml
+++ b/thunderbirdparser/nbproject/project.xml
@@ -12,7 +12,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>7</release-version>
-                        <specification-version>5.0</specification-version>
+                        <specification-version>5.2</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -21,7 +21,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>5</release-version>
-                        <specification-version>3.0</specification-version>
+                        <specification-version>3.1</specification-version>
                     </run-dependency>
                 </dependency>
             </module-dependencies>