diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties
index fe24b2c7d75cd10022dce95c331fcae024ad115e..06297b517cdd5f26e9923b0b819adaba40b05359 100644
--- a/CoreLibs/nbproject/project.properties
+++ b/CoreLibs/nbproject/project.properties
@@ -12,6 +12,7 @@ file.reference.commons-lang3-3.0.jar=release/modules/ext/commons-lang3-3.0.jar
file.reference.commons-logging-1.1.2-javadoc.jar=release/modules/ext/commons-logging-1.1.2-javadoc.jar
file.reference.commons-logging-1.1.2-sources.jar=release/modules/ext/commons-logging-1.1.2-sources.jar
file.reference.commons-logging-1.1.2.jar=release/modules/ext/commons-logging-1.1.2.jar
+file.reference.controlsfx-8.0.6.jar=release/modules/ext/controlsfx-8.0.6.jar
file.reference.dom4j-1.6.1.jar=release/modules/ext/dom4j-1.6.1.jar
file.reference.geronimo-jms_1.1_spec-1.0.jar=release/modules/ext/geronimo-jms_1.1_spec-1.0.jar
file.reference.gson-1.4.jar=release/modules/ext/gson-1.4.jar
diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml
index 0af899f8a14ba1a642565fefde09bc621f5f6b07..777404fb22abf1a58ccc55eed1c81bed5c4b0607 100644
--- a/CoreLibs/nbproject/project.xml
+++ b/CoreLibs/nbproject/project.xml
@@ -46,85 +46,6 @@
<package>com.google.gson.reflect</package>
<package>com.sun.activation.registries</package>
<package>com.sun.activation.viewers</package>
- <package>com.sun.browser.plugin</package>
- <package>com.sun.deploy.uitoolkit.impl.fx</package>
- <package>com.sun.deploy.uitoolkit.impl.fx.ui</package>
- <package>com.sun.deploy.uitoolkit.impl.fx.ui.resources</package>
- <package>com.sun.glass.events</package>
- <package>com.sun.glass.ui</package>
- <package>com.sun.glass.ui.delegate</package>
- <package>com.sun.glass.ui.gtk</package>
- <package>com.sun.glass.ui.mac</package>
- <package>com.sun.glass.ui.win</package>
- <package>com.sun.glass.ui.x11</package>
- <package>com.sun.glass.utils</package>
- <package>com.sun.javafx</package>
- <package>com.sun.javafx.animation</package>
- <package>com.sun.javafx.animation.transition</package>
- <package>com.sun.javafx.applet</package>
- <package>com.sun.javafx.application</package>
- <package>com.sun.javafx.beans</package>
- <package>com.sun.javafx.beans.annotations</package>
- <package>com.sun.javafx.beans.event</package>
- <package>com.sun.javafx.binding</package>
- <package>com.sun.javafx.charts</package>
- <package>com.sun.javafx.collections</package>
- <package>com.sun.javafx.collections.annotations</package>
- <package>com.sun.javafx.collections.transformation</package>
- <package>com.sun.javafx.css</package>
- <package>com.sun.javafx.css.converters</package>
- <package>com.sun.javafx.css.parser</package>
- <package>com.sun.javafx.cursor</package>
- <package>com.sun.javafx.effect</package>
- <package>com.sun.javafx.embed</package>
- <package>com.sun.javafx.event</package>
- <package>com.sun.javafx.font</package>
- <package>com.sun.javafx.fxml</package>
- <package>com.sun.javafx.fxml.builder</package>
- <package>com.sun.javafx.fxml.expression</package>
- <package>com.sun.javafx.geom</package>
- <package>com.sun.javafx.geom.transform</package>
- <package>com.sun.javafx.iio</package>
- <package>com.sun.javafx.iio.bmp</package>
- <package>com.sun.javafx.iio.common</package>
- <package>com.sun.javafx.iio.gif</package>
- <package>com.sun.javafx.iio.jpeg</package>
- <package>com.sun.javafx.iio.png</package>
- <package>com.sun.javafx.image</package>
- <package>com.sun.javafx.image.impl</package>
- <package>com.sun.javafx.jmx</package>
- <package>com.sun.javafx.logging</package>
- <package>com.sun.javafx.menu</package>
- <package>com.sun.javafx.perf</package>
- <package>com.sun.javafx.property</package>
- <package>com.sun.javafx.property.adapter</package>
- <package>com.sun.javafx.robot</package>
- <package>com.sun.javafx.robot.impl</package>
- <package>com.sun.javafx.runtime</package>
- <package>com.sun.javafx.runtime.async</package>
- <package>com.sun.javafx.runtime.eula</package>
- <package>com.sun.javafx.scene</package>
- <package>com.sun.javafx.scene.control</package>
- <package>com.sun.javafx.scene.control.behavior</package>
- <package>com.sun.javafx.scene.control.skin</package>
- <package>com.sun.javafx.scene.control.skin.resources</package>
- <package>com.sun.javafx.scene.input</package>
- <package>com.sun.javafx.scene.layout.region</package>
- <package>com.sun.javafx.scene.paint</package>
- <package>com.sun.javafx.scene.shape</package>
- <package>com.sun.javafx.scene.text</package>
- <package>com.sun.javafx.scene.transform</package>
- <package>com.sun.javafx.scene.traversal</package>
- <package>com.sun.javafx.scene.web</package>
- <package>com.sun.javafx.scene.web.behavior</package>
- <package>com.sun.javafx.scene.web.skin</package>
- <package>com.sun.javafx.sg</package>
- <package>com.sun.javafx.sg.prism</package>
- <package>com.sun.javafx.stage</package>
- <package>com.sun.javafx.tk</package>
- <package>com.sun.javafx.tk.desktop</package>
- <package>com.sun.javafx.tk.quantum</package>
- <package>com.sun.javafx.util</package>
<package>com.sun.jna</package>
<package>com.sun.jna.platform</package>
<package>com.sun.jna.platform.dnd</package>
@@ -143,100 +64,16 @@
<package>com.sun.mail.smtp</package>
<package>com.sun.mail.util</package>
<package>com.sun.mail.util.logging</package>
- <package>com.sun.media.jfxmedia</package>
- <package>com.sun.media.jfxmedia.control</package>
- <package>com.sun.media.jfxmedia.effects</package>
- <package>com.sun.media.jfxmedia.events</package>
- <package>com.sun.media.jfxmedia.locator</package>
- <package>com.sun.media.jfxmedia.logging</package>
- <package>com.sun.media.jfxmedia.track</package>
- <package>com.sun.media.jfxmediaimpl</package>
- <package>com.sun.media.jfxmediaimpl.platform</package>
- <package>com.sun.media.jfxmediaimpl.platform.gstreamer</package>
- <package>com.sun.media.jfxmediaimpl.platform.java</package>
- <package>com.sun.media.jfxmediaimpl.platform.osx</package>
- <package>com.sun.openpisces</package>
- <package>com.sun.prism</package>
- <package>com.sun.prism.camera</package>
- <package>com.sun.prism.d3d</package>
- <package>com.sun.prism.image</package>
- <package>com.sun.prism.impl</package>
- <package>com.sun.prism.impl.packrect</package>
- <package>com.sun.prism.impl.paint</package>
- <package>com.sun.prism.impl.ps</package>
- <package>com.sun.prism.impl.shape</package>
- <package>com.sun.prism.j2d</package>
- <package>com.sun.prism.j2d.paint</package>
- <package>com.sun.prism.paint</package>
- <package>com.sun.prism.ps</package>
- <package>com.sun.prism.render</package>
- <package>com.sun.prism.shader</package>
- <package>com.sun.prism.shape</package>
- <package>com.sun.prism.tkal</package>
- <package>com.sun.prism.util.tess</package>
- <package>com.sun.prism.util.tess.impl.tess</package>
- <package>com.sun.scenario</package>
- <package>com.sun.scenario.animation</package>
- <package>com.sun.scenario.animation.shared</package>
- <package>com.sun.scenario.effect</package>
- <package>com.sun.scenario.effect.impl</package>
- <package>com.sun.scenario.effect.impl.hw</package>
- <package>com.sun.scenario.effect.impl.hw.d3d</package>
- <package>com.sun.scenario.effect.impl.prism</package>
- <package>com.sun.scenario.effect.impl.prism.ps</package>
- <package>com.sun.scenario.effect.impl.prism.sw</package>
- <package>com.sun.scenario.effect.impl.state</package>
- <package>com.sun.scenario.effect.impl.sw</package>
- <package>com.sun.scenario.effect.impl.sw.java</package>
- <package>com.sun.scenario.effect.impl.sw.sse</package>
- <package>com.sun.scenario.effect.light</package>
- <package>com.sun.t2k</package>
- <package>com.sun.webpane.perf</package>
- <package>com.sun.webpane.platform</package>
- <package>com.sun.webpane.platform.event</package>
- <package>com.sun.webpane.platform.graphics</package>
- <package>com.sun.webpane.sg</package>
- <package>com.sun.webpane.sg.prism</package>
- <package>com.sun.webpane.sg.prism.theme</package>
- <package>com.sun.webpane.sg.theme</package>
- <package>com.sun.webpane.webkit</package>
- <package>com.sun.webpane.webkit.dom</package>
- <package>com.sun.webpane.webkit.network</package>
- <package>com.sun.webpane.webkit.network.about</package>
- <package>com.sun.webpane.webkit.network.data</package>
- <package>com.sun.webpane.webkit.unicode</package>
- <package>javafx.animation</package>
- <package>javafx.application</package>
- <package>javafx.beans</package>
- <package>javafx.beans.binding</package>
- <package>javafx.beans.property</package>
- <package>javafx.beans.property.adapter</package>
- <package>javafx.beans.value</package>
- <package>javafx.collections</package>
- <package>javafx.concurrent</package>
- <package>javafx.embed.swing</package>
- <package>javafx.embed.swt</package>
- <package>javafx.event</package>
- <package>javafx.fxml</package>
- <package>javafx.geometry</package>
- <package>javafx.scene</package>
- <package>javafx.scene.canvas</package>
- <package>javafx.scene.chart</package>
- <package>javafx.scene.control</package>
- <package>javafx.scene.control.cell</package>
- <package>javafx.scene.effect</package>
- <package>javafx.scene.image</package>
- <package>javafx.scene.input</package>
- <package>javafx.scene.layout</package>
- <package>javafx.scene.media</package>
- <package>javafx.scene.paint</package>
- <package>javafx.scene.shape</package>
- <package>javafx.scene.text</package>
- <package>javafx.scene.transform</package>
- <package>javafx.scene.web</package>
- <package>javafx.stage</package>
- <package>javafx.util</package>
- <package>javafx.util.converter</package>
+ <package>impl.org.controlsfx</package>
+ <package>impl.org.controlsfx.autocompletion</package>
+ <package>impl.org.controlsfx.behavior</package>
+ <package>impl.org.controlsfx.i18n</package>
+ <package>impl.org.controlsfx.skin</package>
+ <package>impl.org.controlsfx.spreadsheet</package>
+ <package>impl.org.controlsfx.tools</package>
+ <package>impl.org.controlsfx.tools.rectangle</package>
+ <package>impl.org.controlsfx.tools.rectangle.change</package>
+ <package>impl.org.controlsfx.version</package>
<package>javassist</package>
<package>javassist.bytecode</package>
<package>javassist.bytecode.analysis</package>
@@ -640,6 +477,19 @@
<package>org.apache.xmlbeans.xml.stream.events</package>
<package>org.apache.xmlbeans.xml.stream.utils</package>
<package>org.apache.xmlcommons</package>
+ <package>org.controlsfx.control</package>
+ <package>org.controlsfx.control.action</package>
+ <package>org.controlsfx.control.cell</package>
+ <package>org.controlsfx.control.decoration</package>
+ <package>org.controlsfx.control.spreadsheet</package>
+ <package>org.controlsfx.control.textfield</package>
+ <package>org.controlsfx.dialog</package>
+ <package>org.controlsfx.glyphfont</package>
+ <package>org.controlsfx.property</package>
+ <package>org.controlsfx.property.editor</package>
+ <package>org.controlsfx.tools</package>
+ <package>org.controlsfx.validation</package>
+ <package>org.controlsfx.validation.decoration</package>
<package>org.dom4j</package>
<package>org.dom4j.bean</package>
<package>org.dom4j.datatype</package>
@@ -857,6 +707,10 @@
<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/controlsfx-8.0.6.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/controlsfx-8.0.6.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>
diff --git a/ImageAnalyzer/nbproject/project.properties b/ImageAnalyzer/nbproject/project.properties
index 259ddd1e7dda6b0126cd1d1c9ab0825146a01e21..c71cea41512e07507d11ac5af4b6855682d735a6 100644
--- a/ImageAnalyzer/nbproject/project.properties
+++ b/ImageAnalyzer/nbproject/project.properties
@@ -1,9 +1,3 @@
-file.reference.commons-pool2-2.0-javadoc.jar=release/modules/ext/commons-pool2-2.0-javadoc.jar
-file.reference.commons-pool2-2.0-sources.jar=release/modules/ext/commons-pool2-2.0-sources.jar
-file.reference.commons-pool2-2.0.jar=release/modules/ext/commons-pool2-2.0.jar
-file.reference.controlsfx-8.0.6.jar=release/modules/ext/controlsfx-8.0.6.jar
-file.reference.jcip-annotations-src.jar=release/modules/ext/jcip-annotations-src.jar
-file.reference.jcip-annotations.jar=release/modules/ext/jcip-annotations.jar
file.reference.sqlite-jdbc-3.7.8-SNAPSHOT.jar=release/modules/ext/sqlite-jdbc-3.7.8-SNAPSHOT.jar
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/ImageAnalyzer/nbproject/project.xml b/ImageAnalyzer/nbproject/project.xml
index 7b109729493607c535e167285addf64097b12856..ce3c87ea8ed35b934ee7ec73fe3f0aa63ff1ac7b 100644
--- a/ImageAnalyzer/nbproject/project.xml
+++ b/ImageAnalyzer/nbproject/project.xml
@@ -117,34 +117,10 @@
</dependency>
</module-dependencies>
<public-packages/>
- <class-path-extension>
- <runtime-relative-path>ext/controlsfx-8.0.6.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/controlsfx-8.0.6.jar</binary-origin>
- </class-path-extension>
- <class-path-extension>
- <runtime-relative-path>ext/jcip-annotations.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/jcip-annotations.jar</binary-origin>
- </class-path-extension>
- <class-path-extension>
- <runtime-relative-path>ext/commons-pool2-2.0-sources.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/commons-pool2-2.0-sources.jar</binary-origin>
- </class-path-extension>
- <class-path-extension>
- <runtime-relative-path>ext/commons-pool2-2.0.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/commons-pool2-2.0.jar</binary-origin>
- </class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/sqlite-jdbc-3.7.8-SNAPSHOT.jar</runtime-relative-path>
<binary-origin>release/modules/ext/sqlite-jdbc-3.7.8-SNAPSHOT.jar</binary-origin>
</class-path-extension>
- <class-path-extension>
- <runtime-relative-path>ext/jcip-annotations-src.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/jcip-annotations-src.jar</binary-origin>
- </class-path-extension>
- <class-path-extension>
- <runtime-relative-path>ext/commons-pool2-2.0-javadoc.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/commons-pool2-2.0-javadoc.jar</binary-origin>
- </class-path-extension>
</data>
</configuration>
</project>
diff --git a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/Bundle.properties b/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/Bundle.properties
index 5e5062ea192208f43fc214b3ed8e4429a4b511e9..d680fc5648a0208033af3e45c7fcac114a2165e4 100644
--- a/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/Bundle.properties
+++ b/ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/Bundle.properties
@@ -2,7 +2,7 @@ OpenIDE-Module-Long-Description=\
New image and video analyzer that has been designed to make performing image-intensive investigations more efficient. \
This work has been funded by DHS S&T and this is a beta release. \
It is not available on the sleuthkit.org site and has been distributed to limited users.
-OpenIDE-Module-Name=Image Analysis (Beta)
+OpenIDE-Module-Name=Image Analysis
OpenIDE-Module-Short-Description=Advanced image and video analyzer
EurekaOptionsPanel.enabledByDefaultBox.text=Enable listening to ingest for new cases.
EurekaOptionsPanel.enabledForCaseBox.text=Enable listening to ingest for current case.