diff --git a/RecentActivity/nbproject/project.xml b/RecentActivity/nbproject/project.xml
index ef1b87d6c20056000a9bfe561bac00ecda15a8e5..402702e54b6d4d7e75e85318099501819ed80cfc 100644
--- a/RecentActivity/nbproject/project.xml
+++ b/RecentActivity/nbproject/project.xml
@@ -63,6 +63,15 @@
<specification-version>10.14</specification-version>
</run-dependency>
</dependency>
+ <dependency>
+ <code-name-base>org.sleuthkit.autopsy.corelibs</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>3</release-version>
+ <specification-version>1.2</specification-version>
+ </run-dependency>
+ </dependency>
</module-dependencies>
<public-packages/>
<class-path-extension>
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/DataSourceUsageAnalyzer.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/DataSourceUsageAnalyzer.java
index f429d7bb2ed704ccf7a3b5c0b7cd56091768a401..d5e13bd39da45680bda7cf09e82fc9aa41e63873 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/DataSourceUsageAnalyzer.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/DataSourceUsageAnalyzer.java
@@ -23,6 +23,7 @@
import java.util.Collection;
import java.util.List;
import java.util.logging.Level;
+import org.apache.commons.io.FilenameUtils;
import org.openide.util.NbBundle.Messages;
import org.sleuthkit.autopsy.casemodule.services.FileManager;
import org.sleuthkit.autopsy.coreutils.Logger;
@@ -83,11 +84,12 @@ private void checkForOSFiles(List<String> filesToCheckFor, String dataSourceUsag
FileManager fileManager = currentCase.getServices().getFileManager();
List<AbstractFile> files = new ArrayList<>();
for (String filePath : filesToCheckFor) {
- files.addAll(fileManager.findFilesByParentPath(dataSource.getId(), filePath));
+ files.addAll(fileManager.findFiles(dataSource, FilenameUtils.getName(filePath), FilenameUtils.getPath(filePath)));
}
- //create an artifact if any files with the windows/system32 specific path were found
+ //if any files existed matching the specified file
if (!files.isEmpty()) {
if (!dataSourceUsageDescription.isEmpty()) {
+ //if the data source usage description is not empty create a data source usage artifact
Collection<BlackboardAttribute> bbattributes = new ArrayList<>();
bbattributes.add(new BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DESCRIPTION,
Bundle.DataSourceUsageAnalyzer_parentModuleName(),
@@ -95,6 +97,7 @@ private void checkForOSFiles(List<String> filesToCheckFor, String dataSourceUsag
addArtifact(BlackboardArtifact.ARTIFACT_TYPE.TSK_DATA_SOURCE_USAGE, dataSource, bbattributes);
}
if (!osInfoProgramName.isEmpty()) {
+ //if the os info program name is not empty create an os info artifacts
Collection<BlackboardAttribute> bbattributes = new ArrayList<>();
bbattributes.add(new BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_PROG_NAME,
Bundle.DataSourceUsageAnalyzer_parentModuleName(),
diff --git a/nbproject/platform.properties b/nbproject/platform.properties
index 898ac95983ca389f743dbf6ea9182da18ffcc523..b03c3b5199326a4ef0355333a7e15a35ef46b911 100644
--- a/nbproject/platform.properties
+++ b/nbproject/platform.properties
@@ -11,125 +11,126 @@ autoupdate.catalog.url=https://updates.netbeans.org/netbeans/updates/${netbeans-
cluster.path=\
${nbplatform.active.dir}/harness:\
${nbplatform.active.dir}/java:\
- ${nbplatform.active.dir}/platform
+ ${nbplatform.active.dir}/platform:\
+ ${nbplatform.active.dir}/cluster
disabled.modules=\
-org.apache.tools.ant.module,\
- org.netbeans.api.debugger.jpda,\
- org.netbeans.modules.debugger.jpda.jsui,\
- org.netbeans.api.java,\
- org.netbeans.api.maven,\
- org.netbeans.lib.nbjavac,\
+ org.netbeans.modules.hudson.ant,\
org.netbeans.libs.cglib,\
+ org.netbeans.modules.maven.graph,\
+ org.netbeans.modules.java.hints.declarative.test,\
org.netbeans.libs.javacapi,\
- org.netbeans.libs.javacimpl,\
- org.netbeans.libs.springframework,\
- org.netbeans.modules.ant.browsetask,\
+ org.netbeans.modules.nashorn.execution,\
+ org.netbeans.modules.java.metrics,\
+ org.netbeans.modules.debugger.jpda.js,\
+ org.netbeans.api.java,\
+ org.netbeans.modules.debugger.jpda.ant,\
+ org.netbeans.modules.java.source.ant,\
+ org.netbeans.modules.maven.refactoring,\
org.netbeans.modules.ant.debugger,\
- org.netbeans.modules.ant.freeform,\
+ org.netbeans.modules.hibernatelib,\
+ org.netbeans.modules.hibernate,\
+ org.netbeans.lib.nbjavac,\
+ org.netbeans.modules.debugger.jpda.kit,\
+ org.netbeans.modules.maven.persistence,\
+ org.netbeans.modules.javaee.injection,\
+ org.netbeans.modules.maven,\
+ org.netbeans.modules.performance,\
+ org.netbeans.spi.java.hints,\
+ org.netbeans.modules.spellchecker.bindings.java,\
+ org.netbeans.modules.java.j2seproject,\
+ org.netbeans.modules.javawebstart,\
+ org.netbeans.modules.debugger.jpda,\
org.netbeans.modules.ant.grammar,\
- org.netbeans.modules.ant.kit,\
- org.netbeans.modules.beans,\
+ org.netbeans.modules.maven.checkstyle,\
+ org.netbeans.modules.java.source.queries,\
+ org.netbeans.modules.refactoring.java,\
+ org.netbeans.modules.java.examples,\
+ org.netbeans.modules.j2ee.jpa.verification,\
+ org.netbeans.modules.j2ee.jpa.refactoring,\
+ org.netbeans.modules.j2ee.metadata.model.support,\
org.netbeans.modules.classfile,\
- org.netbeans.modules.dbschema,\
- org.netbeans.modules.debugger.jpda,\
- org.netbeans.modules.debugger.jpda.ant,\
- org.netbeans.modules.debugger.jpda.js,\
- org.netbeans.modules.debugger.jpda.kit,\
- org.netbeans.modules.debugger.jpda.projects,\
+ org.netbeans.modules.maven.coverage,\
org.netbeans.modules.debugger.jpda.ui,\
- org.netbeans.modules.debugger.jpda.visual,\
- org.netbeans.modules.findbugs.installer,\
+ org.netbeans.modules.java.guards,\
+ org.netbeans.modules.xml.jaxb,\
+ org.netbeans.modules.java.preprocessorbridge,\
+ org.netbeans.modules.debugger.jpda.jsui,\
+ org.netbeans.api.debugger.jpda,\
+ org.netbeans.modules.ant.freeform,\
+ org.netbeans.modules.java.sourceui,\
+ org.netbeans.modules.projectimport.eclipse.j2se,\
org.netbeans.modules.form,\
- org.netbeans.modules.form.binding,\
- org.netbeans.modules.form.j2ee,\
- org.netbeans.modules.form.kit,\
- org.netbeans.modules.form.nb,\
- org.netbeans.modules.form.refactoring,\
- org.netbeans.modules.hibernate,\
- org.netbeans.modules.hibernate4lib,\
- org.netbeans.modules.hibernatelib,\
- org.netbeans.modules.hudson.ant,\
- org.netbeans.modules.hudson.maven,\
- org.netbeans.modules.i18n,\
- org.netbeans.modules.i18n.form,\
- org.netbeans.modules.j2ee.core.utilities,\
- org.netbeans.modules.j2ee.eclipselink,\
- org.netbeans.modules.j2ee.eclipselinkmodelgen,\
- org.netbeans.modules.j2ee.jpa.refactoring,\
- org.netbeans.modules.j2ee.jpa.verification,\
- org.netbeans.modules.j2ee.metadata,\
- org.netbeans.modules.j2ee.metadata.model.support,\
- org.netbeans.modules.j2ee.persistence,\
+ org.netbeans.modules.junit,\
org.netbeans.modules.j2ee.persistence.kit,\
- org.netbeans.modules.j2ee.persistenceapi,\
- org.netbeans.modules.java.api.common,\
+ org.netbeans.modules.j2ee.metadata,\
+ org.netbeans.modules.java.j2seplatform,\
+ org.netbeans.modules.javadoc,\
+ org.netbeans.modules.debugger.jpda.projects,\
+ org.netbeans.modules.java.source,\
+ org.netbeans.modules.maven.spring,\
+ org.netbeans.modules.maven.search,\
org.netbeans.modules.java.debug,\
- org.netbeans.modules.java.editor,\
+ org.netbeans.modules.maven.grammar,\
+ org.netbeans.modules.java.kit,\
+ org.netbeans.modules.testng,\
+ org.netbeans.modules.spring.beans,\
+ org.netbeans.modules.websvc.saas.codegen.java,\
org.netbeans.modules.java.editor.lib,\
- org.netbeans.modules.java.examples,\
- org.netbeans.modules.java.freeform,\
- org.netbeans.modules.java.guards,\
- org.netbeans.modules.java.helpset,\
- org.netbeans.modules.java.hints,\
- org.netbeans.modules.java.hints.declarative,\
- org.netbeans.modules.java.hints.declarative.test,\
- org.netbeans.modules.java.hints.legacy.spi,\
+ org.netbeans.modules.java.testrunner,\
+ org.netbeans.modules.java.source.queriesimpl,\
+ org.netbeans.modules.maven.junit,\
+ org.netbeans.modules.maven.hints,\
+ org.netbeans.modules.xml.tools.java,\
+ org.netbeans.modules.j2ee.persistenceapi,\
+ org.netbeans.modules.java.j2seprofiles,\
+ org.netbeans.modules.form.kit,\
+ org.netbeans.modules.projectimport.eclipse.core,\
+ org.netbeans.modules.form.refactoring,\
+ org.apache.tools.ant.module,\
+ org.netbeans.modules.testng.maven,\
org.netbeans.modules.java.hints.test,\
+ org.netbeans.modules.i18n.form,\
+ org.netbeans.modules.maven.kit,\
+ org.netbeans.modules.beans,\
+ org.netbeans.modules.java.platform,\
+ org.netbeans.modules.java.hints.legacy.spi,\
+ org.netbeans.modules.java.lexer,\
+ org.netbeans.modules.java.hints,\
+ org.netbeans.modules.java.j2seembedded,\
org.netbeans.modules.java.hints.ui,\
+ org.netbeans.modules.java.editor,\
+ org.netbeans.modules.websvc.jaxws21,\
+ org.netbeans.modules.hudson.maven,\
org.netbeans.modules.java.j2sedeploy,\
- org.netbeans.modules.java.j2seembedded,\
- org.netbeans.modules.java.j2seplatform,\
- org.netbeans.modules.java.j2seprofiles,\
- org.netbeans.modules.java.j2seproject,\
- org.netbeans.modules.java.kit,\
- org.netbeans.modules.java.lexer,\
- org.netbeans.modules.java.metrics,\
- org.netbeans.modules.java.navigation,\
- org.netbeans.modules.java.platform,\
- org.netbeans.modules.java.preprocessorbridge,\
+ org.netbeans.libs.javacimpl,\
+ org.netbeans.modules.java.helpset,\
+ org.netbeans.modules.i18n,\
+ org.netbeans.modules.dbschema,\
+ org.netbeans.api.maven,\
+ org.netbeans.modules.findbugs.installer,\
+ org.netbeans.modules.j2ee.eclipselinkmodelgen,\
+ org.netbeans.modules.form.nb,\
+ org.netbeans.modules.debugger.jpda.visual,\
+ org.netbeans.modules.form.j2ee,\
org.netbeans.modules.java.project,\
- org.netbeans.modules.java.source,\
- org.netbeans.modules.java.source.ant,\
- org.netbeans.modules.java.source.queries,\
- org.netbeans.modules.java.source.queriesimpl,\
- org.netbeans.modules.java.sourceui,\
- org.netbeans.modules.java.testrunner,\
- org.netbeans.modules.javadoc,\
- org.netbeans.modules.javaee.injection,\
- org.netbeans.modules.javawebstart,\
- org.netbeans.modules.junit,\
- org.netbeans.modules.maven,\
- org.netbeans.modules.maven.checkstyle,\
- org.netbeans.modules.maven.coverage,\
+ org.netbeans.modules.java.api.common,\
+ org.netbeans.modules.j2ee.persistence,\
+ org.netbeans.modules.java.freeform,\
+ org.netbeans.modules.whitelist,\
+ org.netbeans.libs.springframework,\
org.netbeans.modules.maven.embedder,\
- org.netbeans.modules.maven.grammar,\
- org.netbeans.modules.maven.graph,\
- org.netbeans.modules.maven.hints,\
- org.netbeans.modules.maven.indexer,\
- org.netbeans.modules.maven.junit,\
- org.netbeans.modules.maven.kit,\
- org.netbeans.modules.maven.model,\
- org.netbeans.modules.maven.osgi,\
- org.netbeans.modules.maven.persistence,\
- org.netbeans.modules.maven.refactoring,\
- org.netbeans.modules.maven.repository,\
- org.netbeans.modules.maven.search,\
- org.netbeans.modules.maven.spring,\
- org.netbeans.modules.nashorn.execution,\
- org.netbeans.modules.performance,\
- org.netbeans.modules.performance.java,\
- org.netbeans.modules.projectimport.eclipse.core,\
- org.netbeans.modules.projectimport.eclipse.j2se,\
- org.netbeans.modules.refactoring.java,\
- org.netbeans.modules.spellchecker.bindings.java,\
- org.netbeans.modules.spring.beans,\
- org.netbeans.modules.testng,\
+ org.netbeans.modules.ant.kit,\
+ org.netbeans.modules.java.hints.declarative,\
org.netbeans.modules.testng.ant,\
- org.netbeans.modules.testng.maven,\
- org.netbeans.modules.websvc.jaxws21,\
+ org.netbeans.modules.form.binding,\
+ org.netbeans.modules.ant.browsetask,\
+ org.netbeans.modules.j2ee.core.utilities,\
+ org.netbeans.modules.performance.java,\
org.netbeans.modules.websvc.jaxws21api,\
- org.netbeans.modules.websvc.saas.codegen.java,\
- org.netbeans.modules.whitelist,\
- org.netbeans.modules.xml.jaxb,\
- org.netbeans.modules.xml.tools.java,\
- org.netbeans.spi.java.hints
+ org.netbeans.modules.maven.repository,\
+ org.netbeans.modules.j2ee.eclipselink,\
+ org.netbeans.modules.maven.model,\
+ org.netbeans.modules.hibernate4lib,\
+ org.netbeans.modules.java.navigation,\
+ org.netbeans.modules.maven.indexer,\
+ org.netbeans.modules.maven.osgi