From 498b8019ae7ecde45d78fbeadf93cd7e6ef4744e Mon Sep 17 00:00:00 2001
From: adam-m <amalinowski@basistech.com>
Date: Wed, 26 Sep 2012 14:43:34 -0400
Subject: [PATCH] Wrap all jars in Core in a separate module CoreLibs

---
 .gitignore                                    |   2 +
 Core/build.xml                                |  34 +-
 Core/nbproject/project.properties             |  23 -
 Core/nbproject/project.xml                    | 139 ++----
 CoreLibs/build.xml                            |  42 ++
 {Core => CoreLibs}/ivy.xml                    |   2 +-
 CoreLibs/manifest.mf                          |   5 +
 CoreLibs/nbproject/build-impl.xml             |  45 ++
 CoreLibs/nbproject/project.properties         |  25 +
 CoreLibs/nbproject/project.xml                | 441 ++++++++++++++++++
 CoreLibs/nbproject/suite.properties           |   1 +
 .../autopsy/corelibs/Bundle.properties        |   3 +
 RecentActivity/nbproject/project.xml          |   8 +
 nbproject/project.properties                  |   4 +-
 14 files changed, 609 insertions(+), 165 deletions(-)
 create mode 100644 CoreLibs/build.xml
 rename {Core => CoreLibs}/ivy.xml (95%)
 create mode 100644 CoreLibs/manifest.mf
 create mode 100644 CoreLibs/nbproject/build-impl.xml
 create mode 100644 CoreLibs/nbproject/project.properties
 create mode 100644 CoreLibs/nbproject/project.xml
 create mode 100644 CoreLibs/nbproject/suite.properties
 create mode 100644 CoreLibs/src/org/sleuthkit/autopsy/corelibs/Bundle.properties

diff --git a/.gitignore b/.gitignore
index 67936787d5..5370c6f69f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,8 @@
 /Core/release/modules/lib/
 /Core/release/modules/ext/
 /Core/src/org/sleuthkit/autopsy/coreutils/Version.properties
+/CoreLibs/release/modules/lib/
+/CoreLibs/release/modules/ext/
 /KeywordSearch/release/modules/ext/
 /KeywordSearch/release/solr/lib/
 /KeywordSearch/release/solr/solr/lib/
diff --git a/Core/build.xml b/Core/build.xml
index 94e49decb0..4a49d26ac9 100644
--- a/Core/build.xml
+++ b/Core/build.xml
@@ -2,35 +2,11 @@
 <!-- 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.core" default="netbeans" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
+<project name="org.sleuthkit.autopsy.core" default="netbeans" basedir=".">
     <description>Builds, tests, and runs the project org.sleuthkit.autopsy.core.</description>
     <import file="nbproject/build-impl.xml"/>
     
-    <!-- TODO move iby setup to global project build.xml and reuse the target in modules -->
      
-    <property name="ivy.install.version" value="2.1.0-rc2" />
-    <condition property="ivy.home" value="${env.IVY_HOME}">
-        <isset property="env.IVY_HOME" />
-    </condition>
-    <property name="ivy.home" value="${user.home}/.ant" />
-    <property name="ivy.jar.dir" value="${ivy.home}/lib" />
-    <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar" />
-
-    <target name="download-ivy" unless="offline">
-        <mkdir dir="${ivy.jar.dir}"/>
-        <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar" 
-         dest="${ivy.jar.file}" usetimestamp="true"/>
-    </target>
-
-    <!-- init-ivy will bootstrap Ivy if the user doesn't have it already -->
-    <target name="init-ivy" depends="download-ivy">
-        <path id="ivy.lib.path">
-            <fileset dir="${ivy.jar.dir}" includes="*.jar"/>
-        </path>
-        <taskdef resource="org/apache/ivy/ant/antlib.xml"
-             uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
-    </target>
-
     <!-- Verify that the TSK_HOME env variable is set -->
     <target name="findTSK">
         <property environment="env"/>
@@ -47,12 +23,8 @@
         <copy file="${env.TSK_HOME}/bindings/java/lib/sqlite-jdbc-3.7.2.jar" tofile="${basedir}/release/modules/ext/sqlite-jdbc-3.7.2.jar"/>
     </target>
 
-    <target name="init" depends="basic-init,files-init,build-init,-javac-init,init-ivy">
-        
-        <!-- clear & fetch all the dependencies from Ivy and stick them in the right places -->
-        <ivy:resolve/>
-        <ivy:retrieve conf="autopsy_core" sync="true" pattern="release/modules/ext/[artifact]-[revision](-[classifier]).[ext]" />
-        
+    <target name="init" depends="basic-init,files-init,build-init,-javac-init">
+
         <!-- get additional deps -->
         <antcall target="getTSKJars" />
         
diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties
index 7eab89ab46..7dec8e49fb 100644
--- a/Core/nbproject/project.properties
+++ b/Core/nbproject/project.properties
@@ -1,26 +1,3 @@
-file.reference.commons-lang-2.4.jar=release/modules/ext/commons-lang-2.4.jar
-file.reference.dom4j-1.6.1.jar=release/modules/ext/dom4j-1.6.1.jar
-file.reference.gson-1.4.jar=release/modules/ext/gson-1.4.jar
-file.reference.gstreamer-java-1.5.jar=release/modules/ext/gstreamer-java-1.5.jar
-file.reference.guava-11.0.2.jar=release/modules/ext/guava-11.0.2.jar
-file.reference.javassist-3.12.1.GA.jar=release/modules/ext/javassist-3.12.1.GA.jar
-file.reference.jcalendarbutton-1.4.6.jar=release/modules/ext/jcalendarbutton-1.4.6.jar
-file.reference.jdom-1.0.jar=release/modules/ext/jdom-1.0.jar
-file.reference.jna-3.4.0.jar=release/modules/ext/jna-3.4.0.jar
-file.reference.jsr305-1.3.9.jar=release/modules/ext/jsr305-1.3.9.jar
-file.reference.poi-3.8.jar=release/modules/ext/poi-3.8.jar
-file.reference.poi-excelant-3.8.jar=release/modules/ext/poi-excelant-3.8.jar
-file.reference.poi-ooxml-3.8.jar=release/modules/ext/poi-ooxml-3.8.jar
-file.reference.poi-ooxml-schemas-3.8.jar=release/modules/ext/poi-ooxml-schemas-3.8.jar
-file.reference.poi-scratchpad-3.8.jar=release/modules/ext/poi-scratchpad-3.8.jar
-file.reference.reflections-0.9.8.jar=release/modules/ext/reflections-0.9.8.jar
-file.reference.servlet-api-2.5.jar=release/modules/ext/servlet-api-2.5.jar
-file.reference.slf4j-api-1.6.1.jar=release/modules/ext/slf4j-api-1.6.1.jar
-file.reference.slf4j-simple-1.6.1.jar=release/modules/ext/slf4j-simple-1.6.1.jar
-file.reference.sqlite-jdbc-3.7.2.jar=release/modules/ext/sqlite-jdbc-3.7.2.jar
-file.reference.Tsk_DataModel.jar=release/modules/ext/Tsk_DataModel.jar
-file.reference.xml-apis-1.0.b2.jar=release/modules/ext/xml-apis-1.0.b2.jar
-file.reference.xmlbeans-2.3.0.jar=release/modules/ext/xmlbeans-2.3.0.jar
 javac.source=1.6
 javac.compilerargs=-Xlint -Xlint:-serial
 license.file=../LICENSE-2.0.txt
diff --git a/Core/nbproject/project.xml b/Core/nbproject/project.xml
index c42c7501c4..6d3ae90435 100644
--- a/Core/nbproject/project.xml
+++ b/Core/nbproject/project.xml
@@ -48,7 +48,15 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>1.26.1</specification-version>
+                        <specification-version>1.35.1</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.netbeans.spi.quicksearch</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>1.14.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -88,7 +96,7 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>7.23.1</specification-version>
+                        <specification-version>7.46.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -96,7 +104,7 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>7.15.1</specification-version>
+                        <specification-version>7.25.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -112,7 +120,7 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>7.47.1</specification-version>
+                        <specification-version>7.62.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -120,7 +128,7 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>7.17.1</specification-version>
+                        <specification-version>7.32.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -128,7 +136,7 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>7.16.1</specification-version>
+                        <specification-version>7.28.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -136,7 +144,7 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>6.30.1</specification-version>
+                        <specification-version>6.49.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -144,7 +152,7 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>8.6.1</specification-version>
+                        <specification-version>8.25.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -152,7 +160,7 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>8.3.1</specification-version>
+                        <specification-version>8.15.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -160,21 +168,22 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>6.33.1</specification-version>
+                        <specification-version>6.55.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.0</specification-version>
                     </run-dependency>
                 </dependency>
             </module-dependencies>
-            <test-dependencies>
-                <test-type>
-                    <name>unit</name>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.libs.junit4</code-name-base>
-                        <compile-dependency/>
-                    </test-dependency>
-                </test-type>
-            </test-dependencies>
             <public-packages>
                 <package>org.sleuthkit.autopsy.casemodule</package>
+                <package>org.sleuthkit.autopsy.core</package>
                 <package>org.sleuthkit.autopsy.corecomponentinterfaces</package>
                 <package>org.sleuthkit.autopsy.corecomponents</package>
                 <package>org.sleuthkit.autopsy.coreutils</package>
@@ -187,101 +196,13 @@
                 <package>org.sleuthkit.datamodel</package>
             </public-packages>
             <class-path-extension>
-                <runtime-relative-path>ext/javassist-3.12.1.GA.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javassist-3.12.1.GA.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/jdom-1.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jdom-1.0.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/jsr305-1.3.9.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jsr305-1.3.9.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/jcalendarbutton-1.4.6.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jcalendarbutton-1.4.6.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/xml-apis-1.0.b2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/xml-apis-1.0.b2.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/commons-logging-1.1.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-logging-1.1.1.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/slf4j-simple-1.6.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/slf4j-simple-1.6.1.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/gson-1.4.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/gson-1.4.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/commons-lang-2.4.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/commons-lang-2.4.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/gstreamer-java-1.5.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/gstreamer-java-1.5.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/poi-ooxml-3.8.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/poi-ooxml-3.8.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/servlet-api-2.5.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/servlet-api-2.5.jar</binary-origin>
+                <runtime-relative-path>ext/Tsk_DataModel.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/Tsk_DataModel.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/sqlite-jdbc-3.7.2.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/sqlite-jdbc-3.7.2.jar</binary-origin>
             </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/slf4j-api-1.6.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/slf4j-api-1.6.1.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/poi-3.8.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/poi-3.8.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/dom4j-1.6.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/dom4j-1.6.1.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/poi-scratchpad-3.8.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/poi-scratchpad-3.8.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/poi-ooxml-schemas-3.8.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/poi-ooxml-schemas-3.8.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/guava-11.0.2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/guava-11.0.2.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>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/xmlbeans-2.3.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/xmlbeans-2.3.0.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/reflections-0.9.8.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/reflections-0.9.8.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/poi-excelant-3.8.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/poi-excelant-3.8.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/jna-3.4.0.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jna-3.4.0.jar</binary-origin>
