diff --git a/.gitignore b/.gitignore
index f65a02309839e8d0fa85a2717bbba29ad72fad77..a4f4130042447d40658bdf7faa81e5227b1610fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,6 +73,8 @@ Core/src/org/sleuthkit/autopsy/datamodel/ranges.csv
.DS_Store
.*.swp
-thunderbirdparser/release/
-ImageGallery/release/
+
+/ImageGallery/release/
+/thunderbirdparser/release/
+/Experimental/release/
diff --git a/Experimental/build.xml b/Experimental/build.xml
index b23ebb9ac363a752cc51837085731f395aa2bcd3..2d5bab214b171f632d6cca701b1e749a196c9b87 100644
--- a/Experimental/build.xml
+++ b/Experimental/build.xml
@@ -2,7 +2,52 @@
<!-- 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.experimental" default="netbeans" basedir=".">
+<project name="org.sleuthkit.autopsy.experimental" default="netbeans" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
<description>Builds, tests, and runs the project org.sleuthkit.autopsy.experimental.</description>
<import file="nbproject/build-impl.xml"/>
+
+ <property name="ivy.install.version" value="2.3.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">
+ <available file="${ivy.jar.file}" property="ivy.available"/>
+ <antcall target="-download-ivy" />
+ </target>
+
+ <target name="-download-ivy" unless="ivy.available">
+ <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" unless="ivy.lib.path">
+ <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>
+
+ <property name="release.dir" value="${basedir}/release" />
+ <target name="init" depends="basic-init,files-init,build-init,-javac-init,init-ivy">
+ <ivy:settings file="ivysettings.xml" />
+ <ivy:resolve/>
+ <ivy:retrieve sync="false" pattern="${release.dir}/ext/[artifact]-[revision](-[classifier]).[ext]" />
+ </target>
+
+ <target name="clean" depends="projectized-common.clean">
+ <!--Override clean to delete jars, etc downloaded with Ivy
+ or copied in from thirdparty folder. This way we don't end up with
+ out-of-date/unneeded stuff in the installer-->
+ <delete includeemptydirs="true" >
+ <fileset dir="${release.dir}" includes="**/*"/>
+ </delete>
+ </target>
+
</project>
diff --git a/Experimental/ivy.xml b/Experimental/ivy.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ebd7bade53491416dcb661e084b4636d59f3f4f5
--- /dev/null
+++ b/Experimental/ivy.xml
@@ -0,0 +1,22 @@
+<ivy-module version="2.0">
+ <info organisation="org.sleuthkit.autopsy" module="corelibs"/>
+ <configurations >
+ <!-- module dependencies -->
+ <conf name="experimental"/>
+
+ </configurations>
+ <dependencies>
+ <dependency conf="experimental->default" org="com.github.lgooddatepicker" name="LGoodDatePicker" rev="4.3.1"/>
+ <dependency conf="experimental->default" org="org.apache.solr" name="solr-solrj" rev="4.9.1"/>
+ <dependency conf="experimental->default" org="org.apache.tika" name="tika-core" rev="1.5"/>
+ <dependency conf="experimental->default" org="org.postgresql" name="postgresql" rev="9.4-1201-jdbc41"/>
+ <dependency conf="experimental->default" org="com.mchange" name="c3p0" rev="0.9.5"/>
+ <dependency conf="experimental->default" org="com.fasterxml.jackson.core" name="jackson-core" rev="2.7.0"/>
+ <dependency conf="experimental->default" org="org.swinglabs.swingx" name="swingx-all" rev="1.6.4"/>
+ <exclude artifact="commons-io"/>
+ <exclude artifact="slf4j-api"/>
+ <exclude artifact="wstx-asl"/>
+ <exclude artifact="zookeeper"/>
+
+ </dependencies>
+</ivy-module>
diff --git a/Experimental/ivysettings.xml b/Experimental/ivysettings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e3e086637b3e4da78f1441c2901c7ab4d616face
--- /dev/null
+++ b/Experimental/ivysettings.xml
@@ -0,0 +1,10 @@
+<ivysettings>
+ <settings defaultResolver="main"/>
+ <resolvers>
+ <chain name="main">
+ <ibiblio name="central" m2compatible="true"/>
+ <ibiblio name="ibiblio" m2compatible="true"/>
+ <ibiblio name="xerial" m2compatible="true" root="http://www.xerial.org/maven/repository/snapshot" />
+ </chain>
+ </resolvers>
+</ivysettings>
diff --git a/Experimental/release/modules/ext/LGoodDatePicker-4.3.1-javadoc.jar b/Experimental/release/modules/ext/LGoodDatePicker-4.3.1-javadoc.jar
deleted file mode 100644
index 06ef34422bd5a907380795719b79d087e291e467..0000000000000000000000000000000000000000
Binary files a/Experimental/release/modules/ext/LGoodDatePicker-4.3.1-javadoc.jar and /dev/null differ
diff --git a/Experimental/release/modules/ext/LGoodDatePicker-4.3.1-sources.jar b/Experimental/release/modules/ext/LGoodDatePicker-4.3.1-sources.jar
deleted file mode 100644
index b1bae3ec96feeb88d17e08eb922bb10968f23e03..0000000000000000000000000000000000000000
Binary files a/Experimental/release/modules/ext/LGoodDatePicker-4.3.1-sources.jar and /dev/null differ
diff --git a/Experimental/release/modules/ext/LGoodDatePicker-4.3.1.jar b/Experimental/release/modules/ext/LGoodDatePicker-4.3.1.jar
deleted file mode 100644
index 4f730e4fe7bbf52a2406968d2909b90f8a6ec19b..0000000000000000000000000000000000000000
Binary files a/Experimental/release/modules/ext/LGoodDatePicker-4.3.1.jar and /dev/null differ
diff --git a/Experimental/release/modules/ext/c3p0-0.9.5.jar b/Experimental/release/modules/ext/c3p0-0.9.5.jar
deleted file mode 100644
index 46fdddf7e7502c9457d4324a9212f7e73df55bd7..0000000000000000000000000000000000000000
Binary files a/Experimental/release/modules/ext/c3p0-0.9.5.jar and /dev/null differ
diff --git a/Experimental/release/modules/ext/httpclient-4.3.1.jar b/Experimental/release/modules/ext/httpclient-4.3.1.jar
deleted file mode 100644
index cdd1e3874c4b45fc52c0a3ae21431514c4e3eb23..0000000000000000000000000000000000000000
Binary files a/Experimental/release/modules/ext/httpclient-4.3.1.jar and /dev/null differ
diff --git a/Experimental/release/modules/ext/httpcore-4.3.jar b/Experimental/release/modules/ext/httpcore-4.3.jar
deleted file mode 100644
index ddfe6dacbc477129f424b9408b35e8959d0ebbf4..0000000000000000000000000000000000000000
Binary files a/Experimental/release/modules/ext/httpcore-4.3.jar and /dev/null differ
diff --git a/Experimental/release/modules/ext/httpmime-4.3.1.jar b/Experimental/release/modules/ext/httpmime-4.3.1.jar
deleted file mode 100644
index 2b26d7a79cc4ab99aad1ba98290bafb57d411633..0000000000000000000000000000000000000000
Binary files a/Experimental/release/modules/ext/httpmime-4.3.1.jar and /dev/null differ
diff --git a/Experimental/release/modules/ext/jackson-core-2.7.0.jar b/Experimental/release/modules/ext/jackson-core-2.7.0.jar
deleted file mode 100644
index a37cc5e2a6206249612ab2de1a8a88e7cd090a08..0000000000000000000000000000000000000000
Binary files a/Experimental/release/modules/ext/jackson-core-2.7.0.jar and /dev/null differ
diff --git a/Experimental/release/modules/ext/mchange-commons-java-0.2.9.jar b/Experimental/release/modules/ext/mchange-commons-java-0.2.9.jar
deleted file mode 100644
index 07e4b66eb30be336022b2456130326b7c922482f..0000000000000000000000000000000000000000
Binary files a/Experimental/release/modules/ext/mchange-commons-java-0.2.9.jar and /dev/null differ
diff --git a/Experimental/release/modules/ext/noggit-0.5.jar b/Experimental/release/modules/ext/noggit-0.5.jar
deleted file mode 100644
index 163ced7cc08ba2f20822be3647e17a6431176854..0000000000000000000000000000000000000000
Binary files a/Experimental/release/modules/ext/noggit-0.5.jar and /dev/null differ
diff --git a/Experimental/release/modules/ext/postgresql-9.4-1201-jdbc41.jar b/Experimental/release/modules/ext/postgresql-9.4-1201-jdbc41.jar
deleted file mode 100644
index a3f19593fbf7a83bf0f257dc5877c854634d814b..0000000000000000000000000000000000000000
Binary files a/Experimental/release/modules/ext/postgresql-9.4-1201-jdbc41.jar and /dev/null differ
diff --git a/Experimental/release/modules/ext/solr-solrj-4.9.1-javadoc.jar b/Experimental/release/modules/ext/solr-solrj-4.9.1-javadoc.jar
deleted file mode 100644
index c048a4629afb3ea2bd651b7b81f78bd4b6f3fa86..0000000000000000000000000000000000000000
Binary files a/Experimental/release/modules/ext/solr-solrj-4.9.1-javadoc.jar and /dev/null differ
diff --git a/Experimental/release/modules/ext/solr-solrj-4.9.1-sources.jar b/Experimental/release/modules/ext/solr-solrj-4.9.1-sources.jar
deleted file mode 100644
index c6b5602af2d5cfe304aa78d0c5b31ac432938741..0000000000000000000000000000000000000000
Binary files a/Experimental/release/modules/ext/solr-solrj-4.9.1-sources.jar and /dev/null differ
diff --git a/Experimental/release/modules/ext/solr-solrj-4.9.1.jar b/Experimental/release/modules/ext/solr-solrj-4.9.1.jar
deleted file mode 100644
index 069d3baa726d0d78cf84bb8dda7d41a61fcf7897..0000000000000000000000000000000000000000
Binary files a/Experimental/release/modules/ext/solr-solrj-4.9.1.jar and /dev/null differ
diff --git a/Experimental/release/modules/ext/swingx-all-1.6.4.jar b/Experimental/release/modules/ext/swingx-all-1.6.4.jar
deleted file mode 100644
index 3078bb6364cd0a435ec99a53cd4e8853a2c4e376..0000000000000000000000000000000000000000
Binary files a/Experimental/release/modules/ext/swingx-all-1.6.4.jar and /dev/null differ
diff --git a/Experimental/release/modules/ext/tika-core-1.5.jar b/Experimental/release/modules/ext/tika-core-1.5.jar
deleted file mode 100644
index d8e45e3f289fa2c865ef01eca9ae05bee7650c84..0000000000000000000000000000000000000000
Binary files a/Experimental/release/modules/ext/tika-core-1.5.jar and /dev/null differ