Merge branch 'master' of github.com:sleuthkit/autopsy

Core/src/org/sleuthkit/autopsy/coreutils/PlatformUtil.java

@@ -142,6 +142,27 @@ public class PlatformUtil {
         return Places.getUserDirectory();
     }
     
+    /**
+     * Get RCP project dirs 
+     * @return 
+     */
+    public static List<String> getProjectsDirs() {
+        List<String> ret = new ArrayList<String>();
+        String projectDir = System.getProperty("netbeans.dirs");
+        if (projectDir == null) {
+            return ret;
+        }
+        String [] split = projectDir.split(";");
+        if (split == null || split.length == 0) {
+            return ret;
+        }
+        for (String path : split) {
+            ret.add(path);
+        }
+         
+         return ret;
+    }
+
     /**
      * Get user config directory path
      *

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

@@ -443,6 +443,16 @@ public final class IngestModuleLoader {
         //user modules
         urls.addAll(getJarPaths(PlatformUtil.getUserModulesPath()));
         
+        // add other project dirs, such as from external modules
+        for (String projectDir : PlatformUtil.getProjectsDirs()) {
+            File modules = new File(projectDir + File.separator + "modules");
+            if (modules.exists()) {
+                urls.addAll(getJarPaths(modules.getAbsolutePath()));
+            }
+        }
+        
+        
+
         return urls;
     }