-            </class-path-extension>
         </data>
     </configuration>
 </project>
diff --git a/CoreLibs/build.xml b/CoreLibs/build.xml
new file mode 100644
index 0000000000..7cfd3e0cf1
--- /dev/null
+++ b/CoreLibs/build.xml
@@ -0,0 +1,42 @@
+<?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.corelibs" default="netbeans" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
+    <description>Builds, tests, and runs the project org.sleuthkit.autopsy.corelibs.</description>
+    <import file="nbproject/build-impl.xml"/>
+    
+    <property name="ivy.install.version" value="2.1.0-rc2" />
+    <condition property="ivy.home" value="${env.IVY_HOME}">
+        <isset property="env.IVY_HOME" />
+    </condition>
+    <property name="ivy.home" value="${user.home}/.ant" />
+    <property name="ivy.jar.dir" value="${ivy.home}/lib" />
+    <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar" />
+
+    <target name="download-ivy" unless="offline">
+        <mkdir dir="${ivy.jar.dir}"/>
+        <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar" 
+         dest="${ivy.jar.file}" usetimestamp="true"/>
+    </target>
+
+    <!-- init-ivy will bootstrap Ivy if the user doesn't have it already -->
+    <target name="init-ivy" depends="download-ivy">
+        <path id="ivy.lib.path">
+            <fileset dir="${ivy.jar.dir}" includes="*.jar"/>
+        </path>
+        <taskdef resource="org/apache/ivy/ant/antlib.xml"
+             uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
+    </target>
+
+    
+     <target name="init" depends="basic-init,files-init,build-init,-javac-init,init-ivy">
+        
+        <!-- clear & fetch all the dependencies from Ivy and stick them in the right places -->
+        <ivy:resolve/>
+        <ivy:retrieve conf="autopsy_core" sync="true" pattern="release/modules/ext/[artifact]-[revision](-[classifier]).[ext]" />
+        
+        
+    </target>
+    
+</project>
diff --git a/Core/ivy.xml b/CoreLibs/ivy.xml
similarity index 95%
rename from Core/ivy.xml
rename to CoreLibs/ivy.xml
index 5cd3e27991..19e09402cc 100644
--- a/Core/ivy.xml
+++ b/CoreLibs/ivy.xml
@@ -1,6 +1,6 @@
 
 <ivy-module version="2.0">
-    <info organisation="org.sleuthkit.autopsy" module="core"/>
+    <info organisation="org.sleuthkit.autopsy" module="corelibs"/>
     <configurations >
         <!-- module dependencies -->
         <conf name="autopsy_core"/>
