From 1d72f2c7f2da5c0d59df4db5c661c2e0768baa9f Mon Sep 17 00:00:00 2001 From: "U-BASIS\\zhaohui" Date: Fri, 13 Oct 2017 12:15:22 -0400 Subject: [PATCH] NoJira: Remove the obsolete sample --- .../SampleExecutableIngestModuleFactory.java | 79 ------------------- .../ingest/IngestModuleFactoryLoader.java | 5 +- 2 files changed, 1 insertion(+), 83 deletions(-) delete mode 100755 Core/src/org/sleuthkit/autopsy/examples/SampleExecutableIngestModuleFactory.java diff --git a/Core/src/org/sleuthkit/autopsy/examples/SampleExecutableIngestModuleFactory.java b/Core/src/org/sleuthkit/autopsy/examples/SampleExecutableIngestModuleFactory.java deleted file mode 100755 index 390aee2a33..0000000000 --- a/Core/src/org/sleuthkit/autopsy/examples/SampleExecutableIngestModuleFactory.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Sample ingest module factory in the public domain. - * Feel free to use this as a template for your inget module factories. - * - * Contact: Brian Carrier [carrier sleuthkit [dot] org] - * - * This is free and unencumbered software released into the public domain. - * - * Anyone is free to copy, modify, publish, use, compile, sell, or - * distribute this software, either in source code form or as a compiled - * binary, for any purpose, commercial or non-commercial, and by any - * means. - * - * In jurisdictions that recognize copyright laws, the author or authors - * of this software dedicate any and all copyright interest in the - * software to the public domain. We make this dedication for the benefit - * of the public at large and to the detriment of our heirs and - * successors. We intend this dedication to be an overt act of - * relinquishment in perpetuity of all present and future rights to this - * software under copyright law. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - */ -package org.sleuthkit.autopsy.examples; - -import org.openide.util.NbBundle; -import org.openide.util.lookup.ServiceProvider; -import static org.sleuthkit.autopsy.examples.SampleIngestModuleFactory.getModuleName; -import org.sleuthkit.autopsy.ingest.DataSourceIngestModule; -import org.sleuthkit.autopsy.ingest.IngestModuleFactory; -import org.sleuthkit.autopsy.ingest.IngestModuleFactoryAdapter; -import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings; - -/** - * A factory that creates sample executable data source ingest modules. - */ -@ServiceProvider(service = IngestModuleFactory.class) // Sample is discarded at runtime -public class SampleExecutableIngestModuleFactory extends IngestModuleFactoryAdapter { - - private static final String VERSION_NUMBER = "1.0.0"; - - // This class method allows the ingest module instances created by this - // factory to use the same display name that is provided to the Autopsy - // ingest framework by the factory. - static String getModuleName() { - return NbBundle.getMessage(SampleIngestModuleFactory.class, "SampleExecutableIngestModuleFactory.moduleName"); - } - - @Override - public String getModuleDisplayName() { - return getModuleName(); - } - - @Override - public String getModuleDescription() { - return NbBundle.getMessage(SampleIngestModuleFactory.class, "SampleExecutableIngestModuleFactory.moduleDescription"); - } - - @Override - public String getModuleVersionNumber() { - return VERSION_NUMBER; - } - - @Override - public boolean isDataSourceIngestModuleFactory() { - return true; - } - - @Override - public DataSourceIngestModule createDataSourceIngestModule(IngestModuleIngestJobSettings ingestOptions) { - return new SampleExecutableDataSourceIngestModule(); - } -} diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleFactoryLoader.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleFactoryLoader.java index e338b79805..3d2c66deb9 100755 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleFactoryLoader.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleFactoryLoader.java @@ -29,7 +29,6 @@ import org.openide.NotifyDescriptor; import org.openide.util.Lookup; import org.openide.util.NbBundle; import org.sleuthkit.autopsy.coreutils.Logger; -import org.sleuthkit.autopsy.examples.SampleExecutableIngestModuleFactory; import org.sleuthkit.autopsy.examples.SampleIngestModuleFactory; import org.sleuthkit.autopsy.modules.e01verify.E01VerifierModuleFactory; import org.sleuthkit.autopsy.modules.exif.ExifParserModuleFactory; @@ -48,7 +47,6 @@ final class IngestModuleFactoryLoader { private static final Logger logger = Logger.getLogger(IngestModuleFactoryLoader.class.getName()); private static final String SAMPLE_MODULE_FACTORY_CLASS_NAME = SampleIngestModuleFactory.class.getCanonicalName(); - private static final String SAMPLE_EXECUTABLE_MODULE_FACTORY_CLASS_NAME = SampleExecutableIngestModuleFactory.class.getCanonicalName(); private static final ArrayList coreModuleOrdering = new ArrayList() { { // The ordering of the core ingest module factories implemented @@ -141,8 +139,7 @@ final class IngestModuleFactoryLoader { private static void addFactory(IngestModuleFactory factory, HashSet moduleDisplayNames, HashMap javaFactoriesByClass) { // Ignore the sample ingest module factories implemented in Java. String className = factory.getClass().getCanonicalName(); - if (className.equals(IngestModuleFactoryLoader.SAMPLE_MODULE_FACTORY_CLASS_NAME) - || className.equals(IngestModuleFactoryLoader.SAMPLE_EXECUTABLE_MODULE_FACTORY_CLASS_NAME)) { + if (className.equals(IngestModuleFactoryLoader.SAMPLE_MODULE_FACTORY_CLASS_NAME)) { return; }