From fa9cfbc40b5728f730c1360cc016395c1fd1d9b0 Mon Sep 17 00:00:00 2001 From: Richard Cordovano Date: Thu, 9 Feb 2017 06:36:46 -0500 Subject: [PATCH 1/4] Update comment in ArtifactStringContent.java --- .../org/sleuthkit/autopsy/datamodel/ArtifactStringContent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ArtifactStringContent.java b/Core/src/org/sleuthkit/autopsy/datamodel/ArtifactStringContent.java index 1c591e6659..2b7f7078a9 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/ArtifactStringContent.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/ArtifactStringContent.java @@ -146,7 +146,7 @@ public class ArtifactStringContent implements StringContent { buffer.append(""); //NON-NLS /* - * Attribute source modules column. + * Attribute sources column. */ buffer.append(""); //NON-NLS buffer.append(StringUtils.join(attr.getSources(), ", ")); From 8377953e625e109512525f53192da8b46f4a44e6 Mon Sep 17 00:00:00 2001 From: Richard Cordovano Date: Thu, 9 Feb 2017 10:03:21 -0500 Subject: [PATCH 2/4] Turn off CustomArtifactsCreatorIngestModuleFactory --- .../testfixtures/CustomArtifactsCreatorIngestModuleFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/src/org/sleuthkit/autopsy/report/testfixtures/CustomArtifactsCreatorIngestModuleFactory.java b/Core/src/org/sleuthkit/autopsy/report/testfixtures/CustomArtifactsCreatorIngestModuleFactory.java index cb2619ecd1..ed7cce8935 100644 --- a/Core/src/org/sleuthkit/autopsy/report/testfixtures/CustomArtifactsCreatorIngestModuleFactory.java +++ b/Core/src/org/sleuthkit/autopsy/report/testfixtures/CustomArtifactsCreatorIngestModuleFactory.java @@ -30,7 +30,7 @@ import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings; * attributes with files for test purposes. Uncomment the service provider * annotation to activate this test fixture. */ -@ServiceProvider(service = IngestModuleFactory.class) +//@ServiceProvider(service = IngestModuleFactory.class) public final class CustomArtifactsCreatorIngestModuleFactory extends IngestModuleFactoryAdapter { @Override From bd729b3ea7a60ce3b53cd88c6eb0fbf893f9363a Mon Sep 17 00:00:00 2001 From: Richard Cordovano Date: Sat, 11 Feb 2017 11:16:30 -0500 Subject: [PATCH 3/4] Reset of build.type in project properties --- nbproject/project.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nbproject/project.properties b/nbproject/project.properties index 7485e33aee..8261bedc39 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -6,8 +6,8 @@ app.name=${branding.token} ### if left unset, version will default to today's date app.version=4.3.0 ### build.type must be one of: DEVELOPMENT, RELEASE -build.type=RELEASE -#build.type=DEVELOPMENT +#build.type=RELEASE +build.type=DEVELOPMENT project.org.sleuthkit.autopsy.experimental=Experimental project.org.sleuthkit.autopsy.imagegallery=ImageGallery From 043e0fb2888274139f5a02a7f746bffef7d4712e Mon Sep 17 00:00:00 2001 From: Richard Cordovano Date: Sat, 11 Feb 2017 13:48:34 -0500 Subject: [PATCH 4/4] Disable CustomArtifactsCreatorIngestModuleFactory --- .../testfixtures/CustomArtifactsCreatorIngestModuleFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/src/org/sleuthkit/autopsy/report/testfixtures/CustomArtifactsCreatorIngestModuleFactory.java b/Core/src/org/sleuthkit/autopsy/report/testfixtures/CustomArtifactsCreatorIngestModuleFactory.java index cb2619ecd1..ed7cce8935 100644 --- a/Core/src/org/sleuthkit/autopsy/report/testfixtures/CustomArtifactsCreatorIngestModuleFactory.java +++ b/Core/src/org/sleuthkit/autopsy/report/testfixtures/CustomArtifactsCreatorIngestModuleFactory.java @@ -30,7 +30,7 @@ import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings; * attributes with files for test purposes. Uncomment the service provider * annotation to activate this test fixture. */ -@ServiceProvider(service = IngestModuleFactory.class) +//@ServiceProvider(service = IngestModuleFactory.class) public final class CustomArtifactsCreatorIngestModuleFactory extends IngestModuleFactoryAdapter { @Override