diff --git a/CoreLibs/manifest.mf b/CoreLibs/manifest.mf
new file mode 100644
index 0000000000..dcd315ee5f
--- /dev/null
+++ b/CoreLibs/manifest.mf
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+OpenIDE-Module: org.sleuthkit.autopsy.corelibs/3
+OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/corelibs/Bundle.properties
+OpenIDE-Module-Specification-Version: 1.0
+
diff --git a/CoreLibs/nbproject/build-impl.xml b/CoreLibs/nbproject/build-impl.xml
new file mode 100644
index 0000000000..060576dfb1
--- /dev/null
+++ b/CoreLibs/nbproject/build-impl.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+*** GENERATED FROM project.xml - DO NOT EDIT  ***
+***         EDIT ../build.xml INSTEAD         ***
+-->
+<project name="org.sleuthkit.autopsy.corelibs-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>
diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties
new file mode 100644
index 0000000000..157a2716e9
--- /dev/null
+++ b/CoreLibs/nbproject/project.properties
@@ -0,0 +1,25 @@
+file.reference.commons-lang-2.4.jar=release/modules/ext/commons-lang-2.4.jar
+file.reference.commons-logging-1.1.1.jar=release/modules/ext/commons-logging-1.1.1.jar
+file.reference.dom4j-1.6.1.jar=release/modules/ext/dom4j-1.6.1.jar
+file.reference.gson-1.4.jar=release/modules/ext/gson-1.4.jar
+file.reference.gstreamer-java-1.5.jar=release/modules/ext/gstreamer-java-1.5.jar
+file.reference.guava-11.0.2.jar=release/modules/ext/guava-11.0.2.jar
+file.reference.javassist-3.12.1.GA.jar=release/modules/ext/javassist-3.12.1.GA.jar
+file.reference.jcalendarbutton-1.4.6.jar=release/modules/ext/jcalendarbutton-1.4.6.jar
+file.reference.jdom-1.0.jar=release/modules/ext/jdom-1.0.jar
+file.reference.jna-3.4.0.jar=release/modules/ext/jna-3.4.0.jar
+file.reference.jsr305-1.3.9.jar=release/modules/ext/jsr305-1.3.9.jar
+file.reference.poi-3.8.jar=release/modules/ext/poi-3.8.jar
+file.reference.poi-excelant-3.8.jar=release/modules/ext/poi-excelant-3.8.jar
+file.reference.poi-ooxml-3.8.jar=release/modules/ext/poi-ooxml-3.8.jar
+file.reference.poi-ooxml-schemas-3.8.jar=release/modules/ext/poi-ooxml-schemas-3.8.jar
+file.reference.poi-scratchpad-3.8.jar=release/modules/ext/poi-scratchpad-3.8.jar
+file.reference.reflections-0.9.8.jar=release/modules/ext/reflections-0.9.8.jar
+file.reference.servlet-api-2.5.jar=release/modules/ext/servlet-api-2.5.jar
+file.reference.slf4j-api-1.6.1.jar=release/modules/ext/slf4j-api-1.6.1.jar
+file.reference.slf4j-simple-1.6.1.jar=release/modules/ext/slf4j-simple-1.6.1.jar
+file.reference.xml-apis-1.0.b2.jar=release/modules/ext/xml-apis-1.0.b2.jar
+file.reference.xmlbeans-2.3.0.jar=release/modules/ext/xmlbeans-2.3.0.jar
+javac.source=1.6
+javac.compilerargs=-Xlint -Xlint:-serial
+nbm.needs.restart=true
diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml
new file mode 100644
index 0000000000..8c8cf8e77a
--- /dev/null
+++ b/CoreLibs/nbproject/project.xml
@@ -0,0 +1,441 @@
+<?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.corelibs</code-name-base>
+            <suite-component/>
+            <module-dependencies/>
+            <test-dependencies>
+                <test-type>
+                    <name>unit</name>
+                    <test-dependency>
+                        <code-name-base>org.netbeans.libs.junit4</code-name-base>
+                        <compile-dependency/>
+                    </test-dependency>
+                </test-type>
+            </test-dependencies>
+            <public-packages>
+                <package>com.google.common.annotations</package>
+                <package>com.google.common.base</package>
+                <package>com.google.common.base.internal</package>
+                <package>com.google.common.cache</package>
+                <package>com.google.common.collect</package>
+                <package>com.google.common.eventbus</package>
+                <package>com.google.common.hash</package>
+                <package>com.google.common.io</package>
+                <package>com.google.common.math</package>
+                <package>com.google.common.net</package>
+                <package>com.google.common.primitives</package>
+                <package>com.google.common.util.concurrent</package>
+                <package>com.google.gson</package>
+                <package>com.google.gson.annotations</package>
+                <package>com.google.gson.reflect</package>
+                <package>com.sun.jna</package>
+                <package>com.sun.jna.ptr</package>
+                <package>com.sun.jna.win32</package>
+                <package>javassist</package>
+                <package>javassist.bytecode</package>
+                <package>javassist.bytecode.analysis</package>
+                <package>javassist.bytecode.annotation</package>
+                <package>javassist.bytecode.stackmap</package>
+                <package>javassist.compiler</package>
+                <package>javassist.compiler.ast</package>
+                <package>javassist.convert</package>
+                <package>javassist.expr</package>
+                <package>javassist.runtime</package>
+                <package>javassist.scopedpool</package>
+                <package>javassist.tools</package>
+                <package>javassist.tools.reflect</package>
+                <package>javassist.tools.rmi</package>
+                <package>javassist.tools.web</package>
+                <package>javassist.util</package>
+                <package>javassist.util.proxy</package>
+                <package>javax.annotation</package>
+                <package>javax.annotation.concurrent</package>
+                <package>javax.annotation.meta</package>
+                <package>javax.servlet</package>
+                <package>javax.servlet.http</package>
+                <package>javax.xml.parsers</package>
+                <package>javax.xml.transform</package>
+                <package>javax.xml.transform.dom</package>
+                <package>javax.xml.transform.sax</package>
+                <package>javax.xml.transform.stream</package>
+                <package>net.sourceforge.jcalendarbutton</package>
+                <package>org.apache.commons.lang</package>
+                <package>org.apache.commons.lang.builder</package>
+                <package>org.apache.commons.lang.enums</package>
+                <package>org.apache.commons.lang.exception</package>
+                <package>org.apache.commons.lang.math</package>
+                <package>org.apache.commons.lang.mutable</package>
+                <package>org.apache.commons.lang.text</package>
+                <package>org.apache.commons.lang.time</package>
+                <package>org.apache.commons.logging</package>
+                <package>org.apache.commons.logging.impl</package>
+                <package>org.apache.poi</package>
+                <package>org.apache.poi.common.usermodel</package>
+                <package>org.apache.poi.ddf</package>
+                <package>org.apache.poi.dev</package>
+                <package>org.apache.poi.extractor</package>
+                <package>org.apache.poi.hdf.event</package>
+                <package>org.apache.poi.hdf.extractor</package>
+                <package>org.apache.poi.hdf.extractor.data</package>
+                <package>org.apache.poi.hdf.extractor.util</package>
+                <package>org.apache.poi.hdf.model</package>
+                <package>org.apache.poi.hdf.model.hdftypes</package>
+                <package>org.apache.poi.hdf.model.hdftypes.definitions</package>
+                <package>org.apache.poi.hdf.model.util</package>
+                <package>org.apache.poi.hdgf</package>
+                <package>org.apache.poi.hdgf.chunks</package>
+                <package>org.apache.poi.hdgf.dev</package>
+                <package>org.apache.poi.hdgf.exceptions</package>
+                <package>org.apache.poi.hdgf.extractor</package>
+                <package>org.apache.poi.hdgf.pointers</package>
+                <package>org.apache.poi.hdgf.streams</package>
+                <package>org.apache.poi.hmef</package>
+                <package>org.apache.poi.hmef.attribute</package>
+                <package>org.apache.poi.hmef.dev</package>
+                <package>org.apache.poi.hmef.extractor</package>
+                <package>org.apache.poi.hpbf</package>
+                <package>org.apache.poi.hpbf.dev</package>
+                <package>org.apache.poi.hpbf.extractor</package>
+                <package>org.apache.poi.hpbf.model</package>
+                <package>org.apache.poi.hpbf.model.qcbits</package>
+                <package>org.apache.poi.hpsf</package>
+                <package>org.apache.poi.hpsf.extractor</package>
+                <package>org.apache.poi.hpsf.wellknown</package>
+                <package>org.apache.poi.hslf</package>
+                <package>org.apache.poi.hslf.blip</package>
+                <package>org.apache.poi.hslf.dev</package>
+                <package>org.apache.poi.hslf.exceptions</package>
+                <package>org.apache.poi.hslf.extractor</package>
+                <package>org.apache.poi.hslf.model</package>
+                <package>org.apache.poi.hslf.model.textproperties</package>
+                <package>org.apache.poi.hslf.record</package>
+                <package>org.apache.poi.hslf.usermodel</package>
+                <package>org.apache.poi.hslf.util</package>
+                <package>org.apache.poi.hsmf</package>
+                <package>org.apache.poi.hsmf.datatypes</package>
+                <package>org.apache.poi.hsmf.dev</package>
+                <package>org.apache.poi.hsmf.exceptions</package>
+                <package>org.apache.poi.hsmf.extractor</package>
+                <package>org.apache.poi.hsmf.parsers</package>
+                <package>org.apache.poi.hssf</package>
+                <package>org.apache.poi.hssf.converter</package>
+                <package>org.apache.poi.hssf.dev</package>
+                <package>org.apache.poi.hssf.eventmodel</package>
+                <package>org.apache.poi.hssf.eventusermodel</package>
+                <package>org.apache.poi.hssf.eventusermodel.dummyrecord</package>
+                <package>org.apache.poi.hssf.extractor</package>
+                <package>org.apache.poi.hssf.model</package>
+                <package>org.apache.poi.hssf.record</package>
+                <package>org.apache.poi.hssf.record.aggregates</package>
+                <package>org.apache.poi.hssf.record.cf</package>
+                <package>org.apache.poi.hssf.record.chart</package>
+                <package>org.apache.poi.hssf.record.common</package>
+                <package>org.apache.poi.hssf.record.cont</package>
+                <package>org.apache.poi.hssf.record.crypto</package>
+                <package>org.apache.poi.hssf.record.pivottable</package>
+                <package>org.apache.poi.hssf.usermodel</package>
+                <package>org.apache.poi.hssf.util</package>
+                <package>org.apache.poi.hwpf</package>
+                <package>org.apache.poi.hwpf.converter</package>
+                <package>org.apache.poi.hwpf.dev</package>
+                <package>org.apache.poi.hwpf.extractor</package>
+                <package>org.apache.poi.hwpf.model</package>
+                <package>org.apache.poi.hwpf.model.io</package>
+                <package>org.apache.poi.hwpf.model.types</package>
+                <package>org.apache.poi.hwpf.sprm</package>
+                <package>org.apache.poi.hwpf.usermodel</package>
+                <package>org.apache.poi.openxml4j.exceptions</package>
+                <package>org.apache.poi.openxml4j.opc</package>
+                <package>org.apache.poi.openxml4j.opc.internal</package>
+                <package>org.apache.poi.openxml4j.opc.internal.marshallers</package>
+                <package>org.apache.poi.openxml4j.opc.internal.signature</package>
+                <package>org.apache.poi.openxml4j.opc.internal.unmarshallers</package>
+                <package>org.apache.poi.openxml4j.opc.signature</package>
+                <package>org.apache.poi.openxml4j.util</package>
+                <package>org.apache.poi.poifs.common</package>
+                <package>org.apache.poi.poifs.crypt</package>
+                <package>org.apache.poi.poifs.dev</package>
+                <package>org.apache.poi.poifs.eventfilesystem</package>
+                <package>org.apache.poi.poifs.filesystem</package>
+                <package>org.apache.poi.poifs.nio</package>
+                <package>org.apache.poi.poifs.property</package>
+                <package>org.apache.poi.poifs.storage</package>
+                <package>org.apache.poi.sl.usermodel</package>
+                <package>org.apache.poi.ss</package>
+                <package>org.apache.poi.ss.excelant</package>
+                <package>org.apache.poi.ss.excelant.util</package>
+                <package>org.apache.poi.ss.extractor</package>
+                <package>org.apache.poi.ss.format</package>
+                <package>org.apache.poi.ss.formula</package>
+                <package>org.apache.poi.ss.formula.atp</package>
+                <package>org.apache.poi.ss.formula.constant</package>
+                <package>org.apache.poi.ss.formula.eval</package>
+                <package>org.apache.poi.ss.formula.eval.forked</package>
+                <package>org.apache.poi.ss.formula.function</package>
+                <package>org.apache.poi.ss.formula.functions</package>
+                <package>org.apache.poi.ss.formula.ptg</package>
+                <package>org.apache.poi.ss.formula.udf</package>
+                <package>org.apache.poi.ss.usermodel</package>
+                <package>org.apache.poi.ss.usermodel.charts</package>
+                <package>org.apache.poi.ss.util</package>
+                <package>org.apache.poi.ss.util.cellwalk</package>
+                <package>org.apache.poi.util</package>
+                <package>org.apache.poi.xslf</package>
+                <package>org.apache.poi.xslf.extractor</package>
+                <package>org.apache.poi.xslf.model</package>
+                <package>org.apache.poi.xslf.model.geom</package>
+                <package>org.apache.poi.xslf.usermodel</package>
+                <package>org.apache.poi.xslf.util</package>
+                <package>org.apache.poi.xssf.dev</package>
+                <package>org.apache.poi.xssf.eventusermodel</package>
+                <package>org.apache.poi.xssf.extractor</package>
+                <package>org.apache.poi.xssf.model</package>
+                <package>org.apache.poi.xssf.streaming</package>
+                <package>org.apache.poi.xssf.usermodel</package>
+                <package>org.apache.poi.xssf.usermodel.charts</package>
+                <package>org.apache.poi.xssf.usermodel.extensions</package>
+                <package>org.apache.poi.xssf.usermodel.helpers</package>
+                <package>org.apache.poi.xssf.util</package>
+                <package>org.apache.poi.xwpf.extractor</package>
+                <package>org.apache.poi.xwpf.model</package>
+                <package>org.apache.poi.xwpf.usermodel</package>
+                <package>org.apache.xmlbeans</package>
+                <package>org.apache.xmlbeans.impl.common</package>
+                <package>org.apache.xmlbeans.impl.config</package>
+                <package>org.apache.xmlbeans.impl.inst2xsd</package>
+                <package>org.apache.xmlbeans.impl.inst2xsd.util</package>
+                <package>org.apache.xmlbeans.impl.jam</package>
+                <package>org.apache.xmlbeans.impl.jam.annotation</package>
+                <package>org.apache.xmlbeans.impl.jam.internal</package>
+                <package>org.apache.xmlbeans.impl.jam.internal.classrefs</package>
+                <package>org.apache.xmlbeans.impl.jam.internal.elements</package>
+                <package>org.apache.xmlbeans.impl.jam.internal.javadoc</package>
+                <package>org.apache.xmlbeans.impl.jam.internal.parser</package>
+                <package>org.apache.xmlbeans.impl.jam.internal.reflect</package>
+                <package>org.apache.xmlbeans.impl.jam.mutable</package>
+                <package>org.apache.xmlbeans.impl.jam.provider</package>
+                <package>org.apache.xmlbeans.impl.jam.visitor</package>
+                <package>org.apache.xmlbeans.impl.jam.xml</package>
+                <package>org.apache.xmlbeans.impl.piccolo.io</package>
+                <package>org.apache.xmlbeans.impl.piccolo.util</package>
+                <package>org.apache.xmlbeans.impl.piccolo.xml</package>
+                <package>org.apache.xmlbeans.impl.regex</package>
+                <package>org.apache.xmlbeans.impl.richParser</package>
+                <package>org.apache.xmlbeans.impl.schema</package>
+                <package>org.apache.xmlbeans.impl.soap</package>
+                <package>org.apache.xmlbeans.impl.store</package>
+                <package>org.apache.xmlbeans.impl.tool</package>
+                <package>org.apache.xmlbeans.impl.util</package>
+                <package>org.apache.xmlbeans.impl.validator</package>
+                <package>org.apache.xmlbeans.impl.values</package>
+                <package>org.apache.xmlbeans.impl.xb.ltgfmt</package>
+                <package>org.apache.xmlbeans.impl.xb.ltgfmt.impl</package>
+                <package>org.apache.xmlbeans.impl.xb.substwsdl</package>
+                <package>org.apache.xmlbeans.impl.xb.substwsdl.impl</package>
+                <package>org.apache.xmlbeans.impl.xb.xmlconfig</package>
+                <package>org.apache.xmlbeans.impl.xb.xmlconfig.impl</package>
+                <package>org.apache.xmlbeans.impl.xb.xmlschema</package>
+                <package>org.apache.xmlbeans.impl.xb.xmlschema.impl</package>
+                <package>org.apache.xmlbeans.impl.xb.xsdownload</package>
+                <package>org.apache.xmlbeans.impl.xb.xsdownload.impl</package>
+                <package>org.apache.xmlbeans.impl.xb.xsdschema</package>
+                <package>org.apache.xmlbeans.impl.xb.xsdschema.impl</package>
+                <package>org.apache.xmlbeans.impl.xsd2inst</package>
+                <package>org.apache.xmlbeans.soap</package>
+                <package>org.apache.xmlbeans.xml.stream</package>
+                <package>org.apache.xmlbeans.xml.stream.events</package>
+                <package>org.apache.xmlbeans.xml.stream.utils</package>
+                <package>org.apache.xmlcommons</package>
+                <package>org.dom4j</package>
+                <package>org.dom4j.bean</package>
+                <package>org.dom4j.datatype</package>
+                <package>org.dom4j.dom</package>
+                <package>org.dom4j.dtd</package>
+                <package>org.dom4j.io</package>
+                <package>org.dom4j.jaxb</package>
+                <package>org.dom4j.rule</package>
+                <package>org.dom4j.rule.pattern</package>
+                <package>org.dom4j.swing</package>
+                <package>org.dom4j.tree</package>
+                <package>org.dom4j.util</package>
+                <package>org.dom4j.xpath</package>
+                <package>org.dom4j.xpp</package>
+                <package>org.gstreamer</package>
+                <package>org.gstreamer.controller</package>
+                <package>org.gstreamer.elements</package>
+                <package>org.gstreamer.elements.good</package>
+                <package>org.gstreamer.event</package>
+                <package>org.gstreamer.example</package>
+                <package>org.gstreamer.glib</package>
+                <package>org.gstreamer.interfaces</package>
+                <package>org.gstreamer.io</package>
+                <package>org.gstreamer.lowlevel</package>
+                <package>org.gstreamer.lowlevel.annotations</package>
+                <package>org.gstreamer.media</package>
+                <package>org.gstreamer.media.event</package>
+                <package>org.gstreamer.message</package>
+                <package>org.gstreamer.query</package>
+                <package>org.gstreamer.swing</package>
+                <package>org.gstreamer.swt</package>
+                <package>org.gstreamer.swt.overlay</package>
+                <package>org.jbundle.thin.base.screen.jcalendarbutton</package>
+                <package>org.jdom</package>
+                <package>org.jdom.adapters</package>
+                <package>org.jdom.filter</package>
+                <package>org.jdom.input</package>
+                <package>org.jdom.output</package>
+                <package>org.jdom.transform</package>
+                <package>org.jdom.xpath</package>
+                <package>org.openxmlformats.schemas.drawingml.x2006.chart</package>
+                <package>org.openxmlformats.schemas.drawingml.x2006.chart.impl</package>
+                <package>org.openxmlformats.schemas.drawingml.x2006.main</package>
+                <package>org.openxmlformats.schemas.drawingml.x2006.main.impl</package>
+                <package>org.openxmlformats.schemas.drawingml.x2006.picture</package>
+                <package>org.openxmlformats.schemas.drawingml.x2006.picture.impl</package>
+                <package>org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing</package>
+                <package>org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.impl</package>
+                <package>org.openxmlformats.schemas.drawingml.x2006.wordprocessingDrawing</package>
+                <package>org.openxmlformats.schemas.drawingml.x2006.wordprocessingDrawing.impl</package>
+                <package>org.openxmlformats.schemas.officeDocument.x2006.customProperties</package>
+                <package>org.openxmlformats.schemas.officeDocument.x2006.customProperties.impl</package>
+                <package>org.openxmlformats.schemas.officeDocument.x2006.docPropsVTypes</package>
+                <package>org.openxmlformats.schemas.officeDocument.x2006.docPropsVTypes.impl</package>
+                <package>org.openxmlformats.schemas.officeDocument.x2006.extendedProperties</package>
+                <package>org.openxmlformats.schemas.officeDocument.x2006.extendedProperties.impl</package>
+                <package>org.openxmlformats.schemas.officeDocument.x2006.relationships</package>
+                <package>org.openxmlformats.schemas.officeDocument.x2006.relationships.impl</package>
+                <package>org.openxmlformats.schemas.presentationml.x2006.main</package>
+                <package>org.openxmlformats.schemas.presentationml.x2006.main.impl</package>
+                <package>org.openxmlformats.schemas.spreadsheetml.x2006.main</package>
+                <package>org.openxmlformats.schemas.spreadsheetml.x2006.main.impl</package>
+                <package>org.openxmlformats.schemas.wordprocessingml.x2006.main</package>
+                <package>org.openxmlformats.schemas.wordprocessingml.x2006.main.impl</package>
+                <package>org.reflections</package>
+                <package>org.reflections.adapters</package>
+                <package>org.reflections.scanners</package>
+                <package>org.reflections.serializers</package>
+                <package>org.reflections.util</package>
+                <package>org.reflections.vfs</package>
+                <package>org.slf4j</package>
+                <package>org.slf4j.helpers</package>
+                <package>org.slf4j.impl</package>
+                <package>org.slf4j.spi</package>
+                <package>org.sourceforge.jcalendarbutton</package>
+                <package>org.w3c.dom</package>
+                <package>org.w3c.dom.css</package>
+                <package>org.w3c.dom.events</package>
+                <package>org.w3c.dom.html</package>
+                <package>org.w3c.dom.ranges</package>
+                <package>org.w3c.dom.stylesheets</package>
+                <package>org.w3c.dom.traversal</package>
+                <package>org.w3c.dom.views</package>
+                <package>org.xml.sax</package>
+                <package>org.xml.sax.ext</package>
+                <package>org.xml.sax.helpers</package>
+                <package>repackage</package>
+                <package>schemaorg_apache_xmlbeans.system.sE130CAA0A01A7CDE5A2B4FEB8B311707</package>
+                <package>schemaorg_apache_xmlbeans.system.sXMLCONFIG</package>
+                <package>schemaorg_apache_xmlbeans.system.sXMLLANG</package>
+                <package>schemaorg_apache_xmlbeans.system.sXMLSCHEMA</package>
+                <package>schemaorg_apache_xmlbeans.system.sXMLTOOLS</package>
+                <package>schemasMicrosoftComOfficeExcel</package>
+                <package>schemasMicrosoftComOfficeExcel.impl</package>
+                <package>schemasMicrosoftComOfficeOffice</package>
+                <package>schemasMicrosoftComOfficeOffice.impl</package>
+                <package>schemasMicrosoftComVml</package>
+                <package>schemasMicrosoftComVml.impl</package>
+            </public-packages>
+            <class-path-extension>
+                <runtime-relative-path>ext/javassist-3.12.1.GA.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javassist-3.12.1.GA.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jdom-1.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jdom-1.0.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jsr305-1.3.9.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jsr305-1.3.9.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jcalendarbutton-1.4.6.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jcalendarbutton-1.4.6.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/xml-apis-1.0.b2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/xml-apis-1.0.b2.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/commons-logging-1.1.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-logging-1.1.1.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/slf4j-simple-1.6.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/slf4j-simple-1.6.1.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/gson-1.4.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/gson-1.4.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/commons-lang-2.4.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/commons-lang-2.4.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/gstreamer-java-1.5.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/gstreamer-java-1.5.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/poi-ooxml-3.8.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/poi-ooxml-3.8.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/servlet-api-2.5.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/servlet-api-2.5.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/slf4j-api-1.6.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/slf4j-api-1.6.1.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/poi-3.8.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/poi-3.8.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/dom4j-1.6.1.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/dom4j-1.6.1.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/poi-scratchpad-3.8.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/poi-scratchpad-3.8.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/poi-ooxml-schemas-3.8.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/poi-ooxml-schemas-3.8.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/guava-11.0.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/guava-11.0.2.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/xmlbeans-2.3.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/xmlbeans-2.3.0.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/reflections-0.9.8.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/reflections-0.9.8.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/poi-excelant-3.8.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/poi-excelant-3.8.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jna-3.4.0.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jna-3.4.0.jar</binary-origin>
+            </class-path-extension>
+        </data>
+    </configuration>
+</project>
diff --git a/CoreLibs/nbproject/suite.properties b/CoreLibs/nbproject/suite.properties
new file mode 100644
index 0000000000..29d7cc9bd6
--- /dev/null
+++ b/CoreLibs/nbproject/suite.properties
@@ -0,0 +1 @@
+suite.dir=${basedir}/..
diff --git a/CoreLibs/src/org/sleuthkit/autopsy/corelibs/Bundle.properties b/CoreLibs/src/org/sleuthkit/autopsy/corelibs/Bundle.properties
new file mode 100644
index 0000000000..efb49699cf
--- /dev/null
+++ b/CoreLibs/src/org/sleuthkit/autopsy/corelibs/Bundle.properties
@@ -0,0 +1,3 @@
+OpenIDE-Module-Display-Category=Libraries
+OpenIDE-Module-Name=Autopsy-CoreLibs
+OpenIDE-Module-Short-Description=Autopsy Core module external libraries
diff --git a/RecentActivity/nbproject/project.xml b/RecentActivity/nbproject/project.xml
index 86c21f0eb3..834ee65cf1 100644
--- a/RecentActivity/nbproject/project.xml
+++ b/RecentActivity/nbproject/project.xml
@@ -6,6 +6,14 @@
             <code-name-base>org.sleuthkit.autopsy.recentactivity</code-name-base>
             <suite-component/>
             <module-dependencies>
+                <dependency>
+                    <code-name-base>org.openide.awt</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>7.46.1</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.openide.modules</code-name-base>
                     <build-prerequisite/>
diff --git a/nbproject/project.properties b/nbproject/project.properties
index f6d07c758c..9f6805c155 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -22,8 +22,10 @@ modules=\
     ${project.org.sleuthkit.autopsy.testing}:\
     ${project.org.sleuthkit.autopsy.thunderbirdparser}:\
     ${project.org.sleuthkit.autopsy.exifparser}:\
-    ${project.org.sleuthkit.autopsy.core}
+    ${project.org.sleuthkit.autopsy.core}:\
+    ${project.org.sleuthkit.autopsy.corelibs}
 project.org.sleuthkit.autopsy.core=Core
+project.org.sleuthkit.autopsy.corelibs=CoreLibs
 project.org.sleuthkit.autopsy.hashdatabase=HashDatabase
 project.org.sleuthkit.autopsy.keywordsearch=KeywordSearch
 project.org.sleuthkit.autopsy.recentactivity=RecentActivity