From 01d64033045ecc17c8656ae5832070e9c7bb7360 Mon Sep 17 00:00:00 2001 From: "U-BASIS\\dsmyda" Date: Fri, 11 Jan 2019 15:54:49 -0500 Subject: [PATCH 01/28] Tika appears to be stable, needs far more testing and verification --- Core/ivy.xml | 5 +- Core/ivysettings.xml | 2 + Core/nbproject/project.properties | 127 +++-- Core/nbproject/project.xml | 627 +++++++++++++++++---- CoreLibs/ivy.xml | 4 +- CoreLibs/nbproject/project.properties | 14 +- CoreLibs/nbproject/project.xml | 296 +--------- Experimental/ivy.xml | 2 +- Experimental/nbproject/project.properties | 3 +- Experimental/nbproject/project.xml | 12 +- ImageGallery/nbproject/project.properties | 1 + ImageGallery/nbproject/project.xml | 4 + KeywordSearch/ivy.xml | 11 +- KeywordSearch/ivysettings.xml | 2 + KeywordSearch/nbproject/project.properties | 96 +--- KeywordSearch/nbproject/project.xml | 453 +++------------ 16 files changed, 727 insertions(+), 932 deletions(-) diff --git a/Core/ivy.xml b/Core/ivy.xml index 0088cc75ba..3cfd17bb11 100644 --- a/Core/ivy.xml +++ b/Core/ivy.xml @@ -18,8 +18,8 @@ - - + + @@ -28,6 +28,7 @@ + diff --git a/Core/ivysettings.xml b/Core/ivysettings.xml index 7a4d38c65e..40032ddeb9 100644 --- a/Core/ivysettings.xml +++ b/Core/ivysettings.xml @@ -7,4 +7,6 @@ + + diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties index 2406271416..1d48f85440 100644 --- a/Core/nbproject/project.properties +++ b/Core/nbproject/project.properties @@ -1,79 +1,98 @@ file.reference.activemq-all-5.11.1.jar=release/modules/ext/activemq-all-5.11.1.jar -file.reference.apache-mime4j-core-0.8.1.jar=release/modules/ext/apache-mime4j-core-0.8.1.jar -file.reference.apache-mime4j-dom-0.8.1.jar=release/modules/ext/apache-mime4j-dom-0.8.1.jar -file.reference.asm-5.0.4.jar=release/modules/ext/asm-5.0.4.jar -file.reference.bcmail-jdk15on-1.54.jar=release/modules/ext/bcmail-jdk15on-1.54.jar -file.reference.bcprov-jdk15on-1.54.jar=release/modules/ext/bcprov-jdk15on-1.54.jar -file.reference.boilerpipe-1.1.0.jar=release/modules/ext/boilerpipe-1.1.0.jar +file.reference.apache-mime4j-core-0.8.2.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\apache-mime4j-core-0.8.2.jar +file.reference.apache-mime4j-dom-0.8.2.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\apache-mime4j-dom-0.8.2.jar +file.reference.asm-7.0.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\asm-7.0.jar +file.reference.bcmail-jdk15on-1.60.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\bcmail-jdk15on-1.60.jar +file.reference.bcprov-jdk15on-1.60.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\bcprov-jdk15on-1.60.jar +file.reference.boilerpipe-1.1.0.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\boilerpipe-1.1.0.jar file.reference.c3p0-0.9.5.jar=release/modules/ext/c3p0-0.9.5.jar -file.reference.cdm-4.5.5.jar=release/modules/ext/cdm-4.5.5.jar -file.reference.commons-codec-1.6.jar=release/modules/ext/commons-codec-1.6.jar -file.reference.commons-compress-1.14.jar=release/modules/ext/commons-compress-1.14.jar +file.reference.cdm-4.5.5.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\cdm-4.5.5.jar +file.reference.commons-codec-1.11.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\commons-codec-1.11.jar +file.reference.commons-collections4-4.2.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\commons-collections4-4.2.jar +file.reference.commons-compress-1.18.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\commons-compress-1.18.jar +file.reference.commons-csv-1.6.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\commons-csv-1.6.jar file.reference.commons-dbcp2-2.1.1.jar=release/modules/ext/commons-dbcp2-2.1.1.jar -file.reference.commons-io-2.5.jar=release/modules/ext/commons-io-2.5.jar +file.reference.commons-exec-1.3.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\commons-exec-1.3.jar +file.reference.commons-io-2.6.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\commons-io-2.6.jar +file.reference.commons-lang3-3.8.1.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\commons-lang3-3.8.1.jar file.reference.commons-pool2-2.4.2.jar=release/modules/ext/commons-pool2-2.4.2.jar +file.reference.cxf-rt-rs-client-3.2.7.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\cxf-rt-rs-client-3.2.7.jar file.reference.dd-plist-1.20.jar=release/modules/ext/dd-plist-1.20.jar -file.reference.geoapi-3.0.0.jar=release/modules/ext/geoapi-3.0.0.jar -file.reference.grib-4.5.5.jar=release/modules/ext/grib-4.5.5.jar -file.reference.gson-2.8.1.jar=release/modules/ext/gson-2.8.1.jar -file.reference.httpservices-4.5.5.jar=release/modules/ext/httpservices-4.5.5.jar -file.reference.isoparser-1.1.18.jar=release/modules/ext/isoparser-1.1.18.jar -file.reference.jackcess-2.2.0.jar=release/modules/ext/jackcess-2.2.0.jar -file.reference.jackcess-encrypt-2.1.4.jar=release/modules/ext/jackcess-encrypt-2.1.4.jar -file.reference.java-libpst-0.8.1.jar=release/modules/ext/java-libpst-0.8.1.jar -file.reference.jcl-over-slf4j-1.7.24.jar=release/modules/ext/jcl-over-slf4j-1.7.24.jar -file.reference.jackson-core-2.9.7.jar=release/modules/ext/jackson-core-2.9.7.jar +file.reference.dec-0.1.2.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\dec-0.1.2.jar +file.reference.fontbox-2.0.13.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\fontbox-2.0.13.jar +file.reference.geoapi-3.0.1.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\geoapi-3.0.1.jar +file.reference.grib-4.5.5.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\grib-4.5.5.jar +file.reference.gson-2.8.5.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\gson-2.8.5.jar +file.reference.httpclient-4.5.6.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\httpclient-4.5.6.jar +file.reference.httpmime-4.5.6.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\httpmime-4.5.6.jar +file.reference.httpservices-4.5.5.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\httpservices-4.5.5.jar +file.reference.isoparser-1.1.22.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\isoparser-1.1.22.jar +file.reference.jackcess-2.2.0.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\jackcess-2.2.0.jar +file.reference.jackcess-encrypt-2.1.4.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\jackcess-encrypt-2.1.4.jar +file.reference.jackson-annotations-2.9.7.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\jackson-annotations-2.9.7.jar +file.reference.jackson-core-2.9.7.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\jackson-core-2.9.7.jar +file.reference.jackson-databind-2.9.7.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\jackson-databind-2.9.7.jar +file.reference.jai-imageio-core-1.4.0.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\jai-imageio-core-1.4.0.jar +file.reference.java-libpst-0.8.1.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\java-libpst-0.8.1.jar +file.reference.javax.activation-1.2.0.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\javax.activation-1.2.0.jar +file.reference.javax.annotation-api-1.3.2.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\javax.annotation-api-1.3.2.jar +file.reference.jaxb-runtime-2.3.1.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\jaxb-runtime-2.3.1.jar +file.reference.jbig2-imageio-3.0.2.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\jbig2-imageio-3.0.2.jar +file.reference.jcl-over-slf4j-1.7.25.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\jcl-over-slf4j-1.7.25.jar file.reference.jdom-2.0.5-contrib.jar=release/modules/ext/jdom-2.0.5-contrib.jar file.reference.jdom-2.0.5.jar=release/modules/ext/jdom-2.0.5.jar +file.reference.jdom2-2.0.6.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\jdom2-2.0.6.jar +file.reference.jempbox-1.8.16.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\jempbox-1.8.16.jar file.reference.jericho-html-3.3.jar=release/modules/ext/jericho-html-3.3.jar file.reference.jgraphx-v3.8.0.jar=release/modules/ext/jgraphx-v3.8.0.jar -file.reference.jhighlight-1.0.2.jar=release/modules/ext/jhighlight-1.0.2.jar -file.reference.jmatio-1.2.jar=release/modules/ext/jmatio-1.2.jar -file.reference.json-1.8.jar=release/modules/ext/json-1.8.jar -file.reference.json-simple-1.1.1.jar=release/modules/ext/json-simple-1.1.1.jar -file.reference.jsoup-1.10.3.jar=release/modules/ext/jsoup-1.10.3.jar -file.reference.jul-to-slf4j-1.7.24.jar=release/modules/ext/jul-to-slf4j-1.7.24.jar -file.reference.juniversalchardet-1.0.3.jar=release/modules/ext/juniversalchardet-1.0.3.jar -file.reference.junrar-0.7.jar=release/modules/ext/junrar-0.7.jar +file.reference.jhighlight-1.0.3.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\jhighlight-1.0.3.jar +file.reference.jmatio-1.5.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\jmatio-1.5.jar +file.reference.jna-5.1.0.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\jna-5.1.0.jar +file.reference.json-simple-1.1.1.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\json-simple-1.1.1.jar +file.reference.jsoup-1.11.3.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\jsoup-1.11.3.jar +file.reference.jul-to-slf4j-1.7.25.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\jul-to-slf4j-1.7.25.jar +file.reference.juniversalchardet-1.0.3.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\juniversalchardet-1.0.3.jar +file.reference.junrar-2.0.0.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\junrar-2.0.0.jar file.reference.jython-standalone-2.7.0.jar=release/modules/ext/jython-standalone-2.7.0.jar file.reference.mchange-commons-java-0.2.9.jar=release/modules/ext/mchange-commons-java-0.2.9.jar -file.reference.metadata-extractor-2.10.1.jar=release/modules/ext/metadata-extractor-2.10.1.jar -file.reference.netcdf4-4.5.5.jar=release/modules/ext/netcdf4-4.5.5.jar -file.reference.opennlp-tools-1.8.3.jar=release/modules/ext/opennlp-tools-1.8.3.jar -file.reference.poi-3.17.jar=release/modules/ext/poi-3.17.jar -file.reference.poi-ooxml-3.17.jar=release/modules/ext/poi-ooxml-3.17.jar -file.reference.poi-scratchpad-3.17.jar=release/modules/ext/poi-scratchpad-3.17.jar +file.reference.metadata-extractor-2.11.0.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\metadata-extractor-2.11.0.jar +file.reference.netcdf4-4.5.5.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\netcdf4-4.5.5.jar +file.reference.openjson-1.0.10.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\openjson-1.0.10.jar +file.reference.opennlp-tools-1.9.0.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\opennlp-tools-1.9.0.jar +file.reference.parso-2.0.10.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\parso-2.0.10.jar +file.reference.pdfbox-2.0.13.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\pdfbox-2.0.13.jar +file.reference.pdfbox-tools-2.0.13.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\pdfbox-tools-2.0.13.jar +file.reference.poi-4.0.1.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\poi-4.0.1.jar +file.reference.poi-ooxml-4.0.1.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\poi-ooxml-4.0.1.jar +file.reference.poi-ooxml-schemas-4.0.1.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\poi-ooxml-schemas-4.0.1.jar +file.reference.poi-scratchpad-4.0.1.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\poi-scratchpad-4.0.1.jar file.reference.postgresql-9.4.1211.jre7.jar=release/modules/ext/postgresql-9.4.1211.jre7.jar file.reference.Rejistry-1.0-SNAPSHOT.jar=release/modules/ext/Rejistry-1.0-SNAPSHOT.jar -file.reference.rome-1.5.1.jar=release/modules/ext/rome-1.5.1.jar +file.reference.rome-1.12.0.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\rome-1.12.0.jar +file.reference.sentiment-analysis-parser-0.1.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\sentiment-analysis-parser-0.1.jar file.reference.sevenzipjbinding-AllPlatforms.jar=release/modules/ext/sevenzipjbinding-AllPlatforms.jar file.reference.sevenzipjbinding.jar=release/modules/ext/sevenzipjbinding.jar -file.reference.sis-metadata-0.6.jar=release/modules/ext/sis-metadata-0.6.jar -file.reference.sis-netcdf-0.6.jar=release/modules/ext/sis-netcdf-0.6.jar -file.reference.sis-utility-0.6.jar=release/modules/ext/sis-utility-0.6.jar -file.reference.slf4j-api-1.7.24.jar=release/modules/ext/slf4j-api-1.7.24.jar +file.reference.sis-metadata-0.8.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\sis-metadata-0.8.jar +file.reference.sis-netcdf-0.8.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\sis-netcdf-0.8.jar +file.reference.sis-utility-0.8.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\sis-utility-0.8.jar +file.reference.slf4j-api-1.7.25.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\slf4j-api-1.7.25.jar +file.reference.sqlite-jdbc-3.25.2.jar=release/modules/ext/sqlite-jdbc-3.25.2.jar file.reference.sqlite-jdbc-3.8.11.jar=release/modules/ext/sqlite-jdbc-3.8.11.jar file.reference.StixLib.jar=release/modules/ext/StixLib.jar -file.reference.jempbox-1.8.13.jar=release/modules/ext/jempbox-1.8.13.jar -file.reference.javax.ws.rs-api-2.0.1.jar=release/modules/ext/javax.ws.rs-api-2.0.1.jar -file.reference.cxf-core-3.0.16.jar=release/modules/ext/cxf-core-3.0.16.jar -file.reference.cxf-rt-frontend-jaxrs-3.0.16.jar=release/modules/ext/cxf-rt-frontend-jaxrs-3.0.16.jar -file.reference.cxf-rt-rs-client-3.0.16.jar=release/modules/ext/cxf-rt-rs-client-3.0.16.jar -file.reference.cxf-rt-transports-http-3.0.16.jar=release/modules/ext/cxf-rt-transports-http-3.0.16.jar -file.reference.fontbox-2.0.8.jar=release/modules/ext/fontbox-2.0.8.jar -file.reference.pdfbox-2.0.8.jar=release/modules/ext/pdfbox-2.0.8.jar -file.reference.pdfbox-tools-2.0.8.jar=release/modules/ext/pdfbox-tools-2.0.8.jar file.reference.sleuthkit-postgresql-4.6.5.jar=release/modules/ext/sleuthkit-postgresql-4.6.5.jar -file.reference.tagsoup-1.2.1.jar=release/modules/ext/tagsoup-1.2.1.jar -file.reference.tika-core-1.17.jar=release/modules/ext/tika-core-1.17.jar -file.reference.tika-parsers-1.17.jar=release/modules/ext/tika-parsers-1.17.jar file.reference.curator-client-2.8.0.jar=release/modules/ext/curator-client-2.8.0.jar file.reference.curator-framework-2.8.0.jar=release/modules/ext/curator-framework-2.8.0.jar file.reference.curator-recipes-2.8.0.jar=release/modules/ext/curator-recipes-2.8.0.jar -file.reference.vorbis-java-core-0.8.jar=release/modules/ext/vorbis-java-core-0.8.jar -file.reference.vorbis-java-tika-0.8.jar=release/modules/ext/vorbis-java-tika-0.8.jar +file.reference.tagsoup-1.2.1.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\tagsoup-1.2.1.jar +file.reference.tika-core-1.20.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\tika-core-1.20.jar +file.reference.tika-parsers-1.20.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\tika-parsers-1.20.jar +file.reference.uimafit-core-2.4.0.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\uimafit-core-2.4.0.jar +file.reference.uimaj-core-3.0.1.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\uimaj-core-3.0.1.jar +file.reference.vorbis-java-core-0.8.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\vorbis-java-core-0.8.jar +file.reference.vorbis-java-tika-0.8.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\vorbis-java-tika-0.8.jar +file.reference.xmlbeans-3.0.2.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\xmlbeans-3.0.2.jar file.reference.xmpcore-5.1.3.jar=release/modules/ext/xmpcore-5.1.3.jar -file.reference.xz-1.6.jar=release/modules/ext/xz-1.6.jar +file.reference.xz-1.8.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\xz-1.8.jar file.reference.zookeeper-3.4.6.jar=release/modules/ext/zookeeper-3.4.6.jar file.reference.SparseBitSet-1.1.jar=release/modules/ext/SparseBitSet-1.1.jar file.reference.commons-validator-1.6.jar=release/modules/ext/commons-validator-1.6.jar diff --git a/Core/nbproject/project.xml b/Core/nbproject/project.xml index 37ea029fba..ddbe0c14ce 100644 --- a/Core/nbproject/project.xml +++ b/Core/nbproject/project.xml @@ -305,10 +305,319 @@ + com.microsoft.schemas.compatibility + com.microsoft.schemas.compatibility.impl + com.microsoft.schemas.office.excel + com.microsoft.schemas.office.excel.impl + com.microsoft.schemas.office.office + com.microsoft.schemas.office.office.impl + com.microsoft.schemas.office.visio.x2012.main + com.microsoft.schemas.office.visio.x2012.main.impl + com.microsoft.schemas.office.x2006.digsig + com.microsoft.schemas.office.x2006.digsig.impl + com.microsoft.schemas.office.x2006.encryption + com.microsoft.schemas.office.x2006.encryption.impl + com.microsoft.schemas.office.x2006.keyEncryptor.certificate + com.microsoft.schemas.office.x2006.keyEncryptor.certificate.impl + com.microsoft.schemas.office.x2006.keyEncryptor.password + com.microsoft.schemas.office.x2006.keyEncryptor.password.impl + com.microsoft.schemas.vml + com.microsoft.schemas.vml.impl net.sf.sevenzipjbinding net.sf.sevenzipjbinding.impl net.sf.sevenzipjbinding.simple net.sf.sevenzipjbinding.simple.impl + org.apache.commons.codec + org.apache.commons.codec.binary + org.apache.commons.codec.cli + org.apache.commons.codec.digest + org.apache.commons.codec.language + org.apache.commons.codec.language.bm + org.apache.commons.codec.net + org.apache.poi + org.apache.poi.common.usermodel + org.apache.poi.common.usermodel.fonts + org.apache.poi.ddf + org.apache.poi.extractor + org.apache.poi.extractor.ole2 + org.apache.poi.hdgf + org.apache.poi.hdgf.chunks + org.apache.poi.hdgf.dev + org.apache.poi.hdgf.exceptions + org.apache.poi.hdgf.extractor + org.apache.poi.hdgf.pointers + org.apache.poi.hdgf.streams + org.apache.poi.hemf.extractor + org.apache.poi.hemf.hemfplus.record + org.apache.poi.hemf.record + org.apache.poi.hmef + org.apache.poi.hmef.attribute + org.apache.poi.hmef.dev + org.apache.poi.hmef.extractor + org.apache.poi.hpbf + org.apache.poi.hpbf.dev + org.apache.poi.hpbf.extractor + org.apache.poi.hpbf.model + org.apache.poi.hpbf.model.qcbits + org.apache.poi.hpsf + org.apache.poi.hpsf.extractor + org.apache.poi.hpsf.wellknown + org.apache.poi.hslf.blip + org.apache.poi.hslf.dev + org.apache.poi.hslf.exceptions + org.apache.poi.hslf.extractor + org.apache.poi.hslf.model + org.apache.poi.hslf.model.textproperties + org.apache.poi.hslf.record + org.apache.poi.hslf.usermodel + org.apache.poi.hslf.util + org.apache.poi.hsmf + org.apache.poi.hsmf.datatypes + org.apache.poi.hsmf.dev + org.apache.poi.hsmf.exceptions + org.apache.poi.hsmf.extractor + org.apache.poi.hsmf.parsers + org.apache.poi.hssf + org.apache.poi.hssf.converter + org.apache.poi.hssf.dev + org.apache.poi.hssf.eventmodel + org.apache.poi.hssf.eventusermodel + org.apache.poi.hssf.eventusermodel.dummyrecord + org.apache.poi.hssf.extractor + org.apache.poi.hssf.model + org.apache.poi.hssf.record + org.apache.poi.hssf.record.aggregates + org.apache.poi.hssf.record.cf + org.apache.poi.hssf.record.chart + org.apache.poi.hssf.record.common + org.apache.poi.hssf.record.cont + org.apache.poi.hssf.record.crypto + org.apache.poi.hssf.record.pivottable + org.apache.poi.hssf.usermodel + org.apache.poi.hssf.usermodel.helpers + org.apache.poi.hssf.util + org.apache.poi.hwmf.draw + org.apache.poi.hwmf.record + org.apache.poi.hwmf.usermodel + org.apache.poi.hwpf + org.apache.poi.hwpf.converter + org.apache.poi.hwpf.dev + org.apache.poi.hwpf.extractor + org.apache.poi.hwpf.model + org.apache.poi.hwpf.model.io + org.apache.poi.hwpf.model.types + org.apache.poi.hwpf.sprm + org.apache.poi.hwpf.usermodel + org.apache.poi.ooxml + org.apache.poi.ooxml.extractor + org.apache.poi.ooxml.util + org.apache.poi.openxml4j.exceptions + org.apache.poi.openxml4j.opc + org.apache.poi.openxml4j.opc.internal + org.apache.poi.openxml4j.opc.internal.marshallers + org.apache.poi.openxml4j.opc.internal.unmarshallers + org.apache.poi.openxml4j.util + org.apache.poi.poifs.common + org.apache.poi.poifs.crypt + org.apache.poi.poifs.crypt.agile + org.apache.poi.poifs.crypt.binaryrc4 + org.apache.poi.poifs.crypt.cryptoapi + org.apache.poi.poifs.crypt.dsig + org.apache.poi.poifs.crypt.dsig.facets + org.apache.poi.poifs.crypt.dsig.services + org.apache.poi.poifs.crypt.standard + org.apache.poi.poifs.crypt.temp + org.apache.poi.poifs.crypt.xor + org.apache.poi.poifs.dev + org.apache.poi.poifs.eventfilesystem + org.apache.poi.poifs.filesystem + org.apache.poi.poifs.macros + org.apache.poi.poifs.nio + org.apache.poi.poifs.property + org.apache.poi.poifs.storage + org.apache.poi.sl.draw + org.apache.poi.sl.draw.binding + org.apache.poi.sl.draw.geom + org.apache.poi.sl.extractor + org.apache.poi.sl.image + org.apache.poi.sl.usermodel + org.apache.poi.ss + org.apache.poi.ss.extractor + org.apache.poi.ss.format + org.apache.poi.ss.formula + org.apache.poi.ss.formula.atp + org.apache.poi.ss.formula.constant + org.apache.poi.ss.formula.eval + org.apache.poi.ss.formula.eval.forked + org.apache.poi.ss.formula.function + org.apache.poi.ss.formula.functions + org.apache.poi.ss.formula.ptg + org.apache.poi.ss.formula.udf + org.apache.poi.ss.usermodel + org.apache.poi.ss.usermodel.charts + org.apache.poi.ss.usermodel.helpers + org.apache.poi.ss.util + org.apache.poi.ss.util.cellwalk + org.apache.poi.util + org.apache.poi.wp.usermodel + org.apache.poi.xddf.usermodel + org.apache.poi.xddf.usermodel.chart + org.apache.poi.xddf.usermodel.text + org.apache.poi.xdgf.exceptions + org.apache.poi.xdgf.extractor + org.apache.poi.xdgf.geom + org.apache.poi.xdgf.usermodel + org.apache.poi.xdgf.usermodel.section + org.apache.poi.xdgf.usermodel.section.geometry + org.apache.poi.xdgf.usermodel.shape + org.apache.poi.xdgf.usermodel.shape.exceptions + org.apache.poi.xdgf.util + org.apache.poi.xdgf.xml + org.apache.poi.xslf.extractor + org.apache.poi.xslf.model + org.apache.poi.xslf.usermodel + org.apache.poi.xslf.util + org.apache.poi.xssf + org.apache.poi.xssf.binary + org.apache.poi.xssf.eventusermodel + org.apache.poi.xssf.extractor + org.apache.poi.xssf.model + org.apache.poi.xssf.streaming + org.apache.poi.xssf.usermodel + org.apache.poi.xssf.usermodel.charts + org.apache.poi.xssf.usermodel.extensions + org.apache.poi.xssf.usermodel.helpers + org.apache.poi.xssf.util + org.apache.poi.xwpf.extractor + org.apache.poi.xwpf.model + org.apache.poi.xwpf.usermodel + org.apache.tika + org.apache.tika.concurrent + org.apache.tika.config + org.apache.tika.detect + org.apache.tika.embedder + org.apache.tika.exception + org.apache.tika.extractor + org.apache.tika.fork + org.apache.tika.io + org.apache.tika.language + org.apache.tika.language.detect + org.apache.tika.language.translate + org.apache.tika.metadata + org.apache.tika.mime + org.apache.tika.parser + org.apache.tika.parser.apple + org.apache.tika.parser.asm + org.apache.tika.parser.audio + org.apache.tika.parser.captioning + org.apache.tika.parser.captioning.tf + org.apache.tika.parser.chm + org.apache.tika.parser.chm.accessor + org.apache.tika.parser.chm.assertion + org.apache.tika.parser.chm.core + org.apache.tika.parser.chm.exception + org.apache.tika.parser.chm.lzx + org.apache.tika.parser.code + org.apache.tika.parser.crypto + org.apache.tika.parser.ctakes + org.apache.tika.parser.dbf + org.apache.tika.parser.dif + org.apache.tika.parser.digest + org.apache.tika.parser.dwg + org.apache.tika.parser.envi + org.apache.tika.parser.epub + org.apache.tika.parser.executable + org.apache.tika.parser.external + org.apache.tika.parser.feed + org.apache.tika.parser.font + org.apache.tika.parser.gdal + org.apache.tika.parser.geo.topic + org.apache.tika.parser.geo.topic.gazetteer + org.apache.tika.parser.geoinfo + org.apache.tika.parser.grib + org.apache.tika.parser.hdf + org.apache.tika.parser.html + org.apache.tika.parser.html.charsetdetector + org.apache.tika.parser.html.charsetdetector.charsets + org.apache.tika.parser.image + org.apache.tika.parser.image.xmp + org.apache.tika.parser.internal + org.apache.tika.parser.iptc + org.apache.tika.parser.isatab + org.apache.tika.parser.iwork + org.apache.tika.parser.iwork.iwana + org.apache.tika.parser.jdbc + org.apache.tika.parser.journal + org.apache.tika.parser.jpeg + org.apache.tika.parser.mail + org.apache.tika.parser.mat + org.apache.tika.parser.mbox + org.apache.tika.parser.microsoft + org.apache.tika.parser.microsoft.ooxml + org.apache.tika.parser.microsoft.ooxml.xps + org.apache.tika.parser.microsoft.ooxml.xslf + org.apache.tika.parser.microsoft.ooxml.xwpf + org.apache.tika.parser.microsoft.ooxml.xwpf.ml2006 + org.apache.tika.parser.microsoft.xml + org.apache.tika.parser.mp3 + org.apache.tika.parser.mp4 + org.apache.tika.parser.ner + org.apache.tika.parser.ner.corenlp + org.apache.tika.parser.ner.grobid + org.apache.tika.parser.ner.mitie + org.apache.tika.parser.ner.nltk + org.apache.tika.parser.ner.opennlp + org.apache.tika.parser.ner.regex + org.apache.tika.parser.netcdf + org.apache.tika.parser.ocr + org.apache.tika.parser.odf + org.apache.tika.parser.opendocument + org.apache.tika.parser.pdf + org.apache.tika.parser.pkg + org.apache.tika.parser.pot + org.apache.tika.parser.prt + org.apache.tika.parser.recognition + org.apache.tika.parser.recognition.tf + org.apache.tika.parser.rtf + org.apache.tika.parser.sas + org.apache.tika.parser.sentiment + org.apache.tika.parser.strings + org.apache.tika.parser.txt + org.apache.tika.parser.utils + org.apache.tika.parser.video + org.apache.tika.parser.wordperfect + org.apache.tika.parser.xml + org.apache.tika.sax + org.apache.tika.sax.xpath + org.apache.tika.utils + org.etsi.uri.x01903.v13 + org.etsi.uri.x01903.v13.impl + org.openxmlformats.schemas.drawingml.x2006.chart + org.openxmlformats.schemas.drawingml.x2006.chart.impl + org.openxmlformats.schemas.drawingml.x2006.main + org.openxmlformats.schemas.drawingml.x2006.main.impl + org.openxmlformats.schemas.drawingml.x2006.picture + org.openxmlformats.schemas.drawingml.x2006.picture.impl + org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing + org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.impl + org.openxmlformats.schemas.drawingml.x2006.wordprocessingDrawing + org.openxmlformats.schemas.drawingml.x2006.wordprocessingDrawing.impl + org.openxmlformats.schemas.officeDocument.x2006.customProperties + org.openxmlformats.schemas.officeDocument.x2006.customProperties.impl + org.openxmlformats.schemas.officeDocument.x2006.docPropsVTypes + org.openxmlformats.schemas.officeDocument.x2006.docPropsVTypes.impl + org.openxmlformats.schemas.officeDocument.x2006.extendedProperties + org.openxmlformats.schemas.officeDocument.x2006.extendedProperties.impl + org.openxmlformats.schemas.officeDocument.x2006.relationships + org.openxmlformats.schemas.officeDocument.x2006.relationships.impl + org.openxmlformats.schemas.presentationml.x2006.main + org.openxmlformats.schemas.presentationml.x2006.main.impl + org.openxmlformats.schemas.spreadsheetml.x2006.main + org.openxmlformats.schemas.spreadsheetml.x2006.main.impl + org.openxmlformats.schemas.wordprocessingml.x2006.main + org.openxmlformats.schemas.wordprocessingml.x2006.main.impl + org.openxmlformats.schemas.xpackage.x2006.digitalSignature + org.openxmlformats.schemas.xpackage.x2006.digitalSignature.impl org.sleuthkit.autopsy.actions org.sleuthkit.autopsy.appservices org.sleuthkit.autopsy.casemodule @@ -342,14 +651,22 @@ org.sleuthkit.autopsy.textextractors.configs org.sleuthkit.autopsy.texttranslation org.sleuthkit.datamodel + org.w3.x2000.x09.xmldsig + org.w3.x2000.x09.xmldsig.impl + schemaorg_apache_xmlbeans.system.s8C3F193EE11A2F798ACF65489B9E6078 + schemaorg_apache_xmlbeans.system.sD023D6490046BA0250A839A9AD24C443 - ext/apache-mime4j-dom-0.8.1.jar - release/modules/ext/apache-mime4j-dom-0.8.1.jar + ext/commons-lang3-3.8.1.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\commons-lang3-3.8.1.jar + + + ext/jempbox-1.8.16.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\jempbox-1.8.16.jar ext/jackcess-2.2.0.jar - release/modules/ext/jackcess-2.2.0.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\jackcess-2.2.0.jar ext/jericho-html-3.3.jar @@ -357,108 +674,160 @@ ext/cdm-4.5.5.jar - release/modules/ext/cdm-4.5.5.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\cdm-4.5.5.jar ext/httpservices-4.5.5.jar - release/modules/ext/httpservices-4.5.5.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\httpservices-4.5.5.jar + + + ext/xz-1.8.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\xz-1.8.jar ext/commons-validator-1.6.jar release/modules/ext/commons-validator-1.6.jar - ext/commons-compress-1.14.jar - release/modules/ext/commons-compress-1.14.jar + ext/sis-utility-0.8.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\sis-utility-0.8.jar - ext/geoapi-3.0.0.jar - release/modules/ext/geoapi-3.0.0.jar + ext/gson-2.8.5.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\gson-2.8.5.jar + + + ext/jna-5.1.0.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\jna-5.1.0.jar ext/boilerpipe-1.1.0.jar - release/modules/ext/boilerpipe-1.1.0.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\boilerpipe-1.1.0.jar + + + ext/jbig2-imageio-3.0.2.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\jbig2-imageio-3.0.2.jar + + + ext/jsoup-1.11.3.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\jsoup-1.11.3.jar ext/sevenzipjbinding.jar release/modules/ext/sevenzipjbinding.jar - ext/bcmail-jdk15on-1.54.jar - release/modules/ext/bcmail-jdk15on-1.54.jar + ext/apache-mime4j-dom-0.8.2.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\apache-mime4j-dom-0.8.2.jar ext/mchange-commons-java-0.2.9.jar release/modules/ext/mchange-commons-java-0.2.9.jar + + ext/pdfbox-2.0.13.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\pdfbox-2.0.13.jar + + + ext/xmlbeans-3.0.2.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\xmlbeans-3.0.2.jar + + + ext/jackson-databind-2.9.7.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\jackson-databind-2.9.7.jar + + + ext/jai-imageio-core-1.4.0.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\jai-imageio-core-1.4.0.jar + + + ext/jcl-over-slf4j-1.7.25.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\jcl-over-slf4j-1.7.25.jar + ext/curator-recipes-2.8.0.jar release/modules/ext/curator-recipes-2.8.0.jar - ext/metadata-extractor-2.10.1.jar - release/modules/ext/metadata-extractor-2.10.1.jar - - - ext/apache-mime4j-core-0.8.1.jar - release/modules/ext/apache-mime4j-core-0.8.1.jar + ext/tika-core-1.20.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\tika-core-1.20.jar ext/tagsoup-1.2.1.jar - release/modules/ext/tagsoup-1.2.1.jar - - - ext/tika-core-1.17.jar - release/modules/ext/tika-core-1.17.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\tagsoup-1.2.1.jar ext/StixLib.jar release/modules/ext/StixLib.jar - ext/pdfbox-tools-2.0.8.jar - release/modules/ext/pdfbox-tools-2.0.8.jar + ext/cxf-rt-rs-client-3.2.7.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\cxf-rt-rs-client-3.2.7.jar - ext/asm-5.0.4.jar - release/modules/ext/asm-5.0.4.jar + ext/jackson-core-2.9.7.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\jackson-core-2.9.7.jar - ext/jcl-over-slf4j-1.7.24.jar - release/modules/ext/jcl-over-slf4j-1.7.24.jar + ext/sis-metadata-0.8.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\sis-metadata-0.8.jar - ext/tika-parsers-1.17.jar - release/modules/ext/tika-parsers-1.17.jar + ext/bcprov-jdk15on-1.60.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\bcprov-jdk15on-1.60.jar - ext/sqlite-jdbc-3.25.2.jar - release/modules/ext/sqlite-jdbc-3.25.2.jar + ext/parso-2.0.10.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\parso-2.0.10.jar + + + ext/poi-scratchpad-4.0.1.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\poi-scratchpad-4.0.1.jar ext/json-simple-1.1.1.jar - release/modules/ext/json-simple-1.1.1.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\json-simple-1.1.1.jar - ext/sis-utility-0.6.jar - release/modules/ext/sis-utility-0.6.jar + ext/poi-ooxml-4.0.1.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\poi-ooxml-4.0.1.jar - ext/jhighlight-1.0.2.jar - release/modules/ext/jhighlight-1.0.2.jar + ext/metadata-extractor-2.11.0.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\metadata-extractor-2.11.0.jar - ext/jempbox-1.8.13.jar - release/modules/ext/jempbox-1.8.13.jar + ext/commons-codec-1.11.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\commons-codec-1.11.jar - ext/cxf-rt-rs-client-3.0.16.jar - release/modules/ext/cxf-rt-rs-client-3.0.16.jar + ext/apache-mime4j-core-0.8.2.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\apache-mime4j-core-0.8.2.jar + + + ext/jmatio-1.5.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\jmatio-1.5.jar + + + ext/tika-parsers-1.20.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\tika-parsers-1.20.jar + + + ext/asm-7.0.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\asm-7.0.jar + + + ext/sleuthkit-postgresql-4.6.5.jar + release/modules/ext/sleuthkit-postgresql-4.6.5.jar ext/commons-pool2-2.4.2.jar release/modules/ext/commons-pool2-2.4.2.jar + + ext/commons-io-2.6.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\commons-io-2.6.jar + ext/jdom-2.0.5-contrib.jar release/modules/ext/jdom-2.0.5-contrib.jar @@ -468,8 +837,12 @@ release/modules/ext/SparseBitSet-1.1.jar - ext/pdfbox-2.0.8.jar - release/modules/ext/pdfbox-2.0.8.jar + ext/openjson-1.0.10.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\openjson-1.0.10.jar + + + ext/isoparser-1.1.22.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\isoparser-1.1.22.jar ext/c3p0-0.9.5.jar @@ -483,81 +856,65 @@ ext/zookeeper-3.4.6.jar release/modules/ext/zookeeper-3.4.6.jar + + ext/javax.activation-1.2.0.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\javax.activation-1.2.0.jar + + + ext/commons-csv-1.6.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\commons-csv-1.6.jar + ext/jdom-2.0.5.jar release/modules/ext/jdom-2.0.5.jar - ext/cxf-rt-transports-http-3.0.16.jar - release/modules/ext/cxf-rt-transports-http-3.0.16.jar + ext/commons-compress-1.18.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\commons-compress-1.18.jar - ext/sis-metadata-0.6.jar - release/modules/ext/sis-metadata-0.6.jar + ext/rome-1.12.0.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\rome-1.12.0.jar - ext/isoparser-1.1.18.jar - release/modules/ext/isoparser-1.1.18.jar + ext/jackson-annotations-2.9.7.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\jackson-annotations-2.9.7.jar - ext/sleuthkit-postgresql-4.6.5.jar - release/modules/ext/sleuthkit-postgresql-4.6.5.jar + ext/javax.annotation-api-1.3.2.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\javax.annotation-api-1.3.2.jar ext/vorbis-java-core-0.8.jar - release/modules/ext/vorbis-java-core-0.8.jar - - - ext/commons-codec-1.6.jar - release/modules/ext/commons-codec-1.6.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\vorbis-java-core-0.8.jar ext/netcdf4-4.5.5.jar - release/modules/ext/netcdf4-4.5.5.jar - - - ext/slf4j-api-1.7.24.jar - release/modules/ext/slf4j-api-1.7.24.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\netcdf4-4.5.5.jar ext/java-libpst-0.8.1.jar - release/modules/ext/java-libpst-0.8.1.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\java-libpst-0.8.1.jar - ext/jul-to-slf4j-1.7.24.jar - release/modules/ext/jul-to-slf4j-1.7.24.jar + ext/opennlp-tools-1.9.0.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\opennlp-tools-1.9.0.jar - ext/gson-2.8.1.jar - release/modules/ext/gson-2.8.1.jar - - - ext/poi-3.17.jar - release/modules/ext/poi-3.17.jar - - - ext/poi-scratchpad-3.17.jar - release/modules/ext/poi-scratchpad-3.17.jar - - - ext/sis-netcdf-0.6.jar - release/modules/ext/sis-netcdf-0.6.jar - - - ext/commons-io-2.5.jar - release/modules/ext/commons-io-2.5.jar + ext/sis-netcdf-0.8.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\sis-netcdf-0.8.jar ext/curator-framework-2.8.0.jar release/modules/ext/curator-framework-2.8.0.jar - ext/bcprov-jdk15on-1.54.jar - release/modules/ext/bcprov-jdk15on-1.54.jar + ext/sentiment-analysis-parser-0.1.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\sentiment-analysis-parser-0.1.jar - ext/fontbox-2.0.8.jar - release/modules/ext/fontbox-2.0.8.jar + ext/commons-collections4-4.2.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\commons-collections4-4.2.jar ext/commons-dbcp2-2.1.1.jar @@ -569,67 +926,99 @@ ext/juniversalchardet-1.0.3.jar - release/modules/ext/juniversalchardet-1.0.3.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\juniversalchardet-1.0.3.jar ext/jython-standalone-2.7.0.jar release/modules/ext/jython-standalone-2.7.0.jar + + ext/uimafit-core-2.4.0.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\uimafit-core-2.4.0.jar + ext/jackcess-encrypt-2.1.4.jar - release/modules/ext/jackcess-encrypt-2.1.4.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\jackcess-encrypt-2.1.4.jar - ext/cxf-core-3.0.16.jar - release/modules/ext/cxf-core-3.0.16.jar + ext/jhighlight-1.0.3.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\jhighlight-1.0.3.jar - ext/javax.ws.rs-api-2.0.1.jar - release/modules/ext/javax.ws.rs-api-2.0.1.jar + ext/junrar-2.0.0.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\junrar-2.0.0.jar - ext/opennlp-tools-1.8.3.jar - release/modules/ext/opennlp-tools-1.8.3.jar - - - ext/junrar-0.7.jar - release/modules/ext/junrar-0.7.jar + ext/jul-to-slf4j-1.7.25.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\jul-to-slf4j-1.7.25.jar ext/postgresql-9.4.1211.jre7.jar release/modules/ext/postgresql-9.4.1211.jre7.jar - ext/poi-ooxml-3.17.jar - release/modules/ext/poi-ooxml-3.17.jar + ext/poi-4.0.1.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\poi-4.0.1.jar + + + ext/slf4j-api-1.7.25.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\slf4j-api-1.7.25.jar + + + ext/jaxb-runtime-2.3.1.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\jaxb-runtime-2.3.1.jar + + + ext/geoapi-3.0.1.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\geoapi-3.0.1.jar + + + ext/httpmime-4.5.6.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\httpmime-4.5.6.jar + + + ext/jdom2-2.0.6.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\jdom2-2.0.6.jar + + + ext/httpclient-4.5.6.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\httpclient-4.5.6.jar + + + ext/uimaj-core-3.0.1.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\uimaj-core-3.0.1.jar ext/curator-client-2.8.0.jar release/modules/ext/curator-client-2.8.0.jar - ext/jackson-core-2.9.7.jar - release/modules/ext/jackson-core-2.9.7.jar + ext/sqlite-jdbc-3.25.2.jar + release/modules/ext/sqlite-jdbc-3.25.2.jar - ext/cxf-rt-frontend-jaxrs-3.0.16.jar - release/modules/ext/cxf-rt-frontend-jaxrs-3.0.16.jar + ext/pdfbox-tools-2.0.13.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\pdfbox-tools-2.0.13.jar ext/grib-4.5.5.jar - release/modules/ext/grib-4.5.5.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\grib-4.5.5.jar - ext/jackson-core-2.9.2.jar - release/modules/ext/jackson-core-2.9.2.jar + ext/fontbox-2.0.13.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\fontbox-2.0.13.jar ext/activemq-all-5.11.1.jar release/modules/ext/activemq-all-5.11.1.jar - ext/xz-1.6.jar - release/modules/ext/xz-1.6.jar + ext/poi-ooxml-schemas-4.0.1.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\poi-ooxml-schemas-4.0.1.jar + + + ext/dec-0.1.2.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\dec-0.1.2.jar ext/Rejistry-1.0-SNAPSHOT.jar @@ -639,29 +1028,17 @@ ext/dd-plist-1.20.jar release/modules/ext/dd-plist-1.20.jar - - ext/rome-1.5.1.jar - release/modules/ext/rome-1.5.1.jar - ext/sevenzipjbinding-AllPlatforms.jar release/modules/ext/sevenzipjbinding-AllPlatforms.jar - ext/jmatio-1.2.jar - release/modules/ext/jmatio-1.2.jar - - - ext/jsoup-1.10.3.jar - release/modules/ext/jsoup-1.10.3.jar + ext/bcmail-jdk15on-1.60.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\bcmail-jdk15on-1.60.jar ext/vorbis-java-tika-0.8.jar - release/modules/ext/vorbis-java-tika-0.8.jar - - - ext/json-1.8.jar - release/modules/ext/json-1.8.jar + C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\vorbis-java-tika-0.8.jar diff --git a/CoreLibs/ivy.xml b/CoreLibs/ivy.xml index a5f7aab768..8f236c0811 100644 --- a/CoreLibs/ivy.xml +++ b/CoreLibs/ivy.xml @@ -28,8 +28,8 @@ - - + + diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties index 08ccc6fea1..8a253dffb2 100644 --- a/CoreLibs/nbproject/project.properties +++ b/CoreLibs/nbproject/project.properties @@ -6,8 +6,6 @@ file.reference.avalon-framework-4.1.5.jar=release/modules/ext/avalon-framework-4 file.reference.common-image-3.2.jar=release/modules/ext/common-image-3.2.jar file.reference.common-io-3.2.jar=release/modules/ext/common-io-3.2.jar file.reference.common-lang-3.2.jar=release/modules/ext/common-lang-3.2.jar -file.reference.commons-codec-1.10.jar=release/modules/ext/commons-codec-1.10.jar -file.reference.commons-collections4-4.1.jar=release/modules/ext/commons-collections4-4.1.jar file.reference.commons-csv-1.4.jar=release/modules/ext/commons-csv-1.4.jar file.reference.commons-io-2.4.jar=release/modules/ext/commons-io-2.4.jar file.reference.commons-io-2.5.jar=release/modules/ext/commons-io-2.5.jar @@ -59,20 +57,18 @@ file.reference.mail-1.4.3.jar=release/modules/ext/mail-1.4.3.jar file.reference.opencv-248.jar=release/modules/ext/opencv-248.jar file.reference.openjfx-dialogs-1.0.2.jar=release/modules/ext/openjfx-dialogs-1.0.3.jar file.reference.platform-3.4.0.jar=release/modules/ext/platform-3.4.0.jar -file.reference.poi-3.17.jar=release/modules/ext/poi-3.17.jar -file.reference.poi-excelant-3.17.jar=release/modules/ext/poi-excelant-3.17.jar -file.reference.poi-ooxml-3.17.jar=release/modules/ext/poi-ooxml-3.17.jar -file.reference.poi-ooxml-schemas-3.17.jar=release/modules/ext/poi-ooxml-schemas-3.17.jar -file.reference.poi-scratchpad-3.17.jar=release/modules/ext/poi-scratchpad-3.17.jar +file.reference.poi-4.0.1.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\CoreLibs\\release\\modules\\ext\\poi-4.0.1.jar +file.reference.poi-excelant-4.0.1.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\CoreLibs\\release\\modules\\ext\\poi-excelant-4.0.1.jar +file.reference.poi-ooxml-4.0.1.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\CoreLibs\\release\\modules\\ext\\poi-ooxml-4.0.1.jar +file.reference.poi-ooxml-schemas-4.0.1.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\CoreLibs\\release\\modules\\ext\\poi-ooxml-schemas-4.0.1.jar +file.reference.poi-scratchpad-4.0.1.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\CoreLibs\\release\\modules\\ext\\poi-scratchpad-4.0.1.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.sigar-1.6.4-sources.jar=release/modules/ext/sigar-1.6.4-sources.jar file.reference.sigar-1.6.4.jar=release/modules/ext/sigar-1.6.4.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.stax-api-1.0.1.jar=release/modules/ext/stax-api-1.0.1.jar file.reference.xml-apis-1.0.b2.jar=release/modules/ext/xml-apis-1.0.b2.jar -file.reference.xmlbeans-2.6.0.jar=release/modules/ext/xmlbeans-2.6.0.jar javac.source=1.8 javac.compilerargs=-Xlint -Xlint:-serial javadoc.reference.commons-csv-1.4.jar=release/modules/ext/commons-csv-1.4-javadoc.jar diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml index 38da548a38..53c964f4f0 100644 --- a/CoreLibs/nbproject/project.xml +++ b/CoreLibs/nbproject/project.xml @@ -225,12 +225,6 @@ org.apache.avalon.framework.parameters org.apache.avalon.framework.service org.apache.avalon.framework.thread - org.apache.commons.codec - org.apache.commons.codec.binary - org.apache.commons.codec.digest - org.apache.commons.codec.language - org.apache.commons.codec.net - org.apache.commons.collections4 org.apache.commons.csv org.apache.commons.io org.apache.commons.io.comparator @@ -294,159 +288,6 @@ org.apache.log4j.spi org.apache.log4j.varia org.apache.log4j.xml - org.apache.poi - org.apache.poi.common.usermodel - org.apache.poi.common.usermodel.fonts - org.apache.poi.ddf - org.apache.poi.dev - org.apache.poi.extractor - org.apache.poi.hdgf - org.apache.poi.hdgf.chunks - org.apache.poi.hdgf.dev - org.apache.poi.hdgf.exceptions - org.apache.poi.hdgf.extractor - org.apache.poi.hdgf.pointers - org.apache.poi.hdgf.streams - org.apache.poi.hemf.extractor - org.apache.poi.hemf.hemfplus.record - org.apache.poi.hemf.record - org.apache.poi.hmef - org.apache.poi.hmef.attribute - org.apache.poi.hmef.dev - org.apache.poi.hmef.extractor - org.apache.poi.hpbf - org.apache.poi.hpbf.dev - org.apache.poi.hpbf.extractor - org.apache.poi.hpbf.model - org.apache.poi.hpbf.model.qcbits - org.apache.poi.hpsf - org.apache.poi.hpsf.extractor - org.apache.poi.hpsf.wellknown - org.apache.poi.hslf.blip - org.apache.poi.hslf.dev - org.apache.poi.hslf.exceptions - org.apache.poi.hslf.extractor - org.apache.poi.hslf.model - org.apache.poi.hslf.model.textproperties - org.apache.poi.hslf.record - org.apache.poi.hslf.usermodel - org.apache.poi.hslf.util - org.apache.poi.hsmf - org.apache.poi.hsmf.datatypes - org.apache.poi.hsmf.dev - org.apache.poi.hsmf.exceptions - org.apache.poi.hsmf.extractor - org.apache.poi.hsmf.parsers - org.apache.poi.hssf - org.apache.poi.hssf.converter - org.apache.poi.hssf.dev - org.apache.poi.hssf.eventmodel - org.apache.poi.hssf.eventusermodel - org.apache.poi.hssf.eventusermodel.dummyrecord - org.apache.poi.hssf.extractor - org.apache.poi.hssf.model - org.apache.poi.hssf.record - org.apache.poi.hssf.record.aggregates - org.apache.poi.hssf.record.cf - org.apache.poi.hssf.record.chart - org.apache.poi.hssf.record.common - org.apache.poi.hssf.record.cont - org.apache.poi.hssf.record.crypto - org.apache.poi.hssf.record.pivottable - org.apache.poi.hssf.usermodel - org.apache.poi.hssf.usermodel.helpers - org.apache.poi.hssf.util - org.apache.poi.hwmf.draw - org.apache.poi.hwmf.record - org.apache.poi.hwmf.usermodel - org.apache.poi.hwpf - org.apache.poi.hwpf.converter - org.apache.poi.hwpf.dev - org.apache.poi.hwpf.extractor - org.apache.poi.hwpf.model - org.apache.poi.hwpf.model.io - org.apache.poi.hwpf.model.types - org.apache.poi.hwpf.sprm - org.apache.poi.hwpf.usermodel - org.apache.poi.openxml4j.exceptions - org.apache.poi.openxml4j.opc - org.apache.poi.openxml4j.opc.internal - org.apache.poi.openxml4j.opc.internal.marshallers - org.apache.poi.openxml4j.opc.internal.unmarshallers - org.apache.poi.openxml4j.util - org.apache.poi.poifs.common - org.apache.poi.poifs.crypt - org.apache.poi.poifs.crypt.agile - org.apache.poi.poifs.crypt.binaryrc4 - org.apache.poi.poifs.crypt.cryptoapi - org.apache.poi.poifs.crypt.dsig - org.apache.poi.poifs.crypt.dsig.facets - org.apache.poi.poifs.crypt.dsig.services - org.apache.poi.poifs.crypt.standard - org.apache.poi.poifs.crypt.temp - org.apache.poi.poifs.crypt.xor - org.apache.poi.poifs.dev - org.apache.poi.poifs.eventfilesystem - org.apache.poi.poifs.filesystem - org.apache.poi.poifs.macros - org.apache.poi.poifs.nio - org.apache.poi.poifs.property - org.apache.poi.poifs.storage - org.apache.poi.sl.draw - org.apache.poi.sl.draw.binding - org.apache.poi.sl.draw.geom - org.apache.poi.sl.image - org.apache.poi.sl.usermodel - org.apache.poi.ss - org.apache.poi.ss.excelant - org.apache.poi.ss.excelant.util - org.apache.poi.ss.extractor - org.apache.poi.ss.format - org.apache.poi.ss.formula - org.apache.poi.ss.formula.atp - org.apache.poi.ss.formula.constant - org.apache.poi.ss.formula.eval - org.apache.poi.ss.formula.eval.forked - org.apache.poi.ss.formula.function - org.apache.poi.ss.formula.functions - org.apache.poi.ss.formula.ptg - org.apache.poi.ss.formula.udf - org.apache.poi.ss.usermodel - org.apache.poi.ss.usermodel.charts - org.apache.poi.ss.usermodel.helpers - org.apache.poi.ss.util - org.apache.poi.ss.util.cellwalk - org.apache.poi.util - org.apache.poi.wp.usermodel - org.apache.poi.xdgf.exceptions - org.apache.poi.xdgf.extractor - org.apache.poi.xdgf.geom - org.apache.poi.xdgf.usermodel - org.apache.poi.xdgf.usermodel.section - org.apache.poi.xdgf.usermodel.section.geometry - org.apache.poi.xdgf.usermodel.shape - org.apache.poi.xdgf.usermodel.shape.exceptions - org.apache.poi.xdgf.util - org.apache.poi.xdgf.xml - org.apache.poi.xslf.extractor - org.apache.poi.xslf.model - org.apache.poi.xslf.usermodel - org.apache.poi.xslf.util - org.apache.poi.xssf - org.apache.poi.xssf.binary - org.apache.poi.xssf.dev - org.apache.poi.xssf.eventusermodel - org.apache.poi.xssf.extractor - org.apache.poi.xssf.model - org.apache.poi.xssf.streaming - org.apache.poi.xssf.usermodel - org.apache.poi.xssf.usermodel.charts - org.apache.poi.xssf.usermodel.extensions - org.apache.poi.xssf.usermodel.helpers - org.apache.poi.xssf.util - org.apache.poi.xwpf.extractor - org.apache.poi.xwpf.model - org.apache.poi.xwpf.usermodel org.apache.tools.ant org.apache.tools.ant.dispatch org.apache.tools.ant.filters @@ -507,52 +348,6 @@ org.apache.tools.mail org.apache.tools.tar org.apache.tools.zip - org.apache.xmlbeans - org.apache.xmlbeans.impl.common - org.apache.xmlbeans.impl.config - org.apache.xmlbeans.impl.inst2xsd - org.apache.xmlbeans.impl.inst2xsd.util - org.apache.xmlbeans.impl.jam - org.apache.xmlbeans.impl.jam.annotation - org.apache.xmlbeans.impl.jam.internal - org.apache.xmlbeans.impl.jam.internal.classrefs - org.apache.xmlbeans.impl.jam.internal.elements - org.apache.xmlbeans.impl.jam.internal.javadoc - org.apache.xmlbeans.impl.jam.internal.parser - org.apache.xmlbeans.impl.jam.internal.reflect - org.apache.xmlbeans.impl.jam.mutable - org.apache.xmlbeans.impl.jam.provider - org.apache.xmlbeans.impl.jam.visitor - org.apache.xmlbeans.impl.jam.xml - org.apache.xmlbeans.impl.piccolo.io - org.apache.xmlbeans.impl.piccolo.util - org.apache.xmlbeans.impl.piccolo.xml - org.apache.xmlbeans.impl.regex - org.apache.xmlbeans.impl.richParser - org.apache.xmlbeans.impl.schema - org.apache.xmlbeans.impl.soap - org.apache.xmlbeans.impl.store - org.apache.xmlbeans.impl.tool - org.apache.xmlbeans.impl.util - org.apache.xmlbeans.impl.validator - org.apache.xmlbeans.impl.values - org.apache.xmlbeans.impl.xb.ltgfmt - org.apache.xmlbeans.impl.xb.ltgfmt.impl - org.apache.xmlbeans.impl.xb.substwsdl - org.apache.xmlbeans.impl.xb.substwsdl.impl - org.apache.xmlbeans.impl.xb.xmlconfig - org.apache.xmlbeans.impl.xb.xmlconfig.impl - org.apache.xmlbeans.impl.xb.xmlschema - org.apache.xmlbeans.impl.xb.xmlschema.impl - org.apache.xmlbeans.impl.xb.xsdownload - org.apache.xmlbeans.impl.xb.xsdownload.impl - org.apache.xmlbeans.impl.xb.xsdschema - org.apache.xmlbeans.impl.xb.xsdschema.impl - org.apache.xmlbeans.impl.xsd2inst - org.apache.xmlbeans.soap - org.apache.xmlbeans.xml.stream - org.apache.xmlbeans.xml.stream.events - org.apache.xmlbeans.xml.stream.utils org.apache.xmlcommons org.controlsfx.control org.controlsfx.control.action @@ -632,32 +427,6 @@ org.opencv.photo org.opencv.utils org.opencv.video - org.openxmlformats.schemas.drawingml.x2006.chart - org.openxmlformats.schemas.drawingml.x2006.chart.impl - org.openxmlformats.schemas.drawingml.x2006.main - org.openxmlformats.schemas.drawingml.x2006.main.impl - org.openxmlformats.schemas.drawingml.x2006.picture - org.openxmlformats.schemas.drawingml.x2006.picture.impl - org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing - org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.impl - org.openxmlformats.schemas.drawingml.x2006.wordprocessingDrawing - org.openxmlformats.schemas.drawingml.x2006.wordprocessingDrawing.impl - org.openxmlformats.schemas.officeDocument.x2006.customProperties - org.openxmlformats.schemas.officeDocument.x2006.customProperties.impl - org.openxmlformats.schemas.officeDocument.x2006.docPropsVTypes - org.openxmlformats.schemas.officeDocument.x2006.docPropsVTypes.impl - org.openxmlformats.schemas.officeDocument.x2006.extendedProperties - org.openxmlformats.schemas.officeDocument.x2006.extendedProperties.impl - org.openxmlformats.schemas.officeDocument.x2006.relationships - org.openxmlformats.schemas.officeDocument.x2006.relationships.impl - org.openxmlformats.schemas.presentationml.x2006.main - org.openxmlformats.schemas.presentationml.x2006.main.impl - org.openxmlformats.schemas.spreadsheetml.x2006.main - org.openxmlformats.schemas.spreadsheetml.x2006.main.impl - org.openxmlformats.schemas.wordprocessingml.x2006.main - org.openxmlformats.schemas.wordprocessingml.x2006.main.impl - org.openxmlformats.schemas.xpackage.x2006.digitalSignature - org.openxmlformats.schemas.xpackage.x2006.digitalSignature.impl org.reflections org.reflections.adapters org.reflections.scanners @@ -680,11 +449,6 @@ org.xml.sax org.xml.sax.ext org.xml.sax.helpers - repackage - schemaorg_apache_xmlbeans.system.sXMLCONFIG - schemaorg_apache_xmlbeans.system.sXMLLANG - schemaorg_apache_xmlbeans.system.sXMLSCHEMA - schemaorg_apache_xmlbeans.system.sXMLTOOLS ext/commons-logging-1.1.2-sources.jar @@ -746,10 +510,6 @@ ext/jfxtras-common-8.0-r4.jar release/modules/ext/jfxtras-common-8.0-r4.jar - - ext/opencv-248.jar - release/modules/ext/opencv-248.jar - ext/jsr305-1.3.9.jar release/modules/ext/jsr305-1.3.9.jar @@ -762,10 +522,6 @@ ext/imgscalr-lib-4.2.jar release/modules/ext/imgscalr-lib-4.2.jar - - ext/xmlbeans-2.6.0.jar - release/modules/ext/xmlbeans-2.6.0.jar - ext/common-io-3.2.jar release/modules/ext/common-io-3.2.jar @@ -798,18 +554,22 @@ ext/joda-time-2.4-javadoc.jar release/modules/ext/joda-time-2.4-javadoc.jar + + ext/poi-scratchpad-4.0.1.jar + C:\cygwin64\home\dsmyda\autopsy\CoreLibs\release\modules\ext\poi-scratchpad-4.0.1.jar + ext/imageio-psd-3.2.jar release/modules/ext/imageio-psd-3.2.jar - - ext/stax-api-1.0.1.jar - release/modules/ext/stax-api-1.0.1.jar - ext/servlet-api-2.5.jar release/modules/ext/servlet-api-2.5.jar + + ext/poi-ooxml-4.0.1.jar + C:\cygwin64\home\dsmyda\autopsy\CoreLibs\release\modules\ext\poi-ooxml-4.0.1.jar + ext/imageio-pcx-3.2.jar release/modules/ext/imageio-pcx-3.2.jar @@ -858,17 +618,13 @@ ext/joda-time-2.4.jar release/modules/ext/joda-time-2.4.jar - - ext/commons-collections4-4.1.jar - release/modules/ext/commons-collections4-4.1.jar - ext/commons-logging-1.1.2-javadoc.jar release/modules/ext/commons-logging-1.1.2-javadoc.jar - ext/commons-codec-1.10.jar - release/modules/ext/commons-codec-1.10.jar + ext/opencv-248.jar + release/modules/ext/opencv-248.jar ext/slf4j-simple-1.6.1.jar @@ -878,18 +634,6 @@ ext/guava-19.0.jar release/modules/ext/guava-19.0.jar - - ext/poi-3.17.jar - release/modules/ext/poi-3.17.jar - - - ext/poi-ooxml-schemas-3.17.jar - release/modules/ext/poi-ooxml-schemas-3.17.jar - - - ext/poi-scratchpad-3.17.jar - release/modules/ext/poi-scratchpad-3.17.jar - ext/commons-io-2.5.jar release/modules/ext/commons-io-2.5.jar @@ -918,10 +662,6 @@ ext/ant-1.8.2.jar release/modules/ext/ant-1.8.2.jar - - ext/poi-excelant-3.17.jar - release/modules/ext/poi-excelant-3.17.jar - ext/javassist-3.12.1.GA.jar release/modules/ext/javassist-3.12.1.GA.jar @@ -931,12 +671,16 @@ release/modules/ext/imageio-core-3.2.jar - ext/commons-logging-1.1.2.jar - release/modules/ext/commons-logging-1.1.2.jar + ext/poi-4.0.1.jar + C:\cygwin64\home\dsmyda\autopsy\CoreLibs\release\modules\ext\poi-4.0.1.jar - ext/poi-ooxml-3.17.jar - release/modules/ext/poi-ooxml-3.17.jar + ext/poi-excelant-4.0.1.jar + C:\cygwin64\home\dsmyda\autopsy\CoreLibs\release\modules\ext\poi-excelant-4.0.1.jar + + + ext/commons-logging-1.1.2.jar + release/modules/ext/commons-logging-1.1.2.jar ext/controlsfx-8.40.11.jar @@ -954,6 +698,10 @@ ext/common-image-3.2.jar release/modules/ext/common-image-3.2.jar + + ext/poi-ooxml-schemas-4.0.1.jar + C:\cygwin64\home\dsmyda\autopsy\CoreLibs\release\modules\ext\poi-ooxml-schemas-4.0.1.jar + ext/imageio-pict-3.2.jar release/modules/ext/imageio-pict-3.2.jar diff --git a/Experimental/ivy.xml b/Experimental/ivy.xml index 965af1bc12..b4e3a11a83 100644 --- a/Experimental/ivy.xml +++ b/Experimental/ivy.xml @@ -6,7 +6,7 @@ - + diff --git a/Experimental/nbproject/project.properties b/Experimental/nbproject/project.properties index 2db8202ab7..831a57d051 100644 --- a/Experimental/nbproject/project.properties +++ b/Experimental/nbproject/project.properties @@ -1,9 +1,10 @@ file.reference.c3p0-0.9.5.jar=release/modules/ext/c3p0-0.9.5.jar +file.reference.commons-codec-1.11.jar=release/modules/ext/commons-codec-1.11.jar file.reference.jackson-core-2.7.0.jar=release/modules/ext/jackson-core-2.7.0.jar file.reference.LGoodDatePicker-10.3.1.jar=release/modules/ext/LGoodDatePicker-10.3.1.jar file.reference.mchange-commons-java-0.2.9.jar=release/modules/ext/mchange-commons-java-0.2.9.jar file.reference.postgresql-9.4-1201-jdbc41.jar=release/modules/ext/postgresql-9.4-1201-jdbc41.jar -file.reference.tika-core-1.17.jar=release/modules/ext/tika-core-1.17.jar +file.reference.tika-core-1.20.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Experimental\\release\\modules\\ext\\tika-core-1.20.jar javac.source=1.8 javac.compilerargs=-Xlint -Xlint:-serial javadoc.reference.LGoodDatePicker-10.3.1.jar=release/modules/ext/LGoodDatePicker-10.3.1-javadoc.jar diff --git a/Experimental/nbproject/project.xml b/Experimental/nbproject/project.xml index 55e6cfdadb..e62cfa5a98 100644 --- a/Experimental/nbproject/project.xml +++ b/Experimental/nbproject/project.xml @@ -162,12 +162,16 @@ org.sleuthkit.autopsy.experimental.configuration - ext/LGoodDatePicker-10.3.1.jar - release/modules/ext/LGoodDatePicker-10.3.1.jar + ext/commons-codec-1.11.jar + release/modules/ext/commons-codec-1.11.jar - ext/tika-core-1.17.jar - release/modules/ext/tika-core-1.17.jar + ext/tika-core-1.20.jar + C:\cygwin64\home\dsmyda\autopsy\Experimental\release\modules\ext\tika-core-1.20.jar + + + ext/LGoodDatePicker-10.3.1.jar + release/modules/ext/LGoodDatePicker-10.3.1.jar ext/mchange-commons-java-0.2.9.jar diff --git a/ImageGallery/nbproject/project.properties b/ImageGallery/nbproject/project.properties index e400c96aab..b0d03e2f33 100644 --- a/ImageGallery/nbproject/project.properties +++ b/ImageGallery/nbproject/project.properties @@ -1,3 +1,4 @@ +file.reference.commons-collections4-4.2.jar=release/modules/ext/commons-collections4-4.2.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/ImageGallery/nbproject/project.xml b/ImageGallery/nbproject/project.xml index 183a947954..5e30bfd06e 100644 --- a/ImageGallery/nbproject/project.xml +++ b/ImageGallery/nbproject/project.xml @@ -145,6 +145,10 @@ ext/sqlite-jdbc-3.25.2.jar release/modules/ext/sqlite-jdbc-3.25.2.jar + + ext/commons-collections4-4.2.jar + release/modules/ext/commons-collections4-4.2.jar + diff --git a/KeywordSearch/ivy.xml b/KeywordSearch/ivy.xml index fc6aa00269..1368e04a99 100644 --- a/KeywordSearch/ivy.xml +++ b/KeywordSearch/ivy.xml @@ -15,18 +15,15 @@ - - + - - + @@ -45,6 +42,10 @@ + + + + diff --git a/KeywordSearch/ivysettings.xml b/KeywordSearch/ivysettings.xml index c27d905255..55d9518a26 100644 --- a/KeywordSearch/ivysettings.xml +++ b/KeywordSearch/ivysettings.xml @@ -6,4 +6,6 @@ + + diff --git a/KeywordSearch/nbproject/project.properties b/KeywordSearch/nbproject/project.properties index 4af4a610bf..4f92e38703 100644 --- a/KeywordSearch/nbproject/project.properties +++ b/KeywordSearch/nbproject/project.properties @@ -1,138 +1,66 @@ -file.reference.apache-mime4j-core-0.8.1.jar=release/modules/ext/apache-mime4j-core-0.8.1.jar -file.reference.apache-mime4j-dom-0.8.1.jar=release/modules/ext/apache-mime4j-dom-0.8.1.jar -file.reference.asm-5.0.4.jar=release/modules/ext/asm-5.0.4.jar -file.reference.asm-all-3.1.jar=release/modules/ext/asm-all-3.1.jar -file.reference.bcmail-jdk15on-1.54.jar=release/modules/ext/bcmail-jdk15on-1.54.jar -file.reference.bcpkix-jdk15on-1.54.jar=release/modules/ext/bcpkix-jdk15on-1.54.jar -file.reference.bcprov-jdk15on-1.54.jar=release/modules/ext/bcprov-jdk15on-1.54.jar file.reference.boilerpipe-1.1.0.jar=release/modules/ext/boilerpipe-1.1.0.jar file.reference.bzip2-0.9.1.jar=release/modules/ext/bzip2-0.9.1.jar file.reference.c3p0-0.9.1.1.jar=release/modules/ext/c3p0-0.9.1.1.jar file.reference.cdm-4.5.5.jar=release/modules/ext/cdm-4.5.5.jar file.reference.cleartk-util-2.0.0.jar=release/modules/ext/cleartk-util-2.0.0.jar file.reference.commons-beanutils-1.9.2.jar=release/modules/ext/commons-beanutils-1.9.2.jar -file.reference.commons-codec-1.10.jar=release/modules/ext/commons-codec-1.10.jar +file.reference.commons-codec-1.11.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\KeywordSearch\\release\\modules\\ext\\commons-codec-1.11.jar file.reference.commons-collections-3.2.2.jar=release/modules/ext/commons-collections-3.2.2.jar -file.reference.commons-collections4-4.1.jar=release/modules/ext/commons-collections4-4.1.jar -file.reference.commons-compress-1.14.jar=release/modules/ext/commons-compress-1.14.jar -file.reference.commons-csv-1.0.jar=release/modules/ext/commons-csv-1.0.jar file.reference.commons-digester-1.8.1.jar=release/modules/ext/commons-digester-1.8.1.jar file.reference.commons-exec-1.3.jar=release/modules/ext/commons-exec-1.3.jar -file.reference.commons-io-2.3.jar=release/modules/ext/commons-io-2.3.jar +file.reference.commons-io-2.3.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\KeywordSearch\\release\\modules\\ext\\commons-io-2.3.jar file.reference.commons-lang-2.6.jar=release/modules/ext/commons-lang-2.6.jar file.reference.commons-logging-1.2.jar=release/modules/ext/commons-logging-1.2.jar file.reference.commons-logging-api-1.1.jar=release/modules/ext/commons-logging-api-1.1.jar file.reference.commons-validator-1.5.1-javadoc.jar=release/modules/ext/commons-validator-1.5.1-javadoc.jar file.reference.commons-validator-1.5.1-sources.jar=release/modules/ext/commons-validator-1.5.1-sources.jar file.reference.commons-validator-1.5.1.jar=release/modules/ext/commons-validator-1.5.1.jar -file.reference.ctakes-core-3.2.2.jar=release/modules/ext/ctakes-core-3.2.2.jar -file.reference.ctakes-core-res-3.2.2.jar=release/modules/ext/ctakes-core-res-3.2.2.jar -file.reference.ctakes-type-system-3.2.2.jar=release/modules/ext/ctakes-type-system-3.2.2.jar -file.reference.ctakes-utils-3.2.2.jar=release/modules/ext/ctakes-utils-3.2.2.jar -file.reference.curvesapi-1.04.jar=release/modules/ext/curvesapi-1.04.jar -file.reference.cxf-core-3.0.16.jar=release/modules/ext/cxf-core-3.0.16.jar -file.reference.cxf-rt-frontend-jaxrs-3.0.16.jar=release/modules/ext/cxf-rt-frontend-jaxrs-3.0.16.jar -file.reference.cxf-rt-rs-client-3.0.16.jar=release/modules/ext/cxf-rt-rs-client-3.0.16.jar -file.reference.cxf-rt-transports-http-3.0.16.jar=release/modules/ext/cxf-rt-transports-http-3.0.16.jar file.reference.ehcache-core-2.6.2.jar=release/modules/ext/ehcache-core-2.6.2.jar file.reference.findstructapi-0.0.1.jar=release/modules/ext/findstructapi-0.0.1.jar -file.reference.fontbox-2.0.8.jar=release/modules/ext/fontbox-2.0.8.jar -file.reference.geoapi-3.0.0.jar=release/modules/ext/geoapi-3.0.0.jar file.reference.grib-4.5.5.jar=release/modules/ext/grib-4.5.5.jar -file.reference.gson-2.8.1.jar=release/modules/ext/gson-2.8.1.jar file.reference.guava-17.0.jar=release/modules/ext/guava-17.0.jar file.reference.hamcrest-core-1.3.jar=release/modules/ext/hamcrest-core-1.3.jar -file.reference.httpclient-4.5.4.jar=release/modules/ext/httpclient-4.5.4.jar +file.reference.httpclient-4.3.1.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\KeywordSearch\\release\\modules\\ext\\httpclient-4.3.1.jar +file.reference.httpcore-4.3.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\KeywordSearch\\release\\modules\\ext\\httpcore-4.3.jar file.reference.httpcore-4.4.1.jar=release/modules/ext/httpcore-4.4.1.jar -file.reference.httpcore-4.4.7.jar=release/modules/ext/httpcore-4.4.7.jar +file.reference.httpmime-4.3.1.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\KeywordSearch\\release\\modules\\ext\\httpmime-4.3.1.jar file.reference.httpmime-4.4.1.jar=release/modules/ext/httpmime-4.4.1.jar -file.reference.httpmime-4.5.4.jar=release/modules/ext/httpmime-4.5.4.jar file.reference.httpservices-4.5.5.jar=release/modules/ext/httpservices-4.5.5.jar -file.reference.icu4j-3.8.jar=release/modules/ext/icu4j-3.8.jar -file.reference.isoparser-1.1.18.jar=release/modules/ext/isoparser-1.1.18.jar -file.reference.jackcess-2.1.8.jar=release/modules/ext/jackcess-2.1.8.jar -file.reference.jackcess-encrypt-2.1.2.jar=release/modules/ext/jackcess-encrypt-2.1.2.jar -file.reference.jackson-core-2.9.2.jar=release/modules/ext/jackson-core-2.9.2.jar -file.reference.jakarta-regexp-1.4.jar=release/modules/ext/jakarta-regexp-1.4.jar file.reference.java-libpst-0.8.1.jar=release/modules/ext/java-libpst-0.8.1.jar -file.reference.javax.annotation-api-1.2.jar=release/modules/ext/javax.annotation-api-1.2.jar -file.reference.javax.ws.rs-api-2.0.1.jar=release/modules/ext/javax.ws.rs-api-2.0.1.jar file.reference.jcip-annotations-1.0.jar=release/modules/ext/jcip-annotations-1.0.jar file.reference.jcommander-1.35.jar=release/modules/ext/jcommander-1.35.jar file.reference.jdom-1.0.jar=release/modules/ext/jdom-1.0.jar -file.reference.jdom2-2.0.4.jar=release/modules/ext/jdom2-2.0.4.jar -file.reference.jempbox-1.8.13.jar=release/modules/ext/jempbox-1.8.13.jar file.reference.jericho-html-3.3-javadoc.jar=release/modules/ext/jericho-html-3.3-javadoc.jar file.reference.jericho-html-3.3-sources.jar=release/modules/ext/jericho-html-3.3-sources.jar file.reference.jericho-html-3.3.jar=release/modules/ext/jericho-html-3.3.jar -file.reference.jhighlight-1.0.2.jar=release/modules/ext/jhighlight-1.0.2.jar -file.reference.jmatio-1.2.jar=release/modules/ext/jmatio-1.2.jar -file.reference.jna-4.1.0.jar=release/modules/ext/jna-4.1.0.jar file.reference.joda-time-2.2.jar=release/modules/ext/joda-time-2.2.jar file.reference.json-simple-1.1.1.jar=release/modules/ext/json-simple-1.1.1.jar -file.reference.jsoup-1.7.2.jar=release/modules/ext/jsoup-1.7.2.jar -file.reference.jsr-275-0.9.3.jar=release/modules/ext/jsr-275-0.9.3.jar file.reference.juniversalchardet-1.0.3.jar=release/modules/ext/juniversalchardet-1.0.3.jar -file.reference.junrar-0.7.jar=release/modules/ext/junrar-0.7.jar -file.reference.jVinci-2.6.0.jar=release/modules/ext/jVinci-2.6.0.jar -file.reference.jwnl-1.3.3.jar=release/modules/ext/jwnl-1.3.3.jar file.reference.libsvm-3.1.jar=release/modules/ext/libsvm-3.1.jar file.reference.log4j-1.2.17.jar=release/modules/ext/log4j-1.2.17.jar -file.reference.lucene-analyzers-common-4.0.0.jar=release/modules/ext/lucene-analyzers-common-4.0.0.jar -file.reference.lucene-core-4.0.0.jar=release/modules/ext/lucene-core-4.0.0.jar -file.reference.lucene-queries-4.0.0.jar=release/modules/ext/lucene-queries-4.0.0.jar -file.reference.lucene-queryparser-4.0.0.jar=release/modules/ext/lucene-queryparser-4.0.0.jar -file.reference.lucene-sandbox-4.0.0.jar=release/modules/ext/lucene-sandbox-4.0.0.jar -file.reference.metadata-extractor-2.10.1.jar=release/modules/ext/metadata-extractor-2.10.1.jar file.reference.netcdf4-4.5.5.jar=release/modules/ext/netcdf4-4.5.5.jar file.reference.noggit-0.5.jar=release/modules/ext/noggit-0.5.jar file.reference.openaifsm-0.0.1.jar=release/modules/ext/openaifsm-0.0.1.jar file.reference.opennlp-maxent-3.0.3.jar=release/modules/ext/opennlp-maxent-3.0.3.jar -file.reference.opennlp-tools-1.5.3.jar=release/modules/ext/opennlp-tools-1.5.3.jar -file.reference.org.apache.felix.scr.annotations-1.6.0.jar=release/modules/ext/org.apache.felix.scr.annotations-1.6.0.jar -file.reference.org.apache.felix.scr.generator-1.1.2.jar=release/modules/ext/org.apache.felix.scr.generator-1.1.2.jar -file.reference.org.osgi.compendium-4.0.0.jar=release/modules/ext/org.osgi.compendium-4.0.0.jar -file.reference.org.osgi.core-4.0.0.jar=release/modules/ext/org.osgi.core-4.0.0.jar -file.reference.pdfbox-2.0.8.jar=release/modules/ext/pdfbox-2.0.8.jar -file.reference.pdfbox-tools-2.0.8.jar=release/modules/ext/pdfbox-tools-2.0.8.jar -file.reference.poi-3.17.jar=release/modules/ext/poi-3.17.jar -file.reference.poi-ooxml-3.17.jar=release/modules/ext/poi-ooxml-3.17.jar -file.reference.poi-ooxml-schemas-3.17.jar=release/modules/ext/poi-ooxml-schemas-3.17.jar -file.reference.poi-scratchpad-3.17.jar=release/modules/ext/poi-scratchpad-3.17.jar +file.reference.poi-4.0.1.jar=release/modules/ext/poi-4.0.1.jar +file.reference.poi-ooxml-4.0.1.jar=release/modules/ext/poi-ooxml-4.0.1.jar +file.reference.poi-ooxml-schemas-4.0.1.jar=release/modules/ext/poi-ooxml-schemas-4.0.1.jar +file.reference.poi-scratchpad-4.0.1.jar=release/modules/ext/poi-scratchpad-4.0.1.jar file.reference.protobuf-java-2.5.0.jar=release/modules/ext/protobuf-java-2.5.0.jar -file.reference.qdox-1.12.jar=release/modules/ext/qdox-1.12.jar file.reference.quartz-2.2.0.jar=release/modules/ext/quartz-2.2.0.jar -file.reference.rome-1.5.1.jar=release/modules/ext/rome-1.5.1.jar -file.reference.rome-utils-1.5.1.jar=release/modules/ext/rome-utils-1.5.1.jar -file.reference.sis-metadata-0.6.jar=release/modules/ext/sis-metadata-0.6.jar -file.reference.sis-netcdf-0.6.jar=release/modules/ext/sis-netcdf-0.6.jar -file.reference.sis-referencing-0.6.jar=release/modules/ext/sis-referencing-0.6.jar -file.reference.sis-storage-0.6.jar=release/modules/ext/sis-storage-0.6.jar -file.reference.sis-utility-0.6.jar=release/modules/ext/sis-utility-0.6.jar -file.reference.slf4j-api-1.7.24.jar=release/modules/ext/slf4j-api-1.7.24.jar file.reference.solr-solrj-4.9.1-javadoc.jar=release/modules/ext/solr-solrj-4.9.1-javadoc.jar file.reference.solr-solrj-4.9.1-sources.jar=release/modules/ext/solr-solrj-4.9.1-sources.jar file.reference.solr-solrj-4.9.1.jar=release/modules/ext/solr-solrj-4.9.1.jar file.reference.sqlite-jdbc-3.19.3.jar=release/modules/ext/sqlite-jdbc-3.19.3.jar +file.reference.sqlite-jdbc-3.25.2.jar=release/modules/ext/sqlite-jdbc-3.25.2.jar file.reference.sqlwrapper-0.0.1.jar=release/modules/ext/sqlwrapper-0.0.1.jar file.reference.stax2-api-3.1.4.jar=release/modules/ext/stax2-api-3.1.4.jar file.reference.tagsoup-1.2.1.jar=release/modules/ext/tagsoup-1.2.1.jar -file.reference.tika-core-1.17.jar=release/modules/ext/tika-core-1.17.jar -file.reference.tika-parsers-1.17-javadoc.jar=release/modules/ext/tika-parsers-1.17-javadoc.jar -file.reference.tika-parsers-1.17-sources.jar=release/modules/ext/tika-parsers-1.17-sources.jar -file.reference.tika-parsers-1.17.jar=release/modules/ext/tika-parsers-1.17.jar +file.reference.tika-core-1.20.jar=release/modules/ext/tika-core-1.20.jar +file.reference.tika-parsers-1.20.jar=release/modules/ext/tika-parsers-1.20.jar file.reference.udunits-4.5.5.jar=release/modules/ext/udunits-4.5.5.jar -file.reference.uimafit-core-2.1.0.jar=release/modules/ext/uimafit-core-2.1.0.jar -file.reference.uimaj-adapter-vinci-2.6.0.jar=release/modules/ext/uimaj-adapter-vinci-2.6.0.jar -file.reference.uimaj-core-2.5.0.jar=release/modules/ext/uimaj-core-2.5.0.jar -file.reference.uimaj-cpe-2.6.0.jar=release/modules/ext/uimaj-cpe-2.6.0.jar -file.reference.uimaj-document-annotation-2.5.0.jar=release/modules/ext/uimaj-document-annotation-2.5.0.jar -file.reference.uimaj-examples-2.4.0.jar=release/modules/ext/uimaj-examples-2.4.0.jar -file.reference.uimaj-tools-2.6.0.jar=release/modules/ext/uimaj-tools-2.6.0.jar file.reference.vorbis-java-core-0.8.jar=release/modules/ext/vorbis-java-core-0.8.jar file.reference.vorbis-java-tika-0.8.jar=release/modules/ext/vorbis-java-tika-0.8.jar -file.reference.woodstox-core-asl-4.4.1.jar=release/modules/ext/woodstox-core-asl-4.4.1.jar -file.reference.xmlbeans-2.6.0.jar=release/modules/ext/xmlbeans-2.6.0.jar file.reference.xmpcore-5.1.3.jar=release/modules/ext/xmpcore-5.1.3.jar file.reference.zookeeper-3.4.6.jar=release/modules/ext/zookeeper-3.4.6.jar javac.source=1.8 diff --git a/KeywordSearch/nbproject/project.xml b/KeywordSearch/nbproject/project.xml index c66ad369eb..a6db4dfc07 100644 --- a/KeywordSearch/nbproject/project.xml +++ b/KeywordSearch/nbproject/project.xml @@ -134,52 +134,27 @@ org.apache.commons.logging.impl - org.apache.tika.parser.txt org.sleuthkit.autopsy.keywordsearch ext/commons-validator-1.5.1-sources.jar release/modules/ext/commons-validator-1.5.1-sources.jar - - ext/apache-mime4j-dom-0.8.1.jar - release/modules/ext/apache-mime4j-dom-0.8.1.jar - ext/commons-digester-1.8.1.jar release/modules/ext/commons-digester-1.8.1.jar - ext/jwnl-1.3.3.jar - release/modules/ext/jwnl-1.3.3.jar - - - ext/lucene-queryparser-4.0.0.jar - release/modules/ext/lucene-queryparser-4.0.0.jar - - - ext/httpclient-4.5.4.jar - release/modules/ext/httpclient-4.5.4.jar - - - ext/uimaj-examples-2.4.0.jar - release/modules/ext/uimaj-examples-2.4.0.jar + ext/jericho-html-3.3.jar + release/modules/ext/jericho-html-3.3.jar ext/cdm-4.5.5.jar release/modules/ext/cdm-4.5.5.jar - ext/org.osgi.compendium-4.0.0.jar - release/modules/ext/org.osgi.compendium-4.0.0.jar - - - ext/geoapi-3.0.0.jar - release/modules/ext/geoapi-3.0.0.jar - - - ext/commons-compress-1.14.jar - release/modules/ext/commons-compress-1.14.jar + ext/httpservices-4.5.5.jar + release/modules/ext/httpservices-4.5.5.jar ext/hamcrest-core-1.3.jar @@ -194,332 +169,72 @@ release/modules/ext/commons-logging-api-1.1.jar - ext/jakarta-regexp-1.4.jar - release/modules/ext/jakarta-regexp-1.4.jar - - - ext/xmlbeans-2.6.0.jar - release/modules/ext/xmlbeans-2.6.0.jar + ext/solr-solrj-4.9.1-javadoc.jar + release/modules/ext/solr-solrj-4.9.1-javadoc.jar ext/quartz-2.2.0.jar release/modules/ext/quartz-2.2.0.jar - - ext/sqlite-jdbc-3.25.2.jar - release/modules/ext/sqlite-jdbc-3.25.2.jar - ext/guava-17.0.jar release/modules/ext/guava-17.0.jar - - ext/metadata-extractor-2.10.1.jar - release/modules/ext/metadata-extractor-2.10.1.jar - - - ext/apache-mime4j-core-0.8.1.jar - release/modules/ext/apache-mime4j-core-0.8.1.jar - - - ext/opennlp-maxent-3.0.3.jar - release/modules/ext/opennlp-maxent-3.0.3.jar - - - ext/pdfbox-tools-2.0.8.jar - release/modules/ext/pdfbox-tools-2.0.8.jar - - - ext/jVinci-2.6.0.jar - release/modules/ext/jVinci-2.6.0.jar - - - ext/json-simple-1.1.1.jar - release/modules/ext/json-simple-1.1.1.jar - - - ext/tika-parsers-1.17.jar - release/modules/ext/tika-parsers-1.17.jar - - - ext/sis-utility-0.6.jar - release/modules/ext/sis-utility-0.6.jar - - - ext/jhighlight-1.0.2.jar - release/modules/ext/jhighlight-1.0.2.jar - - - ext/uimaj-cpe-2.6.0.jar - release/modules/ext/uimaj-cpe-2.6.0.jar - - - ext/log4j-1.2.17.jar - release/modules/ext/log4j-1.2.17.jar - - - ext/ctakes-utils-3.2.2.jar - release/modules/ext/ctakes-utils-3.2.2.jar - - - ext/cxf-rt-rs-client-3.0.16.jar - release/modules/ext/cxf-rt-rs-client-3.0.16.jar - - - ext/jempbox-1.8.13.jar - release/modules/ext/jempbox-1.8.13.jar - - - ext/openaifsm-0.0.1.jar - release/modules/ext/openaifsm-0.0.1.jar - - - ext/stax2-api-3.1.4.jar - release/modules/ext/stax2-api-3.1.4.jar - - - ext/commons-collections4-4.1.jar - release/modules/ext/commons-collections4-4.1.jar - - - ext/solr-solrj-4.9.1.jar - release/modules/ext/solr-solrj-4.9.1.jar - - - ext/xmpcore-5.1.3.jar - release/modules/ext/xmpcore-5.1.3.jar - - - ext/jackcess-2.1.8.jar - release/modules/ext/jackcess-2.1.8.jar - - - ext/findstructapi-0.0.1.jar - release/modules/ext/findstructapi-0.0.1.jar - - - ext/jcommander-1.35.jar - release/modules/ext/jcommander-1.35.jar - - - ext/sis-metadata-0.6.jar - release/modules/ext/sis-metadata-0.6.jar - - - ext/isoparser-1.1.18.jar - release/modules/ext/isoparser-1.1.18.jar - - - ext/vorbis-java-core-0.8.jar - release/modules/ext/vorbis-java-core-0.8.jar - - - ext/jdom2-2.0.4.jar - release/modules/ext/jdom2-2.0.4.jar - - - ext/java-libpst-0.8.1.jar - release/modules/ext/java-libpst-0.8.1.jar - - - ext/commons-codec-1.10.jar - release/modules/ext/commons-codec-1.10.jar - - - ext/gson-2.8.1.jar - release/modules/ext/gson-2.8.1.jar - - - ext/poi-ooxml-schemas-3.17.jar - release/modules/ext/poi-ooxml-schemas-3.17.jar - - - ext/poi-scratchpad-3.17.jar - release/modules/ext/poi-scratchpad-3.17.jar - - - ext/poi-3.17.jar - release/modules/ext/poi-3.17.jar - - - ext/lucene-queries-4.0.0.jar - release/modules/ext/lucene-queries-4.0.0.jar - - - ext/bcprov-jdk15on-1.54.jar - release/modules/ext/bcprov-jdk15on-1.54.jar - - - ext/fontbox-2.0.8.jar - release/modules/ext/fontbox-2.0.8.jar - - - ext/solr-solrj-4.9.1-sources.jar - release/modules/ext/solr-solrj-4.9.1-sources.jar - - - ext/lucene-analyzers-common-4.0.0.jar - release/modules/ext/lucene-analyzers-common-4.0.0.jar - - - ext/javax.ws.rs-api-2.0.1.jar - release/modules/ext/javax.ws.rs-api-2.0.1.jar - - - ext/httpmime-4.5.4.jar - release/modules/ext/httpmime-4.5.4.jar - - - ext/junrar-0.7.jar - release/modules/ext/junrar-0.7.jar - - - ext/libsvm-3.1.jar - release/modules/ext/libsvm-3.1.jar - - - ext/noggit-0.5.jar - release/modules/ext/noggit-0.5.jar - - - ext/poi-ooxml-3.17.jar - release/modules/ext/poi-ooxml-3.17.jar - - - ext/jna-4.1.0.jar - release/modules/ext/jna-4.1.0.jar - - - ext/qdox-1.12.jar - release/modules/ext/qdox-1.12.jar - - - ext/bcpkix-jdk15on-1.54.jar - release/modules/ext/bcpkix-jdk15on-1.54.jar - - - ext/bzip2-0.9.1.jar - release/modules/ext/bzip2-0.9.1.jar - - - ext/grib-4.5.5.jar - release/modules/ext/grib-4.5.5.jar - - - ext/jackson-core-2.9.2.jar - release/modules/ext/jackson-core-2.9.2.jar - - - ext/uimaj-core-2.5.0.jar - release/modules/ext/uimaj-core-2.5.0.jar - - - ext/jmatio-1.2.jar - release/modules/ext/jmatio-1.2.jar - - - ext/commons-csv-1.0.jar - release/modules/ext/commons-csv-1.0.jar - - - ext/commons-validator-1.5.1-javadoc.jar - release/modules/ext/commons-validator-1.5.1-javadoc.jar - - - ext/lucene-sandbox-4.0.0.jar - release/modules/ext/lucene-sandbox-4.0.0.jar - - - ext/jericho-html-3.3.jar - release/modules/ext/jericho-html-3.3.jar - - - ext/jsr-275-0.9.3.jar - release/modules/ext/jsr-275-0.9.3.jar - - - ext/httpservices-4.5.5.jar - release/modules/ext/httpservices-4.5.5.jar - - - ext/httpcore-4.4.7.jar - release/modules/ext/httpcore-4.4.7.jar - - - ext/bcmail-jdk15on-1.54.jar - release/modules/ext/bcmail-jdk15on-1.54.jar - - - ext/solr-solrj-4.9.1-javadoc.jar - release/modules/ext/solr-solrj-4.9.1-javadoc.jar - - - ext/asm-all-3.1.jar - release/modules/ext/asm-all-3.1.jar - - - ext/tika-parsers-1.17-javadoc.jar - release/modules/ext/tika-parsers-1.17-javadoc.jar - - - ext/icu4j-3.8.jar - release/modules/ext/icu4j-3.8.jar - - - ext/curvesapi-1.04.jar - release/modules/ext/curvesapi-1.04.jar - - - ext/sis-referencing-0.6.jar - release/modules/ext/sis-referencing-0.6.jar - - - ext/ctakes-core-res-3.2.2.jar - release/modules/ext/ctakes-core-res-3.2.2.jar - ext/joda-time-2.2.jar release/modules/ext/joda-time-2.2.jar + + ext/tika-core-1.20.jar + release/modules/ext/tika-core-1.20.jar + ext/tagsoup-1.2.1.jar release/modules/ext/tagsoup-1.2.1.jar - ext/tika-core-1.17.jar - release/modules/ext/tika-core-1.17.jar + ext/opennlp-maxent-3.0.3.jar + release/modules/ext/opennlp-maxent-3.0.3.jar - ext/lucene-core-4.0.0.jar - release/modules/ext/lucene-core-4.0.0.jar - - - ext/asm-5.0.4.jar - release/modules/ext/asm-5.0.4.jar + ext/poi-scratchpad-4.0.1.jar + release/modules/ext/poi-scratchpad-4.0.1.jar ext/commons-logging-1.2.jar release/modules/ext/commons-logging-1.2.jar - ext/org.osgi.core-4.0.0.jar - release/modules/ext/org.osgi.core-4.0.0.jar + ext/json-simple-1.1.1.jar + release/modules/ext/json-simple-1.1.1.jar ext/c3p0-0.9.1.1.jar release/modules/ext/c3p0-0.9.1.1.jar - ext/tika-parsers-1.17-sources.jar - release/modules/ext/tika-parsers-1.17-sources.jar + ext/poi-ooxml-4.0.1.jar + release/modules/ext/poi-ooxml-4.0.1.jar + + + ext/httpclient-4.3.1.jar + C:\cygwin64\home\dsmyda\autopsy\KeywordSearch\release\modules\ext\httpclient-4.3.1.jar + + + ext/commons-codec-1.11.jar + C:\cygwin64\home\dsmyda\autopsy\KeywordSearch\release\modules\ext\commons-codec-1.11.jar + + + ext/tika-parsers-1.20.jar + release/modules/ext/tika-parsers-1.20.jar ext/sqlwrapper-0.0.1.jar release/modules/ext/sqlwrapper-0.0.1.jar - ext/jackcess-encrypt-2.1.2.jar - release/modules/ext/jackcess-encrypt-2.1.2.jar + ext/log4j-1.2.17.jar + release/modules/ext/log4j-1.2.17.jar ext/jericho-html-3.3-javadoc.jar @@ -534,80 +249,88 @@ release/modules/ext/commons-collections-3.2.2.jar - ext/uimaj-document-annotation-2.5.0.jar - release/modules/ext/uimaj-document-annotation-2.5.0.jar + ext/openaifsm-0.0.1.jar + release/modules/ext/openaifsm-0.0.1.jar - ext/woodstox-core-asl-4.4.1.jar - release/modules/ext/woodstox-core-asl-4.4.1.jar + ext/stax2-api-3.1.4.jar + release/modules/ext/stax2-api-3.1.4.jar - ext/org.apache.felix.scr.generator-1.1.2.jar - release/modules/ext/org.apache.felix.scr.generator-1.1.2.jar + ext/solr-solrj-4.9.1.jar + release/modules/ext/solr-solrj-4.9.1.jar - ext/pdfbox-2.0.8.jar - release/modules/ext/pdfbox-2.0.8.jar + ext/xmpcore-5.1.3.jar + release/modules/ext/xmpcore-5.1.3.jar + + + ext/findstructapi-0.0.1.jar + release/modules/ext/findstructapi-0.0.1.jar ext/zookeeper-3.4.6.jar release/modules/ext/zookeeper-3.4.6.jar - ext/cxf-rt-transports-http-3.0.16.jar - release/modules/ext/cxf-rt-transports-http-3.0.16.jar + ext/jcommander-1.35.jar + release/modules/ext/jcommander-1.35.jar + + + ext/vorbis-java-core-0.8.jar + release/modules/ext/vorbis-java-core-0.8.jar ext/netcdf4-4.5.5.jar release/modules/ext/netcdf4-4.5.5.jar - ext/slf4j-api-1.7.24.jar - release/modules/ext/slf4j-api-1.7.24.jar + ext/java-libpst-0.8.1.jar + release/modules/ext/java-libpst-0.8.1.jar ext/protobuf-java-2.5.0.jar release/modules/ext/protobuf-java-2.5.0.jar - ext/sis-netcdf-0.6.jar - release/modules/ext/sis-netcdf-0.6.jar - - - ext/javax.annotation-api-1.2.jar - release/modules/ext/javax.annotation-api-1.2.jar + ext/commons-io-2.3.jar + C:\cygwin64\home\dsmyda\autopsy\KeywordSearch\release\modules\ext\commons-io-2.3.jar ext/jericho-html-3.3-sources.jar release/modules/ext/jericho-html-3.3-sources.jar - ext/juniversalchardet-1.0.3.jar - release/modules/ext/juniversalchardet-1.0.3.jar + ext/solr-solrj-4.9.1-sources.jar + release/modules/ext/solr-solrj-4.9.1-sources.jar - ext/org.apache.felix.scr.annotations-1.6.0.jar - release/modules/ext/org.apache.felix.scr.annotations-1.6.0.jar + ext/juniversalchardet-1.0.3.jar + release/modules/ext/juniversalchardet-1.0.3.jar ext/commons-lang-2.6.jar release/modules/ext/commons-lang-2.6.jar - ext/cxf-core-3.0.16.jar - release/modules/ext/cxf-core-3.0.16.jar + ext/libsvm-3.1.jar + release/modules/ext/libsvm-3.1.jar - ext/opennlp-tools-1.5.3.jar - release/modules/ext/opennlp-tools-1.5.3.jar + ext/noggit-0.5.jar + release/modules/ext/noggit-0.5.jar - ext/rome-utils-1.5.1.jar - release/modules/ext/rome-utils-1.5.1.jar + ext/poi-4.0.1.jar + release/modules/ext/poi-4.0.1.jar - ext/sis-storage-0.6.jar - release/modules/ext/sis-storage-0.6.jar + ext/httpmime-4.3.1.jar + C:\cygwin64\home\dsmyda\autopsy\KeywordSearch\release\modules\ext\httpmime-4.3.1.jar + + + ext/httpcore-4.3.jar + C:\cygwin64\home\dsmyda\autopsy\KeywordSearch\release\modules\ext\httpcore-4.3.jar ext/jcip-annotations-1.0.jar @@ -618,17 +341,21 @@ release/modules/ext/commons-validator-1.5.1.jar - ext/uimafit-core-2.1.0.jar - release/modules/ext/uimafit-core-2.1.0.jar + ext/sqlite-jdbc-3.25.2.jar + release/modules/ext/sqlite-jdbc-3.25.2.jar - ext/cxf-rt-frontend-jaxrs-3.0.16.jar - release/modules/ext/cxf-rt-frontend-jaxrs-3.0.16.jar + ext/bzip2-0.9.1.jar + release/modules/ext/bzip2-0.9.1.jar ext/cleartk-util-2.0.0.jar release/modules/ext/cleartk-util-2.0.0.jar + + ext/grib-4.5.5.jar + release/modules/ext/grib-4.5.5.jar + ext/jdom-1.0.jar release/modules/ext/jdom-1.0.jar @@ -642,32 +369,16 @@ release/modules/ext/ehcache-core-2.6.2.jar - ext/ctakes-type-system-3.2.2.jar - release/modules/ext/ctakes-type-system-3.2.2.jar - - - ext/rome-1.5.1.jar - release/modules/ext/rome-1.5.1.jar - - - ext/uimaj-adapter-vinci-2.6.0.jar - release/modules/ext/uimaj-adapter-vinci-2.6.0.jar - - - ext/ctakes-core-3.2.2.jar - release/modules/ext/ctakes-core-3.2.2.jar - - - ext/jsoup-1.7.2.jar - release/modules/ext/jsoup-1.7.2.jar + ext/poi-ooxml-schemas-4.0.1.jar + release/modules/ext/poi-ooxml-schemas-4.0.1.jar ext/commons-exec-1.3.jar release/modules/ext/commons-exec-1.3.jar - ext/uimaj-tools-2.6.0.jar - release/modules/ext/uimaj-tools-2.6.0.jar + ext/commons-validator-1.5.1-javadoc.jar + release/modules/ext/commons-validator-1.5.1-javadoc.jar ext/vorbis-java-tika-0.8.jar From 974500e08756dd9918c48aecdadc712a5e55fa4f Mon Sep 17 00:00:00 2001 From: "U-BASIS\\dsmyda" Date: Tue, 29 Jan 2019 13:56:15 -0500 Subject: [PATCH 02/28] Fixing public api stuff --- Core/nbproject/project.xml | 313 ---------------------- ImageGallery/nbproject/project.properties | 2 +- ImageGallery/nbproject/project.xml | 4 - 3 files changed, 1 insertion(+), 318 deletions(-) diff --git a/Core/nbproject/project.xml b/Core/nbproject/project.xml index ddbe0c14ce..f8ab850daf 100644 --- a/Core/nbproject/project.xml +++ b/Core/nbproject/project.xml @@ -305,319 +305,10 @@ - com.microsoft.schemas.compatibility - com.microsoft.schemas.compatibility.impl - com.microsoft.schemas.office.excel - com.microsoft.schemas.office.excel.impl - com.microsoft.schemas.office.office - com.microsoft.schemas.office.office.impl - com.microsoft.schemas.office.visio.x2012.main - com.microsoft.schemas.office.visio.x2012.main.impl - com.microsoft.schemas.office.x2006.digsig - com.microsoft.schemas.office.x2006.digsig.impl - com.microsoft.schemas.office.x2006.encryption - com.microsoft.schemas.office.x2006.encryption.impl - com.microsoft.schemas.office.x2006.keyEncryptor.certificate - com.microsoft.schemas.office.x2006.keyEncryptor.certificate.impl - com.microsoft.schemas.office.x2006.keyEncryptor.password - com.microsoft.schemas.office.x2006.keyEncryptor.password.impl - com.microsoft.schemas.vml - com.microsoft.schemas.vml.impl net.sf.sevenzipjbinding net.sf.sevenzipjbinding.impl net.sf.sevenzipjbinding.simple net.sf.sevenzipjbinding.simple.impl - org.apache.commons.codec - org.apache.commons.codec.binary - org.apache.commons.codec.cli - org.apache.commons.codec.digest - org.apache.commons.codec.language - org.apache.commons.codec.language.bm - org.apache.commons.codec.net - org.apache.poi - org.apache.poi.common.usermodel - org.apache.poi.common.usermodel.fonts - org.apache.poi.ddf - org.apache.poi.extractor - org.apache.poi.extractor.ole2 - org.apache.poi.hdgf - org.apache.poi.hdgf.chunks - org.apache.poi.hdgf.dev - org.apache.poi.hdgf.exceptions - org.apache.poi.hdgf.extractor - org.apache.poi.hdgf.pointers - org.apache.poi.hdgf.streams - org.apache.poi.hemf.extractor - org.apache.poi.hemf.hemfplus.record - org.apache.poi.hemf.record - org.apache.poi.hmef - org.apache.poi.hmef.attribute - org.apache.poi.hmef.dev - org.apache.poi.hmef.extractor - org.apache.poi.hpbf - org.apache.poi.hpbf.dev - org.apache.poi.hpbf.extractor - org.apache.poi.hpbf.model - org.apache.poi.hpbf.model.qcbits - org.apache.poi.hpsf - org.apache.poi.hpsf.extractor - org.apache.poi.hpsf.wellknown - org.apache.poi.hslf.blip - org.apache.poi.hslf.dev - org.apache.poi.hslf.exceptions - org.apache.poi.hslf.extractor - org.apache.poi.hslf.model - org.apache.poi.hslf.model.textproperties - org.apache.poi.hslf.record - org.apache.poi.hslf.usermodel - org.apache.poi.hslf.util - org.apache.poi.hsmf - org.apache.poi.hsmf.datatypes - org.apache.poi.hsmf.dev - org.apache.poi.hsmf.exceptions - org.apache.poi.hsmf.extractor - org.apache.poi.hsmf.parsers - org.apache.poi.hssf - org.apache.poi.hssf.converter - org.apache.poi.hssf.dev - org.apache.poi.hssf.eventmodel - org.apache.poi.hssf.eventusermodel - org.apache.poi.hssf.eventusermodel.dummyrecord - org.apache.poi.hssf.extractor - org.apache.poi.hssf.model - org.apache.poi.hssf.record - org.apache.poi.hssf.record.aggregates - org.apache.poi.hssf.record.cf - org.apache.poi.hssf.record.chart - org.apache.poi.hssf.record.common - org.apache.poi.hssf.record.cont - org.apache.poi.hssf.record.crypto - org.apache.poi.hssf.record.pivottable - org.apache.poi.hssf.usermodel - org.apache.poi.hssf.usermodel.helpers - org.apache.poi.hssf.util - org.apache.poi.hwmf.draw - org.apache.poi.hwmf.record - org.apache.poi.hwmf.usermodel - org.apache.poi.hwpf - org.apache.poi.hwpf.converter - org.apache.poi.hwpf.dev - org.apache.poi.hwpf.extractor - org.apache.poi.hwpf.model - org.apache.poi.hwpf.model.io - org.apache.poi.hwpf.model.types - org.apache.poi.hwpf.sprm - org.apache.poi.hwpf.usermodel - org.apache.poi.ooxml - org.apache.poi.ooxml.extractor - org.apache.poi.ooxml.util - org.apache.poi.openxml4j.exceptions - org.apache.poi.openxml4j.opc - org.apache.poi.openxml4j.opc.internal - org.apache.poi.openxml4j.opc.internal.marshallers - org.apache.poi.openxml4j.opc.internal.unmarshallers - org.apache.poi.openxml4j.util - org.apache.poi.poifs.common - org.apache.poi.poifs.crypt - org.apache.poi.poifs.crypt.agile - org.apache.poi.poifs.crypt.binaryrc4 - org.apache.poi.poifs.crypt.cryptoapi - org.apache.poi.poifs.crypt.dsig - org.apache.poi.poifs.crypt.dsig.facets - org.apache.poi.poifs.crypt.dsig.services - org.apache.poi.poifs.crypt.standard - org.apache.poi.poifs.crypt.temp - org.apache.poi.poifs.crypt.xor - org.apache.poi.poifs.dev - org.apache.poi.poifs.eventfilesystem - org.apache.poi.poifs.filesystem - org.apache.poi.poifs.macros - org.apache.poi.poifs.nio - org.apache.poi.poifs.property - org.apache.poi.poifs.storage - org.apache.poi.sl.draw - org.apache.poi.sl.draw.binding - org.apache.poi.sl.draw.geom - org.apache.poi.sl.extractor - org.apache.poi.sl.image - org.apache.poi.sl.usermodel - org.apache.poi.ss - org.apache.poi.ss.extractor - org.apache.poi.ss.format - org.apache.poi.ss.formula - org.apache.poi.ss.formula.atp - org.apache.poi.ss.formula.constant - org.apache.poi.ss.formula.eval - org.apache.poi.ss.formula.eval.forked - org.apache.poi.ss.formula.function - org.apache.poi.ss.formula.functions - org.apache.poi.ss.formula.ptg - org.apache.poi.ss.formula.udf - org.apache.poi.ss.usermodel - org.apache.poi.ss.usermodel.charts - org.apache.poi.ss.usermodel.helpers - org.apache.poi.ss.util - org.apache.poi.ss.util.cellwalk - org.apache.poi.util - org.apache.poi.wp.usermodel - org.apache.poi.xddf.usermodel - org.apache.poi.xddf.usermodel.chart - org.apache.poi.xddf.usermodel.text - org.apache.poi.xdgf.exceptions - org.apache.poi.xdgf.extractor - org.apache.poi.xdgf.geom - org.apache.poi.xdgf.usermodel - org.apache.poi.xdgf.usermodel.section - org.apache.poi.xdgf.usermodel.section.geometry - org.apache.poi.xdgf.usermodel.shape - org.apache.poi.xdgf.usermodel.shape.exceptions - org.apache.poi.xdgf.util - org.apache.poi.xdgf.xml - org.apache.poi.xslf.extractor - org.apache.poi.xslf.model - org.apache.poi.xslf.usermodel - org.apache.poi.xslf.util - org.apache.poi.xssf - org.apache.poi.xssf.binary - org.apache.poi.xssf.eventusermodel - org.apache.poi.xssf.extractor - org.apache.poi.xssf.model - org.apache.poi.xssf.streaming - org.apache.poi.xssf.usermodel - org.apache.poi.xssf.usermodel.charts - org.apache.poi.xssf.usermodel.extensions - org.apache.poi.xssf.usermodel.helpers - org.apache.poi.xssf.util - org.apache.poi.xwpf.extractor - org.apache.poi.xwpf.model - org.apache.poi.xwpf.usermodel - org.apache.tika - org.apache.tika.concurrent - org.apache.tika.config - org.apache.tika.detect - org.apache.tika.embedder - org.apache.tika.exception - org.apache.tika.extractor - org.apache.tika.fork - org.apache.tika.io - org.apache.tika.language - org.apache.tika.language.detect - org.apache.tika.language.translate - org.apache.tika.metadata - org.apache.tika.mime - org.apache.tika.parser - org.apache.tika.parser.apple - org.apache.tika.parser.asm - org.apache.tika.parser.audio - org.apache.tika.parser.captioning - org.apache.tika.parser.captioning.tf - org.apache.tika.parser.chm - org.apache.tika.parser.chm.accessor - org.apache.tika.parser.chm.assertion - org.apache.tika.parser.chm.core - org.apache.tika.parser.chm.exception - org.apache.tika.parser.chm.lzx - org.apache.tika.parser.code - org.apache.tika.parser.crypto - org.apache.tika.parser.ctakes - org.apache.tika.parser.dbf - org.apache.tika.parser.dif - org.apache.tika.parser.digest - org.apache.tika.parser.dwg - org.apache.tika.parser.envi - org.apache.tika.parser.epub - org.apache.tika.parser.executable - org.apache.tika.parser.external - org.apache.tika.parser.feed - org.apache.tika.parser.font - org.apache.tika.parser.gdal - org.apache.tika.parser.geo.topic - org.apache.tika.parser.geo.topic.gazetteer - org.apache.tika.parser.geoinfo - org.apache.tika.parser.grib - org.apache.tika.parser.hdf - org.apache.tika.parser.html - org.apache.tika.parser.html.charsetdetector - org.apache.tika.parser.html.charsetdetector.charsets - org.apache.tika.parser.image - org.apache.tika.parser.image.xmp - org.apache.tika.parser.internal - org.apache.tika.parser.iptc - org.apache.tika.parser.isatab - org.apache.tika.parser.iwork - org.apache.tika.parser.iwork.iwana - org.apache.tika.parser.jdbc - org.apache.tika.parser.journal - org.apache.tika.parser.jpeg - org.apache.tika.parser.mail - org.apache.tika.parser.mat - org.apache.tika.parser.mbox - org.apache.tika.parser.microsoft - org.apache.tika.parser.microsoft.ooxml - org.apache.tika.parser.microsoft.ooxml.xps - org.apache.tika.parser.microsoft.ooxml.xslf - org.apache.tika.parser.microsoft.ooxml.xwpf - org.apache.tika.parser.microsoft.ooxml.xwpf.ml2006 - org.apache.tika.parser.microsoft.xml - org.apache.tika.parser.mp3 - org.apache.tika.parser.mp4 - org.apache.tika.parser.ner - org.apache.tika.parser.ner.corenlp - org.apache.tika.parser.ner.grobid - org.apache.tika.parser.ner.mitie - org.apache.tika.parser.ner.nltk - org.apache.tika.parser.ner.opennlp - org.apache.tika.parser.ner.regex - org.apache.tika.parser.netcdf - org.apache.tika.parser.ocr - org.apache.tika.parser.odf - org.apache.tika.parser.opendocument - org.apache.tika.parser.pdf - org.apache.tika.parser.pkg - org.apache.tika.parser.pot - org.apache.tika.parser.prt - org.apache.tika.parser.recognition - org.apache.tika.parser.recognition.tf - org.apache.tika.parser.rtf - org.apache.tika.parser.sas - org.apache.tika.parser.sentiment - org.apache.tika.parser.strings - org.apache.tika.parser.txt - org.apache.tika.parser.utils - org.apache.tika.parser.video - org.apache.tika.parser.wordperfect - org.apache.tika.parser.xml - org.apache.tika.sax - org.apache.tika.sax.xpath - org.apache.tika.utils - org.etsi.uri.x01903.v13 - org.etsi.uri.x01903.v13.impl - org.openxmlformats.schemas.drawingml.x2006.chart - org.openxmlformats.schemas.drawingml.x2006.chart.impl - org.openxmlformats.schemas.drawingml.x2006.main - org.openxmlformats.schemas.drawingml.x2006.main.impl - org.openxmlformats.schemas.drawingml.x2006.picture - org.openxmlformats.schemas.drawingml.x2006.picture.impl - org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing - org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.impl - org.openxmlformats.schemas.drawingml.x2006.wordprocessingDrawing - org.openxmlformats.schemas.drawingml.x2006.wordprocessingDrawing.impl - org.openxmlformats.schemas.officeDocument.x2006.customProperties - org.openxmlformats.schemas.officeDocument.x2006.customProperties.impl - org.openxmlformats.schemas.officeDocument.x2006.docPropsVTypes - org.openxmlformats.schemas.officeDocument.x2006.docPropsVTypes.impl - org.openxmlformats.schemas.officeDocument.x2006.extendedProperties - org.openxmlformats.schemas.officeDocument.x2006.extendedProperties.impl - org.openxmlformats.schemas.officeDocument.x2006.relationships - org.openxmlformats.schemas.officeDocument.x2006.relationships.impl - org.openxmlformats.schemas.presentationml.x2006.main - org.openxmlformats.schemas.presentationml.x2006.main.impl - org.openxmlformats.schemas.spreadsheetml.x2006.main - org.openxmlformats.schemas.spreadsheetml.x2006.main.impl - org.openxmlformats.schemas.wordprocessingml.x2006.main - org.openxmlformats.schemas.wordprocessingml.x2006.main.impl - org.openxmlformats.schemas.xpackage.x2006.digitalSignature - org.openxmlformats.schemas.xpackage.x2006.digitalSignature.impl org.sleuthkit.autopsy.actions org.sleuthkit.autopsy.appservices org.sleuthkit.autopsy.casemodule @@ -651,10 +342,6 @@ org.sleuthkit.autopsy.textextractors.configs org.sleuthkit.autopsy.texttranslation org.sleuthkit.datamodel - org.w3.x2000.x09.xmldsig - org.w3.x2000.x09.xmldsig.impl - schemaorg_apache_xmlbeans.system.s8C3F193EE11A2F798ACF65489B9E6078 - schemaorg_apache_xmlbeans.system.sD023D6490046BA0250A839A9AD24C443 ext/commons-lang3-3.8.1.jar diff --git a/ImageGallery/nbproject/project.properties b/ImageGallery/nbproject/project.properties index b0d03e2f33..0e4afc928e 100644 --- a/ImageGallery/nbproject/project.properties +++ b/ImageGallery/nbproject/project.properties @@ -1,4 +1,4 @@ -file.reference.commons-collections4-4.2.jar=release/modules/ext/commons-collections4-4.2.jar +file.reference.sqlite-jdbc-3.25.2.jar=release/modules/ext/sqlite-jdbc-3.25.2.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/ImageGallery/nbproject/project.xml b/ImageGallery/nbproject/project.xml index 5e30bfd06e..183a947954 100644 --- a/ImageGallery/nbproject/project.xml +++ b/ImageGallery/nbproject/project.xml @@ -145,10 +145,6 @@ ext/sqlite-jdbc-3.25.2.jar release/modules/ext/sqlite-jdbc-3.25.2.jar - - ext/commons-collections4-4.2.jar - release/modules/ext/commons-collections4-4.2.jar - From 2e9a1467c3ceaa827d3b9238c5af0d1e16dda76d Mon Sep 17 00:00:00 2001 From: "U-BASIS\\dsmyda" Date: Tue, 29 Jan 2019 14:27:10 -0500 Subject: [PATCH 03/28] Readded public packages that Netbeans auto deleted --- CoreLibs/nbproject/project.properties | 3 + CoreLibs/nbproject/project.xml | 296 ++++++++++++++++++++++ Experimental/manifest.mf | 1 - Experimental/nbproject/project.properties | 1 - Experimental/nbproject/project.xml | 4 - KeywordSearch/nbproject/project.xml | 1 + 6 files changed, 300 insertions(+), 6 deletions(-) diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties index 8a253dffb2..139000f80e 100644 --- a/CoreLibs/nbproject/project.properties +++ b/CoreLibs/nbproject/project.properties @@ -6,6 +6,8 @@ file.reference.avalon-framework-4.1.5.jar=release/modules/ext/avalon-framework-4 file.reference.common-image-3.2.jar=release/modules/ext/common-image-3.2.jar file.reference.common-io-3.2.jar=release/modules/ext/common-io-3.2.jar file.reference.common-lang-3.2.jar=release/modules/ext/common-lang-3.2.jar +file.reference.commons-codec-1.11.jar=release/modules/ext/commons-codec-1.11.jar +file.reference.commons-collections4-4.2.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\CoreLibs\\release\\modules\\ext\\commons-collections4-4.2.jar file.reference.commons-csv-1.4.jar=release/modules/ext/commons-csv-1.4.jar file.reference.commons-io-2.4.jar=release/modules/ext/commons-io-2.4.jar file.reference.commons-io-2.5.jar=release/modules/ext/commons-io-2.5.jar @@ -69,6 +71,7 @@ file.reference.sigar-1.6.4.jar=release/modules/ext/sigar-1.6.4.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-3.0.2.jar=release/modules/ext/xmlbeans-3.0.2.jar javac.source=1.8 javac.compilerargs=-Xlint -Xlint:-serial javadoc.reference.commons-csv-1.4.jar=release/modules/ext/commons-csv-1.4-javadoc.jar diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml index 53c964f4f0..3fb511741d 100644 --- a/CoreLibs/nbproject/project.xml +++ b/CoreLibs/nbproject/project.xml @@ -65,6 +65,24 @@ com.google.gson com.google.gson.annotations com.google.gson.reflect + com.microsoft.schemas.compatibility + com.microsoft.schemas.compatibility.impl + com.microsoft.schemas.office.excel + com.microsoft.schemas.office.excel.impl + com.microsoft.schemas.office.office + com.microsoft.schemas.office.office.impl + com.microsoft.schemas.office.visio.x2012.main + com.microsoft.schemas.office.visio.x2012.main.impl + com.microsoft.schemas.office.x2006.digsig + com.microsoft.schemas.office.x2006.digsig.impl + com.microsoft.schemas.office.x2006.encryption + com.microsoft.schemas.office.x2006.encryption.impl + com.microsoft.schemas.office.x2006.keyEncryptor.certificate + com.microsoft.schemas.office.x2006.keyEncryptor.certificate.impl + com.microsoft.schemas.office.x2006.keyEncryptor.password + com.microsoft.schemas.office.x2006.keyEncryptor.password.impl + com.microsoft.schemas.vml + com.microsoft.schemas.vml.impl com.sun.activation.registries com.sun.activation.viewers com.sun.jna @@ -225,6 +243,32 @@ org.apache.avalon.framework.parameters org.apache.avalon.framework.service org.apache.avalon.framework.thread + org.apache.commons.codec + org.apache.commons.codec.binary + org.apache.commons.codec.cli + org.apache.commons.codec.digest + org.apache.commons.codec.language + org.apache.commons.codec.language.bm + org.apache.commons.codec.net + org.apache.commons.collections4 + org.apache.commons.collections4.bag + org.apache.commons.collections4.bidimap + org.apache.commons.collections4.collection + org.apache.commons.collections4.comparators + org.apache.commons.collections4.functors + org.apache.commons.collections4.iterators + org.apache.commons.collections4.keyvalue + org.apache.commons.collections4.list + org.apache.commons.collections4.map + org.apache.commons.collections4.multimap + org.apache.commons.collections4.multiset + org.apache.commons.collections4.properties + org.apache.commons.collections4.queue + org.apache.commons.collections4.sequence + org.apache.commons.collections4.set + org.apache.commons.collections4.splitmap + org.apache.commons.collections4.trie + org.apache.commons.collections4.trie.analyzer org.apache.commons.csv org.apache.commons.io org.apache.commons.io.comparator @@ -288,6 +332,165 @@ org.apache.log4j.spi org.apache.log4j.varia org.apache.log4j.xml + org.apache.poi + org.apache.poi.common.usermodel + org.apache.poi.common.usermodel.fonts + org.apache.poi.ddf + org.apache.poi.extractor + org.apache.poi.extractor.ole2 + org.apache.poi.hdgf + org.apache.poi.hdgf.chunks + org.apache.poi.hdgf.dev + org.apache.poi.hdgf.exceptions + org.apache.poi.hdgf.extractor + org.apache.poi.hdgf.pointers + org.apache.poi.hdgf.streams + org.apache.poi.hemf.extractor + org.apache.poi.hemf.hemfplus.record + org.apache.poi.hemf.record + org.apache.poi.hmef + org.apache.poi.hmef.attribute + org.apache.poi.hmef.dev + org.apache.poi.hmef.extractor + org.apache.poi.hpbf + org.apache.poi.hpbf.dev + org.apache.poi.hpbf.extractor + org.apache.poi.hpbf.model + org.apache.poi.hpbf.model.qcbits + org.apache.poi.hpsf + org.apache.poi.hpsf.extractor + org.apache.poi.hpsf.wellknown + org.apache.poi.hslf.blip + org.apache.poi.hslf.dev + org.apache.poi.hslf.exceptions + org.apache.poi.hslf.extractor + org.apache.poi.hslf.model + org.apache.poi.hslf.model.textproperties + org.apache.poi.hslf.record + org.apache.poi.hslf.usermodel + org.apache.poi.hslf.util + org.apache.poi.hsmf + org.apache.poi.hsmf.datatypes + org.apache.poi.hsmf.dev + org.apache.poi.hsmf.exceptions + org.apache.poi.hsmf.extractor + org.apache.poi.hsmf.parsers + org.apache.poi.hssf + org.apache.poi.hssf.converter + org.apache.poi.hssf.dev + org.apache.poi.hssf.eventmodel + org.apache.poi.hssf.eventusermodel + org.apache.poi.hssf.eventusermodel.dummyrecord + org.apache.poi.hssf.extractor + org.apache.poi.hssf.model + org.apache.poi.hssf.record + org.apache.poi.hssf.record.aggregates + org.apache.poi.hssf.record.cf + org.apache.poi.hssf.record.chart + org.apache.poi.hssf.record.common + org.apache.poi.hssf.record.cont + org.apache.poi.hssf.record.crypto + org.apache.poi.hssf.record.pivottable + org.apache.poi.hssf.usermodel + org.apache.poi.hssf.usermodel.helpers + org.apache.poi.hssf.util + org.apache.poi.hwmf.draw + org.apache.poi.hwmf.record + org.apache.poi.hwmf.usermodel + org.apache.poi.hwpf + org.apache.poi.hwpf.converter + org.apache.poi.hwpf.dev + org.apache.poi.hwpf.extractor + org.apache.poi.hwpf.model + org.apache.poi.hwpf.model.io + org.apache.poi.hwpf.model.types + org.apache.poi.hwpf.sprm + org.apache.poi.hwpf.usermodel + org.apache.poi.ooxml + org.apache.poi.ooxml.extractor + org.apache.poi.ooxml.util + org.apache.poi.openxml4j.exceptions + org.apache.poi.openxml4j.opc + org.apache.poi.openxml4j.opc.internal + org.apache.poi.openxml4j.opc.internal.marshallers + org.apache.poi.openxml4j.opc.internal.unmarshallers + org.apache.poi.openxml4j.util + org.apache.poi.poifs.common + org.apache.poi.poifs.crypt + org.apache.poi.poifs.crypt.agile + org.apache.poi.poifs.crypt.binaryrc4 + org.apache.poi.poifs.crypt.cryptoapi + org.apache.poi.poifs.crypt.dsig + org.apache.poi.poifs.crypt.dsig.facets + org.apache.poi.poifs.crypt.dsig.services + org.apache.poi.poifs.crypt.standard + org.apache.poi.poifs.crypt.temp + org.apache.poi.poifs.crypt.xor + org.apache.poi.poifs.dev + org.apache.poi.poifs.eventfilesystem + org.apache.poi.poifs.filesystem + org.apache.poi.poifs.macros + org.apache.poi.poifs.nio + org.apache.poi.poifs.property + org.apache.poi.poifs.storage + org.apache.poi.sl.draw + org.apache.poi.sl.draw.binding + org.apache.poi.sl.draw.geom + org.apache.poi.sl.extractor + org.apache.poi.sl.image + org.apache.poi.sl.usermodel + org.apache.poi.ss + org.apache.poi.ss.excelant + org.apache.poi.ss.excelant.util + org.apache.poi.ss.extractor + org.apache.poi.ss.format + org.apache.poi.ss.formula + org.apache.poi.ss.formula.atp + org.apache.poi.ss.formula.constant + org.apache.poi.ss.formula.eval + org.apache.poi.ss.formula.eval.forked + org.apache.poi.ss.formula.function + org.apache.poi.ss.formula.functions + org.apache.poi.ss.formula.ptg + org.apache.poi.ss.formula.udf + org.apache.poi.ss.usermodel + org.apache.poi.ss.usermodel.charts + org.apache.poi.ss.usermodel.helpers + org.apache.poi.ss.util + org.apache.poi.ss.util.cellwalk + org.apache.poi.util + org.apache.poi.wp.usermodel + org.apache.poi.xddf.usermodel + org.apache.poi.xddf.usermodel.chart + org.apache.poi.xddf.usermodel.text + org.apache.poi.xdgf.exceptions + org.apache.poi.xdgf.extractor + org.apache.poi.xdgf.geom + org.apache.poi.xdgf.usermodel + org.apache.poi.xdgf.usermodel.section + org.apache.poi.xdgf.usermodel.section.geometry + org.apache.poi.xdgf.usermodel.shape + org.apache.poi.xdgf.usermodel.shape.exceptions + org.apache.poi.xdgf.util + org.apache.poi.xdgf.xml + org.apache.poi.xslf.extractor + org.apache.poi.xslf.model + org.apache.poi.xslf.usermodel + org.apache.poi.xslf.util + org.apache.poi.xssf + org.apache.poi.xssf.binary + org.apache.poi.xssf.eventusermodel + org.apache.poi.xssf.extractor + org.apache.poi.xssf.model + org.apache.poi.xssf.streaming + org.apache.poi.xssf.usermodel + org.apache.poi.xssf.usermodel.charts + org.apache.poi.xssf.usermodel.extensions + org.apache.poi.xssf.usermodel.helpers + org.apache.poi.xssf.util + org.apache.poi.xwpf.extractor + org.apache.poi.xwpf.model + org.apache.poi.xwpf.usermodel org.apache.tools.ant org.apache.tools.ant.dispatch org.apache.tools.ant.filters @@ -348,6 +551,50 @@ org.apache.tools.mail org.apache.tools.tar org.apache.tools.zip + org.apache.xmlbeans + org.apache.xmlbeans.impl.common + org.apache.xmlbeans.impl.config + org.apache.xmlbeans.impl.inst2xsd + org.apache.xmlbeans.impl.inst2xsd.util + org.apache.xmlbeans.impl.jam + org.apache.xmlbeans.impl.jam.annotation + org.apache.xmlbeans.impl.jam.internal + org.apache.xmlbeans.impl.jam.internal.classrefs + org.apache.xmlbeans.impl.jam.internal.elements + org.apache.xmlbeans.impl.jam.internal.javadoc + org.apache.xmlbeans.impl.jam.internal.parser + org.apache.xmlbeans.impl.jam.internal.reflect + org.apache.xmlbeans.impl.jam.mutable + org.apache.xmlbeans.impl.jam.provider + org.apache.xmlbeans.impl.jam.visitor + org.apache.xmlbeans.impl.jam.xml + org.apache.xmlbeans.impl.regex + org.apache.xmlbeans.impl.richParser + org.apache.xmlbeans.impl.schema + org.apache.xmlbeans.impl.soap + org.apache.xmlbeans.impl.store + org.apache.xmlbeans.impl.tool + org.apache.xmlbeans.impl.util + org.apache.xmlbeans.impl.validator + org.apache.xmlbeans.impl.values + org.apache.xmlbeans.impl.xb.ltgfmt + org.apache.xmlbeans.impl.xb.ltgfmt.impl + org.apache.xmlbeans.impl.xb.substwsdl + org.apache.xmlbeans.impl.xb.substwsdl.impl + org.apache.xmlbeans.impl.xb.xmlconfig + org.apache.xmlbeans.impl.xb.xmlconfig.impl + org.apache.xmlbeans.impl.xb.xmlschema + org.apache.xmlbeans.impl.xb.xmlschema.impl + org.apache.xmlbeans.impl.xb.xsdownload + org.apache.xmlbeans.impl.xb.xsdownload.impl + org.apache.xmlbeans.impl.xb.xsdschema + org.apache.xmlbeans.impl.xb.xsdschema.impl + org.apache.xmlbeans.impl.xpathgen + org.apache.xmlbeans.impl.xsd2inst + org.apache.xmlbeans.soap + org.apache.xmlbeans.xml.stream + org.apache.xmlbeans.xml.stream.events + org.apache.xmlbeans.xml.stream.utils org.apache.xmlcommons org.controlsfx.control org.controlsfx.control.action @@ -378,6 +625,8 @@ org.dom4j.util org.dom4j.xpath org.dom4j.xpp + org.etsi.uri.x01903.v13 + org.etsi.uri.x01903.v13.impl org.gstreamer org.gstreamer.controller org.gstreamer.elements @@ -427,6 +676,32 @@ org.opencv.photo org.opencv.utils org.opencv.video + org.openxmlformats.schemas.drawingml.x2006.chart + org.openxmlformats.schemas.drawingml.x2006.chart.impl + org.openxmlformats.schemas.drawingml.x2006.main + org.openxmlformats.schemas.drawingml.x2006.main.impl + org.openxmlformats.schemas.drawingml.x2006.picture + org.openxmlformats.schemas.drawingml.x2006.picture.impl + org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing + org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.impl + org.openxmlformats.schemas.drawingml.x2006.wordprocessingDrawing + org.openxmlformats.schemas.drawingml.x2006.wordprocessingDrawing.impl + org.openxmlformats.schemas.officeDocument.x2006.customProperties + org.openxmlformats.schemas.officeDocument.x2006.customProperties.impl + org.openxmlformats.schemas.officeDocument.x2006.docPropsVTypes + org.openxmlformats.schemas.officeDocument.x2006.docPropsVTypes.impl + org.openxmlformats.schemas.officeDocument.x2006.extendedProperties + org.openxmlformats.schemas.officeDocument.x2006.extendedProperties.impl + org.openxmlformats.schemas.officeDocument.x2006.relationships + org.openxmlformats.schemas.officeDocument.x2006.relationships.impl + org.openxmlformats.schemas.presentationml.x2006.main + org.openxmlformats.schemas.presentationml.x2006.main.impl + org.openxmlformats.schemas.spreadsheetml.x2006.main + org.openxmlformats.schemas.spreadsheetml.x2006.main.impl + org.openxmlformats.schemas.wordprocessingml.x2006.main + org.openxmlformats.schemas.wordprocessingml.x2006.main.impl + org.openxmlformats.schemas.xpackage.x2006.digitalSignature + org.openxmlformats.schemas.xpackage.x2006.digitalSignature.impl org.reflections org.reflections.adapters org.reflections.scanners @@ -438,6 +713,8 @@ org.slf4j.helpers org.slf4j.impl org.slf4j.spi + org.w3.x2000.x09.xmldsig + org.w3.x2000.x09.xmldsig.impl org.w3c.dom org.w3c.dom.css org.w3c.dom.events @@ -449,6 +726,13 @@ org.xml.sax org.xml.sax.ext org.xml.sax.helpers + repackage + schemaorg_apache_xmlbeans.system.s8C3F193EE11A2F798ACF65489B9E6078 + schemaorg_apache_xmlbeans.system.sD023D6490046BA0250A839A9AD24C443 + schemaorg_apache_xmlbeans.system.sXMLCONFIG + schemaorg_apache_xmlbeans.system.sXMLLANG + schemaorg_apache_xmlbeans.system.sXMLSCHEMA + schemaorg_apache_xmlbeans.system.sXMLTOOLS ext/commons-logging-1.1.2-sources.jar @@ -526,6 +810,10 @@ ext/common-io-3.2.jar release/modules/ext/common-io-3.2.jar + + ext/xmlbeans-3.0.2.jar + release/modules/ext/xmlbeans-3.0.2.jar + ext/commons-lang3-3.0-sources.jar release/modules/ext/commons-lang3-3.0-sources.jar @@ -570,6 +858,10 @@ ext/poi-ooxml-4.0.1.jar C:\cygwin64\home\dsmyda\autopsy\CoreLibs\release\modules\ext\poi-ooxml-4.0.1.jar + + ext/commons-codec-1.11.jar + release/modules/ext/commons-codec-1.11.jar + ext/imageio-pcx-3.2.jar release/modules/ext/imageio-pcx-3.2.jar @@ -638,6 +930,10 @@ ext/commons-io-2.5.jar release/modules/ext/commons-io-2.5.jar + + ext/commons-collections4-4.2.jar + C:\cygwin64\home\dsmyda\autopsy\CoreLibs\release\modules\ext\commons-collections4-4.2.jar + ext/imageio-bmp-3.2.jar release/modules/ext/imageio-bmp-3.2.jar diff --git a/Experimental/manifest.mf b/Experimental/manifest.mf index 15ed8c19f7..96c1cf6d49 100644 --- a/Experimental/manifest.mf +++ b/Experimental/manifest.mf @@ -4,4 +4,3 @@ OpenIDE-Module: org.sleuthkit.autopsy.experimental OpenIDE-Module-Layer: org/sleuthkit/autopsy/experimental/autoingest/layer.xml OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties OpenIDE-Module-Requires: org.openide.windows.WindowManager -OpenIDE-Module-Specification-Version: 1.0 \ No newline at end of file diff --git a/Experimental/nbproject/project.properties b/Experimental/nbproject/project.properties index 831a57d051..b50b12bc00 100644 --- a/Experimental/nbproject/project.properties +++ b/Experimental/nbproject/project.properties @@ -1,5 +1,4 @@ file.reference.c3p0-0.9.5.jar=release/modules/ext/c3p0-0.9.5.jar -file.reference.commons-codec-1.11.jar=release/modules/ext/commons-codec-1.11.jar file.reference.jackson-core-2.7.0.jar=release/modules/ext/jackson-core-2.7.0.jar file.reference.LGoodDatePicker-10.3.1.jar=release/modules/ext/LGoodDatePicker-10.3.1.jar file.reference.mchange-commons-java-0.2.9.jar=release/modules/ext/mchange-commons-java-0.2.9.jar diff --git a/Experimental/nbproject/project.xml b/Experimental/nbproject/project.xml index e62cfa5a98..ad8a97e347 100644 --- a/Experimental/nbproject/project.xml +++ b/Experimental/nbproject/project.xml @@ -161,10 +161,6 @@ org.sleuthkit.autopsy.experimental.autoingest org.sleuthkit.autopsy.experimental.configuration - - ext/commons-codec-1.11.jar - release/modules/ext/commons-codec-1.11.jar - ext/tika-core-1.20.jar C:\cygwin64\home\dsmyda\autopsy\Experimental\release\modules\ext\tika-core-1.20.jar diff --git a/KeywordSearch/nbproject/project.xml b/KeywordSearch/nbproject/project.xml index a6db4dfc07..891728973e 100644 --- a/KeywordSearch/nbproject/project.xml +++ b/KeywordSearch/nbproject/project.xml @@ -134,6 +134,7 @@ org.apache.commons.logging.impl + org.apache.tika.parser.txt org.sleuthkit.autopsy.keywordsearch From b7e983d528807fe648d88862d7c8a3dfaa50cb67 Mon Sep 17 00:00:00 2001 From: "U-BASIS\\dsmyda" Date: Tue, 29 Jan 2019 14:47:06 -0500 Subject: [PATCH 04/28] Made all absolute jar paths relative --- Core/nbproject/project.properties | 144 ++++++++++----------- Core/nbproject/project.xml | 142 ++++++++++---------- CoreLibs/nbproject/project.properties | 12 +- CoreLibs/nbproject/project.xml | 12 +- Experimental/nbproject/project.properties | 2 +- Experimental/nbproject/project.xml | 2 +- KeywordSearch/nbproject/project.properties | 10 +- KeywordSearch/nbproject/project.xml | 10 +- 8 files changed, 167 insertions(+), 167 deletions(-) diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties index 1d48f85440..369dcac9b3 100644 --- a/Core/nbproject/project.properties +++ b/Core/nbproject/project.properties @@ -1,81 +1,81 @@ file.reference.activemq-all-5.11.1.jar=release/modules/ext/activemq-all-5.11.1.jar -file.reference.apache-mime4j-core-0.8.2.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\apache-mime4j-core-0.8.2.jar -file.reference.apache-mime4j-dom-0.8.2.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\apache-mime4j-dom-0.8.2.jar -file.reference.asm-7.0.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\asm-7.0.jar -file.reference.bcmail-jdk15on-1.60.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\bcmail-jdk15on-1.60.jar -file.reference.bcprov-jdk15on-1.60.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\bcprov-jdk15on-1.60.jar -file.reference.boilerpipe-1.1.0.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\boilerpipe-1.1.0.jar +file.reference.apache-mime4j-core-0.8.2.jar=release\\modules\\ext\\apache-mime4j-core-0.8.2.jar +file.reference.apache-mime4j-dom-0.8.2.jar=release\\modules\\ext\\apache-mime4j-dom-0.8.2.jar +file.reference.asm-7.0.jar=release\\modules\\ext\\asm-7.0.jar +file.reference.bcmail-jdk15on-1.60.jar=release\\modules\\ext\\bcmail-jdk15on-1.60.jar +file.reference.bcprov-jdk15on-1.60.jar=release\\modules\\ext\\bcprov-jdk15on-1.60.jar +file.reference.boilerpipe-1.1.0.jar=release\\modules\\ext\\boilerpipe-1.1.0.jar file.reference.c3p0-0.9.5.jar=release/modules/ext/c3p0-0.9.5.jar -file.reference.cdm-4.5.5.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\cdm-4.5.5.jar -file.reference.commons-codec-1.11.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\commons-codec-1.11.jar -file.reference.commons-collections4-4.2.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\commons-collections4-4.2.jar -file.reference.commons-compress-1.18.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\commons-compress-1.18.jar -file.reference.commons-csv-1.6.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\commons-csv-1.6.jar +file.reference.cdm-4.5.5.jar=release\\modules\\ext\\cdm-4.5.5.jar +file.reference.commons-codec-1.11.jar=release\\modules\\ext\\commons-codec-1.11.jar +file.reference.commons-collections4-4.2.jar=release\\modules\\ext\\commons-collections4-4.2.jar +file.reference.commons-compress-1.18.jar=release\\modules\\ext\\commons-compress-1.18.jar +file.reference.commons-csv-1.6.jar=release\\modules\\ext\\commons-csv-1.6.jar file.reference.commons-dbcp2-2.1.1.jar=release/modules/ext/commons-dbcp2-2.1.1.jar -file.reference.commons-exec-1.3.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\commons-exec-1.3.jar -file.reference.commons-io-2.6.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\commons-io-2.6.jar -file.reference.commons-lang3-3.8.1.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\commons-lang3-3.8.1.jar +file.reference.commons-exec-1.3.jar=release\\modules\\ext\\commons-exec-1.3.jar +file.reference.commons-io-2.6.jar=release\\modules\\ext\\commons-io-2.6.jar +file.reference.commons-lang3-3.8.1.jar=release\\modules\\ext\\commons-lang3-3.8.1.jar file.reference.commons-pool2-2.4.2.jar=release/modules/ext/commons-pool2-2.4.2.jar -file.reference.cxf-rt-rs-client-3.2.7.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\cxf-rt-rs-client-3.2.7.jar +file.reference.cxf-rt-rs-client-3.2.7.jar=release\\modules\\ext\\cxf-rt-rs-client-3.2.7.jar file.reference.dd-plist-1.20.jar=release/modules/ext/dd-plist-1.20.jar -file.reference.dec-0.1.2.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\dec-0.1.2.jar -file.reference.fontbox-2.0.13.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\fontbox-2.0.13.jar -file.reference.geoapi-3.0.1.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\geoapi-3.0.1.jar -file.reference.grib-4.5.5.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\grib-4.5.5.jar -file.reference.gson-2.8.5.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\gson-2.8.5.jar -file.reference.httpclient-4.5.6.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\httpclient-4.5.6.jar -file.reference.httpmime-4.5.6.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\httpmime-4.5.6.jar -file.reference.httpservices-4.5.5.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\httpservices-4.5.5.jar -file.reference.isoparser-1.1.22.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\isoparser-1.1.22.jar -file.reference.jackcess-2.2.0.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\jackcess-2.2.0.jar -file.reference.jackcess-encrypt-2.1.4.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\jackcess-encrypt-2.1.4.jar -file.reference.jackson-annotations-2.9.7.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\jackson-annotations-2.9.7.jar -file.reference.jackson-core-2.9.7.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\jackson-core-2.9.7.jar -file.reference.jackson-databind-2.9.7.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\jackson-databind-2.9.7.jar -file.reference.jai-imageio-core-1.4.0.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\jai-imageio-core-1.4.0.jar -file.reference.java-libpst-0.8.1.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\java-libpst-0.8.1.jar -file.reference.javax.activation-1.2.0.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\javax.activation-1.2.0.jar -file.reference.javax.annotation-api-1.3.2.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\javax.annotation-api-1.3.2.jar -file.reference.jaxb-runtime-2.3.1.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\jaxb-runtime-2.3.1.jar -file.reference.jbig2-imageio-3.0.2.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\jbig2-imageio-3.0.2.jar -file.reference.jcl-over-slf4j-1.7.25.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\jcl-over-slf4j-1.7.25.jar +file.reference.dec-0.1.2.jar=release\\modules\\ext\\dec-0.1.2.jar +file.reference.fontbox-2.0.13.jar=release\\modules\\ext\\fontbox-2.0.13.jar +file.reference.geoapi-3.0.1.jar=release\\modules\\ext\\geoapi-3.0.1.jar +file.reference.grib-4.5.5.jar=release\\modules\\ext\\grib-4.5.5.jar +file.reference.gson-2.8.5.jar=release\\modules\\ext\\gson-2.8.5.jar +file.reference.httpclient-4.5.6.jar=release\\modules\\ext\\httpclient-4.5.6.jar +file.reference.httpmime-4.5.6.jar=release\\modules\\ext\\httpmime-4.5.6.jar +file.reference.httpservices-4.5.5.jar=release\\modules\\ext\\httpservices-4.5.5.jar +file.reference.isoparser-1.1.22.jar=release\\modules\\ext\\isoparser-1.1.22.jar +file.reference.jackcess-2.2.0.jar=release\\modules\\ext\\jackcess-2.2.0.jar +file.reference.jackcess-encrypt-2.1.4.jar=release\\modules\\ext\\jackcess-encrypt-2.1.4.jar +file.reference.jackson-annotations-2.9.7.jar=release\\modules\\ext\\jackson-annotations-2.9.7.jar +file.reference.jackson-core-2.9.7.jar=release\\modules\\ext\\jackson-core-2.9.7.jar +file.reference.jackson-databind-2.9.7.jar=release\\modules\\ext\\jackson-databind-2.9.7.jar +file.reference.jai-imageio-core-1.4.0.jar=release\\modules\\ext\\jai-imageio-core-1.4.0.jar +file.reference.java-libpst-0.8.1.jar=release\\modules\\ext\\java-libpst-0.8.1.jar +file.reference.javax.activation-1.2.0.jar=release\\modules\\ext\\javax.activation-1.2.0.jar +file.reference.javax.annotation-api-1.3.2.jar=release\\modules\\ext\\javax.annotation-api-1.3.2.jar +file.reference.jaxb-runtime-2.3.1.jar=release\\modules\\ext\\jaxb-runtime-2.3.1.jar +file.reference.jbig2-imageio-3.0.2.jar=release\\modules\\ext\\jbig2-imageio-3.0.2.jar +file.reference.jcl-over-slf4j-1.7.25.jar=release\\modules\\ext\\jcl-over-slf4j-1.7.25.jar file.reference.jdom-2.0.5-contrib.jar=release/modules/ext/jdom-2.0.5-contrib.jar file.reference.jdom-2.0.5.jar=release/modules/ext/jdom-2.0.5.jar -file.reference.jdom2-2.0.6.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\jdom2-2.0.6.jar -file.reference.jempbox-1.8.16.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\jempbox-1.8.16.jar +file.reference.jdom2-2.0.6.jar=release\\modules\\ext\\jdom2-2.0.6.jar +file.reference.jempbox-1.8.16.jar=release\\modules\\ext\\jempbox-1.8.16.jar file.reference.jericho-html-3.3.jar=release/modules/ext/jericho-html-3.3.jar file.reference.jgraphx-v3.8.0.jar=release/modules/ext/jgraphx-v3.8.0.jar -file.reference.jhighlight-1.0.3.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\jhighlight-1.0.3.jar -file.reference.jmatio-1.5.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\jmatio-1.5.jar -file.reference.jna-5.1.0.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\jna-5.1.0.jar -file.reference.json-simple-1.1.1.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\json-simple-1.1.1.jar -file.reference.jsoup-1.11.3.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\jsoup-1.11.3.jar -file.reference.jul-to-slf4j-1.7.25.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\jul-to-slf4j-1.7.25.jar -file.reference.juniversalchardet-1.0.3.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\juniversalchardet-1.0.3.jar -file.reference.junrar-2.0.0.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\junrar-2.0.0.jar +file.reference.jhighlight-1.0.3.jar=release\\modules\\ext\\jhighlight-1.0.3.jar +file.reference.jmatio-1.5.jar=release\\modules\\ext\\jmatio-1.5.jar +file.reference.jna-5.1.0.jar=release\\modules\\ext\\jna-5.1.0.jar +file.reference.json-simple-1.1.1.jar=release\\modules\\ext\\json-simple-1.1.1.jar +file.reference.jsoup-1.11.3.jar=release\\modules\\ext\\jsoup-1.11.3.jar +file.reference.jul-to-slf4j-1.7.25.jar=release\\modules\\ext\\jul-to-slf4j-1.7.25.jar +file.reference.juniversalchardet-1.0.3.jar=release\\modules\\ext\\juniversalchardet-1.0.3.jar +file.reference.junrar-2.0.0.jar=release\\modules\\ext\\junrar-2.0.0.jar file.reference.jython-standalone-2.7.0.jar=release/modules/ext/jython-standalone-2.7.0.jar file.reference.mchange-commons-java-0.2.9.jar=release/modules/ext/mchange-commons-java-0.2.9.jar -file.reference.metadata-extractor-2.11.0.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\metadata-extractor-2.11.0.jar -file.reference.netcdf4-4.5.5.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\netcdf4-4.5.5.jar -file.reference.openjson-1.0.10.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\openjson-1.0.10.jar -file.reference.opennlp-tools-1.9.0.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\opennlp-tools-1.9.0.jar -file.reference.parso-2.0.10.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\parso-2.0.10.jar -file.reference.pdfbox-2.0.13.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\pdfbox-2.0.13.jar -file.reference.pdfbox-tools-2.0.13.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\pdfbox-tools-2.0.13.jar -file.reference.poi-4.0.1.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\poi-4.0.1.jar -file.reference.poi-ooxml-4.0.1.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\poi-ooxml-4.0.1.jar -file.reference.poi-ooxml-schemas-4.0.1.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\poi-ooxml-schemas-4.0.1.jar -file.reference.poi-scratchpad-4.0.1.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\poi-scratchpad-4.0.1.jar +file.reference.metadata-extractor-2.11.0.jar=release\\modules\\ext\\metadata-extractor-2.11.0.jar +file.reference.netcdf4-4.5.5.jar=release\\modules\\ext\\netcdf4-4.5.5.jar +file.reference.openjson-1.0.10.jar=release\\modules\\ext\\openjson-1.0.10.jar +file.reference.opennlp-tools-1.9.0.jar=release\\modules\\ext\\opennlp-tools-1.9.0.jar +file.reference.parso-2.0.10.jar=release\\modules\\ext\\parso-2.0.10.jar +file.reference.pdfbox-2.0.13.jar=release\\modules\\ext\\pdfbox-2.0.13.jar +file.reference.pdfbox-tools-2.0.13.jar=release\\modules\\ext\\pdfbox-tools-2.0.13.jar +file.reference.poi-4.0.1.jar=release\\modules\\ext\\poi-4.0.1.jar +file.reference.poi-ooxml-4.0.1.jar=release\\modules\\ext\\poi-ooxml-4.0.1.jar +file.reference.poi-ooxml-schemas-4.0.1.jar=release\\modules\\ext\\poi-ooxml-schemas-4.0.1.jar +file.reference.poi-scratchpad-4.0.1.jar=release\\modules\\ext\\poi-scratchpad-4.0.1.jar file.reference.postgresql-9.4.1211.jre7.jar=release/modules/ext/postgresql-9.4.1211.jre7.jar file.reference.Rejistry-1.0-SNAPSHOT.jar=release/modules/ext/Rejistry-1.0-SNAPSHOT.jar -file.reference.rome-1.12.0.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\rome-1.12.0.jar -file.reference.sentiment-analysis-parser-0.1.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\sentiment-analysis-parser-0.1.jar +file.reference.rome-1.12.0.jar=release\\modules\\ext\\rome-1.12.0.jar +file.reference.sentiment-analysis-parser-0.1.jar=release\\modules\\ext\\sentiment-analysis-parser-0.1.jar file.reference.sevenzipjbinding-AllPlatforms.jar=release/modules/ext/sevenzipjbinding-AllPlatforms.jar file.reference.sevenzipjbinding.jar=release/modules/ext/sevenzipjbinding.jar -file.reference.sis-metadata-0.8.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\sis-metadata-0.8.jar -file.reference.sis-netcdf-0.8.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\sis-netcdf-0.8.jar -file.reference.sis-utility-0.8.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\sis-utility-0.8.jar -file.reference.slf4j-api-1.7.25.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\slf4j-api-1.7.25.jar +file.reference.sis-metadata-0.8.jar=release\\modules\\ext\\sis-metadata-0.8.jar +file.reference.sis-netcdf-0.8.jar=release\\modules\\ext\\sis-netcdf-0.8.jar +file.reference.sis-utility-0.8.jar=release\\modules\\ext\\sis-utility-0.8.jar +file.reference.slf4j-api-1.7.25.jar=release\\modules\\ext\\slf4j-api-1.7.25.jar file.reference.sqlite-jdbc-3.25.2.jar=release/modules/ext/sqlite-jdbc-3.25.2.jar file.reference.sqlite-jdbc-3.8.11.jar=release/modules/ext/sqlite-jdbc-3.8.11.jar file.reference.StixLib.jar=release/modules/ext/StixLib.jar @@ -83,16 +83,16 @@ file.reference.sleuthkit-postgresql-4.6.5.jar=release/modules/ext/sleuthkit-post file.reference.curator-client-2.8.0.jar=release/modules/ext/curator-client-2.8.0.jar file.reference.curator-framework-2.8.0.jar=release/modules/ext/curator-framework-2.8.0.jar file.reference.curator-recipes-2.8.0.jar=release/modules/ext/curator-recipes-2.8.0.jar -file.reference.tagsoup-1.2.1.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\tagsoup-1.2.1.jar -file.reference.tika-core-1.20.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\tika-core-1.20.jar -file.reference.tika-parsers-1.20.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\tika-parsers-1.20.jar -file.reference.uimafit-core-2.4.0.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\uimafit-core-2.4.0.jar -file.reference.uimaj-core-3.0.1.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\uimaj-core-3.0.1.jar -file.reference.vorbis-java-core-0.8.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\vorbis-java-core-0.8.jar -file.reference.vorbis-java-tika-0.8.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\vorbis-java-tika-0.8.jar -file.reference.xmlbeans-3.0.2.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\xmlbeans-3.0.2.jar +file.reference.tagsoup-1.2.1.jar=release\\modules\\ext\\tagsoup-1.2.1.jar +file.reference.tika-core-1.20.jar=release\\modules\\ext\\tika-core-1.20.jar +file.reference.tika-parsers-1.20.jar=release\\modules\\ext\\tika-parsers-1.20.jar +file.reference.uimafit-core-2.4.0.jar=release\\modules\\ext\\uimafit-core-2.4.0.jar +file.reference.uimaj-core-3.0.1.jar=release\\modules\\ext\\uimaj-core-3.0.1.jar +file.reference.vorbis-java-core-0.8.jar=release\\modules\\ext\\vorbis-java-core-0.8.jar +file.reference.vorbis-java-tika-0.8.jar=release\\modules\\ext\\vorbis-java-tika-0.8.jar +file.reference.xmlbeans-3.0.2.jar=release\\modules\\ext\\xmlbeans-3.0.2.jar file.reference.xmpcore-5.1.3.jar=release/modules/ext/xmpcore-5.1.3.jar -file.reference.xz-1.8.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Core\\release\\modules\\ext\\xz-1.8.jar +file.reference.xz-1.8.jar=release\\modules\\ext\\xz-1.8.jar file.reference.zookeeper-3.4.6.jar=release/modules/ext/zookeeper-3.4.6.jar file.reference.SparseBitSet-1.1.jar=release/modules/ext/SparseBitSet-1.1.jar file.reference.commons-validator-1.6.jar=release/modules/ext/commons-validator-1.6.jar diff --git a/Core/nbproject/project.xml b/Core/nbproject/project.xml index f8ab850daf..eeb2555eb4 100644 --- a/Core/nbproject/project.xml +++ b/Core/nbproject/project.xml @@ -345,15 +345,15 @@ ext/commons-lang3-3.8.1.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\commons-lang3-3.8.1.jar + release\modules\ext\commons-lang3-3.8.1.jar ext/jempbox-1.8.16.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\jempbox-1.8.16.jar + release\modules\ext\jempbox-1.8.16.jar ext/jackcess-2.2.0.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\jackcess-2.2.0.jar + release\modules\ext\jackcess-2.2.0.jar ext/jericho-html-3.3.jar @@ -361,15 +361,15 @@ ext/cdm-4.5.5.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\cdm-4.5.5.jar + release\modules\ext\cdm-4.5.5.jar ext/httpservices-4.5.5.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\httpservices-4.5.5.jar + release\modules\ext\httpservices-4.5.5.jar ext/xz-1.8.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\xz-1.8.jar + release\modules\ext\xz-1.8.jar ext/commons-validator-1.6.jar @@ -377,27 +377,27 @@ ext/sis-utility-0.8.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\sis-utility-0.8.jar + release\modules\ext\sis-utility-0.8.jar ext/gson-2.8.5.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\gson-2.8.5.jar + release\modules\ext\gson-2.8.5.jar ext/jna-5.1.0.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\jna-5.1.0.jar + release\modules\ext\jna-5.1.0.jar ext/boilerpipe-1.1.0.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\boilerpipe-1.1.0.jar + release\modules\ext\boilerpipe-1.1.0.jar ext/jbig2-imageio-3.0.2.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\jbig2-imageio-3.0.2.jar + release\modules\ext\jbig2-imageio-3.0.2.jar ext/jsoup-1.11.3.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\jsoup-1.11.3.jar + release\modules\ext\jsoup-1.11.3.jar ext/sevenzipjbinding.jar @@ -405,7 +405,7 @@ ext/apache-mime4j-dom-0.8.2.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\apache-mime4j-dom-0.8.2.jar + release\modules\ext\apache-mime4j-dom-0.8.2.jar ext/mchange-commons-java-0.2.9.jar @@ -413,23 +413,23 @@ ext/pdfbox-2.0.13.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\pdfbox-2.0.13.jar + release\modules\ext\pdfbox-2.0.13.jar ext/xmlbeans-3.0.2.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\xmlbeans-3.0.2.jar + release\modules\ext\xmlbeans-3.0.2.jar ext/jackson-databind-2.9.7.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\jackson-databind-2.9.7.jar + release\modules\ext\jackson-databind-2.9.7.jar ext/jai-imageio-core-1.4.0.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\jai-imageio-core-1.4.0.jar + release\modules\ext\jai-imageio-core-1.4.0.jar ext/jcl-over-slf4j-1.7.25.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\jcl-over-slf4j-1.7.25.jar + release\modules\ext\jcl-over-slf4j-1.7.25.jar ext/curator-recipes-2.8.0.jar @@ -437,11 +437,11 @@ ext/tika-core-1.20.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\tika-core-1.20.jar + release\modules\ext\tika-core-1.20.jar ext/tagsoup-1.2.1.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\tagsoup-1.2.1.jar + release\modules\ext\tagsoup-1.2.1.jar ext/StixLib.jar @@ -449,59 +449,59 @@ ext/cxf-rt-rs-client-3.2.7.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\cxf-rt-rs-client-3.2.7.jar + release\modules\ext\cxf-rt-rs-client-3.2.7.jar ext/jackson-core-2.9.7.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\jackson-core-2.9.7.jar + release\modules\ext\jackson-core-2.9.7.jar ext/sis-metadata-0.8.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\sis-metadata-0.8.jar + release\modules\ext\sis-metadata-0.8.jar ext/bcprov-jdk15on-1.60.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\bcprov-jdk15on-1.60.jar + release\modules\ext\bcprov-jdk15on-1.60.jar ext/parso-2.0.10.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\parso-2.0.10.jar + release\modules\ext\parso-2.0.10.jar ext/poi-scratchpad-4.0.1.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\poi-scratchpad-4.0.1.jar + release\modules\ext\poi-scratchpad-4.0.1.jar ext/json-simple-1.1.1.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\json-simple-1.1.1.jar + release\modules\ext\json-simple-1.1.1.jar ext/poi-ooxml-4.0.1.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\poi-ooxml-4.0.1.jar + release\modules\ext\poi-ooxml-4.0.1.jar ext/metadata-extractor-2.11.0.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\metadata-extractor-2.11.0.jar + release\modules\ext\metadata-extractor-2.11.0.jar ext/commons-codec-1.11.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\commons-codec-1.11.jar + release\modules\ext\commons-codec-1.11.jar ext/apache-mime4j-core-0.8.2.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\apache-mime4j-core-0.8.2.jar + release\modules\ext\apache-mime4j-core-0.8.2.jar ext/jmatio-1.5.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\jmatio-1.5.jar + release\modules\ext\jmatio-1.5.jar ext/tika-parsers-1.20.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\tika-parsers-1.20.jar + release\modules\ext\tika-parsers-1.20.jar ext/asm-7.0.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\asm-7.0.jar + release\modules\ext\asm-7.0.jar ext/sleuthkit-postgresql-4.6.5.jar @@ -513,7 +513,7 @@ ext/commons-io-2.6.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\commons-io-2.6.jar + release\modules\ext\commons-io-2.6.jar ext/jdom-2.0.5-contrib.jar @@ -525,11 +525,11 @@ ext/openjson-1.0.10.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\openjson-1.0.10.jar + release\modules\ext\openjson-1.0.10.jar ext/isoparser-1.1.22.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\isoparser-1.1.22.jar + release\modules\ext\isoparser-1.1.22.jar ext/c3p0-0.9.5.jar @@ -545,11 +545,11 @@ ext/javax.activation-1.2.0.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\javax.activation-1.2.0.jar + release\modules\ext\javax.activation-1.2.0.jar ext/commons-csv-1.6.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\commons-csv-1.6.jar + release\modules\ext\commons-csv-1.6.jar ext/jdom-2.0.5.jar @@ -557,39 +557,39 @@ ext/commons-compress-1.18.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\commons-compress-1.18.jar + release\modules\ext\commons-compress-1.18.jar ext/rome-1.12.0.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\rome-1.12.0.jar + release\modules\ext\rome-1.12.0.jar ext/jackson-annotations-2.9.7.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\jackson-annotations-2.9.7.jar + release\modules\ext\jackson-annotations-2.9.7.jar ext/javax.annotation-api-1.3.2.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\javax.annotation-api-1.3.2.jar + release\modules\ext\javax.annotation-api-1.3.2.jar ext/vorbis-java-core-0.8.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\vorbis-java-core-0.8.jar + release\modules\ext\vorbis-java-core-0.8.jar ext/netcdf4-4.5.5.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\netcdf4-4.5.5.jar + release\modules\ext\netcdf4-4.5.5.jar ext/java-libpst-0.8.1.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\java-libpst-0.8.1.jar + release\modules\ext\java-libpst-0.8.1.jar ext/opennlp-tools-1.9.0.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\opennlp-tools-1.9.0.jar + release\modules\ext\opennlp-tools-1.9.0.jar ext/sis-netcdf-0.8.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\sis-netcdf-0.8.jar + release\modules\ext\sis-netcdf-0.8.jar ext/curator-framework-2.8.0.jar @@ -597,11 +597,11 @@ ext/sentiment-analysis-parser-0.1.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\sentiment-analysis-parser-0.1.jar + release\modules\ext\sentiment-analysis-parser-0.1.jar ext/commons-collections4-4.2.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\commons-collections4-4.2.jar + release\modules\ext\commons-collections4-4.2.jar ext/commons-dbcp2-2.1.1.jar @@ -613,7 +613,7 @@ ext/juniversalchardet-1.0.3.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\juniversalchardet-1.0.3.jar + release\modules\ext\juniversalchardet-1.0.3.jar ext/jython-standalone-2.7.0.jar @@ -621,23 +621,23 @@ ext/uimafit-core-2.4.0.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\uimafit-core-2.4.0.jar + release\modules\ext\uimafit-core-2.4.0.jar ext/jackcess-encrypt-2.1.4.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\jackcess-encrypt-2.1.4.jar + release\modules\ext\jackcess-encrypt-2.1.4.jar ext/jhighlight-1.0.3.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\jhighlight-1.0.3.jar + release\modules\ext\jhighlight-1.0.3.jar ext/junrar-2.0.0.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\junrar-2.0.0.jar + release\modules\ext\junrar-2.0.0.jar ext/jul-to-slf4j-1.7.25.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\jul-to-slf4j-1.7.25.jar + release\modules\ext\jul-to-slf4j-1.7.25.jar ext/postgresql-9.4.1211.jre7.jar @@ -645,35 +645,35 @@ ext/poi-4.0.1.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\poi-4.0.1.jar + release\modules\ext\poi-4.0.1.jar ext/slf4j-api-1.7.25.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\slf4j-api-1.7.25.jar + release\modules\ext\slf4j-api-1.7.25.jar ext/jaxb-runtime-2.3.1.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\jaxb-runtime-2.3.1.jar + release\modules\ext\jaxb-runtime-2.3.1.jar ext/geoapi-3.0.1.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\geoapi-3.0.1.jar + release\modules\ext\geoapi-3.0.1.jar ext/httpmime-4.5.6.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\httpmime-4.5.6.jar + release\modules\ext\httpmime-4.5.6.jar ext/jdom2-2.0.6.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\jdom2-2.0.6.jar + release\modules\ext\jdom2-2.0.6.jar ext/httpclient-4.5.6.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\httpclient-4.5.6.jar + release\modules\ext\httpclient-4.5.6.jar ext/uimaj-core-3.0.1.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\uimaj-core-3.0.1.jar + release\modules\ext\uimaj-core-3.0.1.jar ext/curator-client-2.8.0.jar @@ -685,15 +685,15 @@ ext/pdfbox-tools-2.0.13.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\pdfbox-tools-2.0.13.jar + release\modules\ext\pdfbox-tools-2.0.13.jar ext/grib-4.5.5.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\grib-4.5.5.jar + release\modules\ext\grib-4.5.5.jar ext/fontbox-2.0.13.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\fontbox-2.0.13.jar + release\modules\ext\fontbox-2.0.13.jar ext/activemq-all-5.11.1.jar @@ -701,11 +701,11 @@ ext/poi-ooxml-schemas-4.0.1.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\poi-ooxml-schemas-4.0.1.jar + release\modules\ext\poi-ooxml-schemas-4.0.1.jar ext/dec-0.1.2.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\dec-0.1.2.jar + release\modules\ext\dec-0.1.2.jar ext/Rejistry-1.0-SNAPSHOT.jar @@ -721,11 +721,11 @@ ext/bcmail-jdk15on-1.60.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\bcmail-jdk15on-1.60.jar + release\modules\ext\bcmail-jdk15on-1.60.jar ext/vorbis-java-tika-0.8.jar - C:\cygwin64\home\dsmyda\autopsy\Core\release\modules\ext\vorbis-java-tika-0.8.jar + release\modules\ext\vorbis-java-tika-0.8.jar diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties index 139000f80e..f50cdb1db4 100644 --- a/CoreLibs/nbproject/project.properties +++ b/CoreLibs/nbproject/project.properties @@ -7,7 +7,7 @@ file.reference.common-image-3.2.jar=release/modules/ext/common-image-3.2.jar file.reference.common-io-3.2.jar=release/modules/ext/common-io-3.2.jar file.reference.common-lang-3.2.jar=release/modules/ext/common-lang-3.2.jar file.reference.commons-codec-1.11.jar=release/modules/ext/commons-codec-1.11.jar -file.reference.commons-collections4-4.2.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\CoreLibs\\release\\modules\\ext\\commons-collections4-4.2.jar +file.reference.commons-collections4-4.2.jar=release\\modules\\ext\\commons-collections4-4.2.jar file.reference.commons-csv-1.4.jar=release/modules/ext/commons-csv-1.4.jar file.reference.commons-io-2.4.jar=release/modules/ext/commons-io-2.4.jar file.reference.commons-io-2.5.jar=release/modules/ext/commons-io-2.5.jar @@ -59,11 +59,11 @@ file.reference.mail-1.4.3.jar=release/modules/ext/mail-1.4.3.jar file.reference.opencv-248.jar=release/modules/ext/opencv-248.jar file.reference.openjfx-dialogs-1.0.2.jar=release/modules/ext/openjfx-dialogs-1.0.3.jar file.reference.platform-3.4.0.jar=release/modules/ext/platform-3.4.0.jar -file.reference.poi-4.0.1.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\CoreLibs\\release\\modules\\ext\\poi-4.0.1.jar -file.reference.poi-excelant-4.0.1.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\CoreLibs\\release\\modules\\ext\\poi-excelant-4.0.1.jar -file.reference.poi-ooxml-4.0.1.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\CoreLibs\\release\\modules\\ext\\poi-ooxml-4.0.1.jar -file.reference.poi-ooxml-schemas-4.0.1.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\CoreLibs\\release\\modules\\ext\\poi-ooxml-schemas-4.0.1.jar -file.reference.poi-scratchpad-4.0.1.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\CoreLibs\\release\\modules\\ext\\poi-scratchpad-4.0.1.jar +file.reference.poi-4.0.1.jar=release\\modules\\ext\\poi-4.0.1.jar +file.reference.poi-excelant-4.0.1.jar=release\\modules\\ext\\poi-excelant-4.0.1.jar +file.reference.poi-ooxml-4.0.1.jar=release\\modules\\ext\\poi-ooxml-4.0.1.jar +file.reference.poi-ooxml-schemas-4.0.1.jar=release\\modules\\ext\\poi-ooxml-schemas-4.0.1.jar +file.reference.poi-scratchpad-4.0.1.jar=release\\modules\\ext\\poi-scratchpad-4.0.1.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.sigar-1.6.4-sources.jar=release/modules/ext/sigar-1.6.4-sources.jar diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml index 3fb511741d..f32e0b7747 100644 --- a/CoreLibs/nbproject/project.xml +++ b/CoreLibs/nbproject/project.xml @@ -844,7 +844,7 @@ ext/poi-scratchpad-4.0.1.jar - C:\cygwin64\home\dsmyda\autopsy\CoreLibs\release\modules\ext\poi-scratchpad-4.0.1.jar + release\modules\ext\poi-scratchpad-4.0.1.jar ext/imageio-psd-3.2.jar @@ -856,7 +856,7 @@ ext/poi-ooxml-4.0.1.jar - C:\cygwin64\home\dsmyda\autopsy\CoreLibs\release\modules\ext\poi-ooxml-4.0.1.jar + release\modules\ext\poi-ooxml-4.0.1.jar ext/commons-codec-1.11.jar @@ -932,7 +932,7 @@ ext/commons-collections4-4.2.jar - C:\cygwin64\home\dsmyda\autopsy\CoreLibs\release\modules\ext\commons-collections4-4.2.jar + release\modules\ext\commons-collections4-4.2.jar ext/imageio-bmp-3.2.jar @@ -968,11 +968,11 @@ ext/poi-4.0.1.jar - C:\cygwin64\home\dsmyda\autopsy\CoreLibs\release\modules\ext\poi-4.0.1.jar + release\modules\ext\poi-4.0.1.jar ext/poi-excelant-4.0.1.jar - C:\cygwin64\home\dsmyda\autopsy\CoreLibs\release\modules\ext\poi-excelant-4.0.1.jar + release\modules\ext\poi-excelant-4.0.1.jar ext/commons-logging-1.1.2.jar @@ -996,7 +996,7 @@ ext/poi-ooxml-schemas-4.0.1.jar - C:\cygwin64\home\dsmyda\autopsy\CoreLibs\release\modules\ext\poi-ooxml-schemas-4.0.1.jar + release\modules\ext\poi-ooxml-schemas-4.0.1.jar ext/imageio-pict-3.2.jar diff --git a/Experimental/nbproject/project.properties b/Experimental/nbproject/project.properties index b50b12bc00..8dc87db7e3 100644 --- a/Experimental/nbproject/project.properties +++ b/Experimental/nbproject/project.properties @@ -3,7 +3,7 @@ file.reference.jackson-core-2.7.0.jar=release/modules/ext/jackson-core-2.7.0.jar file.reference.LGoodDatePicker-10.3.1.jar=release/modules/ext/LGoodDatePicker-10.3.1.jar file.reference.mchange-commons-java-0.2.9.jar=release/modules/ext/mchange-commons-java-0.2.9.jar file.reference.postgresql-9.4-1201-jdbc41.jar=release/modules/ext/postgresql-9.4-1201-jdbc41.jar -file.reference.tika-core-1.20.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\Experimental\\release\\modules\\ext\\tika-core-1.20.jar +file.reference.tika-core-1.20.jar=release\\modules\\ext\\tika-core-1.20.jar javac.source=1.8 javac.compilerargs=-Xlint -Xlint:-serial javadoc.reference.LGoodDatePicker-10.3.1.jar=release/modules/ext/LGoodDatePicker-10.3.1-javadoc.jar diff --git a/Experimental/nbproject/project.xml b/Experimental/nbproject/project.xml index ad8a97e347..ea6cb05686 100644 --- a/Experimental/nbproject/project.xml +++ b/Experimental/nbproject/project.xml @@ -163,7 +163,7 @@ ext/tika-core-1.20.jar - C:\cygwin64\home\dsmyda\autopsy\Experimental\release\modules\ext\tika-core-1.20.jar + release\modules\ext\tika-core-1.20.jar ext/LGoodDatePicker-10.3.1.jar diff --git a/KeywordSearch/nbproject/project.properties b/KeywordSearch/nbproject/project.properties index 4f92e38703..433825a613 100644 --- a/KeywordSearch/nbproject/project.properties +++ b/KeywordSearch/nbproject/project.properties @@ -4,11 +4,11 @@ file.reference.c3p0-0.9.1.1.jar=release/modules/ext/c3p0-0.9.1.1.jar file.reference.cdm-4.5.5.jar=release/modules/ext/cdm-4.5.5.jar file.reference.cleartk-util-2.0.0.jar=release/modules/ext/cleartk-util-2.0.0.jar file.reference.commons-beanutils-1.9.2.jar=release/modules/ext/commons-beanutils-1.9.2.jar -file.reference.commons-codec-1.11.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\KeywordSearch\\release\\modules\\ext\\commons-codec-1.11.jar +file.reference.commons-codec-1.11.jar=release\\modules\\ext\\commons-codec-1.11.jar file.reference.commons-collections-3.2.2.jar=release/modules/ext/commons-collections-3.2.2.jar file.reference.commons-digester-1.8.1.jar=release/modules/ext/commons-digester-1.8.1.jar file.reference.commons-exec-1.3.jar=release/modules/ext/commons-exec-1.3.jar -file.reference.commons-io-2.3.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\KeywordSearch\\release\\modules\\ext\\commons-io-2.3.jar +file.reference.commons-io-2.3.jar=release\\modules\\ext\\commons-io-2.3.jar file.reference.commons-lang-2.6.jar=release/modules/ext/commons-lang-2.6.jar file.reference.commons-logging-1.2.jar=release/modules/ext/commons-logging-1.2.jar file.reference.commons-logging-api-1.1.jar=release/modules/ext/commons-logging-api-1.1.jar @@ -20,10 +20,10 @@ file.reference.findstructapi-0.0.1.jar=release/modules/ext/findstructapi-0.0.1.j file.reference.grib-4.5.5.jar=release/modules/ext/grib-4.5.5.jar file.reference.guava-17.0.jar=release/modules/ext/guava-17.0.jar file.reference.hamcrest-core-1.3.jar=release/modules/ext/hamcrest-core-1.3.jar -file.reference.httpclient-4.3.1.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\KeywordSearch\\release\\modules\\ext\\httpclient-4.3.1.jar -file.reference.httpcore-4.3.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\KeywordSearch\\release\\modules\\ext\\httpcore-4.3.jar +file.reference.httpclient-4.3.1.jar=release\\modules\\ext\\httpclient-4.3.1.jar +file.reference.httpcore-4.3.jar=release\\modules\\ext\\httpcore-4.3.jar file.reference.httpcore-4.4.1.jar=release/modules/ext/httpcore-4.4.1.jar -file.reference.httpmime-4.3.1.jar=C:\\cygwin64\\home\\dsmyda\\autopsy\\KeywordSearch\\release\\modules\\ext\\httpmime-4.3.1.jar +file.reference.httpmime-4.3.1.jar=release\\modules\\ext\\httpmime-4.3.1.jar file.reference.httpmime-4.4.1.jar=release/modules/ext/httpmime-4.4.1.jar file.reference.httpservices-4.5.5.jar=release/modules/ext/httpservices-4.5.5.jar file.reference.java-libpst-0.8.1.jar=release/modules/ext/java-libpst-0.8.1.jar diff --git a/KeywordSearch/nbproject/project.xml b/KeywordSearch/nbproject/project.xml index 891728973e..bbf3f2a7ab 100644 --- a/KeywordSearch/nbproject/project.xml +++ b/KeywordSearch/nbproject/project.xml @@ -219,11 +219,11 @@ ext/httpclient-4.3.1.jar - C:\cygwin64\home\dsmyda\autopsy\KeywordSearch\release\modules\ext\httpclient-4.3.1.jar + release\modules\ext\httpclient-4.3.1.jar ext/commons-codec-1.11.jar - C:\cygwin64\home\dsmyda\autopsy\KeywordSearch\release\modules\ext\commons-codec-1.11.jar + release\modules\ext\commons-codec-1.11.jar ext/tika-parsers-1.20.jar @@ -295,7 +295,7 @@ ext/commons-io-2.3.jar - C:\cygwin64\home\dsmyda\autopsy\KeywordSearch\release\modules\ext\commons-io-2.3.jar + release\modules\ext\commons-io-2.3.jar ext/jericho-html-3.3-sources.jar @@ -327,11 +327,11 @@ ext/httpmime-4.3.1.jar - C:\cygwin64\home\dsmyda\autopsy\KeywordSearch\release\modules\ext\httpmime-4.3.1.jar + release\modules\ext\httpmime-4.3.1.jar ext/httpcore-4.3.jar - C:\cygwin64\home\dsmyda\autopsy\KeywordSearch\release\modules\ext\httpcore-4.3.jar + release\modules\ext\httpcore-4.3.jar ext/jcip-annotations-1.0.jar From 5c631c8eff8dbe120dcf170bd54bef68b5a4680d Mon Sep 17 00:00:00 2001 From: "U-BASIS\\dsmyda" Date: Thu, 31 Jan 2019 14:42:58 -0500 Subject: [PATCH 05/28] Workaround for the missing commons compress jar --- Core/nbproject/project.properties | 5 ---- Core/nbproject/project.xml | 20 ---------------- CoreLibs/nbproject/project.properties | 1 + CoreLibs/nbproject/project.xml | 33 +++++++++++++++++++++++++++ 4 files changed, 34 insertions(+), 25 deletions(-) diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties index 369dcac9b3..afed6913ca 100644 --- a/Core/nbproject/project.properties +++ b/Core/nbproject/project.properties @@ -9,7 +9,6 @@ file.reference.c3p0-0.9.5.jar=release/modules/ext/c3p0-0.9.5.jar file.reference.cdm-4.5.5.jar=release\\modules\\ext\\cdm-4.5.5.jar file.reference.commons-codec-1.11.jar=release\\modules\\ext\\commons-codec-1.11.jar file.reference.commons-collections4-4.2.jar=release\\modules\\ext\\commons-collections4-4.2.jar -file.reference.commons-compress-1.18.jar=release\\modules\\ext\\commons-compress-1.18.jar file.reference.commons-csv-1.6.jar=release\\modules\\ext\\commons-csv-1.6.jar file.reference.commons-dbcp2-2.1.1.jar=release/modules/ext/commons-dbcp2-2.1.1.jar file.reference.commons-exec-1.3.jar=release\\modules\\ext\\commons-exec-1.3.jar @@ -62,10 +61,6 @@ file.reference.opennlp-tools-1.9.0.jar=release\\modules\\ext\\opennlp-tools-1.9. file.reference.parso-2.0.10.jar=release\\modules\\ext\\parso-2.0.10.jar file.reference.pdfbox-2.0.13.jar=release\\modules\\ext\\pdfbox-2.0.13.jar file.reference.pdfbox-tools-2.0.13.jar=release\\modules\\ext\\pdfbox-tools-2.0.13.jar -file.reference.poi-4.0.1.jar=release\\modules\\ext\\poi-4.0.1.jar -file.reference.poi-ooxml-4.0.1.jar=release\\modules\\ext\\poi-ooxml-4.0.1.jar -file.reference.poi-ooxml-schemas-4.0.1.jar=release\\modules\\ext\\poi-ooxml-schemas-4.0.1.jar -file.reference.poi-scratchpad-4.0.1.jar=release\\modules\\ext\\poi-scratchpad-4.0.1.jar file.reference.postgresql-9.4.1211.jre7.jar=release/modules/ext/postgresql-9.4.1211.jre7.jar file.reference.Rejistry-1.0-SNAPSHOT.jar=release/modules/ext/Rejistry-1.0-SNAPSHOT.jar file.reference.rome-1.12.0.jar=release\\modules\\ext\\rome-1.12.0.jar diff --git a/Core/nbproject/project.xml b/Core/nbproject/project.xml index eeb2555eb4..2fba7caaf8 100644 --- a/Core/nbproject/project.xml +++ b/Core/nbproject/project.xml @@ -467,18 +467,10 @@ ext/parso-2.0.10.jar release\modules\ext\parso-2.0.10.jar - - ext/poi-scratchpad-4.0.1.jar - release\modules\ext\poi-scratchpad-4.0.1.jar - ext/json-simple-1.1.1.jar release\modules\ext\json-simple-1.1.1.jar - - ext/poi-ooxml-4.0.1.jar - release\modules\ext\poi-ooxml-4.0.1.jar - ext/metadata-extractor-2.11.0.jar release\modules\ext\metadata-extractor-2.11.0.jar @@ -555,10 +547,6 @@ ext/jdom-2.0.5.jar release/modules/ext/jdom-2.0.5.jar - - ext/commons-compress-1.18.jar - release\modules\ext\commons-compress-1.18.jar - ext/rome-1.12.0.jar release\modules\ext\rome-1.12.0.jar @@ -643,10 +631,6 @@ ext/postgresql-9.4.1211.jre7.jar release/modules/ext/postgresql-9.4.1211.jre7.jar - - ext/poi-4.0.1.jar - release\modules\ext\poi-4.0.1.jar - ext/slf4j-api-1.7.25.jar release\modules\ext\slf4j-api-1.7.25.jar @@ -699,10 +683,6 @@ ext/activemq-all-5.11.1.jar release/modules/ext/activemq-all-5.11.1.jar - - ext/poi-ooxml-schemas-4.0.1.jar - release\modules\ext\poi-ooxml-schemas-4.0.1.jar - ext/dec-0.1.2.jar release\modules\ext\dec-0.1.2.jar diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties index f50cdb1db4..eaa721cde6 100644 --- a/CoreLibs/nbproject/project.properties +++ b/CoreLibs/nbproject/project.properties @@ -8,6 +8,7 @@ file.reference.common-io-3.2.jar=release/modules/ext/common-io-3.2.jar file.reference.common-lang-3.2.jar=release/modules/ext/common-lang-3.2.jar file.reference.commons-codec-1.11.jar=release/modules/ext/commons-codec-1.11.jar file.reference.commons-collections4-4.2.jar=release\\modules\\ext\\commons-collections4-4.2.jar +file.reference.commons-compress-1.18.jar=release/modules/ext/commons-compress-1.18.jar file.reference.commons-csv-1.4.jar=release/modules/ext/commons-csv-1.4.jar file.reference.commons-io-2.4.jar=release/modules/ext/commons-io-2.4.jar file.reference.commons-io-2.5.jar=release/modules/ext/commons-io-2.5.jar diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml index f32e0b7747..67bd10d99b 100644 --- a/CoreLibs/nbproject/project.xml +++ b/CoreLibs/nbproject/project.xml @@ -269,6 +269,35 @@ org.apache.commons.collections4.splitmap org.apache.commons.collections4.trie org.apache.commons.collections4.trie.analyzer + org.apache.commons.compress + org.apache.commons.compress.archivers + org.apache.commons.compress.archivers.ar + org.apache.commons.compress.archivers.arj + org.apache.commons.compress.archivers.cpio + org.apache.commons.compress.archivers.dump + org.apache.commons.compress.archivers.examples + org.apache.commons.compress.archivers.jar + org.apache.commons.compress.archivers.sevenz + org.apache.commons.compress.archivers.tar + org.apache.commons.compress.archivers.zip + org.apache.commons.compress.changes + org.apache.commons.compress.compressors + org.apache.commons.compress.compressors.brotli + org.apache.commons.compress.compressors.bzip2 + org.apache.commons.compress.compressors.deflate + org.apache.commons.compress.compressors.deflate64 + org.apache.commons.compress.compressors.gzip + org.apache.commons.compress.compressors.lz4 + org.apache.commons.compress.compressors.lz77support + org.apache.commons.compress.compressors.lzma + org.apache.commons.compress.compressors.lzw + org.apache.commons.compress.compressors.pack200 + org.apache.commons.compress.compressors.snappy + org.apache.commons.compress.compressors.xz + org.apache.commons.compress.compressors.z + org.apache.commons.compress.compressors.zstandard + org.apache.commons.compress.parallel + org.apache.commons.compress.utils org.apache.commons.csv org.apache.commons.io org.apache.commons.io.comparator @@ -910,6 +939,10 @@ ext/joda-time-2.4.jar release/modules/ext/joda-time-2.4.jar + + ext/commons-compress-1.18.jar + release/modules/ext/commons-compress-1.18.jar + ext/commons-logging-1.1.2-javadoc.jar release/modules/ext/commons-logging-1.1.2-javadoc.jar From 38d26d030e88b675e9ecf53f797b43a7b5aca75e Mon Sep 17 00:00:00 2001 From: "U-BASIS\\dsmyda" Date: Fri, 22 Feb 2019 11:50:27 -0500 Subject: [PATCH 06/28] Missed on thing in the merge conflict resolution --- KeywordSearch/nbproject/project.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/KeywordSearch/nbproject/project.xml b/KeywordSearch/nbproject/project.xml index 7f2344f20a..0640ef01a1 100644 --- a/KeywordSearch/nbproject/project.xml +++ b/KeywordSearch/nbproject/project.xml @@ -293,6 +293,7 @@ ext/protobuf-java-2.5.0.jar release/modules/ext/protobuf-java-2.5.0.jar + ext/lucene-queries-4.0.0.jar release/modules/ext/lucene-queries-4.0.0.jar From 85dece0516546842b86a8f3579bb4ce5d3204131 Mon Sep 17 00:00:00 2001 From: "U-BASIS\\dsmyda" Date: Fri, 22 Feb 2019 13:25:30 -0500 Subject: [PATCH 07/28] Tracked down the problem dependency that was causing the build errors and fixed it --- Core/ivy.xml | 15 +++++++++++---- Core/ivysettings.xml | 2 -- Core/nbproject/project.properties | 3 +-- Core/nbproject/project.xml | 12 ++++-------- KeywordSearch/ivy.xml | 6 ++++-- KeywordSearch/ivysettings.xml | 2 -- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Core/ivy.xml b/Core/ivy.xml index 3cfd17bb11..b74b84437a 100644 --- a/Core/ivy.xml +++ b/Core/ivy.xml @@ -19,7 +19,14 @@ - + + + + + + + + @@ -33,14 +40,14 @@ - + - - + + diff --git a/Core/ivysettings.xml b/Core/ivysettings.xml index 40032ddeb9..7a4d38c65e 100644 --- a/Core/ivysettings.xml +++ b/Core/ivysettings.xml @@ -7,6 +7,4 @@ - - diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties index 177d1b38d5..0730f84a55 100644 --- a/Core/nbproject/project.properties +++ b/Core/nbproject/project.properties @@ -15,7 +15,7 @@ file.reference.commons-exec-1.3.jar=release\\modules\\ext\\commons-exec-1.3.jar file.reference.commons-io-2.6.jar=release\\modules\\ext\\commons-io-2.6.jar file.reference.commons-lang3-3.8.1.jar=release\\modules\\ext\\commons-lang3-3.8.1.jar file.reference.commons-pool2-2.4.2.jar=release/modules/ext/commons-pool2-2.4.2.jar -file.reference.cxf-rt-rs-client-3.2.7.jar=release\\modules\\ext\\cxf-rt-rs-client-3.2.7.jar +file.reference.cxf-rt-rs-client-3.3.0.jar=release\\modules\\ext\\cxf-rt-rs-client-3.3.0.jar file.reference.dd-plist-1.20.jar=release/modules/ext/dd-plist-1.20.jar file.reference.dec-0.1.2.jar=release\\modules\\ext\\dec-0.1.2.jar file.reference.fontbox-2.0.13.jar=release\\modules\\ext\\fontbox-2.0.13.jar @@ -35,7 +35,6 @@ file.reference.jai-imageio-core-1.4.0.jar=release\\modules\\ext\\jai-imageio-cor file.reference.java-libpst-0.8.1.jar=release\\modules\\ext\\java-libpst-0.8.1.jar file.reference.javax.activation-1.2.0.jar=release\\modules\\ext\\javax.activation-1.2.0.jar file.reference.javax.annotation-api-1.3.2.jar=release\\modules\\ext\\javax.annotation-api-1.3.2.jar -file.reference.jaxb-runtime-2.3.1.jar=release\\modules\\ext\\jaxb-runtime-2.3.1.jar file.reference.jbig2-imageio-3.0.2.jar=release\\modules\\ext\\jbig2-imageio-3.0.2.jar file.reference.jcl-over-slf4j-1.7.25.jar=release\\modules\\ext\\jcl-over-slf4j-1.7.25.jar file.reference.jdom-2.0.5-contrib.jar=release/modules/ext/jdom-2.0.5-contrib.jar diff --git a/Core/nbproject/project.xml b/Core/nbproject/project.xml index 2fba7caaf8..49dbe0672f 100644 --- a/Core/nbproject/project.xml +++ b/Core/nbproject/project.xml @@ -447,10 +447,6 @@ ext/StixLib.jar release/modules/ext/StixLib.jar - - ext/cxf-rt-rs-client-3.2.7.jar - release\modules\ext\cxf-rt-rs-client-3.2.7.jar - ext/jackson-core-2.9.7.jar release\modules\ext\jackson-core-2.9.7.jar @@ -635,10 +631,6 @@ ext/slf4j-api-1.7.25.jar release\modules\ext\slf4j-api-1.7.25.jar - - ext/jaxb-runtime-2.3.1.jar - release\modules\ext\jaxb-runtime-2.3.1.jar - ext/geoapi-3.0.1.jar release\modules\ext\geoapi-3.0.1.jar @@ -667,6 +659,10 @@ ext/sqlite-jdbc-3.25.2.jar release/modules/ext/sqlite-jdbc-3.25.2.jar + + ext/cxf-rt-rs-client-3.3.0.jar + release\modules\ext\cxf-rt-rs-client-3.3.0.jar + ext/pdfbox-tools-2.0.13.jar release\modules\ext\pdfbox-tools-2.0.13.jar diff --git a/KeywordSearch/ivy.xml b/KeywordSearch/ivy.xml index 1368e04a99..0da201a08b 100644 --- a/KeywordSearch/ivy.xml +++ b/KeywordSearch/ivy.xml @@ -21,8 +21,10 @@ - - + + + + diff --git a/KeywordSearch/ivysettings.xml b/KeywordSearch/ivysettings.xml index 55d9518a26..c27d905255 100644 --- a/KeywordSearch/ivysettings.xml +++ b/KeywordSearch/ivysettings.xml @@ -6,6 +6,4 @@ - - From 926d017370e6c55b11ca292ba1a27bb15902b9a7 Mon Sep 17 00:00:00 2001 From: "U-BASIS\\dsmyda" Date: Tue, 2 Apr 2019 11:20:37 -0400 Subject: [PATCH 08/28] Added missing tag from the conflict resolution for the previous merge --- Core/nbproject/project.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/Core/nbproject/project.xml b/Core/nbproject/project.xml index 7a6c3966a4..1ee0f19822 100644 --- a/Core/nbproject/project.xml +++ b/Core/nbproject/project.xml @@ -477,6 +477,7 @@ ext/apache-mime4j-core-0.8.2.jar release\modules\ext\apache-mime4j-core-0.8.2.jar + ext/jmatio-1.5.jar release\modules\ext\jmatio-1.5.jar From 5eb96d1e72a99668f38b3bd9a26ae957e39cac56 Mon Sep 17 00:00:00 2001 From: "U-BASIS\\dsmyda" Date: Tue, 2 Apr 2019 12:10:00 -0400 Subject: [PATCH 09/28] Attempting to make travis build. Also fixed the mistake with the gson conflict resolution --- CoreLibs/nbproject/project.xml | 4 ++-- KeywordSearch/ivy.xml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml index 3a761b09cd..5c9db80c71 100644 --- a/CoreLibs/nbproject/project.xml +++ b/CoreLibs/nbproject/project.xml @@ -953,8 +953,8 @@ release/modules/ext/opencv-248.jar - ext/gson-2.8.1.jar - release/modules/ext/gson-2.8.1.jar + ext/gson-2.8.5.jar + release/modules/ext/gson-2.8.5.jar ext/opencv-248.jar diff --git a/KeywordSearch/ivy.xml b/KeywordSearch/ivy.xml index 0da201a08b..56a606816f 100644 --- a/KeywordSearch/ivy.xml +++ b/KeywordSearch/ivy.xml @@ -41,9 +41,9 @@ - - + + From 6a5b83cc7e83b69dd6af27b7e9437dd549b82acf Mon Sep 17 00:00:00 2001 From: Kelly Kelly Date: Fri, 5 Apr 2019 12:44:32 -0400 Subject: [PATCH 10/28] Revert "Revert "1218 back\forward code for Communications window"" This reverts commit 0b43813a6ff851c4464ed4c96b32ac8a19378fe1. --- .../communications/AccountsBrowser.java | 13 ++ .../autopsy/communications/Bundle.properties | 17 +- .../communications/Bundle.properties-MERGED | 17 +- .../autopsy/communications/CVTEvents.java | 40 ++++ .../communications/CVTTopComponent.java | 5 +- .../autopsy/communications/FiltersPanel.java | 89 +++++++- .../communications/PinnedAccountModel.java | 6 +- .../autopsy/communications/StateManager.java | 207 +++++++++++++++++ .../communications/UnpinAccountsAction.java | 2 +- .../communications/VisualizationPanel.form | 135 +++++------ .../communications/VisualizationPanel.java | 209 +++++++++++------- .../autopsy/images/resultset_next.png | Bin 0 -> 395 bytes .../autopsy/images/resultset_previous.png | Bin 0 -> 389 bytes .../autopsy/timeline/actions/Back.java | 2 +- .../autopsy/timeline/actions/Forward.java | 2 +- 15 files changed, 575 insertions(+), 169 deletions(-) create mode 100755 Core/src/org/sleuthkit/autopsy/communications/StateManager.java create mode 100755 Core/src/org/sleuthkit/autopsy/images/resultset_next.png create mode 100755 Core/src/org/sleuthkit/autopsy/images/resultset_previous.png diff --git a/Core/src/org/sleuthkit/autopsy/communications/AccountsBrowser.java b/Core/src/org/sleuthkit/autopsy/communications/AccountsBrowser.java index 006fbd846f..1d23a7f9fc 100644 --- a/Core/src/org/sleuthkit/autopsy/communications/AccountsBrowser.java +++ b/Core/src/org/sleuthkit/autopsy/communications/AccountsBrowser.java @@ -130,6 +130,19 @@ public final class AccountsBrowser extends JPanel implements ExplorerManager.Pro //Case is closed, do nothig. } } + + @Subscribe + void historyChange(CVTEvents.StateEvent event) { + try { + final CommunicationsManager commsManager = Case.getCurrentCaseThrows().getSleuthkitCase().getCommunicationsManager(); + accountsTableEM.setRootContext(new AbstractNode(Children.create(new AccountDeviceInstanceNodeFactory(commsManager, event.getCommunicationsState().getCommunicationsFilter()), true))); + } catch (TskCoreException ex) { + logger.log(Level.SEVERE, "There was an error getting the CommunicationsManager for the current case.", ex); + } catch (NoCurrentCaseException ex) { //NOPMD empty catch clause + //Case is closed, do nothig. + } + + } /** * This method is called from within the constructor to initialize the form. diff --git a/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties b/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties index 6665c2e958..f00a02cf9d 100644 --- a/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties @@ -22,7 +22,6 @@ CVTTopComponent.browseVisualizeTabPane.AccessibleContext.accessibleName=Visualiz CVTTopComponent.vizPanel.TabConstraints.tabTitle_1=Visualize VisualizationPanel.fitGraphButton.text= VisualizationPanel.jTextArea1.text=Right-click an account in the Browse Accounts table, and select 'Visualize' to begin. -VisualizationPanel.jLabel1.text=Layouts: VisualizationPanel.zoomLabel.text=100% VisualizationPanel.jLabel2.text=Zoom: VisualizationPanel.fitZoomButton.toolTipText=fit visualization @@ -33,9 +32,21 @@ VisualizationPanel.zoomInButton.toolTipText=Zoom in VisualizationPanel.zoomInButton.text= VisualizationPanel.zoomOutButton.toolTipText=Zoom out VisualizationPanel.zoomOutButton.text= +<<<<<<< HEAD +VisualizationPanel.fastOrganicLayoutButton.text=Redraw +VisualizationPanel.clearVizButton.text_1=Clear +VisualizationPanel.backButton.text_1= +VisualizationPanel.forwardButton.text= +======= VisualizationPanel.circleLayoutButton.text=Circle VisualizationPanel.organicLayoutButton.text=Organic -VisualizationPanel.fastOrganicLayoutButton.text=Fast Organic +VisualizationPanel.fastOrganicLayoutButton.text= VisualizationPanel.hierarchyLayoutButton.text=Hierarchical -VisualizationPanel.clearVizButton.text_1=Clear Viz. +VisualizationPanel.clearVizButton.text_1= VisualizationPanel.snapshotButton.text_1=Snapshot Report +>>>>>>> develop +VisualizationPanel.clearVizButton.actionCommand= +VisualizationPanel.backButton.toolTipText=Click to go back +VisualizationPanel.forwardButton.toolTipText=Click to go forward +VisualizationPanel.fastOrganicLayoutButton.toolTipText=Click to redraw the chart +VisualizationPanel.clearVizButton.toolTipText=Click to clear the chart diff --git a/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties-MERGED index e4daded09b..c9f38865a8 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/communications/Bundle.properties-MERGED @@ -58,7 +58,6 @@ CVTTopComponent.browseVisualizeTabPane.AccessibleContext.accessibleName=Visualiz CVTTopComponent.vizPanel.TabConstraints.tabTitle_1=Visualize VisualizationPanel.fitGraphButton.text= VisualizationPanel.jTextArea1.text=Right-click an account in the Browse Accounts table, and select 'Visualize' to begin. -VisualizationPanel.jLabel1.text=Layouts: # {0} - layout name VisualizationPanel.layoutFail.text={0} layout failed. Try a different layout. # {0} - layout name @@ -77,12 +76,24 @@ VisualizationPanel.zoomInButton.toolTipText=Zoom in VisualizationPanel.zoomInButton.text= VisualizationPanel.zoomOutButton.toolTipText=Zoom out VisualizationPanel.zoomOutButton.text= +<<<<<<< HEAD +VisualizationPanel.fastOrganicLayoutButton.text=Redraw +VisualizationPanel.clearVizButton.text_1=Clear +VisualizationPanel.backButton.text_1= +VisualizationPanel.forwardButton.text= +======= VisualizationPanel.circleLayoutButton.text=Circle VisualizationPanel.organicLayoutButton.text=Organic -VisualizationPanel.fastOrganicLayoutButton.text=Fast Organic +VisualizationPanel.fastOrganicLayoutButton.text= VisualizationPanel.hierarchyLayoutButton.text=Hierarchical -VisualizationPanel.clearVizButton.text_1=Clear Viz. +VisualizationPanel.clearVizButton.text_1= VisualizationPanel.snapshotButton.text_1=Snapshot Report +>>>>>>> develop +VisualizationPanel.clearVizButton.actionCommand= +VisualizationPanel.backButton.toolTipText=Click to go back +VisualizationPanel.forwardButton.toolTipText=Click to go forward +VisualizationPanel.fastOrganicLayoutButton.toolTipText=Click to redraw the chart +VisualizationPanel.clearVizButton.toolTipText=Click to clear the chart VisualizationPanel_action_dialogs_title=Communications VisualizationPanel_action_name_text=Snapshot Report VisualizationPanel_module_name=Communications diff --git a/Core/src/org/sleuthkit/autopsy/communications/CVTEvents.java b/Core/src/org/sleuthkit/autopsy/communications/CVTEvents.java index 6a6a60d3da..051ff2b193 100644 --- a/Core/src/org/sleuthkit/autopsy/communications/CVTEvents.java +++ b/Core/src/org/sleuthkit/autopsy/communications/CVTEvents.java @@ -22,6 +22,7 @@ import com.google.common.collect.ImmutableSet; import com.google.common.eventbus.EventBus; import java.util.Collection; import org.sleuthkit.datamodel.CommunicationsFilter; +import org.sleuthkit.autopsy.communications.StateManager.CommunicationsState; /** * Provide the singleton EventBus. @@ -37,6 +38,9 @@ final class CVTEvents { private CVTEvents() { } + /** + * Invoked when a ComminucationsFilter change occures. + */ static final class FilterChangeEvent { private final CommunicationsFilter newFilter; @@ -51,6 +55,9 @@ final class CVTEvents { } + /** + * Invoked when a change in the pinned accounts occures. + */ static final class PinAccountsEvent { private final ImmutableSet accountDeviceInstances; @@ -70,6 +77,9 @@ final class CVTEvents { } } + /** + * Invoked when a change in the unpinned accounts occures. + */ static final class UnpinAccountsEvent { private final ImmutableSet accountDeviceInstances; @@ -82,4 +92,34 @@ final class CVTEvents { this.accountDeviceInstances = ImmutableSet.copyOf(accountDeviceInstances); } } + + /** + * Invoked when there is a change in the state of the window. + */ + static final class StateEvent { + private final CommunicationsState newState; + + StateEvent(CommunicationsState newState) { + this.newState = newState; + } + + public CommunicationsState getCommunicationsState(){ + return newState; + } + } + + /** + * Invoked when change in the link analysis graph scale occures. + */ + static final class ZoomEvent { + private final double zoomValue; + + ZoomEvent(double zoomValue) { + this.zoomValue = zoomValue; + } + + public double getZoomValue(){ + return zoomValue; + } + } } diff --git a/Core/src/org/sleuthkit/autopsy/communications/CVTTopComponent.java b/Core/src/org/sleuthkit/autopsy/communications/CVTTopComponent.java index 1e1004de25..bc8047d473 100644 --- a/Core/src/org/sleuthkit/autopsy/communications/CVTTopComponent.java +++ b/Core/src/org/sleuthkit/autopsy/communications/CVTTopComponent.java @@ -65,8 +65,8 @@ public final class CVTTopComponent extends TopComponent { proxyLookup.setNewLookups(selectedComponent.getLookup()); filtersPane.setDeviceAccountTypeEnabled(browseVisualizeTabPane.getSelectedIndex() != 0); }); - - + + /* * Connect the filtersPane to the accountsBrowser and visualizaionPanel * via an Eventbus @@ -74,6 +74,7 @@ public final class CVTTopComponent extends TopComponent { CVTEvents.getCVTEventBus().register(this); CVTEvents.getCVTEventBus().register(vizPanel); CVTEvents.getCVTEventBus().register(accountsBrowser); + CVTEvents.getCVTEventBus().register(filtersPane); } @Subscribe diff --git a/Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.java b/Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.java index 587bf47260..a6ed7e5aef 100644 --- a/Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.java +++ b/Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.java @@ -19,12 +19,17 @@ package org.sleuthkit.autopsy.communications; import com.google.common.collect.ImmutableSet; +import com.google.common.eventbus.Subscribe; import java.awt.event.ItemListener; import java.beans.PropertyChangeListener; +import java.time.Instant; import java.time.LocalDate; import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.util.Collection; import java.util.EnumSet; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.logging.Level; @@ -260,6 +265,75 @@ final public class FiltersPanel extends JPanel { logger.log(Level.SEVERE, "There was a error loading the datasources for the case.", tskCoreException); } } + + /** + * Given a list of subFilters, set the states of the panel controls + * accordingly. + * + * @param subFilters A list of subFilters + */ + public void setFilters(List subFilters) { + + subFilters.forEach(subFilter -> { + if( subFilter instanceof DeviceFilter ) { + setDeviceFilter((DeviceFilter)subFilter); + } else if (subFilter instanceof DateRangeFilter) { + setDateRangeFilter( (DateRangeFilter) subFilter); + } else if( subFilter instanceof AccountTypeFilter) { + setAccountTypeFilter((AccountTypeFilter) subFilter); + } + }); + } + + /** + * Sets the state of the device filter checkboxes + * + * @param deviceFilter Selected devices + */ + private void setDeviceFilter(DeviceFilter deviceFilter) { + Collection deviceIDs = deviceFilter.getDevices(); + devicesMap.forEach((type, cb) -> { + cb.setSelected(deviceIDs.contains(type)); + }); + } + + /** + * Sets the value of the DateRangeFilters. + * + * @param dateFilter + */ + private void setDateRangeFilter(DateRangeFilter dateFilter) { + ZonedDateTime zoneDate = ZonedDateTime.ofInstant(Instant.ofEpochSecond(dateFilter.getStartDate()), Utils.getUserPreferredZoneId()); + startDatePicker.setEnabled(dateFilter.isStartDateEnabled()); + startCheckBox.setSelected(dateFilter.isStartDateEnabled()); + startDatePicker.setDate(zoneDate.toLocalDate()); + + zoneDate = ZonedDateTime.ofInstant(Instant.ofEpochSecond(dateFilter.getEndDate()), Utils.getUserPreferredZoneId()); + endDatePicker.setEnabled(dateFilter.isEndDateEnabled()); + endCheckBox.setSelected(dateFilter.isEndDateEnabled()); + endDatePicker.setDate(zoneDate.toLocalDate()); + } + + /** + * Set the state of the account type checkboxes to match the passed in filter + * + * @param typeFilter Account Types to be selected + */ + private void setAccountTypeFilter(AccountTypeFilter typeFilter){ + + accountTypeMap.forEach((type, cb) -> { + cb.setSelected(typeFilter.getAccountTypes().contains(type)); + }); + } + + @Subscribe + void filtersBack(CVTEvents.StateEvent event) { + if(event.getCommunicationsState().getCommunicationsFilters() != null){ + setFilters(event.getCommunicationsState().getCommunicationsFilters()); + needsRefresh = false; + validateFilters(); + } + } /** * This method is called from within the constructor to initialize the form. @@ -508,7 +582,12 @@ final public class FiltersPanel extends JPanel { validateFilters(); } - private CommunicationsFilter getFilter() { + /** + * Get an instance of CommunicationsFilters base on the current panel state. + * + * @return an instance of CommunicationsFilter + */ + protected CommunicationsFilter getFilter() { CommunicationsFilter commsFilter = new CommunicationsFilter(); commsFilter.addAndFilter(getDeviceFilter()); commsFilter.addAndFilter(getAccountTypeFilter()); @@ -553,9 +632,11 @@ final public class FiltersPanel extends JPanel { */ private DateRangeFilter getDateRangeFilter() { ZoneId zone = Utils.getUserPreferredZoneId(); - long start = startDatePicker.isEnabled() ? startDatePicker.getDate().atStartOfDay(zone).toEpochSecond() : 0; - long end = endDatePicker.isEnabled() ? endDatePicker.getDate().atStartOfDay(zone).toEpochSecond() : 0; - return new DateRangeFilter(start, end); + + return new DateRangeFilter(startDatePicker.isEnabled(), + startDatePicker.getDate().atStartOfDay(zone).toEpochSecond(), + endDatePicker.isEnabled(), + endDatePicker.getDate().atStartOfDay(zone).toEpochSecond()); } /** diff --git a/Core/src/org/sleuthkit/autopsy/communications/PinnedAccountModel.java b/Core/src/org/sleuthkit/autopsy/communications/PinnedAccountModel.java index f7fb7d1232..c9fe899c3f 100644 --- a/Core/src/org/sleuthkit/autopsy/communications/PinnedAccountModel.java +++ b/Core/src/org/sleuthkit/autopsy/communications/PinnedAccountModel.java @@ -57,7 +57,7 @@ class PinnedAccountModel { * * @param accountDeviceInstances The accounts to unpin. */ - void unpinAccount(ImmutableSet accountDeviceInstances) { + void unpinAccount(Set accountDeviceInstances) { pinnedAccountDevices.removeAll(accountDeviceInstances); } @@ -68,7 +68,7 @@ class PinnedAccountModel { * * @param accountDeviceInstances The accounts to pin. */ - void pinAccount(ImmutableSet accountDeviceInstances) { + void pinAccount(Set accountDeviceInstances) { pinnedAccountDevices.addAll(accountDeviceInstances); } @@ -86,7 +86,7 @@ class PinnedAccountModel { pinnedAccountDevices.clear(); } - Iterable getPinnedAccounts() { + ImmutableSet getPinnedAccounts() { return ImmutableSet.copyOf(pinnedAccountDevices); } diff --git a/Core/src/org/sleuthkit/autopsy/communications/StateManager.java b/Core/src/org/sleuthkit/autopsy/communications/StateManager.java new file mode 100755 index 0000000000..9e7d78da93 --- /dev/null +++ b/Core/src/org/sleuthkit/autopsy/communications/StateManager.java @@ -0,0 +1,207 @@ +/* + * Autopsy Forensic Browser + * + * Copyright 2019 Basis Technology Corp. + * Contact: carrier sleuthkit org + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.sleuthkit.autopsy.communications; + +import com.google.common.collect.ImmutableSet; +import com.google.common.eventbus.Subscribe; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import org.sleuthkit.autopsy.coreutils.History; +import org.sleuthkit.datamodel.CommunicationsFilter; +import org.sleuthkit.datamodel.CommunicationsFilter.SubFilter; +import static org.sleuthkit.datamodel.Relationship.Type.CALL_LOG; +import static org.sleuthkit.datamodel.Relationship.Type.MESSAGE; + +/** + * Manages the state history for the Communications window. History is currently + * maintained for the CommunicationsFilter, the List of pinned accounts and the + * scale value of the graph. + */ +final class StateManager { + + private final History historyManager = new History<>(); + private CommunicationsFilter comFilter; + private final PinnedAccountModel pinModel; + + /** + * Manages the state history for the Communications window. + * + * @param pinModel PinnedACcountModel + */ + public StateManager(PinnedAccountModel pinModel){ + this.pinModel = pinModel; + CVTEvents.getCVTEventBus().register(this); + } + + @Subscribe + void pinAccount(CVTEvents.PinAccountsEvent pinEvent) { + if(pinEvent.isReplace()){ + HashSet pinnedList = new HashSet<>(); + pinnedList.addAll(pinEvent.getAccountDeviceInstances()); + historyManager.advance(new CommunicationsState(comFilter.getAndFilters(), pinnedList, -1)); + } else { + HashSet pinnedList = new HashSet<>(); + pinnedList.addAll(pinEvent.getAccountDeviceInstances()); + pinnedList.addAll(pinModel.getPinnedAccounts()); + + historyManager.advance(new CommunicationsState( comFilter.getAndFilters(), pinnedList, -1)); + } + } + + @Subscribe + void filterChange(CVTEvents.FilterChangeEvent fileterEvent) { + comFilter = fileterEvent.getNewFilter(); + historyManager.advance(new CommunicationsState(comFilter.getAndFilters(), pinModel.getPinnedAccounts(), -1)); + } + + @Subscribe + void unpinAccounts(CVTEvents.UnpinAccountsEvent pinEvent) { + + HashSet pinnedList = new HashSet<>(); + pinnedList.addAll(pinModel.getPinnedAccounts()); + pinnedList.removeAll(pinEvent.getAccountDeviceInstances()); + + historyManager.advance(new CommunicationsState(comFilter.getAndFilters(), pinnedList, -1)); + } + + @Subscribe + void zoomedGraph(CVTEvents.ZoomEvent zoomEvent) { + historyManager.advance(new CommunicationsState(comFilter.getAndFilters(), pinModel.getPinnedAccounts(), zoomEvent.getZoomValue())); + } + + /** + * Returns the next state object in the history. + * + * @return CommunicationsState or null if canRetreat is null + */ + public CommunicationsState retreat(){ + if(canRetreat()) { + return historyManager.retreat(); + } else { + return null; + } + } + + /** + * Returns the next state object in the forward history. + * + * @return CommunicationsState or null if canAdvance is null + */ + public CommunicationsState advance() { + if(canAdvance()) { + return historyManager.advance(); + } else { + return null; + } + } + + /** + * Returns true if there is a history of states. + * + * @return boolean + */ + public boolean canRetreat() { + return historyManager.canRetreat(); + } + + /** + * Returns true if there is history to advance too. + * + * @return + */ + public boolean canAdvance(){ + return historyManager.canAdvance(); + } + + /** + * Object to store one instance of the state of the Communications window. + */ + final class CommunicationsState{ + private final List communcationFilters; + private final Set pinnedList; + private final double zoomValue; + + /** + * Stores all the properties of the current state of the Communications + * window. + * + * @param communcationFilters List of the SubFilters from the FiltersPanel + * @param pinnedList Set of AccountDeviceInstanceKey + * @param zoomValue Double value of the current graph scale + */ + protected CommunicationsState(List communcationFilters, Set pinnedList, double zoomValue){ + this.pinnedList = pinnedList; + this.communcationFilters = communcationFilters; + this.zoomValue = zoomValue; + } + + /** + * Return whether or not this state contains a zoom change + * + * @return boolean + */ + public boolean isZoomChange() { + return (zoomValue != -1); + } + + /** + * Returns a list of the currently pinned accounts. + * + * @return Set of AccountDeviceInstanceKey + */ + public Set getPinnedList(){ + return pinnedList; + } + + /** + * Returns a list of communication SubFilters. + * + * @return List of SubFilter + */ + public List getCommunicationsFilters(){ + return communcationFilters; + } + + /** + * Return a new CommunicationsFilter object based on the list of + * SubFilters + * + * @return CommunicationsFilter + */ + public CommunicationsFilter getCommunicationsFilter() { + CommunicationsFilter newFilters = new CommunicationsFilter(); + newFilters.addAndFilter(new CommunicationsFilter.RelationshipTypeFilter(ImmutableSet.of(CALL_LOG, MESSAGE))); + communcationFilters.forEach(filter -> { + newFilters.addAndFilter(filter); + }); + + return newFilters; + } + + /** + * Return the value for the % zoom. + * + * @return double value % zoom or -1 if zoom did not change + */ + public double getZoomValue() { + return zoomValue; + } + } +} diff --git a/Core/src/org/sleuthkit/autopsy/communications/UnpinAccountsAction.java b/Core/src/org/sleuthkit/autopsy/communications/UnpinAccountsAction.java index ba0bbc545b..58ace503d9 100644 --- a/Core/src/org/sleuthkit/autopsy/communications/UnpinAccountsAction.java +++ b/Core/src/org/sleuthkit/autopsy/communications/UnpinAccountsAction.java @@ -46,7 +46,7 @@ final class UnpinAccountsAction extends AbstractCVTAction { public void actionPerformed(final ActionEvent event) { CVTEvents.getCVTEventBus().post(new CVTEvents.UnpinAccountsEvent(getSelectedAccounts())); } - + @Override String getActionDisplayName() { return getSelectedAccounts().size() > 1 ? PLURAL_TEXT : SINGULAR_TEXT; diff --git a/Core/src/org/sleuthkit/autopsy/communications/VisualizationPanel.form b/Core/src/org/sleuthkit/autopsy/communications/VisualizationPanel.form index 4e0a73a6c7..f2e3052f47 100644 --- a/Core/src/org/sleuthkit/autopsy/communications/VisualizationPanel.form +++ b/Core/src/org/sleuthkit/autopsy/communications/VisualizationPanel.form @@ -11,7 +11,7 @@ - + @@ -49,9 +49,9 @@ - + - + @@ -93,32 +93,28 @@ - - - - - + + + + + - - - - - - + + - + - + - + - + - + - + @@ -133,12 +129,7 @@ - - - - - @@ -147,8 +138,11 @@ + + + @@ -156,58 +150,21 @@ - - - - - - - - - - - - - - - - - + + + - - - - - - - - - + + - - - - - - - - - - - - - - - - @@ -306,6 +263,12 @@ + + + + + + @@ -316,6 +279,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -334,6 +330,11 @@ + + + + + diff --git a/Core/src/org/sleuthkit/autopsy/communications/VisualizationPanel.java b/Core/src/org/sleuthkit/autopsy/communications/VisualizationPanel.java index f3d4f95bb2..dd6826570b 100644 --- a/Core/src/org/sleuthkit/autopsy/communications/VisualizationPanel.java +++ b/Core/src/org/sleuthkit/autopsy/communications/VisualizationPanel.java @@ -18,6 +18,7 @@ */ package org.sleuthkit.autopsy.communications; +import com.google.common.collect.ImmutableSet; import com.google.common.eventbus.Subscribe; import com.mxgraph.layout.hierarchical.mxHierarchicalLayout; import com.mxgraph.layout.mxCircleLayout; @@ -41,7 +42,6 @@ import com.mxgraph.view.mxGraph; import com.mxgraph.view.mxGraphView; import java.awt.BorderLayout; import java.awt.Color; -import java.awt.Cursor; import java.awt.Desktop; import java.awt.Dimension; import java.awt.Font; @@ -163,6 +163,8 @@ final public class VisualizationPanel extends JPanel implements Lookup.Provider private final Map layoutButtons = new HashMap<>(); private NamedGraphLayout currentLayout; + private final StateManager stateManager; + @NbBundle.Messages("VisalizationPanel.paintingError=Problem painting visualization.") public VisualizationPanel() { initComponents(); @@ -241,10 +243,6 @@ final public class VisualizationPanel extends JPanel implements Lookup.Provider graph.getView().addListener(mxEvent.UNDO, undoListener); FastOrganicLayoutImpl fastOrganicLayout = new FastOrganicLayoutImpl(graph); - CircleLayoutImpl circleLayout = new CircleLayoutImpl(graph); - OrganicLayoutImpl organicLayout = new OrganicLayoutImpl(graph); - organicLayout.setMaxIterations(10); - HierarchicalLayoutImpl hierarchyLayout = new HierarchicalLayoutImpl(graph); //local method to configure layout buttons BiConsumer configure = (layoutButton, layout) -> { @@ -252,12 +250,13 @@ final public class VisualizationPanel extends JPanel implements Lookup.Provider layoutButton.addActionListener(event -> applyLayout(layout)); }; //configure layout buttons. - configure.accept(circleLayoutButton, circleLayout); - configure.accept(organicLayoutButton, organicLayout); configure.accept(fastOrganicLayoutButton, fastOrganicLayout); - configure.accept(hierarchyLayoutButton, hierarchyLayout); applyLayout(fastOrganicLayout); + + stateManager = new StateManager(pinnedAccountModel); + + setStateButtonsEnabled(); } @Override @@ -286,6 +285,8 @@ final public class VisualizationPanel extends JPanel implements Lookup.Provider rebuildGraph(); // Updates the display graph.getModel().endUpdate(); + + setStateButtonsEnabled(); } @Subscribe @@ -298,6 +299,8 @@ final public class VisualizationPanel extends JPanel implements Lookup.Provider rebuildGraph(); // Updates the display graph.getModel().endUpdate(); + + setStateButtonsEnabled(); } @Subscribe @@ -308,6 +311,8 @@ final public class VisualizationPanel extends JPanel implements Lookup.Provider rebuildGraph(); // Updates the display graph.getModel().endUpdate(); + + setStateButtonsEnabled(); } @ThreadConfined(type = ThreadConfined.ThreadType.AWT) @@ -349,9 +354,9 @@ final public class VisualizationPanel extends JPanel implements Lookup.Provider try { commsManager = Case.getCurrentCaseThrows().getSleuthkitCase().getCommunicationsManager(); } catch (TskCoreException ex) { - logger.log(Level.SEVERE, "Error getting CommunicationsManager for the current case.", ex); + logger.log(Level.SEVERE, "Error getting CommunicationsManager for the current case.", ex); //NON-NLS } catch (NoCurrentCaseException ex) { - logger.log(Level.SEVERE, "Can't get CommunicationsManager when there is no case open.", ex); + logger.log(Level.SEVERE, "Can't get CommunicationsManager when there is no case open.", ex); //NON-NLS } Case.addEventTypeSubscriber(EnumSet.of(Case.Events.CURRENT_CASE), evt -> { @@ -368,7 +373,7 @@ final public class VisualizationPanel extends JPanel implements Lookup.Provider try { commsManager = currentCase.getSleuthkitCase().getCommunicationsManager(); } catch (TskCoreException ex) { - logger.log(Level.SEVERE, "Error getting CommunicationsManager for the current case.", ex); + logger.log(Level.SEVERE, "Error getting CommunicationsManager for the current case.", ex); //NON-NLS } } }); @@ -388,12 +393,7 @@ final public class VisualizationPanel extends JPanel implements Lookup.Provider placeHolderPanel = new JPanel(); jTextArea1 = new JTextArea(); toolbar = new JPanel(); - jLabel1 = new JLabel(); - hierarchyLayoutButton = new JButton(); fastOrganicLayoutButton = new JButton(); - organicLayoutButton = new JButton(); - circleLayoutButton = new JButton(); - jSeparator1 = new JToolBar.Separator(); zoomOutButton = new JButton(); zoomInButton = new JButton(); zoomActualButton = new JButton(); @@ -402,8 +402,11 @@ final public class VisualizationPanel extends JPanel implements Lookup.Provider zoomLabel = new JLabel(); clearVizButton = new JButton(); jSeparator2 = new JToolBar.Separator(); + backButton = new JButton(); + forwardButton = new JButton(); snapshotButton = new JButton(); jSeparator3 = new JToolBar.Separator(); + jSeparator4 = new JToolBar.Separator(); notificationsJFXPanel = new JFXPanel(); setLayout(new BorderLayout()); @@ -423,9 +426,9 @@ final public class VisualizationPanel extends JPanel implements Lookup.Provider placeHolderPanel.setLayout(placeHolderPanelLayout); placeHolderPanelLayout.setHorizontalGroup(placeHolderPanelLayout.createParallelGroup(GroupLayout.LEADING) .add(placeHolderPanelLayout.createSequentialGroup() - .addContainerGap(268, Short.MAX_VALUE) + .addContainerGap(250, Short.MAX_VALUE) .add(jTextArea1, GroupLayout.PREFERRED_SIZE, 424, GroupLayout.PREFERRED_SIZE) - .addContainerGap(445, Short.MAX_VALUE)) + .addContainerGap(423, Short.MAX_VALUE)) ); placeHolderPanelLayout.setVerticalGroup(placeHolderPanelLayout.createParallelGroup(GroupLayout.LEADING) .add(placeHolderPanelLayout.createSequentialGroup() @@ -436,30 +439,12 @@ final public class VisualizationPanel extends JPanel implements Lookup.Provider borderLayoutPanel.add(placeHolderPanel, BorderLayout.CENTER); - jLabel1.setText(NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.jLabel1.text")); // NOI18N - - hierarchyLayoutButton.setText(NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.hierarchyLayoutButton.text")); // NOI18N - hierarchyLayoutButton.setFocusable(false); - hierarchyLayoutButton.setHorizontalTextPosition(SwingConstants.CENTER); - hierarchyLayoutButton.setVerticalTextPosition(SwingConstants.BOTTOM); - + fastOrganicLayoutButton.setIcon(new ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/communications/images/arrow-circle-double-135.png"))); // NOI18N fastOrganicLayoutButton.setText(NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.fastOrganicLayoutButton.text")); // NOI18N + fastOrganicLayoutButton.setToolTipText(NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.fastOrganicLayoutButton.toolTipText")); // NOI18N fastOrganicLayoutButton.setFocusable(false); - fastOrganicLayoutButton.setHorizontalTextPosition(SwingConstants.CENTER); fastOrganicLayoutButton.setVerticalTextPosition(SwingConstants.BOTTOM); - organicLayoutButton.setText(NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.organicLayoutButton.text")); // NOI18N - organicLayoutButton.setFocusable(false); - organicLayoutButton.setHorizontalTextPosition(SwingConstants.CENTER); - organicLayoutButton.setVerticalTextPosition(SwingConstants.BOTTOM); - - circleLayoutButton.setText(NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.circleLayoutButton.text")); // NOI18N - circleLayoutButton.setFocusable(false); - circleLayoutButton.setHorizontalTextPosition(SwingConstants.CENTER); - circleLayoutButton.setVerticalTextPosition(SwingConstants.BOTTOM); - - jSeparator1.setOrientation(SwingConstants.VERTICAL); - zoomOutButton.setIcon(new ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/communications/images/magnifier-zoom-out-red.png"))); // NOI18N zoomOutButton.setText(NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.zoomOutButton.text")); // NOI18N zoomOutButton.setToolTipText(NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.zoomOutButton.toolTipText")); // NOI18N @@ -514,6 +499,8 @@ final public class VisualizationPanel extends JPanel implements Lookup.Provider clearVizButton.setIcon(new ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/communications/images/broom.png"))); // NOI18N clearVizButton.setText(NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.clearVizButton.text_1")); // NOI18N + clearVizButton.setToolTipText(NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.clearVizButton.toolTipText")); // NOI18N + clearVizButton.setActionCommand(NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.clearVizButton.actionCommand")); // NOI18N clearVizButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) { clearVizButtonActionPerformed(evt); @@ -522,6 +509,25 @@ final public class VisualizationPanel extends JPanel implements Lookup.Provider jSeparator2.setOrientation(SwingConstants.VERTICAL); + backButton.setIcon(new ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/images/resultset_previous.png"))); // NOI18N + backButton.setText(NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.backButton.text_1")); // NOI18N + backButton.setToolTipText(NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.backButton.toolTipText")); // NOI18N + backButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent evt) { + backButtonActionPerformed(evt); + } + }); + + forwardButton.setIcon(new ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/images/resultset_next.png"))); // NOI18N + forwardButton.setText(NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.forwardButton.text")); // NOI18N + forwardButton.setToolTipText(NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.forwardButton.toolTipText")); // NOI18N + forwardButton.setHorizontalTextPosition(SwingConstants.LEADING); + forwardButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent evt) { + forwardButtonActionPerformed(evt); + } + }); + snapshotButton.setIcon(new ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/report/images/image.png"))); // NOI18N snapshotButton.setText(NbBundle.getMessage(VisualizationPanel.class, "VisualizationPanel.snapshotButton.text_1")); // NOI18N snapshotButton.addActionListener(new ActionListener() { @@ -532,24 +538,22 @@ final public class VisualizationPanel extends JPanel implements Lookup.Provider jSeparator3.setOrientation(SwingConstants.VERTICAL); + jSeparator4.setOrientation(SwingConstants.VERTICAL); + GroupLayout toolbarLayout = new GroupLayout(toolbar); toolbar.setLayout(toolbarLayout); toolbarLayout.setHorizontalGroup(toolbarLayout.createParallelGroup(GroupLayout.LEADING) .add(toolbarLayout.createSequentialGroup() .addContainerGap() - .add(clearVizButton) - .add(3, 3, 3) - .add(jSeparator1, GroupLayout.PREFERRED_SIZE, 10, GroupLayout.PREFERRED_SIZE) - .add(5, 5, 5) - .add(jLabel1) + .add(backButton) + .addPreferredGap(LayoutStyle.RELATED) + .add(forwardButton) + .addPreferredGap(LayoutStyle.RELATED) + .add(jSeparator4, GroupLayout.PREFERRED_SIZE, 10, GroupLayout.PREFERRED_SIZE) .addPreferredGap(LayoutStyle.RELATED) .add(fastOrganicLayoutButton) .addPreferredGap(LayoutStyle.RELATED) - .add(organicLayoutButton) - .addPreferredGap(LayoutStyle.RELATED) - .add(hierarchyLayoutButton) - .addPreferredGap(LayoutStyle.RELATED) - .add(circleLayoutButton) + .add(clearVizButton) .addPreferredGap(LayoutStyle.RELATED) .add(jSeparator2, GroupLayout.PREFERRED_SIZE, 10, GroupLayout.PREFERRED_SIZE) .addPreferredGap(LayoutStyle.RELATED) @@ -574,12 +578,7 @@ final public class VisualizationPanel extends JPanel implements Lookup.Provider .add(toolbarLayout.createSequentialGroup() .add(3, 3, 3) .add(toolbarLayout.createParallelGroup(GroupLayout.CENTER) - .add(jLabel1, GroupLayout.PREFERRED_SIZE, 25, GroupLayout.PREFERRED_SIZE) - .add(hierarchyLayoutButton) .add(fastOrganicLayoutButton) - .add(organicLayoutButton) - .add(circleLayoutButton) - .add(jSeparator1, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .add(zoomOutButton) .add(zoomInButton, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .add(zoomActualButton, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) @@ -588,8 +587,11 @@ final public class VisualizationPanel extends JPanel implements Lookup.Provider .add(zoomLabel) .add(clearVizButton) .add(jSeparator2, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .add(backButton) + .add(forwardButton) .add(snapshotButton) - .add(jSeparator3, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .add(jSeparator3, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .add(jSeparator4, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .add(3, 3, 3)) ); @@ -607,14 +609,17 @@ final public class VisualizationPanel extends JPanel implements Lookup.Provider private void zoomActualButtonActionPerformed(ActionEvent evt) {//GEN-FIRST:event_zoomActualButtonActionPerformed graphComponent.zoomActual(); + CVTEvents.getCVTEventBus().post(new CVTEvents.ZoomEvent(graph.getView().getScale())); }//GEN-LAST:event_zoomActualButtonActionPerformed private void zoomInButtonActionPerformed(ActionEvent evt) {//GEN-FIRST:event_zoomInButtonActionPerformed graphComponent.zoomIn(); + CVTEvents.getCVTEventBus().post(new CVTEvents.ZoomEvent(graph.getView().getScale())); }//GEN-LAST:event_zoomInButtonActionPerformed private void zoomOutButtonActionPerformed(ActionEvent evt) {//GEN-FIRST:event_zoomOutButtonActionPerformed graphComponent.zoomOut(); + CVTEvents.getCVTEventBus().post(new CVTEvents.ZoomEvent(graph.getView().getScale())); }//GEN-LAST:event_zoomOutButtonActionPerformed /** @@ -656,30 +661,66 @@ final public class VisualizationPanel extends JPanel implements Lookup.Provider get(); } catch (InterruptedException | ExecutionException ex) { logger.log(Level.WARNING, "CVT graph layout failed.", ex); - String message = (lockedVertexModel.isEmpty()) - ? Bundle.VisualizationPanel_layoutFail_text(layout.getDisplayName()) - : Bundle.VisualizationPanel_layoutFailWithLockedVertices_text(layout.getDisplayName()); - - Platform.runLater(() - -> Notifications.create().owner(notificationsJFXPanel.getScene().getWindow()) - .text(message) - .showWarning() - ); } } }.execute(); } private void clearVizButtonActionPerformed(ActionEvent evt) {//GEN-FIRST:event_clearVizButtonActionPerformed - setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); + CVTEvents.getCVTEventBus().post(new CVTEvents.UnpinAccountsEvent(pinnedAccountModel.getPinnedAccounts())); + }//GEN-LAST:event_clearVizButtonActionPerformed + + private void forwardButtonActionPerformed(ActionEvent evt) {//GEN-FIRST:event_forwardButtonActionPerformed + handleStateChange(stateManager.advance()); + }//GEN-LAST:event_forwardButtonActionPerformed + + private void backButtonActionPerformed(ActionEvent evt) {//GEN-FIRST:event_backButtonActionPerformed + handleStateChange(stateManager.retreat()); + }//GEN-LAST:event_backButtonActionPerformed + + /** + * Manages the redo and undo actions. + * + * @param newState a CommunicationsState + */ + private void handleStateChange(StateManager.CommunicationsState newState ){ + if(newState == null) { + return; + } + + // If the zoom was changed, only change the zoom. + if(newState.isZoomChange()) { + graph.getView().setScale(newState.getZoomValue()); + return; + } + + // This will cause the FilterPane to update its controls + CVTEvents.getCVTEventBus().post(new CVTEvents.StateEvent(newState)); + setStateButtonsEnabled(); + graph.getModel().beginUpdate(); - pinnedAccountModel.clear(); - graph.clear(); + graph.resetGraph(); + + if(newState.getPinnedList() != null) { + pinnedAccountModel.pinAccount(newState.getPinnedList()); + } else { + pinnedAccountModel.clear(); + } + + currentFilter = newState.getCommunicationsFilter(); + rebuildGraph(); // Updates the display graph.getModel().endUpdate(); - setCursor(Cursor.getDefaultCursor()); - }//GEN-LAST:event_clearVizButtonActionPerformed + + fitGraph(); + + } + + private void setStateButtonsEnabled() { + backButton.setEnabled(stateManager.canRetreat()); + forwardButton.setEnabled(stateManager.canAdvance()); + } @NbBundle.Messages({ "VisualizationPanel_snapshot_report_failure=Snapshot report not created. An error occurred during creation." @@ -725,12 +766,12 @@ final public class VisualizationPanel extends JPanel implements Lookup.Provider graphComponent.zoom((heightFactor + widthFactor) / 2.0); } - + /** * Handle the ActionPerformed event from the Snapshot button. - * + * * @throws NoCurrentCaseException - * @throws IOException + * @throws IOException */ @NbBundle.Messages({ "VisualizationPanel_action_dialogs_title=Communications", @@ -762,14 +803,14 @@ final public class VisualizationPanel extends JPanel implements Lookup.Provider if (result == JOptionPane.OK_OPTION) { String enteredReportName = text.getText(); - + if(enteredReportName.trim().isEmpty()){ result = JOptionPane.showConfirmDialog(graphComponent, Bundle.VisualizationPane_accept_defaultName(defaultReportName), Bundle.VisualizationPane_blank_report_title(), JOptionPane.OK_CANCEL_OPTION); if(result != JOptionPane.OK_OPTION) { return; } } - + String reportName = StringUtils.defaultIfBlank(enteredReportName, defaultReportName); Path reportPath = Paths.get(currentCase.getReportDirectory(), reportName); if (Files.exists(reportPath)) { @@ -787,14 +828,14 @@ final public class VisualizationPanel extends JPanel implements Lookup.Provider } } } - + /** * Create the Snapshot Report. - * + * * @param currentCase The current case * @param reportName User selected name for the report - * - * @throws IOException + * + * @throws IOException */ @NbBundle.Messages({ "VisualizationPane_DisplayName=Open Report", @@ -808,12 +849,12 @@ final public class VisualizationPanel extends JPanel implements Lookup.Provider "VisualizationPane_Report_OK_Button=OK", "VisualizationPane_Open_Report=Open Report",}) private void createReport(Case currentCase, String reportName) throws IOException { - + // Create the report. Path reportFolderPath = Paths.get(currentCase.getReportDirectory(), reportName, Bundle.VisualizationPane_reportName()); //NON_NLS BufferedImage image = mxCellRenderer.createBufferedImage(graph, null, graph.getView().getScale(), Color.WHITE, true, null); Path reportPath = new CommSnapShotReportWriter(currentCase, reportFolderPath, reportName, new Date(), image, currentFilter).writeReport(); - + // Report success to the user and offer to open the report. String message = Bundle.VisualizationPane_Report_Success(reportPath.toAbsolutePath()); String[] buttons = {Bundle.VisualizationPane_Open_Report(), Bundle.VisualizationPane_Report_OK_Button()}; @@ -850,20 +891,18 @@ final public class VisualizationPanel extends JPanel implements Lookup.Provider } // Variables declaration - do not modify//GEN-BEGIN:variables + private JButton backButton; private JPanel borderLayoutPanel; - private JButton circleLayoutButton; private JButton clearVizButton; private JButton fastOrganicLayoutButton; private JButton fitZoomButton; - private JButton hierarchyLayoutButton; - private JLabel jLabel1; + private JButton forwardButton; private JLabel jLabel2; - private JToolBar.Separator jSeparator1; private JToolBar.Separator jSeparator2; private JToolBar.Separator jSeparator3; + private JToolBar.Separator jSeparator4; private JTextArea jTextArea1; private JFXPanel notificationsJFXPanel; - private JButton organicLayoutButton; private JPanel placeHolderPanel; private JButton snapshotButton; private JSplitPane splitPane; @@ -1093,6 +1132,8 @@ final public class VisualizationPanel extends JPanel implements Lookup.Provider } else if (event.getPreciseWheelRotation() > 0) { graphComponent.zoomOut(); } + + CVTEvents.getCVTEventBus().post(new CVTEvents.ZoomEvent(graph.getView().getScale())); } /** diff --git a/Core/src/org/sleuthkit/autopsy/images/resultset_next.png b/Core/src/org/sleuthkit/autopsy/images/resultset_next.png new file mode 100755 index 0000000000000000000000000000000000000000..e252606d3e68c6da135a9b165996d9da968ef7fc GIT binary patch literal 395 zcmV;60d)R}P)IO8de(|Ml<%@O-40!dwX61{2C5s-llVw2V@@N0oo_PPieZ!0Y2~+R( zk!(QTf=B;X9DnzJ@u9c>OP4(U@7{849!UlyO@H`*;lVfmCvAW6f9CF&{}ZR*{jXDW zb_vl21ozzrYJBy-Vb$aRjjJF3@7nm}zjw#A|58cE9uZ}LbIY~=6ShA8U$XeY|MDdd zfQCH!?_7WRzhvaG%|sbsT7Kz&`}!yUix%Do#>T_{_Ei`DO9UTSBkH=Hg(w4*^UnUS zTk-IJ<+2C=ZObqG7Z2FGlB7VCN;>(!bn*TFHYMl(i+Sx`L~=ArL>~EXU3lidsO!!J pWF;gqzXSh89JkLNxXeT<1_12n>%V}Y6R`jQ002ovPDHLkV1iLCz99er literal 0 HcmV?d00001 diff --git a/Core/src/org/sleuthkit/autopsy/images/resultset_previous.png b/Core/src/org/sleuthkit/autopsy/images/resultset_previous.png new file mode 100755 index 0000000000000000000000000000000000000000..18f9cc10948f025fde708328fa704b520161e5f6 GIT binary patch literal 389 zcmV;00eb$4P)K{b{Xc8(tN&i@ zH%T)fYQpV#rAr?FpSkE_eXe+_wJd|K3f{{%aMTC(eL? z&YO?2=RWv9b;pbUjjJF3FIss2fAiYM|D{t;5@!?n%vQ}6um-u(1``H~0!(`ViJ zU$yMvf616*#2KJfaGFIu@9Y|n)@%Q3RzCcnHskjH!iD$#iw7MbEf6JRj;ypTzwkeA z{@wqXv+w*Db>B;RG>UocU1Xkp@_*9QTmMBIcK# Date: Fri, 5 Apr 2019 15:26:04 -0400 Subject: [PATCH 11/28] refactored how the date control state was saved --- .../communications/AccountsBrowser.java | 4 +- .../autopsy/communications/CVTEvents.java | 31 +++-- .../autopsy/communications/FiltersPanel.java | 115 +++++++++++++----- .../autopsy/communications/StateManager.java | 77 ++++++------ .../communications/VisualizationPanel.java | 11 +- .../keywordsearch/Bundle.properties-MERGED | 2 +- .../recentactivity/Bundle.properties-MERGED | 2 +- 7 files changed, 157 insertions(+), 85 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/communications/AccountsBrowser.java b/Core/src/org/sleuthkit/autopsy/communications/AccountsBrowser.java index 1d23a7f9fc..6abd4a70d0 100644 --- a/Core/src/org/sleuthkit/autopsy/communications/AccountsBrowser.java +++ b/Core/src/org/sleuthkit/autopsy/communications/AccountsBrowser.java @@ -120,7 +120,7 @@ public final class AccountsBrowser extends JPanel implements ExplorerManager.Pro } @Subscribe - public void handleFilterEvent(CVTEvents.FilterChangeEvent filterChangeEvent) { + void handleFilterEvent(CVTEvents.FilterChangeEvent filterChangeEvent) { try { final CommunicationsManager commsManager = Case.getCurrentCaseThrows().getSleuthkitCase().getCommunicationsManager(); accountsTableEM.setRootContext(new AbstractNode(Children.create(new AccountDeviceInstanceNodeFactory(commsManager, filterChangeEvent.getNewFilter()), true))); @@ -132,7 +132,7 @@ public final class AccountsBrowser extends JPanel implements ExplorerManager.Pro } @Subscribe - void historyChange(CVTEvents.StateEvent event) { + void historyChange(CVTEvents.StateChangeEvent event) { try { final CommunicationsManager commsManager = Case.getCurrentCaseThrows().getSleuthkitCase().getCommunicationsManager(); accountsTableEM.setRootContext(new AbstractNode(Children.create(new AccountDeviceInstanceNodeFactory(commsManager, event.getCommunicationsState().getCommunicationsFilter()), true))); diff --git a/Core/src/org/sleuthkit/autopsy/communications/CVTEvents.java b/Core/src/org/sleuthkit/autopsy/communications/CVTEvents.java index 051ff2b193..ee7224b673 100644 --- a/Core/src/org/sleuthkit/autopsy/communications/CVTEvents.java +++ b/Core/src/org/sleuthkit/autopsy/communications/CVTEvents.java @@ -21,6 +21,7 @@ package org.sleuthkit.autopsy.communications; import com.google.common.collect.ImmutableSet; import com.google.common.eventbus.EventBus; import java.util.Collection; +import org.sleuthkit.autopsy.communications.FiltersPanel.DateControlState; import org.sleuthkit.datamodel.CommunicationsFilter; import org.sleuthkit.autopsy.communications.StateManager.CommunicationsState; @@ -39,18 +40,30 @@ final class CVTEvents { } /** - * Invoked when a ComminucationsFilter change occures. + * Invoked when a change from the FiltersPanel occures. */ static final class FilterChangeEvent { private final CommunicationsFilter newFilter; + private final DateControlState startControlState; + private final DateControlState endControlState; CommunicationsFilter getNewFilter() { return newFilter; } + + DateControlState getStartControlState() { + return startControlState; + } + + DateControlState getEndControlState() { + return endControlState; + } - FilterChangeEvent(CommunicationsFilter newFilter) { + FilterChangeEvent(CommunicationsFilter newFilter, DateControlState startControlState, DateControlState endControlState) { this.newFilter = newFilter; + this.startControlState = startControlState; + this.endControlState = endControlState; } } @@ -96,10 +109,10 @@ final class CVTEvents { /** * Invoked when there is a change in the state of the window. */ - static final class StateEvent { + static final class StateChangeEvent { private final CommunicationsState newState; - StateEvent(CommunicationsState newState) { + StateChangeEvent(CommunicationsState newState) { this.newState = newState; } @@ -111,15 +124,15 @@ final class CVTEvents { /** * Invoked when change in the link analysis graph scale occures. */ - static final class ZoomEvent { - private final double zoomValue; + static final class ScaleChangeEvent { + private final double scaleValue; - ZoomEvent(double zoomValue) { - this.zoomValue = zoomValue; + ScaleChangeEvent(double scaleValue) { + this.scaleValue = scaleValue; } public double getZoomValue(){ - return zoomValue; + return scaleValue; } } } diff --git a/Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.java b/Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.java index a6ed7e5aef..56c8be50a7 100644 --- a/Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.java +++ b/Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.java @@ -22,10 +22,8 @@ import com.google.common.collect.ImmutableSet; import com.google.common.eventbus.Subscribe; import java.awt.event.ItemListener; import java.beans.PropertyChangeListener; -import java.time.Instant; import java.time.LocalDate; import java.time.ZoneId; -import java.time.ZonedDateTime; import java.util.Collection; import java.util.EnumSet; import java.util.HashMap; @@ -272,13 +270,11 @@ final public class FiltersPanel extends JPanel { * * @param subFilters A list of subFilters */ - public void setFilters(List subFilters) { - + public void setFilters(CommunicationsFilter commFilter) { + List subFilters = commFilter.getAndFilters(); subFilters.forEach(subFilter -> { if( subFilter instanceof DeviceFilter ) { setDeviceFilter((DeviceFilter)subFilter); - } else if (subFilter instanceof DateRangeFilter) { - setDateRangeFilter( (DateRangeFilter) subFilter); } else if( subFilter instanceof AccountTypeFilter) { setAccountTypeFilter((AccountTypeFilter) subFilter); } @@ -297,23 +293,6 @@ final public class FiltersPanel extends JPanel { }); } - /** - * Sets the value of the DateRangeFilters. - * - * @param dateFilter - */ - private void setDateRangeFilter(DateRangeFilter dateFilter) { - ZonedDateTime zoneDate = ZonedDateTime.ofInstant(Instant.ofEpochSecond(dateFilter.getStartDate()), Utils.getUserPreferredZoneId()); - startDatePicker.setEnabled(dateFilter.isStartDateEnabled()); - startCheckBox.setSelected(dateFilter.isStartDateEnabled()); - startDatePicker.setDate(zoneDate.toLocalDate()); - - zoneDate = ZonedDateTime.ofInstant(Instant.ofEpochSecond(dateFilter.getEndDate()), Utils.getUserPreferredZoneId()); - endDatePicker.setEnabled(dateFilter.isEndDateEnabled()); - endCheckBox.setSelected(dateFilter.isEndDateEnabled()); - endDatePicker.setDate(zoneDate.toLocalDate()); - } - /** * Set the state of the account type checkboxes to match the passed in filter * @@ -326,10 +305,36 @@ final public class FiltersPanel extends JPanel { }); } + /** + * Set up the startDatePicker and startCheckBox based on the passed in + * DateControlState. + * + * @param state new control state + */ + private void setStartDateControlState(DateControlState state) { + startDatePicker.setDate(state.getDate()); + startCheckBox.setSelected(state.isEnabled()); + startDatePicker.setEnabled(state.isEnabled()); + } + + /** + * Set up the endDatePicker and endCheckBox based on the passed in + * DateControlState. + * + * @param state new control state + */ + private void setEndDateControlState(DateControlState state) { + endDatePicker.setDate(state.getDate()); + endCheckBox.setSelected(state.isEnabled()); + endDatePicker.setEnabled(state.isEnabled()); + } + @Subscribe - void filtersBack(CVTEvents.StateEvent event) { - if(event.getCommunicationsState().getCommunicationsFilters() != null){ - setFilters(event.getCommunicationsState().getCommunicationsFilters()); + void filtersBack(CVTEvents.StateChangeEvent event) { + if(event.getCommunicationsState().getCommunicationsFilter() != null){ + setFilters(event.getCommunicationsState().getCommunicationsFilter()); + setStartDateControlState(event.getCommunicationsState().getStartControlState()); + setEndDateControlState(event.getCommunicationsState().getEndControlState()); needsRefresh = false; validateFilters(); } @@ -577,7 +582,7 @@ final public class FiltersPanel extends JPanel { * Post an event with the new filters. */ private void applyFilters() { - CVTEvents.getCVTEventBus().post(new CVTEvents.FilterChangeEvent(getFilter())); + CVTEvents.getCVTEventBus().post(new CVTEvents.FilterChangeEvent(getFilter(), getStartControlState(), getEndControlState())); needsRefresh = false; validateFilters(); } @@ -633,10 +638,16 @@ final public class FiltersPanel extends JPanel { private DateRangeFilter getDateRangeFilter() { ZoneId zone = Utils.getUserPreferredZoneId(); - return new DateRangeFilter(startDatePicker.isEnabled(), - startDatePicker.getDate().atStartOfDay(zone).toEpochSecond(), - endDatePicker.isEnabled(), - endDatePicker.getDate().atStartOfDay(zone).toEpochSecond()); + return new DateRangeFilter( startCheckBox.isSelected() ? startDatePicker.getDate().atStartOfDay(zone).toEpochSecond() : 0, + endCheckBox.isSelected() ? endDatePicker.getDate().atStartOfDay(zone).toEpochSecond() : 0); + } + + private DateControlState getStartControlState() { + return new DateControlState (startDatePicker.getDate(), startCheckBox.isSelected()); + } + + private DateControlState getEndControlState() { + return new DateControlState (endDatePicker.getDate(), endCheckBox.isSelected()); } /** @@ -710,7 +721,47 @@ final public class FiltersPanel extends JPanel { endDatePicker.setEnabled(endCheckBox.isSelected()); }//GEN-LAST:event_endCheckBoxStateChanged - + /** + * A class to wrap the state of the date controls that consist of a date picker + * and a checkbox. + * + */ + final class DateControlState { + private final LocalDate date; + private final boolean enabled; + + /** + * Wraps the state of the date controls that consist of a date picker + * and checkbox + * + * @param date LocalDate value of the datepicker + * @param enabled State of the checkbox + */ + protected DateControlState(LocalDate date, boolean enabled) { + this.date = date; + this.enabled = enabled; + } + + /** + * Returns the given LocalDate from the datepicker + * + * @return Current state LocalDate + */ + public LocalDate getDate(){ + return date; + } + + /** + * Returns the given state of the datepicker checkbox + * + * @return boolean, whether or not the datepicker was enabled + */ + public boolean isEnabled() { + return enabled; + } + + } + // Variables declaration - do not modify//GEN-BEGIN:variables private final javax.swing.JPanel accountTypePane = new javax.swing.JPanel(); private final javax.swing.JLabel accountTypeRequiredLabel = new javax.swing.JLabel(); diff --git a/Core/src/org/sleuthkit/autopsy/communications/StateManager.java b/Core/src/org/sleuthkit/autopsy/communications/StateManager.java index 9e7d78da93..c84a5beb79 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/StateManager.java +++ b/Core/src/org/sleuthkit/autopsy/communications/StateManager.java @@ -18,16 +18,12 @@ */ package org.sleuthkit.autopsy.communications; -import com.google.common.collect.ImmutableSet; import com.google.common.eventbus.Subscribe; import java.util.HashSet; -import java.util.List; import java.util.Set; +import org.sleuthkit.autopsy.communications.FiltersPanel.DateControlState; import org.sleuthkit.autopsy.coreutils.History; import org.sleuthkit.datamodel.CommunicationsFilter; -import org.sleuthkit.datamodel.CommunicationsFilter.SubFilter; -import static org.sleuthkit.datamodel.Relationship.Type.CALL_LOG; -import static org.sleuthkit.datamodel.Relationship.Type.MESSAGE; /** * Manages the state history for the Communications window. History is currently @@ -39,6 +35,8 @@ final class StateManager { private final History historyManager = new History<>(); private CommunicationsFilter comFilter; private final PinnedAccountModel pinModel; + private DateControlState currentStartState; + private DateControlState currentEndState; /** * Manages the state history for the Communications window. @@ -55,20 +53,22 @@ final class StateManager { if(pinEvent.isReplace()){ HashSet pinnedList = new HashSet<>(); pinnedList.addAll(pinEvent.getAccountDeviceInstances()); - historyManager.advance(new CommunicationsState(comFilter.getAndFilters(), pinnedList, -1)); + historyManager.advance(new CommunicationsState(comFilter, pinnedList, -1, currentStartState, currentEndState)); } else { HashSet pinnedList = new HashSet<>(); pinnedList.addAll(pinEvent.getAccountDeviceInstances()); pinnedList.addAll(pinModel.getPinnedAccounts()); - historyManager.advance(new CommunicationsState( comFilter.getAndFilters(), pinnedList, -1)); + historyManager.advance(new CommunicationsState( comFilter, pinnedList, -1, currentStartState, currentEndState)); } } @Subscribe - void filterChange(CVTEvents.FilterChangeEvent fileterEvent) { - comFilter = fileterEvent.getNewFilter(); - historyManager.advance(new CommunicationsState(comFilter.getAndFilters(), pinModel.getPinnedAccounts(), -1)); + void filterChange(CVTEvents.FilterChangeEvent filterEvent) { + comFilter = filterEvent.getNewFilter(); + currentStartState = filterEvent.getStartControlState(); + currentEndState = filterEvent.getEndControlState(); + historyManager.advance(new CommunicationsState(comFilter, pinModel.getPinnedAccounts(), -1, currentStartState, currentEndState)); } @Subscribe @@ -78,12 +78,12 @@ final class StateManager { pinnedList.addAll(pinModel.getPinnedAccounts()); pinnedList.removeAll(pinEvent.getAccountDeviceInstances()); - historyManager.advance(new CommunicationsState(comFilter.getAndFilters(), pinnedList, -1)); + historyManager.advance(new CommunicationsState(comFilter, pinnedList, -1, currentStartState, currentEndState)); } @Subscribe - void zoomedGraph(CVTEvents.ZoomEvent zoomEvent) { - historyManager.advance(new CommunicationsState(comFilter.getAndFilters(), pinModel.getPinnedAccounts(), zoomEvent.getZoomValue())); + void zoomedGraph(CVTEvents.ScaleChangeEvent zoomEvent) { + historyManager.advance(new CommunicationsState(comFilter, pinModel.getPinnedAccounts(), zoomEvent.getZoomValue(), currentStartState, currentEndState)); } /** @@ -134,22 +134,28 @@ final class StateManager { * Object to store one instance of the state of the Communications window. */ final class CommunicationsState{ - private final List communcationFilters; + private final CommunicationsFilter communcationFilter; private final Set pinnedList; private final double zoomValue; + private final DateControlState startDateState; + private final DateControlState endDateState; /** * Stores all the properties of the current state of the Communications * window. * - * @param communcationFilters List of the SubFilters from the FiltersPanel + * @param communcationFilter Instance of CommunicationsFilter * @param pinnedList Set of AccountDeviceInstanceKey * @param zoomValue Double value of the current graph scale */ - protected CommunicationsState(List communcationFilters, Set pinnedList, double zoomValue){ + protected CommunicationsState(CommunicationsFilter communcationFilter, + Set pinnedList, double zoomValue, + DateControlState startDateState, DateControlState endDateState){ this.pinnedList = pinnedList; - this.communcationFilters = communcationFilters; + this.communcationFilter = communcationFilter; this.zoomValue = zoomValue; + this.startDateState = startDateState; + this.endDateState = endDateState; } /** @@ -169,16 +175,7 @@ final class StateManager { public Set getPinnedList(){ return pinnedList; } - - /** - * Returns a list of communication SubFilters. - * - * @return List of SubFilter - */ - public List getCommunicationsFilters(){ - return communcationFilters; - } - + /** * Return a new CommunicationsFilter object based on the list of * SubFilters @@ -186,13 +183,7 @@ final class StateManager { * @return CommunicationsFilter */ public CommunicationsFilter getCommunicationsFilter() { - CommunicationsFilter newFilters = new CommunicationsFilter(); - newFilters.addAndFilter(new CommunicationsFilter.RelationshipTypeFilter(ImmutableSet.of(CALL_LOG, MESSAGE))); - communcationFilters.forEach(filter -> { - newFilters.addAndFilter(filter); - }); - - return newFilters; + return communcationFilter; } /** @@ -203,5 +194,23 @@ final class StateManager { public double getZoomValue() { return zoomValue; } + + /** + * Returns the state for the start date picker. + * + * @return Start DateControlState + */ + public DateControlState getStartControlState() { + return startDateState; + } + + /** + * Returns the state for the end date picker. + * + * @return Etart DateControlState + */ + public DateControlState getEndControlState() { + return endDateState; + } } } diff --git a/Core/src/org/sleuthkit/autopsy/communications/VisualizationPanel.java b/Core/src/org/sleuthkit/autopsy/communications/VisualizationPanel.java index dd6826570b..a0f63348ee 100644 --- a/Core/src/org/sleuthkit/autopsy/communications/VisualizationPanel.java +++ b/Core/src/org/sleuthkit/autopsy/communications/VisualizationPanel.java @@ -18,7 +18,6 @@ */ package org.sleuthkit.autopsy.communications; -import com.google.common.collect.ImmutableSet; import com.google.common.eventbus.Subscribe; import com.mxgraph.layout.hierarchical.mxHierarchicalLayout; import com.mxgraph.layout.mxCircleLayout; @@ -609,17 +608,17 @@ final public class VisualizationPanel extends JPanel implements Lookup.Provider private void zoomActualButtonActionPerformed(ActionEvent evt) {//GEN-FIRST:event_zoomActualButtonActionPerformed graphComponent.zoomActual(); - CVTEvents.getCVTEventBus().post(new CVTEvents.ZoomEvent(graph.getView().getScale())); + CVTEvents.getCVTEventBus().post(new CVTEvents.ScaleChangeEvent(graph.getView().getScale())); }//GEN-LAST:event_zoomActualButtonActionPerformed private void zoomInButtonActionPerformed(ActionEvent evt) {//GEN-FIRST:event_zoomInButtonActionPerformed graphComponent.zoomIn(); - CVTEvents.getCVTEventBus().post(new CVTEvents.ZoomEvent(graph.getView().getScale())); + CVTEvents.getCVTEventBus().post(new CVTEvents.ScaleChangeEvent(graph.getView().getScale())); }//GEN-LAST:event_zoomInButtonActionPerformed private void zoomOutButtonActionPerformed(ActionEvent evt) {//GEN-FIRST:event_zoomOutButtonActionPerformed graphComponent.zoomOut(); - CVTEvents.getCVTEventBus().post(new CVTEvents.ZoomEvent(graph.getView().getScale())); + CVTEvents.getCVTEventBus().post(new CVTEvents.ScaleChangeEvent(graph.getView().getScale())); }//GEN-LAST:event_zoomOutButtonActionPerformed /** @@ -695,7 +694,7 @@ final public class VisualizationPanel extends JPanel implements Lookup.Provider } // This will cause the FilterPane to update its controls - CVTEvents.getCVTEventBus().post(new CVTEvents.StateEvent(newState)); + CVTEvents.getCVTEventBus().post(new CVTEvents.StateChangeEvent(newState)); setStateButtonsEnabled(); graph.getModel().beginUpdate(); @@ -1133,7 +1132,7 @@ final public class VisualizationPanel extends JPanel implements Lookup.Provider graphComponent.zoomOut(); } - CVTEvents.getCVTEventBus().post(new CVTEvents.ZoomEvent(graph.getView().getScale())); + CVTEvents.getCVTEventBus().post(new CVTEvents.ScaleChangeEvent(graph.getView().getScale())); } /** diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties-MERGED b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties-MERGED index 6f95dfc82f..ab7e11a07f 100755 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties-MERGED +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties-MERGED @@ -35,7 +35,7 @@ KeywordSearchResultFactory.createNodeForKey.noResultsFound.text=No results found KeywordSearchResultFactory.query.exception.msg=Could not perform the query OpenIDE-Module-Display-Category=Ingest Module -OpenIDE-Module-Long-Description=Keyword Search ingest module.\n\nThe module indexes files found in the disk image at ingest time.\nIt then periodically runs the search on the indexed files using one or more keyword lists (containing pure words and/or regular expressions) and posts results.\n\nThe module also contains additional tools integrated in the main GUI, such as keyword list configuration, keyword search bar in the top-right corner, extracted text viewer and search results viewer showing highlighted keywords found. +OpenIDE-Module-Long-Description=Keyword Search ingest module.\n\nThe module indexes files found in the disk image at ingest time.\nIt then periodically runs the search on the indexed files using one or more keyword lists (containing pure words and/or regular expressions) and posts results.\n\n\The module also contains additional tools integrated in the main GUI, such as keyword list configuration, keyword search bar in the top-right corner, extracted text viewer and search results viewer showing highlighted keywords found. OpenIDE-Module-Name=KeywordSearch OptionsCategory_Name_KeywordSearchOptions=Keyword Search OptionsCategory_Keywords_KeywordSearchOptions=Keyword Search diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED index 17d744eee1..7da2ebca7b 100755 --- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED +++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED @@ -64,7 +64,7 @@ ExtractZone_progress_Msg=Extracting :Zone.Identifer files ExtractZone_Restricted=Restricted Sites Zone ExtractZone_Trusted=Trusted Sites Zone OpenIDE-Module-Display-Category=Ingest Module -OpenIDE-Module-Long-Description=Recent Activity ingest module.\n\nThe module extracts useful information about the recent user activity on the disk image being ingested, such as:\n\n- Recently open documents,\n- Web activity (sites visited, stored cookies, book marked sites, search engine queries, file downloads),\n- Recently attached devices,\n- Installed programs.\n\nThe module currently supports Windows only disk images.\nThe plugin is also fully functional when deployed on Windows version of Autopsy. +OpenIDE-Module-Long-Description=Recent Activity ingest module.\n\n\The module extracts useful information about the recent user activity on the disk image being ingested, such as:\n\n- Recently open documents,\n- Web activity (sites visited, stored cookies, book marked sites, search engine queries, file downloads),\n- Recently attached devices,\n- Installed programs.\n\nThe module currently supports Windows only disk images.\nThe plugin is also fully functional when deployed on Windows version of Autopsy. OpenIDE-Module-Name=RecentActivity OpenIDE-Module-Short-Description=Recent Activity finder ingest module Chrome.moduleName=Chrome From 21f48470946490c0636d0dc943dda64af5d33950 Mon Sep 17 00:00:00 2001 From: "U-BASIS\\dsmyda" Date: Fri, 12 Apr 2019 15:20:17 -0400 Subject: [PATCH 12/28] Attempting to override cleartk for linux build --- Core/ivy.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/ivy.xml b/Core/ivy.xml index e085dc8411..9e48bb5180 100644 --- a/Core/ivy.xml +++ b/Core/ivy.xml @@ -46,7 +46,7 @@ - + From 29f6664257aafe958ba8e5c03cdf09954e610031 Mon Sep 17 00:00:00 2001 From: "U-BASIS\\dsmyda" Date: Wed, 17 Apr 2019 09:43:35 -0400 Subject: [PATCH 13/28] Added a reference to the Tika log when an exception is encountered during extraction --- .../autopsy/textextractors/TikaTextExtractor.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/textextractors/TikaTextExtractor.java b/Core/src/org/sleuthkit/autopsy/textextractors/TikaTextExtractor.java index 0a05a238c4..b4a53b2e55 100644 --- a/Core/src/org/sleuthkit/autopsy/textextractors/TikaTextExtractor.java +++ b/Core/src/org/sleuthkit/autopsy/textextractors/TikaTextExtractor.java @@ -58,6 +58,7 @@ import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException; import org.sleuthkit.autopsy.coreutils.ExecUtil; import org.sleuthkit.autopsy.coreutils.ExecUtil.ProcessTerminator; import org.sleuthkit.autopsy.coreutils.FileUtil; +import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.coreutils.PlatformUtil; import org.sleuthkit.autopsy.textextractors.configs.ImageConfig; import org.sleuthkit.autopsy.datamodel.ContentUtils; @@ -118,7 +119,8 @@ final class TikaTextExtractor implements TextExtractor { "application/x-z", //NON-NLS "application/x-compress"); //NON-NLS - private static final java.util.logging.Logger tikaLogger = java.util.logging.Logger.getLogger("Tika"); //NON-NLS + private static final java.util.logging.Logger TIKA_LOGGER = java.util.logging.Logger.getLogger("Tika"); //NON-NLS + private static final Logger AUTOPSY_LOGGER = Logger.getLogger(TikaTextExtractor.class.getName()); private final ThreadFactory tikaThreadFactory = new ThreadFactoryBuilder().setNameFormat("tika-reader-%d").build(); @@ -242,7 +244,9 @@ final class TikaTextExtractor implements TextExtractor { } catch (InitReaderException ex) { throw ex; } catch (Exception ex) { - tikaLogger.log(Level.WARNING, "Exception: Unable to Tika parse the " + AUTOPSY_LOGGER.log(Level.WARNING, String.format("Error with file [id=%d] %s, see Tika log for details...", + content.getId(), content.getName())); + TIKA_LOGGER.log(Level.WARNING, "Exception: Unable to Tika parse the " + "content" + content.getId() + ": " + content.getName(), ex.getCause()); //NON-NLS final String msg = NbBundle.getMessage(this.getClass(), From fdb22719f41c4d13df059b31a3e882e7ac204803 Mon Sep 17 00:00:00 2001 From: Ann Priestman Date: Thu, 18 Apr 2019 13:56:39 -0400 Subject: [PATCH 14/28] Adding triage doc --- docs/doxygen-user/images/triage/createVHD.png | Bin 0 -> 19510 bytes docs/doxygen-user/images/triage/fileFilter.png | Bin 0 -> 10985 bytes .../images/triage/fileFilterImage.png | Bin 0 -> 15534 bytes .../images/triage/ingestProfile.png | Bin 0 -> 47359 bytes .../images/triage/pipelineFolders.png | Bin 0 -> 20025 bytes docs/doxygen-user/live_triage.dox | 2 +- docs/doxygen-user/main.dox | 4 +++- 7 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 docs/doxygen-user/images/triage/createVHD.png create mode 100644 docs/doxygen-user/images/triage/fileFilter.png create mode 100644 docs/doxygen-user/images/triage/fileFilterImage.png create mode 100644 docs/doxygen-user/images/triage/ingestProfile.png create mode 100644 docs/doxygen-user/images/triage/pipelineFolders.png diff --git a/docs/doxygen-user/images/triage/createVHD.png b/docs/doxygen-user/images/triage/createVHD.png new file mode 100644 index 0000000000000000000000000000000000000000..8c8c859bcf74b675d861bc5d6ea749ca07065b2d GIT binary patch literal 19510 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 JKX(pI`xl`R#9jaZ literal 0 HcmV?d00001 diff --git a/docs/doxygen-user/images/triage/fileFilter.png b/docs/doxygen-user/images/triage/fileFilter.png new file mode 100644 index 0000000000000000000000000000000000000000..e327a15d71b61ad6d6b6e14f335f79e0733d6f5e GIT binary patch literal 10985 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%0D#PAT#57jx{K3nSJcOTfl|y0!fx%l0>tp_ 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 literal 0 HcmV?d00001 diff --git a/docs/doxygen-user/images/triage/pipelineFolders.png b/docs/doxygen-user/images/triage/pipelineFolders.png new file mode 100644 index 0000000000000000000000000000000000000000..41aa8a64bfbd0056c4cc7564a5deea516a65de2c GIT binary patch literal 20025 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�xz=zZrHPqd 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 Date: Thu, 18 Apr 2019 13:58:31 -0400 Subject: [PATCH 15/28] Added section about translating the UI --- docs/doxygen-user/translations.dox | 79 ++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/docs/doxygen-user/translations.dox b/docs/doxygen-user/translations.dox index 6ff49fa558..672268f231 100644 --- a/docs/doxygen-user/translations.dox +++ b/docs/doxygen-user/translations.dox @@ -72,4 +72,83 @@ You should submit a Github Pull Request when: To get the code committed, send a [pull request](https://help.github.com/articles/about-pull-requests/) to the main Autopsy repository. +\section translations_ui Translating The UI +This section outlines how to translate the UI. To do this, you will need: + +- A git account +- Basic familiarity with git +- A full Autopsy development environment. + +\subsection translations_ui_autopsy Autopsy Development Environment + +You will need to have a full Autopsy development environment setup so that you can launch Autopsy with your translations and verify it is in the correct location and doesn't get cropped. + +You can find instructions for doing this in [BUILDING.txt](https://github.com/sleuthkit/autopsy/blob/develop/BUILDING.txt). + +\subsection translations_ui_strings Where The English Strings Are Stored + +Autopsy uses two different methods for storing the English versions of the UI strings. Some are stored in Bundle.properties files and others are stored in the code as \@Message annotations. The annotations make it harder for the code to be translated because translators would need to look in two places, but makes development easier. + +To make translations easier, we've added some logic into our build process to merge the various strings together into a single place. When the Autopsy code is compiled, it merges the contents of the annotations and the Bundle.properties files into a single file named Bundle.properties-MERGED. One of these files exists for each Java package. + +Let's look at an example in the corecomponents package. Note that some of these links may not be exactly correct once these files are updated and the documentation is not updated, but they serve as a basic reference): +- There is a [Bundle.properties](https://github.com/sleuthkit/autopsy/blob/develop/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties) file. At the time of this writing, there are 230 lines in that file. +- In that same package, the [AutopsyOptionsPanel.java](https://github.com/sleuthkit/autopsy/blob/develop/Core/src/org/sleuthkit/autopsy/corecomponents/AutopsyOptionsPanel.java#L53) class has some strings defined as \@Message annotations. +- There is a [Bundle.properties-MERGED](https://github.com/sleuthkit/autopsy/blob/develop/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties-MERGED) file that contains the strings from both Bundle.properties and the annotations. At this time of this writing, that file has 277 lines. + +\subsection translations_ui_translation Where The Translated Strings Are Stored + +Each Java package should have a Bundle_AB.properties file that stores the translated text. The AB is replaced by the 2 character [country code] (http://www.lingoes.net/en/translator/langcode.htm). Such as Bundle_fr.properties for French or Bundle_ja.properties for Japanese. + +As an example, you can see the Japanese translation of the previous corecomponents package in [Bundle_ja.properties](https://github.com/sleuthkit/autopsy/blob/develop/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle_ja.properties). + +This file needs to contain all of the strings for that language. It needs to be based off of the Bundle.properties-MERGED file, not the Bundle.properties file (which does not contain all of the strings). + + + +\subsection translations_ui_start Translating To a New Language + +If there is not already documentation in a language, then you need to: +- Go into each package +- Copy the Bundle.properties-MERGED file to Bundle_XX.properties file where XX is replaced by the language code. +- Edit the Bundle_XX.properties file and translate the English strings. + + +\subsection translations_ui_update Updating The Translations + +When new releases are made and the English UI is updated, the other languages should be updated as well. To determine what has changed: + +- First, determine when the last time the translated file was changed. From a command line, you can change into the package folder and type: + +\code + $ cd Core/src/org/sleuthkit/autopsy/corecomponents + $ git log -n 1 Bundle_ja.properties + commit 94e4b1042af47908dd4a0b2959b3f6c3d4af1333 + Author: John Doe + Date: Tue Jan 1 22:56:09 2019 -0500 +\endcode + +This shows you that commit 94e4b1042af47908dd4a0b2959b3f6c3d4af1333 was the last translation update to occur for the Japanese version. + +- Next, determine what changed in the English version since then: + +\code + $ git diff 94e4b1042af47908dd4a0b2959b3f6c3d4af1333 Bundle.properties-MERGED + -AutopsyOptionsPanel.restartNecessaryWarning.text=A restart is necessary for any changes to max memory to take effect. + +AutopsyOptionsPanel.restartNecessaryWarning.text=A restart is necessary for any memory changes to take effect. +\endcode + +- Update the strings in Bundle_ja.properties appropriately based on what was added, removed, or changed. + +- If you do not get to complete all of the changes, you should create a TODO_xx.txt file that lists what was not updated so that other people know that not everything was updated. + +\subsection translations_ui_commit Committing the Documentation + +You should submit a Github Pull Request when: +- You complete a language. +- You don't have time to do more work, but want to submit what you did. + +To get the code committed, send a [pull request](https://help.github.com/articles/about-pull-requests/) to the main Autopsy repository. + + */ \ No newline at end of file From b7960e4e8639cbe7b3ebb9cd45edbb5c920cc33e Mon Sep 17 00:00:00 2001 From: Ann Priestman Date: Thu, 18 Apr 2019 14:05:57 -0400 Subject: [PATCH 16/28] Adding triage.dox --- docs/doxygen-user/triage.dox | 85 ++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 docs/doxygen-user/triage.dox diff --git a/docs/doxygen-user/triage.dox b/docs/doxygen-user/triage.dox new file mode 100644 index 0000000000..7168621f98 --- /dev/null +++ b/docs/doxygen-user/triage.dox @@ -0,0 +1,85 @@ +/*! \page triage_page Triage + +\section triage_overview Overview + +Intro here. + +\section triage_features Triage-related Features + +There are many features of Autopsy that can come into play in a triage situation. Some help you process the files most likely to be relevant earlier, and others allow you to continue analyzing the data after disconnecting from the target system. + +\subsection triage_prioritization Prioritization/Filtering + +The goal is to find the most important files first when there is limited time to analyze a system. Autopsy always runs on the user folders first (if present), since in many situations they are the most likely folders to contain data of interest. + +\image html triage\pipelineFolders.png + +For a particular scenario, you may know specific file types that you are interested in. For example, if you are only concerned with finding images, you could save time by not analyzing any non-image files. This will allow a system to be processed far faster than if you analyzed every file. + +\image html triage\fileFilterImage.png + +File filters allow you to limit which types of files will be processed. The \ref file_filters section of \ref ingest_page page shows how to create a file filter. You can filter on file name/extension, path, or how recently the file was modified. Once saved, your new file filter can be selected when configuring ingest modules. + +\image html triage\fileFilter.png + +Another way to speed up analysis is to only run some of the ingest modules. For example, if we're only interested in images, there may be no point in running the \ref keyword_search_page or the \ref encryption_page. You can manually select and configure the modules you want to run each time, but since many sessions are similar it may be easier to set up an ingest profile. An ingest profile allows you to store which file filter you want to run, which ingest modules should be enabled, and your configuration for each ingest module. See the \ref ingest_profiles section of the \ref ingest_page page for information on how to set up and use an ingest profile. + +\image html triage\ingestProfile.png + +\subsection triage_no_image Running on Live Systems and Devices + +In a triage situation, there is generally not time to make a full image of the system in question. There are a few ways to process live systems and devices with Autopsy: + +
    +
  • Devices such as USB drives can be analyzed as local disks without needing to create an image file. See the \ref ds_local section for more details. +
  • A live triage drive can be created that will allow you to run Autopsy from a USB drive on a live system. All case data will be saved to the USB drive with minimal changes to the system being analyzed. See \ref live_triage_page for more details. +
  • Whatever Paladin is +
+ +With any of these methods there is still the problem that your Autopsy case won't be very useful after you disconnect from the drive. To solve this problem you can choose to make a "sparse VHD" as Autopsy is processing the device. This is a file format used by Microsoft Virtual Machines that is readable by Windows and other forensic tools. Instead of copying each sector of sequentially, sparse VHDs allow us to copy sectors in any order. This lets us copy each sector as Autopsy reads it, so the sparse VHD will contain all of the files that have been processed so far. We will also have the data associated with volumes and file systems since Autopsy has to process those in the course of analyzing the system. + +To create a sparse VHD, check the box for "Make a VHD image..." when selecting the disk to analyze. + +\image html createVHD.png + +\section triage_scenarios Scenarios + +\subsection triage_scen1 Scenario: Previewing computer for child exploitation material + +In this scenario, you are trying to answer whether child exploitation images exist in a knock and talk type situation where you will have a limited amount of time with the target system. + +Preparaton at the office: +
    +
  • Create a \ref live_triage_page "live triage drive" on your USB drive +
  • Launch Autopsy from that USB drive and create an \ref ingest_profiles "ingest profile" that: +
      +
    • Uses a \ref file_filters "file filter" that runs on only picture and ZIP extensions +
    • Runs only the \ref hash_db_page "Hash Lookup Module", \ref EXIF_parser_page \ref file_type_identification_page, and \ref embedded_file_extractor_page +
    • Uses known child exploitation hash sets, following the instructions in \ref live_triage_hash_db to copy them to the USB drive +
    +
+ +At the house: +
    +
  • Start the analysis: +
      +
    • Plus the live triage drive you made at the office into their laptop +
    • Launch Autopsy from the .bat file +
    • \ref cases_page "Create a case" (saving to your USB drive) +
    • Add a \ref ds_local "local drive data source" +
        +
      • "C:" +
      • Choose to make VHD and keep default location +
      +
    +
  • As the automated analysis continues: +
      +
    • Choose View->File Types->Images in the \ref tree_viewer_page "tree viewer" and review the thumbnails +
    • Wait for hash set hits +
    • Review EXIF fles +
    • \ref tagging_page "Tag" any notable files found +
    +
  • You can stop the analysis at any time. All data read so far will be in the VHD file. +
+ +*/ \ No newline at end of file From 100761be13325ef5574d68db23149ca4f489c462 Mon Sep 17 00:00:00 2001 From: Ann Priestman Date: Thu, 18 Apr 2019 14:13:37 -0400 Subject: [PATCH 17/28] Changed slashes --- docs/doxygen-user/triage.dox | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/doxygen-user/triage.dox b/docs/doxygen-user/triage.dox index 7168621f98..c1be11cb98 100644 --- a/docs/doxygen-user/triage.dox +++ b/docs/doxygen-user/triage.dox @@ -12,19 +12,19 @@ There are many features of Autopsy that can come into play in a triage situation The goal is to find the most important files first when there is limited time to analyze a system. Autopsy always runs on the user folders first (if present), since in many situations they are the most likely folders to contain data of interest. -\image html triage\pipelineFolders.png +\image html triage/pipelineFolders.png For a particular scenario, you may know specific file types that you are interested in. For example, if you are only concerned with finding images, you could save time by not analyzing any non-image files. This will allow a system to be processed far faster than if you analyzed every file. -\image html triage\fileFilterImage.png +\image html triage/fileFilterImage.png File filters allow you to limit which types of files will be processed. The \ref file_filters section of \ref ingest_page page shows how to create a file filter. You can filter on file name/extension, path, or how recently the file was modified. Once saved, your new file filter can be selected when configuring ingest modules. -\image html triage\fileFilter.png +\image html triage/fileFilter.png Another way to speed up analysis is to only run some of the ingest modules. For example, if we're only interested in images, there may be no point in running the \ref keyword_search_page or the \ref encryption_page. You can manually select and configure the modules you want to run each time, but since many sessions are similar it may be easier to set up an ingest profile. An ingest profile allows you to store which file filter you want to run, which ingest modules should be enabled, and your configuration for each ingest module. See the \ref ingest_profiles section of the \ref ingest_page page for information on how to set up and use an ingest profile. -\image html triage\ingestProfile.png +\image html triage/ingestProfile.png \subsection triage_no_image Running on Live Systems and Devices From e8489fb377136a58aa0af2940e631650ad3e5f4b Mon Sep 17 00:00:00 2001 From: Ann Priestman Date: Thu, 18 Apr 2019 14:42:50 -0400 Subject: [PATCH 18/28] Added intro --- docs/doxygen-user/triage.dox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/doxygen-user/triage.dox b/docs/doxygen-user/triage.dox index c1be11cb98..52da96a3b2 100644 --- a/docs/doxygen-user/triage.dox +++ b/docs/doxygen-user/triage.dox @@ -2,7 +2,7 @@ \section triage_overview Overview -Intro here. +Sometimes you need to make a quick decision about a system or systems and don't have the time or resources to make full images. For example, during a knock and talk you want to know if there is notable data on their system. Or you are at a location with many systems and want to know which should be analyzed first. Autopsy has features that will allow you to quickly find the data of interest without making full images of the devices. Those features will be described below, followed by some example scenarios that show how to put everything together. \section triage_features Triage-related Features From be0e2cf05973d5a7f793bb51a3b55e3c4f088fb6 Mon Sep 17 00:00:00 2001 From: "U-BASIS\\dsmyda" Date: Thu, 18 Apr 2019 17:09:30 -0400 Subject: [PATCH 19/28] Removed erroneous Image Gallery project property and manually downloaded the cleartk-ml package in attempt to fix Travis --- Core/ivy.xml | 7 +++---- ImageGallery/nbproject/project.properties | 1 - KeywordSearch/ivy.xml | 7 ++++--- KeywordSearch/nbproject/project.properties | 8 +++----- KeywordSearch/nbproject/project.xml | 12 ++++++------ 5 files changed, 16 insertions(+), 19 deletions(-) diff --git a/Core/ivy.xml b/Core/ivy.xml index e085dc8411..ab4045edfb 100644 --- a/Core/ivy.xml +++ b/Core/ivy.xml @@ -22,10 +22,12 @@ + + @@ -43,10 +45,7 @@ - - - + diff --git a/ImageGallery/nbproject/project.properties b/ImageGallery/nbproject/project.properties index 0e4afc928e..e400c96aab 100644 --- a/ImageGallery/nbproject/project.properties +++ b/ImageGallery/nbproject/project.properties @@ -1,4 +1,3 @@ -file.reference.sqlite-jdbc-3.25.2.jar=release/modules/ext/sqlite-jdbc-3.25.2.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/KeywordSearch/ivy.xml b/KeywordSearch/ivy.xml index 56a606816f..b84b739696 100644 --- a/KeywordSearch/ivy.xml +++ b/KeywordSearch/ivy.xml @@ -24,8 +24,12 @@ + + + + @@ -41,9 +45,6 @@ - - diff --git a/KeywordSearch/nbproject/project.properties b/KeywordSearch/nbproject/project.properties index 36eec859c7..1adf8293ec 100644 --- a/KeywordSearch/nbproject/project.properties +++ b/KeywordSearch/nbproject/project.properties @@ -20,11 +20,9 @@ file.reference.findstructapi-0.0.1.jar=release/modules/ext/findstructapi-0.0.1.j file.reference.grib-4.5.5.jar=release/modules/ext/grib-4.5.5.jar file.reference.guava-17.0.jar=release/modules/ext/guava-17.0.jar file.reference.hamcrest-core-1.3.jar=release/modules/ext/hamcrest-core-1.3.jar -file.reference.httpclient-4.3.1.jar=release\\modules\\ext\\httpclient-4.3.1.jar -file.reference.httpcore-4.3.jar=release\\modules\\ext\\httpcore-4.3.jar -file.reference.httpcore-4.4.1.jar=release/modules/ext/httpcore-4.4.1.jar -file.reference.httpmime-4.3.1.jar=release\\modules\\ext\\httpmime-4.3.1.jar -file.reference.httpmime-4.4.1.jar=release/modules/ext/httpmime-4.4.1.jar +file.reference.httpclient-4.3.1.jar=release\\modules\\ext\\httpclient-4.5.6.jar +file.reference.httpcore-4.4.1.jar=release/modules/ext/httpcore-4.4.10.jar +file.reference.httpmime-4.3.1.jar=release\\modules\\ext\\httpmime-4.5.6.jar file.reference.httpservices-4.5.5.jar=release/modules/ext/httpservices-4.5.5.jar file.reference.java-libpst-0.8.1.jar=release/modules/ext/java-libpst-0.8.1.jar file.reference.jcip-annotations-1.0.jar=release/modules/ext/jcip-annotations-1.0.jar diff --git a/KeywordSearch/nbproject/project.xml b/KeywordSearch/nbproject/project.xml index 87e41f805b..88ce4efdb8 100644 --- a/KeywordSearch/nbproject/project.xml +++ b/KeywordSearch/nbproject/project.xml @@ -304,8 +304,8 @@ release/modules/ext/poi-ooxml-4.0.1.jar - ext/httpclient-4.3.1.jar - release\modules\ext\httpclient-4.3.1.jar + ext/httpclient-4.5.6.jar + release\modules\ext\httpclient-4.5.6.jar ext/commons-codec-1.11.jar @@ -468,8 +468,8 @@ release/modules/ext/jsr-275-0.9.3.jar - ext/httpcore-4.4.7.jar - release/modules/ext/httpcore-4.4.7.jar + ext/httpcore-4.4.10.jar + release/modules/ext/httpcore-4.4.10.jar ext/bcmail-jdk15on-1.54.jar @@ -524,8 +524,8 @@ release/modules/ext/jackcess-encrypt-2.1.2.jar - ext/httpmime-4.3.1.jar - release\modules\ext\httpmime-4.3.1.jar + ext/httpmime-4.5.6.jar + release\modules\ext\httpmime-4.5.6.jar ext/jcip-annotations-1.0.jar From 511d6c5dbf563fc585a77c5ea340ede533cc09f5 Mon Sep 17 00:00:00 2001 From: Ann Priestman Date: Thu, 18 Apr 2019 18:05:29 -0400 Subject: [PATCH 20/28] Added profile select image and Paladin info. --- .../images/triage/profileSelect.png | Bin 0 -> 10637 bytes docs/doxygen-user/triage.dox | 20 ++++++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 docs/doxygen-user/images/triage/profileSelect.png diff --git a/docs/doxygen-user/images/triage/profileSelect.png b/docs/doxygen-user/images/triage/profileSelect.png new file mode 100644 index 0000000000000000000000000000000000000000..d0b53df7e6b4f6bb9ae772a6481cc6c84d4f14b4 GIT binary patch literal 10637 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 SSpX0NL2Am{N@WUGZ~qTf77|VX literal 0 HcmV?d00001 diff --git a/docs/doxygen-user/triage.dox b/docs/doxygen-user/triage.dox index 52da96a3b2..1e46665b21 100644 --- a/docs/doxygen-user/triage.dox +++ b/docs/doxygen-user/triage.dox @@ -8,12 +8,14 @@ Sometimes you need to make a quick decision about a system or systems and don't There are many features of Autopsy that can come into play in a triage situation. Some help you process the files most likely to be relevant earlier, and others allow you to continue analyzing the data after disconnecting from the target system. -\subsection triage_prioritization Prioritization/Filtering +\subsection triage_prioritization Prioritization The goal is to find the most important files first when there is limited time to analyze a system. Autopsy always runs on the user folders first (if present), since in many situations they are the most likely folders to contain data of interest. \image html triage/pipelineFolders.png +\subsection triage_file_filter File Filters + For a particular scenario, you may know specific file types that you are interested in. For example, if you are only concerned with finding images, you could save time by not analyzing any non-image files. This will allow a system to be processed far faster than if you analyzed every file. \image html triage/fileFilterImage.png @@ -22,10 +24,18 @@ File filters allow you to limit which types of files will be processed. The \ref \image html triage/fileFilter.png -Another way to speed up analysis is to only run some of the ingest modules. For example, if we're only interested in images, there may be no point in running the \ref keyword_search_page or the \ref encryption_page. You can manually select and configure the modules you want to run each time, but since many sessions are similar it may be easier to set up an ingest profile. An ingest profile allows you to store which file filter you want to run, which ingest modules should be enabled, and your configuration for each ingest module. See the \ref ingest_profiles section of the \ref ingest_page page for information on how to set up and use an ingest profile. +\subsection triage_profile Ingest Profiles + +Another way to speed up analysis is to only run some of the ingest modules. For example, if we're only interested in images, there may be no point in running the \ref keyword_search_page or the \ref encryption_page. You can manually select and configure the modules you want to run each time, but since many sessions are similar it may be easier to set up an ingest profile. An ingest profile allows you to store which file filter you want to run, which ingest modules should be enabled, and your configuration for each ingest module. \image html triage/ingestProfile.png +Once you have at least one ingest profile configured, a new screen will appear before the normal ingest module configuration panel. If you choose your user-defined profile, that ingest module configuration panel will be skipped entirely and the ingest modules from that profile will be run on the data source. + +\image html triage/profileSelect.png + +See the \ref ingest_profiles section of the \ref ingest_page page for additional information on how to set up and use an ingest profile. + \subsection triage_no_image Running on Live Systems and Devices In a triage situation, there is generally not time to make a full image of the system in question. There are a few ways to process live systems and devices with Autopsy: @@ -33,10 +43,12 @@ In a triage situation, there is generally not time to make a full image of the s
-With any of these methods there is still the problem that your Autopsy case won't be very useful after you disconnect from the drive. To solve this problem you can choose to make a "sparse VHD" as Autopsy is processing the device. This is a file format used by Microsoft Virtual Machines that is readable by Windows and other forensic tools. Instead of copying each sector of sequentially, sparse VHDs allow us to copy sectors in any order. This lets us copy each sector as Autopsy reads it, so the sparse VHD will contain all of the files that have been processed so far. We will also have the data associated with volumes and file systems since Autopsy has to process those in the course of analyzing the system. +\subsubsection triage_vhd Making a Sparse Image + +With any of the above methods for analyzing live systems and devices there is still the problem that your Autopsy case won't be very useful after you disconnect from the drive. To solve this problem you can choose to make a "sparse VHD" as Autopsy is processing the device. This is a file format used by Microsoft Virtual Machines that is readable by Windows and other forensic tools. Instead of copying each sector of sequentially, sparse VHDs allow us to copy sectors in any order. This lets us copy each sector as Autopsy reads it, so the sparse VHD will contain all of the files that have been processed so far. We will also have the data associated with volumes and file systems since Autopsy has to process those in the course of analyzing the system. To create a sparse VHD, check the box for "Make a VHD image..." when selecting the disk to analyze. From d37dc80da98d6fdcc404243fc1ee570c2015078d Mon Sep 17 00:00:00 2001 From: "U-BASIS\\dsmyda" Date: Mon, 22 Apr 2019 12:31:23 -0400 Subject: [PATCH 21/28] Removed the unused sqlite jdbc references --- KeywordSearch/nbproject/project.properties | 2 -- KeywordSearch/nbproject/project.xml | 4 ---- 2 files changed, 6 deletions(-) diff --git a/KeywordSearch/nbproject/project.properties b/KeywordSearch/nbproject/project.properties index 1adf8293ec..08eec5cbee 100644 --- a/KeywordSearch/nbproject/project.properties +++ b/KeywordSearch/nbproject/project.properties @@ -49,8 +49,6 @@ file.reference.quartz-2.2.0.jar=release/modules/ext/quartz-2.2.0.jar file.reference.solr-solrj-4.9.1-javadoc.jar=release/modules/ext/solr-solrj-4.9.1-javadoc.jar file.reference.solr-solrj-4.9.1-sources.jar=release/modules/ext/solr-solrj-4.9.1-sources.jar file.reference.solr-solrj-4.9.1.jar=release/modules/ext/solr-solrj-4.9.1.jar -file.reference.sqlite-jdbc-3.19.3.jar=release/modules/ext/sqlite-jdbc-3.19.3.jar -file.reference.sqlite-jdbc-3.25.2.jar=release/modules/ext/sqlite-jdbc-3.25.2.jar file.reference.sqlwrapper-0.0.1.jar=release/modules/ext/sqlwrapper-0.0.1.jar file.reference.stax2-api-3.1.4.jar=release/modules/ext/stax2-api-3.1.4.jar file.reference.tagsoup-1.2.1.jar=release/modules/ext/tagsoup-1.2.1.jar diff --git a/KeywordSearch/nbproject/project.xml b/KeywordSearch/nbproject/project.xml index 88ce4efdb8..b6a814eb36 100644 --- a/KeywordSearch/nbproject/project.xml +++ b/KeywordSearch/nbproject/project.xml @@ -535,10 +535,6 @@ ext/commons-validator-1.5.1.jar release/modules/ext/commons-validator-1.5.1.jar - - ext/sqlite-jdbc-3.25.2.jar - release/modules/ext/sqlite-jdbc-3.25.2.jar - ext/cleartk-util-2.0.0.jar release/modules/ext/cleartk-util-2.0.0.jar From eae8425e07e5d4d03f4d377344161cf848a9a2f7 Mon Sep 17 00:00:00 2001 From: "U-BASIS\\dsmyda" Date: Mon, 22 Apr 2019 17:05:48 -0400 Subject: [PATCH 22/28] Removed non-needed overrides and redundant jar references --- Core/ivy.xml | 3 --- KeywordSearch/ivy.xml | 6 ------ 2 files changed, 9 deletions(-) diff --git a/Core/ivy.xml b/Core/ivy.xml index d85b23e9ff..3073796ab1 100644 --- a/Core/ivy.xml +++ b/Core/ivy.xml @@ -15,9 +15,6 @@ - - - diff --git a/KeywordSearch/ivy.xml b/KeywordSearch/ivy.xml index b84b739696..f86e1de895 100644 --- a/KeywordSearch/ivy.xml +++ b/KeywordSearch/ivy.xml @@ -44,11 +44,5 @@ - - - - - - From 813f01e94e962cdbcdb84ec061a56ab0c086f6b0 Mon Sep 17 00:00:00 2001 From: Ann Priestman Date: Tue, 23 Apr 2019 09:38:25 -0400 Subject: [PATCH 23/28] Fixed typo --- docs/doxygen-user/triage.dox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/doxygen-user/triage.dox b/docs/doxygen-user/triage.dox index 1e46665b21..6f27b02683 100644 --- a/docs/doxygen-user/triage.dox +++ b/docs/doxygen-user/triage.dox @@ -48,7 +48,7 @@ In a triage situation, there is generally not time to make a full image of the s \subsubsection triage_vhd Making a Sparse Image -With any of the above methods for analyzing live systems and devices there is still the problem that your Autopsy case won't be very useful after you disconnect from the drive. To solve this problem you can choose to make a "sparse VHD" as Autopsy is processing the device. This is a file format used by Microsoft Virtual Machines that is readable by Windows and other forensic tools. Instead of copying each sector of sequentially, sparse VHDs allow us to copy sectors in any order. This lets us copy each sector as Autopsy reads it, so the sparse VHD will contain all of the files that have been processed so far. We will also have the data associated with volumes and file systems since Autopsy has to process those in the course of analyzing the system. +With any of the above methods for analyzing live systems and devices there is still the problem that your Autopsy case won't be very useful after you disconnect from the drive. To solve this problem you can choose to make a "sparse VHD" as Autopsy is processing the device. This is a file format used by Microsoft Virtual Machines that is readable by Windows and other forensic tools. Instead of copying each sector sequentially, sparse VHDs allow us to copy sectors in any order. This lets us copy each sector as Autopsy reads it, so the sparse VHD will contain all of the files that have been processed so far. We will also have the data associated with volumes and file systems since Autopsy has to process those in the course of analyzing the system. To create a sparse VHD, check the box for "Make a VHD image..." when selecting the disk to analyze. From dee5022bb659d75c3c8689ebdaaaba72873c863d Mon Sep 17 00:00:00 2001 From: "U-BASIS\\dsmyda" Date: Thu, 25 Apr 2019 15:46:43 -0400 Subject: [PATCH 24/28] Removed javadoc from being pulled down from Maven repo, renamed configurations to more closely match their parent NBM, and took sources jars off of the classpath --- CoreLibs/ivy.xml | 88 +++++++++++----------- CoreLibs/nbproject/project.properties | 9 --- CoreLibs/nbproject/project.xml | 36 --------- KeywordSearch/build.xml | 2 +- KeywordSearch/ivy.xml | 16 ++-- KeywordSearch/nbproject/project.properties | 8 -- KeywordSearch/nbproject/project.xml | 32 -------- 7 files changed, 53 insertions(+), 138 deletions(-) diff --git a/CoreLibs/ivy.xml b/CoreLibs/ivy.xml index 994e82c694..7d05e9b890 100644 --- a/CoreLibs/ivy.xml +++ b/CoreLibs/ivy.xml @@ -2,75 +2,75 @@ - + - + - - + + - - - + + + - + - - - + + + - - - - - - - + + + + + + + - + - + - + - - - - + + + + - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties index 7a154a4cf6..6ea13ead1b 100644 --- a/CoreLibs/nbproject/project.properties +++ b/CoreLibs/nbproject/project.properties @@ -12,11 +12,7 @@ file.reference.commons-csv-1.4.jar=release/modules/ext/commons-csv-1.4.jar file.reference.commons-io-2.4.jar=release/modules/ext/commons-io-2.4.jar file.reference.commons-io-2.5.jar=release/modules/ext/commons-io-2.5.jar file.reference.commons-lang-2.6.jar=release/modules/ext/commons-lang-2.6.jar -file.reference.commons-lang3-3.0-javadoc.jar=release/modules/ext/commons-lang3-3.0-javadoc.jar -file.reference.commons-lang3-3.0-sources.jar=release/modules/ext/commons-lang3-3.0-sources.jar 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.compiler-0.9.1.jar=release/modules/ext/compiler-0.9.1.jar file.reference.controlsfx-8.40.11.jar=release/modules/ext/controlsfx-8.40.11.jar @@ -40,8 +36,6 @@ file.reference.imageio-sgi-3.2.jar=release/modules/ext/imageio-sgi-3.2.jar file.reference.imageio-tga-3.2.jar=release/modules/ext/imageio-tga-3.2.jar file.reference.imageio-thumbsdb-3.2.jar=release/modules/ext/imageio-thumbsdb-3.2.jar file.reference.imageio-tiff-3.2.jar=release/modules/ext/imageio-tiff-3.2.jar -file.reference.imgscalr-lib-4.2-javadoc.jar=release/modules/ext/imgscalr-lib-4.2-javadoc.jar -file.reference.imgscalr-lib-4.2-sources.jar=release/modules/ext/imgscalr-lib-4.2-sources.jar file.reference.imgscalr-lib-4.2.jar=release/modules/ext/imgscalr-lib-4.2.jar file.reference.javaee-api-5.0-2.jar=release/modules/ext/javaee-api-5.0-2.jar file.reference.javassist-3.12.1.GA.jar=release/modules/ext/javassist-3.12.1.GA.jar @@ -49,8 +43,6 @@ file.reference.jfxtras-common-8.0-r4.jar=release/modules/ext/jfxtras-common-8.0- file.reference.jfxtras-controls-8.0-r4.jar=release/modules/ext/jfxtras-controls-8.0-r4.jar file.reference.jfxtras-fxml-8.0-r4.jar=release/modules/ext/jfxtras-fxml-8.0-r4.jar file.reference.jna-3.4.0.jar=release/modules/ext/jna-3.4.0.jar -file.reference.joda-time-2.4-javadoc.jar=release/modules/ext/joda-time-2.4-javadoc.jar -file.reference.joda-time-2.4-sources.jar=release/modules/ext/joda-time-2.4-sources.jar file.reference.joda-time-2.4.jar=release/modules/ext/joda-time-2.4.jar file.reference.jsr305-1.3.9.jar=release/modules/ext/jsr305-1.3.9.jar file.reference.LGoodDatePicker-10.3.1.jar=release/modules/ext/LGoodDatePicker-10.3.1.jar @@ -67,7 +59,6 @@ file.reference.poi-ooxml-schemas-3.17.jar=release/modules/ext/poi-ooxml-schemas- file.reference.poi-scratchpad-3.17.jar=release/modules/ext/poi-scratchpad-3.17.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.sigar-1.6.4-sources.jar=release/modules/ext/sigar-1.6.4-sources.jar file.reference.sigar-1.6.4.jar=release/modules/ext/sigar-1.6.4.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 diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml index f7ebf84361..4de1ea5124 100644 --- a/CoreLibs/nbproject/project.xml +++ b/CoreLibs/nbproject/project.xml @@ -685,10 +685,6 @@ schemaorg_apache_xmlbeans.system.sXMLSCHEMA schemaorg_apache_xmlbeans.system.sXMLTOOLS - - ext/commons-logging-1.1.2-sources.jar - release/modules/ext/commons-logging-1.1.2-sources.jar - ext/imageio-thumbsdb-3.2.jar release/modules/ext/imageio-thumbsdb-3.2.jar @@ -725,10 +721,6 @@ ext/imageio-icns-3.2.jar release/modules/ext/imageio-icns-3.2.jar - - ext/imgscalr-lib-4.2-javadoc.jar - release/modules/ext/imgscalr-lib-4.2-javadoc.jar - ext/AppleJavaExtensions-1.4.jar release/modules/ext/AppleJavaExtensions-1.4.jar @@ -765,10 +757,6 @@ ext/common-io-3.2.jar release/modules/ext/common-io-3.2.jar - - ext/commons-lang3-3.0-sources.jar - release/modules/ext/commons-lang3-3.0-sources.jar - ext/mail-1.4.3.jar release/modules/ext/mail-1.4.3.jar @@ -789,10 +777,6 @@ ext/activation-1.1.jar release/modules/ext/activation-1.1.jar - - ext/joda-time-2.4-javadoc.jar - release/modules/ext/joda-time-2.4-javadoc.jar - ext/imageio-psd-3.2.jar release/modules/ext/imageio-psd-3.2.jar @@ -813,10 +797,6 @@ ext/log4j-1.2.17.jar release/modules/ext/log4j-1.2.17.jar - - ext/sigar-1.6.4-sources.jar - release/modules/ext/sigar-1.6.4-sources.jar - ext/avalon-framework-4.1.5.jar release/modules/ext/avalon-framework-4.1.5.jar @@ -841,10 +821,6 @@ ext/geronimo-jms_1.1_spec-1.0.jar release/modules/ext/geronimo-jms_1.1_spec-1.0.jar - - ext/joda-time-2.4-sources.jar - release/modules/ext/joda-time-2.4-sources.jar - ext/jfxtras-fxml-8.0-r4.jar release/modules/ext/jfxtras-fxml-8.0-r4.jar @@ -857,10 +833,6 @@ ext/commons-collections4-4.1.jar release/modules/ext/commons-collections4-4.1.jar - - ext/commons-logging-1.1.2-javadoc.jar - release/modules/ext/commons-logging-1.1.2-javadoc.jar - ext/commons-codec-1.10.jar release/modules/ext/commons-codec-1.10.jar @@ -901,10 +873,6 @@ ext/imageio-bmp-3.2.jar release/modules/ext/imageio-bmp-3.2.jar - - ext/commons-lang3-3.0-javadoc.jar - release/modules/ext/commons-lang3-3.0-javadoc.jar - ext/platform-3.4.0.jar release/modules/ext/platform-3.4.0.jar @@ -977,10 +945,6 @@ ext/imageio-metadata-3.2.jar release/modules/ext/imageio-metadata-3.2.jar - - ext/imgscalr-lib-4.2-sources.jar - release/modules/ext/imgscalr-lib-4.2-sources.jar - diff --git a/KeywordSearch/build.xml b/KeywordSearch/build.xml index 1a43a00cf8..ebaa4bcc65 100644 --- a/KeywordSearch/build.xml +++ b/KeywordSearch/build.xml @@ -30,7 +30,7 @@ - + diff --git a/KeywordSearch/ivy.xml b/KeywordSearch/ivy.xml index fc6aa00269..8db54f5373 100644 --- a/KeywordSearch/ivy.xml +++ b/KeywordSearch/ivy.xml @@ -3,7 +3,7 @@ - + @@ -19,17 +19,17 @@ - - - - + + + + - + - - + + diff --git a/KeywordSearch/nbproject/project.properties b/KeywordSearch/nbproject/project.properties index 7e931bf641..1278e5d2d9 100644 --- a/KeywordSearch/nbproject/project.properties +++ b/KeywordSearch/nbproject/project.properties @@ -22,8 +22,6 @@ file.reference.commons-io-2.3.jar=release/modules/ext/commons-io-2.3.jar file.reference.commons-lang-2.6.jar=release/modules/ext/commons-lang-2.6.jar file.reference.commons-logging-1.2.jar=release/modules/ext/commons-logging-1.2.jar file.reference.commons-logging-api-1.1.jar=release/modules/ext/commons-logging-api-1.1.jar -file.reference.commons-validator-1.5.1-javadoc.jar=release/modules/ext/commons-validator-1.5.1-javadoc.jar -file.reference.commons-validator-1.5.1-sources.jar=release/modules/ext/commons-validator-1.5.1-sources.jar file.reference.commons-validator-1.5.1.jar=release/modules/ext/commons-validator-1.5.1.jar file.reference.ctakes-core-3.2.2.jar=release/modules/ext/ctakes-core-3.2.2.jar file.reference.ctakes-core-res-3.2.2.jar=release/modules/ext/ctakes-core-res-3.2.2.jar @@ -61,8 +59,6 @@ file.reference.jcommander-1.35.jar=release/modules/ext/jcommander-1.35.jar file.reference.jdom-1.0.jar=release/modules/ext/jdom-1.0.jar file.reference.jdom2-2.0.4.jar=release/modules/ext/jdom2-2.0.4.jar file.reference.jempbox-1.8.13.jar=release/modules/ext/jempbox-1.8.13.jar -file.reference.jericho-html-3.3-javadoc.jar=release/modules/ext/jericho-html-3.3-javadoc.jar -file.reference.jericho-html-3.3-sources.jar=release/modules/ext/jericho-html-3.3-sources.jar file.reference.jericho-html-3.3.jar=release/modules/ext/jericho-html-3.3.jar file.reference.jhighlight-1.0.2.jar=release/modules/ext/jhighlight-1.0.2.jar file.reference.jmatio-1.2.jar=release/modules/ext/jmatio-1.2.jar @@ -109,16 +105,12 @@ file.reference.sis-referencing-0.6.jar=release/modules/ext/sis-referencing-0.6.j file.reference.sis-storage-0.6.jar=release/modules/ext/sis-storage-0.6.jar file.reference.sis-utility-0.6.jar=release/modules/ext/sis-utility-0.6.jar file.reference.slf4j-api-1.7.24.jar=release/modules/ext/slf4j-api-1.7.24.jar -file.reference.solr-solrj-4.9.1-javadoc.jar=release/modules/ext/solr-solrj-4.9.1-javadoc.jar -file.reference.solr-solrj-4.9.1-sources.jar=release/modules/ext/solr-solrj-4.9.1-sources.jar file.reference.solr-solrj-4.9.1.jar=release/modules/ext/solr-solrj-4.9.1.jar file.reference.sqlite-jdbc-3.19.3.jar=release/modules/ext/sqlite-jdbc-3.19.3.jar file.reference.sqlwrapper-0.0.1.jar=release/modules/ext/sqlwrapper-0.0.1.jar file.reference.stax2-api-3.1.4.jar=release/modules/ext/stax2-api-3.1.4.jar file.reference.tagsoup-1.2.1.jar=release/modules/ext/tagsoup-1.2.1.jar file.reference.tika-core-1.17.jar=release/modules/ext/tika-core-1.17.jar -file.reference.tika-parsers-1.17-javadoc.jar=release/modules/ext/tika-parsers-1.17-javadoc.jar -file.reference.tika-parsers-1.17-sources.jar=release/modules/ext/tika-parsers-1.17-sources.jar file.reference.tika-parsers-1.17.jar=release/modules/ext/tika-parsers-1.17.jar file.reference.udunits-4.5.5.jar=release/modules/ext/udunits-4.5.5.jar file.reference.uimafit-core-2.1.0.jar=release/modules/ext/uimafit-core-2.1.0.jar diff --git a/KeywordSearch/nbproject/project.xml b/KeywordSearch/nbproject/project.xml index 05aa7b3165..7e1a174f98 100644 --- a/KeywordSearch/nbproject/project.xml +++ b/KeywordSearch/nbproject/project.xml @@ -235,10 +235,6 @@ org.slf4j.helpers org.slf4j.spi - - ext/commons-validator-1.5.1-sources.jar - release/modules/ext/commons-validator-1.5.1-sources.jar - ext/apache-mime4j-dom-0.8.1.jar release/modules/ext/apache-mime4j-dom-0.8.1.jar @@ -443,10 +439,6 @@ ext/fontbox-2.0.8.jar release/modules/ext/fontbox-2.0.8.jar - - ext/solr-solrj-4.9.1-sources.jar - release/modules/ext/solr-solrj-4.9.1-sources.jar - ext/lucene-analyzers-common-4.0.0.jar release/modules/ext/lucene-analyzers-common-4.0.0.jar @@ -515,10 +507,6 @@ ext/commons-csv-1.0.jar release/modules/ext/commons-csv-1.0.jar - - ext/commons-validator-1.5.1-javadoc.jar - release/modules/ext/commons-validator-1.5.1-javadoc.jar - ext/lucene-sandbox-4.0.0.jar release/modules/ext/lucene-sandbox-4.0.0.jar @@ -543,18 +531,10 @@ ext/bcmail-jdk15on-1.54.jar release/modules/ext/bcmail-jdk15on-1.54.jar - - ext/solr-solrj-4.9.1-javadoc.jar - release/modules/ext/solr-solrj-4.9.1-javadoc.jar - ext/asm-all-3.1.jar release/modules/ext/asm-all-3.1.jar - - ext/tika-parsers-1.17-javadoc.jar - release/modules/ext/tika-parsers-1.17-javadoc.jar - ext/icu4j-3.8.jar release/modules/ext/icu4j-3.8.jar @@ -603,10 +583,6 @@ ext/c3p0-0.9.1.1.jar release/modules/ext/c3p0-0.9.1.1.jar - - ext/tika-parsers-1.17-sources.jar - release/modules/ext/tika-parsers-1.17-sources.jar - ext/sqlwrapper-0.0.1.jar release/modules/ext/sqlwrapper-0.0.1.jar @@ -615,10 +591,6 @@ ext/jackcess-encrypt-2.1.2.jar release/modules/ext/jackcess-encrypt-2.1.2.jar - - ext/jericho-html-3.3-javadoc.jar - release/modules/ext/jericho-html-3.3-javadoc.jar - ext/udunits-4.5.5.jar release/modules/ext/udunits-4.5.5.jar @@ -671,10 +643,6 @@ ext/javax.annotation-api-1.2.jar release/modules/ext/javax.annotation-api-1.2.jar - - ext/jericho-html-3.3-sources.jar - release/modules/ext/jericho-html-3.3-sources.jar - ext/juniversalchardet-1.0.3.jar release/modules/ext/juniversalchardet-1.0.3.jar From 01065c269d1324e2d3777914bee9b7bed3e5a22a Mon Sep 17 00:00:00 2001 From: "U-BASIS\\dsmyda" Date: Mon, 29 Apr 2019 17:06:41 -0400 Subject: [PATCH 25/28] Changed the solution to a one-liner rather than explicitly excluding javadoc on each configuration --- CoreLibs/ivy.xml | 52 ++++++++++++++++++++++--------------------- KeywordSearch/ivy.xml | 15 +++++++------ 2 files changed, 35 insertions(+), 32 deletions(-) diff --git a/CoreLibs/ivy.xml b/CoreLibs/ivy.xml index 7d05e9b890..e201afd8fe 100644 --- a/CoreLibs/ivy.xml +++ b/CoreLibs/ivy.xml @@ -7,50 +7,50 @@ - + - - + + - - - + + + - + - - - + + + - - - - - - - + + + + + + + - + - + - + - - - - + + + + - + @@ -71,6 +71,8 @@ + + diff --git a/KeywordSearch/ivy.xml b/KeywordSearch/ivy.xml index 8db54f5373..86fa2e3ac0 100644 --- a/KeywordSearch/ivy.xml +++ b/KeywordSearch/ivy.xml @@ -19,17 +19,17 @@ - - - - + + + + - + - - + + @@ -42,6 +42,7 @@ + From a85de0565951cc0a4de5a0b6695994b4763cbecd Mon Sep 17 00:00:00 2001 From: "U-BASIS\\dsmyda" Date: Tue, 30 Apr 2019 08:36:05 -0400 Subject: [PATCH 26/28] Reverted confs back that are no longer needed --- CoreLibs/ivy.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CoreLibs/ivy.xml b/CoreLibs/ivy.xml index 0199461811..22701e060a 100644 --- a/CoreLibs/ivy.xml +++ b/CoreLibs/ivy.xml @@ -9,8 +9,8 @@ - - + + @@ -21,7 +21,7 @@ - + From f1883d85393d5d8a91599daad5d7bfb30214be39 Mon Sep 17 00:00:00 2001 From: "U-BASIS\\dsmyda" Date: Tue, 30 Apr 2019 10:01:01 -0400 Subject: [PATCH 27/28] Fixing merge errors --- KeywordSearch/nbproject/project.properties | 11 +--- KeywordSearch/nbproject/project.xml | 70 +--------------------- 2 files changed, 2 insertions(+), 79 deletions(-) diff --git a/KeywordSearch/nbproject/project.properties b/KeywordSearch/nbproject/project.properties index 99e0b8b2a1..5159d729b4 100644 --- a/KeywordSearch/nbproject/project.properties +++ b/KeywordSearch/nbproject/project.properties @@ -26,7 +26,6 @@ file.reference.java-libpst-0.8.1.jar=release/modules/ext/java-libpst-0.8.1.jar file.reference.jcip-annotations-1.0.jar=release/modules/ext/jcip-annotations-1.0.jar file.reference.jcommander-1.35.jar=release/modules/ext/jcommander-1.35.jar file.reference.jdom-1.0.jar=release/modules/ext/jdom-1.0.jar -file.reference.jempbox-1.8.13.jar=release/modules/ext/jempbox-1.8.13.jar file.reference.jericho-html-3.3.jar=release/modules/ext/jericho-html-3.3.jar file.reference.joda-time-2.2.jar=release/modules/ext/joda-time-2.2.jar file.reference.json-simple-1.1.1.jar=release/modules/ext/json-simple-1.1.1.jar @@ -43,14 +42,6 @@ file.reference.poi-ooxml-schemas-4.0.1.jar=release/modules/ext/poi-ooxml-schemas file.reference.poi-scratchpad-4.0.1.jar=release/modules/ext/poi-scratchpad-4.0.1.jar file.reference.protobuf-java-2.5.0.jar=release/modules/ext/protobuf-java-2.5.0.jar file.reference.quartz-2.2.0.jar=release/modules/ext/quartz-2.2.0.jar -file.reference.rome-1.5.1.jar=release/modules/ext/rome-1.5.1.jar -file.reference.rome-utils-1.5.1.jar=release/modules/ext/rome-utils-1.5.1.jar -file.reference.sis-metadata-0.6.jar=release/modules/ext/sis-metadata-0.6.jar -file.reference.sis-netcdf-0.6.jar=release/modules/ext/sis-netcdf-0.6.jar -file.reference.sis-referencing-0.6.jar=release/modules/ext/sis-referencing-0.6.jar -file.reference.sis-storage-0.6.jar=release/modules/ext/sis-storage-0.6.jar -file.reference.sis-utility-0.6.jar=release/modules/ext/sis-utility-0.6.jar -file.reference.slf4j-api-1.7.24.jar=release/modules/ext/slf4j-api-1.7.24.jar file.reference.solr-solrj-4.9.1.jar=release/modules/ext/solr-solrj-4.9.1.jar file.reference.sqlwrapper-0.0.1.jar=release/modules/ext/sqlwrapper-0.0.1.jar file.reference.stax2-api-3.1.4.jar=release/modules/ext/stax2-api-3.1.4.jar @@ -72,4 +63,4 @@ license.file=../LICENSE-2.0.txt nbm.homepage=http://www.sleuthkit.org/autopsy/ nbm.needs.restart=true source.reference.commons-validator-1.5.1.jar=release/modules/ext/commons-validator-1.5.1-sources.jar -spec.version.base=6.6 +spec.version.base=6.6 \ No newline at end of file diff --git a/KeywordSearch/nbproject/project.xml b/KeywordSearch/nbproject/project.xml index 9dd1c7946e..c71320da5d 100644 --- a/KeywordSearch/nbproject/project.xml +++ b/KeywordSearch/nbproject/project.xml @@ -235,10 +235,6 @@ org.slf4j.helpers org.slf4j.spi - - ext/apache-mime4j-dom-0.8.1.jar - release/modules/ext/apache-mime4j-dom-0.8.1.jar - ext/commons-digester-1.8.1.jar release/modules/ext/commons-digester-1.8.1.jar @@ -387,14 +383,6 @@ ext/jericho-html-3.3-sources.jar release/modules/ext/jericho-html-3.3-sources.jar - - ext/lucene-analyzers-common-4.0.0.jar - release/modules/ext/lucene-analyzers-common-4.0.0.jar - - - ext/javax.ws.rs-api-2.0.1.jar - release/modules/ext/javax.ws.rs-api-2.0.1.jar - ext/commons-lang-2.6.jar release/modules/ext/commons-lang-2.6.jar @@ -519,62 +507,6 @@ ext/jackcess-encrypt-2.1.2.jar release/modules/ext/jackcess-encrypt-2.1.2.jar - - ext/uimaj-document-annotation-2.5.0.jar - release/modules/ext/uimaj-document-annotation-2.5.0.jar - - - ext/woodstox-core-asl-4.4.1.jar - release/modules/ext/woodstox-core-asl-4.4.1.jar - - - ext/org.apache.felix.scr.generator-1.1.2.jar - release/modules/ext/org.apache.felix.scr.generator-1.1.2.jar - - - ext/pdfbox-2.0.8.jar - release/modules/ext/pdfbox-2.0.8.jar - - - ext/cxf-rt-transports-http-3.0.16.jar - release/modules/ext/cxf-rt-transports-http-3.0.16.jar - - - ext/slf4j-api-1.7.24.jar - release/modules/ext/slf4j-api-1.7.24.jar - - - ext/sis-netcdf-0.6.jar - release/modules/ext/sis-netcdf-0.6.jar - - - ext/javax.annotation-api-1.2.jar - release/modules/ext/javax.annotation-api-1.2.jar - - - ext/juniversalchardet-1.0.3.jar - release/modules/ext/juniversalchardet-1.0.3.jar - - - ext/org.apache.felix.scr.annotations-1.6.0.jar - release/modules/ext/org.apache.felix.scr.annotations-1.6.0.jar - - - ext/cxf-core-3.0.16.jar - release/modules/ext/cxf-core-3.0.16.jar - - - ext/opennlp-tools-1.5.3.jar - release/modules/ext/opennlp-tools-1.5.3.jar - - - ext/rome-utils-1.5.1.jar - release/modules/ext/rome-utils-1.5.1.jar - - - ext/sis-storage-0.6.jar - release/modules/ext/sis-storage-0.6.jar - ext/httpmime-4.5.6.jar release\modules\ext\httpmime-4.5.6.jar @@ -617,4 +549,4 @@ - + \ No newline at end of file From bcb5987430b2493c93e57a349f07df8e37011b42 Mon Sep 17 00:00:00 2001 From: Richard Cordovano Date: Tue, 30 Apr 2019 16:35:26 -0400 Subject: [PATCH 28/28] Revert "4972 - Remove Javadocs from release" --- CoreLibs/ivy.xml | 84 +++++++++++----------- CoreLibs/nbproject/project.properties | 9 +++ CoreLibs/nbproject/project.xml | 36 ++++++++++ KeywordSearch/build.xml | 2 +- KeywordSearch/ivy.xml | 24 +++---- KeywordSearch/nbproject/project.properties | 8 ++- KeywordSearch/nbproject/project.xml | 18 ++++- 7 files changed, 123 insertions(+), 58 deletions(-) diff --git a/CoreLibs/ivy.xml b/CoreLibs/ivy.xml index 22701e060a..c3056bda3f 100644 --- a/CoreLibs/ivy.xml +++ b/CoreLibs/ivy.xml @@ -2,77 +2,75 @@ - + - + - - - + + + - + - - + + - - - - - - - + + + + + + + - + - + - + - - - - + + + + - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties index 161c5184ed..875fdacfe9 100644 --- a/CoreLibs/nbproject/project.properties +++ b/CoreLibs/nbproject/project.properties @@ -13,7 +13,11 @@ file.reference.commons-csv-1.4.jar=release/modules/ext/commons-csv-1.4.jar file.reference.commons-io-2.4.jar=release/modules/ext/commons-io-2.4.jar file.reference.commons-io-2.5.jar=release/modules/ext/commons-io-2.5.jar file.reference.commons-lang-2.6.jar=release/modules/ext/commons-lang-2.6.jar +file.reference.commons-lang3-3.0-javadoc.jar=release/modules/ext/commons-lang3-3.0-javadoc.jar +file.reference.commons-lang3-3.0-sources.jar=release/modules/ext/commons-lang3-3.0-sources.jar 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.compiler-0.9.1.jar=release/modules/ext/compiler-0.9.1.jar file.reference.controlsfx-8.40.11.jar=release/modules/ext/controlsfx-8.40.11.jar @@ -37,6 +41,8 @@ file.reference.imageio-sgi-3.2.jar=release/modules/ext/imageio-sgi-3.2.jar file.reference.imageio-tga-3.2.jar=release/modules/ext/imageio-tga-3.2.jar file.reference.imageio-thumbsdb-3.2.jar=release/modules/ext/imageio-thumbsdb-3.2.jar file.reference.imageio-tiff-3.2.jar=release/modules/ext/imageio-tiff-3.2.jar +file.reference.imgscalr-lib-4.2-javadoc.jar=release/modules/ext/imgscalr-lib-4.2-javadoc.jar +file.reference.imgscalr-lib-4.2-sources.jar=release/modules/ext/imgscalr-lib-4.2-sources.jar file.reference.imgscalr-lib-4.2.jar=release/modules/ext/imgscalr-lib-4.2.jar file.reference.javaee-api-5.0-2.jar=release/modules/ext/javaee-api-5.0-2.jar file.reference.javassist-3.12.1.GA.jar=release/modules/ext/javassist-3.12.1.GA.jar @@ -44,6 +50,8 @@ file.reference.jfxtras-common-8.0-r4.jar=release/modules/ext/jfxtras-common-8.0- file.reference.jfxtras-controls-8.0-r4.jar=release/modules/ext/jfxtras-controls-8.0-r4.jar file.reference.jfxtras-fxml-8.0-r4.jar=release/modules/ext/jfxtras-fxml-8.0-r4.jar file.reference.jna-3.4.0.jar=release/modules/ext/jna-3.4.0.jar +file.reference.joda-time-2.4-javadoc.jar=release/modules/ext/joda-time-2.4-javadoc.jar +file.reference.joda-time-2.4-sources.jar=release/modules/ext/joda-time-2.4-sources.jar file.reference.joda-time-2.4.jar=release/modules/ext/joda-time-2.4.jar file.reference.jsr305-1.3.9.jar=release/modules/ext/jsr305-1.3.9.jar file.reference.LGoodDatePicker-10.3.1.jar=release/modules/ext/LGoodDatePicker-10.3.1.jar @@ -60,6 +68,7 @@ file.reference.poi-ooxml-schemas-4.0.1.jar=release\\modules\\ext\\poi-ooxml-sche file.reference.poi-scratchpad-4.0.1.jar=release\\modules\\ext\\poi-scratchpad-4.0.1.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.sigar-1.6.4-sources.jar=release/modules/ext/sigar-1.6.4-sources.jar file.reference.sigar-1.6.4.jar=release/modules/ext/sigar-1.6.4.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 diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml index b2bf0b8923..30a331dfc9 100644 --- a/CoreLibs/nbproject/project.xml +++ b/CoreLibs/nbproject/project.xml @@ -762,6 +762,10 @@ schemaorg_apache_xmlbeans.system.sXMLSCHEMA schemaorg_apache_xmlbeans.system.sXMLTOOLS + + ext/commons-logging-1.1.2-sources.jar + release/modules/ext/commons-logging-1.1.2-sources.jar + ext/imageio-thumbsdb-3.2.jar release/modules/ext/imageio-thumbsdb-3.2.jar @@ -798,6 +802,10 @@ ext/imageio-icns-3.2.jar release/modules/ext/imageio-icns-3.2.jar + + ext/imgscalr-lib-4.2-javadoc.jar + release/modules/ext/imgscalr-lib-4.2-javadoc.jar + ext/AppleJavaExtensions-1.4.jar release/modules/ext/AppleJavaExtensions-1.4.jar @@ -858,6 +866,10 @@ ext/activation-1.1.jar release/modules/ext/activation-1.1.jar + + ext/joda-time-2.4-javadoc.jar + release/modules/ext/joda-time-2.4-javadoc.jar + ext/poi-scratchpad-4.0.1.jar release\modules\ext\poi-scratchpad-4.0.1.jar @@ -886,6 +898,10 @@ ext/log4j-1.2.17.jar release/modules/ext/log4j-1.2.17.jar + + ext/sigar-1.6.4-sources.jar + release/modules/ext/sigar-1.6.4-sources.jar + ext/avalon-framework-4.1.5.jar release/modules/ext/avalon-framework-4.1.5.jar @@ -910,6 +926,10 @@ ext/geronimo-jms_1.1_spec-1.0.jar release/modules/ext/geronimo-jms_1.1_spec-1.0.jar + + ext/joda-time-2.4-sources.jar + release/modules/ext/joda-time-2.4-sources.jar + ext/jfxtras-fxml-8.0-r4.jar release/modules/ext/jfxtras-fxml-8.0-r4.jar @@ -922,6 +942,14 @@ ext/commons-compress-1.18.jar release/modules/ext/commons-compress-1.18.jar + + ext/commons-logging-1.1.2-javadoc.jar + release/modules/ext/commons-logging-1.1.2-javadoc.jar + + + ext/opencv-248.jar + release/modules/ext/opencv-248.jar + ext/gson-2.8.5.jar release/modules/ext/gson-2.8.5.jar @@ -950,6 +978,10 @@ ext/imageio-bmp-3.2.jar release/modules/ext/imageio-bmp-3.2.jar + + ext/commons-lang3-3.0-javadoc.jar + release/modules/ext/commons-lang3-3.0-javadoc.jar + ext/platform-3.4.0.jar release/modules/ext/platform-3.4.0.jar @@ -1026,6 +1058,10 @@ ext/imageio-metadata-3.2.jar release/modules/ext/imageio-metadata-3.2.jar + + ext/imgscalr-lib-4.2-sources.jar + release/modules/ext/imgscalr-lib-4.2-sources.jar + diff --git a/KeywordSearch/build.xml b/KeywordSearch/build.xml index ebaa4bcc65..1a43a00cf8 100644 --- a/KeywordSearch/build.xml +++ b/KeywordSearch/build.xml @@ -30,7 +30,7 @@ - + diff --git a/KeywordSearch/ivy.xml b/KeywordSearch/ivy.xml index 652999ffb6..f86e1de895 100644 --- a/KeywordSearch/ivy.xml +++ b/KeywordSearch/ivy.xml @@ -3,7 +3,7 @@ - + @@ -18,19 +18,21 @@ - - - + + + - + - - - + + + + + - - + + @@ -42,7 +44,5 @@ - - diff --git a/KeywordSearch/nbproject/project.properties b/KeywordSearch/nbproject/project.properties index 5159d729b4..08eec5cbee 100644 --- a/KeywordSearch/nbproject/project.properties +++ b/KeywordSearch/nbproject/project.properties @@ -12,6 +12,8 @@ file.reference.commons-io-2.3.jar=release\\modules\\ext\\commons-io-2.3.jar file.reference.commons-lang-2.6.jar=release/modules/ext/commons-lang-2.6.jar file.reference.commons-logging-1.2.jar=release/modules/ext/commons-logging-1.2.jar file.reference.commons-logging-api-1.1.jar=release/modules/ext/commons-logging-api-1.1.jar +file.reference.commons-validator-1.5.1-javadoc.jar=release/modules/ext/commons-validator-1.5.1-javadoc.jar +file.reference.commons-validator-1.5.1-sources.jar=release/modules/ext/commons-validator-1.5.1-sources.jar file.reference.commons-validator-1.5.1.jar=release/modules/ext/commons-validator-1.5.1.jar file.reference.ehcache-core-2.6.2.jar=release/modules/ext/ehcache-core-2.6.2.jar file.reference.findstructapi-0.0.1.jar=release/modules/ext/findstructapi-0.0.1.jar @@ -26,6 +28,8 @@ file.reference.java-libpst-0.8.1.jar=release/modules/ext/java-libpst-0.8.1.jar file.reference.jcip-annotations-1.0.jar=release/modules/ext/jcip-annotations-1.0.jar file.reference.jcommander-1.35.jar=release/modules/ext/jcommander-1.35.jar file.reference.jdom-1.0.jar=release/modules/ext/jdom-1.0.jar +file.reference.jericho-html-3.3-javadoc.jar=release/modules/ext/jericho-html-3.3-javadoc.jar +file.reference.jericho-html-3.3-sources.jar=release/modules/ext/jericho-html-3.3-sources.jar file.reference.jericho-html-3.3.jar=release/modules/ext/jericho-html-3.3.jar file.reference.joda-time-2.2.jar=release/modules/ext/joda-time-2.2.jar file.reference.json-simple-1.1.1.jar=release/modules/ext/json-simple-1.1.1.jar @@ -42,6 +46,8 @@ file.reference.poi-ooxml-schemas-4.0.1.jar=release/modules/ext/poi-ooxml-schemas file.reference.poi-scratchpad-4.0.1.jar=release/modules/ext/poi-scratchpad-4.0.1.jar file.reference.protobuf-java-2.5.0.jar=release/modules/ext/protobuf-java-2.5.0.jar file.reference.quartz-2.2.0.jar=release/modules/ext/quartz-2.2.0.jar +file.reference.solr-solrj-4.9.1-javadoc.jar=release/modules/ext/solr-solrj-4.9.1-javadoc.jar +file.reference.solr-solrj-4.9.1-sources.jar=release/modules/ext/solr-solrj-4.9.1-sources.jar file.reference.solr-solrj-4.9.1.jar=release/modules/ext/solr-solrj-4.9.1.jar file.reference.sqlwrapper-0.0.1.jar=release/modules/ext/sqlwrapper-0.0.1.jar file.reference.stax2-api-3.1.4.jar=release/modules/ext/stax2-api-3.1.4.jar @@ -63,4 +69,4 @@ license.file=../LICENSE-2.0.txt nbm.homepage=http://www.sleuthkit.org/autopsy/ nbm.needs.restart=true source.reference.commons-validator-1.5.1.jar=release/modules/ext/commons-validator-1.5.1-sources.jar -spec.version.base=6.6 \ No newline at end of file +spec.version.base=6.6 diff --git a/KeywordSearch/nbproject/project.xml b/KeywordSearch/nbproject/project.xml index c71320da5d..b6a814eb36 100644 --- a/KeywordSearch/nbproject/project.xml +++ b/KeywordSearch/nbproject/project.xml @@ -235,6 +235,10 @@ org.slf4j.helpers org.slf4j.spi + + ext/commons-validator-1.5.1-sources.jar + release/modules/ext/commons-validator-1.5.1-sources.jar + ext/commons-digester-1.8.1.jar release/modules/ext/commons-digester-1.8.1.jar @@ -383,6 +387,14 @@ ext/jericho-html-3.3-sources.jar release/modules/ext/jericho-html-3.3-sources.jar + + ext/solr-solrj-4.9.1-sources.jar + release/modules/ext/solr-solrj-4.9.1-sources.jar + + + ext/juniversalchardet-1.0.3.jar + release/modules/ext/juniversalchardet-1.0.3.jar + ext/commons-lang-2.6.jar release/modules/ext/commons-lang-2.6.jar @@ -439,6 +451,10 @@ ext/commons-csv-1.0.jar release/modules/ext/commons-csv-1.0.jar + + ext/commons-validator-1.5.1-javadoc.jar + release/modules/ext/commons-validator-1.5.1-javadoc.jar + ext/lucene-sandbox-4.0.0.jar release/modules/ext/lucene-sandbox-4.0.0.jar @@ -549,4 +565,4 @@ - \ No newline at end of file +