diff --git a/Experimental/build.xml b/Experimental/build.xml new file mode 100644 index 0000000000..b23ebb9ac3 --- /dev/null +++ b/Experimental/build.xml @@ -0,0 +1,8 @@ + + + + + + Builds, tests, and runs the project org.sleuthkit.autopsy.experimental. + + diff --git a/Experimental/manifest.mf b/Experimental/manifest.mf new file mode 100644 index 0000000000..62671108e7 --- /dev/null +++ b/Experimental/manifest.mf @@ -0,0 +1,6 @@ +Manifest-Version: 1.0 +AutoUpdate-Show-In-Client: true +OpenIDE-Module: org.sleuthkit.autopsy.experimental +OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties +OpenIDE-Module-Specification-Version: 1.0 + diff --git a/Experimental/nbproject/build-impl.xml b/Experimental/nbproject/build-impl.xml new file mode 100644 index 0000000000..9b537ab812 --- /dev/null +++ b/Experimental/nbproject/build-impl.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + You must set 'suite.dir' to point to your containing module suite + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Experimental/nbproject/project.properties b/Experimental/nbproject/project.properties new file mode 100644 index 0000000000..234017c629 --- /dev/null +++ b/Experimental/nbproject/project.properties @@ -0,0 +1,2 @@ +javac.source=1.8 +javac.compilerargs=-Xlint -Xlint:-serial diff --git a/Experimental/nbproject/project.xml b/Experimental/nbproject/project.xml new file mode 100644 index 0000000000..2e9e431326 --- /dev/null +++ b/Experimental/nbproject/project.xml @@ -0,0 +1,70 @@ + + + org.netbeans.modules.apisupport.project + + + org.sleuthkit.autopsy.experimental + + + + org.openide.awt + + + + 7.65.1 + + + + org.openide.dialogs + + + + 7.41.1 + + + + org.openide.util + + + + 9.5.1 + + + + org.openide.util.lookup + + + + 8.32.1 + + + + org.openide.util.ui + + + + 9.4.1 + + + + org.openide.windows + + + + 6.74.1 + + + + org.sleuthkit.autopsy.core + + + + 10 + 10.5 + + + + + + + diff --git a/Experimental/nbproject/suite.properties b/Experimental/nbproject/suite.properties new file mode 100644 index 0000000000..29d7cc9bd6 --- /dev/null +++ b/Experimental/nbproject/suite.properties @@ -0,0 +1 @@ +suite.dir=${basedir}/.. diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties new file mode 100644 index 0000000000..4a176482a9 --- /dev/null +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties @@ -0,0 +1 @@ +OpenIDE-Module-Name=Experimental diff --git a/Core/src/org/sleuthkit/autopsy/configuration/AdvancedOptionsPanel.form b/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/AdvancedOptionsPanel.form similarity index 77% rename from Core/src/org/sleuthkit/autopsy/configuration/AdvancedOptionsPanel.form rename to Experimental/src/org/sleuthkit/autopsy/experimental/configuration/AdvancedOptionsPanel.form index c9b4d64896..3c5689f031 100644 --- a/Core/src/org/sleuthkit/autopsy/configuration/AdvancedOptionsPanel.form +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/AdvancedOptionsPanel.form @@ -113,10 +113,10 @@ - + - + @@ -126,14 +126,14 @@ - + - + @@ -156,17 +156,17 @@ - + - + - + @@ -187,7 +187,7 @@ - + @@ -197,10 +197,10 @@ - + - + @@ -210,17 +210,17 @@ - + - + - + @@ -249,22 +249,22 @@ - + - + - + - + @@ -275,7 +275,7 @@ - + @@ -285,14 +285,14 @@ - + - + diff --git a/Core/src/org/sleuthkit/autopsy/configuration/AdvancedOptionsPanel.java b/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/AdvancedOptionsPanel.java similarity index 99% rename from Core/src/org/sleuthkit/autopsy/configuration/AdvancedOptionsPanel.java rename to Experimental/src/org/sleuthkit/autopsy/experimental/configuration/AdvancedOptionsPanel.java index 81ae74d135..7926053cfe 100644 --- a/Core/src/org/sleuthkit/autopsy/configuration/AdvancedOptionsPanel.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/AdvancedOptionsPanel.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.configuration; +package org.sleuthkit.autopsy.experimental.configuration; import java.util.ArrayList; import java.util.Collection; diff --git a/Core/src/org/sleuthkit/autopsy/configuration/Bundle.properties b/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/Bundle.properties similarity index 100% rename from Core/src/org/sleuthkit/autopsy/configuration/Bundle.properties rename to Experimental/src/org/sleuthkit/autopsy/experimental/configuration/Bundle.properties diff --git a/Core/src/org/sleuthkit/autopsy/configuration/OpenOptionsPanelAction.java b/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/OpenOptionsPanelAction.java similarity index 97% rename from Core/src/org/sleuthkit/autopsy/configuration/OpenOptionsPanelAction.java rename to Experimental/src/org/sleuthkit/autopsy/experimental/configuration/OpenOptionsPanelAction.java index cda6b18a89..54c1290539 100644 --- a/Core/src/org/sleuthkit/autopsy/configuration/OpenOptionsPanelAction.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/OpenOptionsPanelAction.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.configuration; +package org.sleuthkit.autopsy.experimental.configuration; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; diff --git a/Core/src/org/sleuthkit/autopsy/configuration/OptionsDialog.java b/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/OptionsDialog.java similarity index 98% rename from Core/src/org/sleuthkit/autopsy/configuration/OptionsDialog.java rename to Experimental/src/org/sleuthkit/autopsy/experimental/configuration/OptionsDialog.java index d49bd2e087..ca0a878b17 100644 --- a/Core/src/org/sleuthkit/autopsy/configuration/OptionsDialog.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/OptionsDialog.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.configuration; +package org.sleuthkit.autopsy.experimental.configuration; import java.awt.BorderLayout; import java.awt.Container; diff --git a/Core/src/org/sleuthkit/autopsy/configuration/OptionsPanel.form b/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/OptionsPanel.form similarity index 85% rename from Core/src/org/sleuthkit/autopsy/configuration/OptionsPanel.form rename to Experimental/src/org/sleuthkit/autopsy/experimental/configuration/OptionsPanel.form index 2235b222a6..bb379e93a7 100644 --- a/Core/src/org/sleuthkit/autopsy/configuration/OptionsPanel.form +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/OptionsPanel.form @@ -56,7 +56,7 @@ - + @@ -66,7 +66,7 @@ - + @@ -89,7 +89,7 @@ - + @@ -206,7 +206,7 @@ - + @@ -216,10 +216,10 @@ - + - + @@ -229,10 +229,10 @@ - + - + @@ -242,10 +242,10 @@ - + - + @@ -255,17 +255,17 @@ - + - + - + @@ -275,7 +275,7 @@ - + @@ -285,7 +285,7 @@ - + @@ -351,7 +351,7 @@ - + @@ -361,7 +361,7 @@ - + @@ -371,14 +371,14 @@ - + - + @@ -388,7 +388,7 @@ - + @@ -398,7 +398,7 @@ - + @@ -472,10 +472,10 @@ - + - + @@ -485,10 +485,10 @@ - + - + @@ -498,10 +498,10 @@ - + - + @@ -511,10 +511,10 @@ - + - + @@ -524,7 +524,7 @@ - + @@ -532,7 +532,7 @@ - + @@ -542,7 +542,7 @@ - + @@ -553,7 +553,7 @@ - + @@ -562,7 +562,7 @@ - + @@ -576,7 +576,7 @@ - + @@ -592,7 +592,7 @@ - + @@ -610,7 +610,7 @@ - + @@ -653,7 +653,7 @@ - + @@ -767,7 +767,7 @@ - + @@ -777,7 +777,7 @@ - + @@ -787,10 +787,10 @@ - + - + @@ -803,7 +803,7 @@ - + @@ -816,10 +816,10 @@ - + - + @@ -832,10 +832,10 @@ - + - + @@ -845,7 +845,7 @@ - + @@ -853,17 +853,17 @@ - + - + - + @@ -873,7 +873,7 @@ - + @@ -881,17 +881,17 @@ - + - + - + @@ -904,7 +904,7 @@ - + @@ -914,7 +914,7 @@ - + @@ -924,7 +924,7 @@ - + @@ -935,7 +935,7 @@ - + @@ -952,7 +952,7 @@ - + @@ -1037,7 +1037,7 @@ - + @@ -1056,7 +1056,7 @@ - + @@ -1064,7 +1064,7 @@ - + @@ -1079,7 +1079,7 @@ - + @@ -1089,7 +1089,7 @@ - + @@ -1100,7 +1100,7 @@ - + @@ -1110,7 +1110,7 @@ - + @@ -1120,7 +1120,7 @@ - + @@ -1129,7 +1129,7 @@ - + @@ -1140,7 +1140,7 @@ - + @@ -1159,7 +1159,7 @@ - + @@ -1197,10 +1197,10 @@ - + - + @@ -1210,7 +1210,7 @@ - + @@ -1220,7 +1220,7 @@ - + diff --git a/Core/src/org/sleuthkit/autopsy/configuration/OptionsPanel.java b/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/OptionsPanel.java similarity index 99% rename from Core/src/org/sleuthkit/autopsy/configuration/OptionsPanel.java rename to Experimental/src/org/sleuthkit/autopsy/experimental/configuration/OptionsPanel.java index 51e7c6de07..683df261ab 100644 --- a/Core/src/org/sleuthkit/autopsy/configuration/OptionsPanel.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/OptionsPanel.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.configuration; +package org.sleuthkit.autopsy.experimental.configuration; import java.awt.BorderLayout; import java.awt.Color; @@ -58,7 +58,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.datamodel.CaseDbConnectionInfo; import org.sleuthkit.autopsy.keywordsearchservice.KeywordSearchServiceException; import org.sleuthkit.autopsy.events.MessageServiceException; -import org.sleuthkit.autopsy.autoingest.FileExporterSettingsPanel; +import org.sleuthkit.experimental.autoingest.FileExporterSettingsPanel; /** * diff --git a/Core/src/org/sleuthkit/autopsy/configuration/SharedConfiguration.java b/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/SharedConfiguration.java similarity index 99% rename from Core/src/org/sleuthkit/autopsy/configuration/SharedConfiguration.java rename to Experimental/src/org/sleuthkit/autopsy/experimental/configuration/SharedConfiguration.java index 3f7ec33b85..2f8adba560 100644 --- a/Core/src/org/sleuthkit/autopsy/configuration/SharedConfiguration.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/SharedConfiguration.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.configuration; +package org.sleuthkit.autopsy.experimental.configuration; import java.io.File; import java.io.IOException; @@ -49,10 +49,10 @@ import org.sleuthkit.autopsy.modules.hashdatabase.HashDbManager; import org.sleuthkit.datamodel.TskCoreException; import org.sleuthkit.autopsy.core.ServicesMonitor; import org.sleuthkit.autopsy.modules.hashdatabase.HashDbManager.HashDb; -import org.sleuthkit.autopsy.configuration.OptionsPanel.UpdateConfigSwingWorker; -import org.sleuthkit.autopsy.coordinationservice.CoordinationService; -import org.sleuthkit.autopsy.coordinationservice.CoordinationService.Lock; -import org.sleuthkit.autopsy.coordinationservice.CoordinationService.CoordinationServiceException; +import org.sleuthkit.autopsy.experimental.configuration.OptionsPanel.UpdateConfigSwingWorker; +import org.sleuthkit.autopsy.experimental.coordinationservice.CoordinationService; +import org.sleuthkit.autopsy.experimental.coordinationservice.CoordinationService.Lock; +import org.sleuthkit.autopsy.experimental.coordinationservice.CoordinationService.CoordinationServiceException; /* * A utility class for loading and saving shared configuration data diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/StartupWindow.java b/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/StartupWindow.java new file mode 100644 index 0000000000..9bb07ab1c6 --- /dev/null +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/StartupWindow.java @@ -0,0 +1,161 @@ +/* + * Autopsy Forensic Browser + * + * Copyright 2011 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.experimental.configuration; + +import java.awt.Cursor; +import java.awt.Dimension; +import java.awt.Toolkit; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import javax.swing.JDialog; +import javax.swing.JTabbedPane; +import javax.swing.WindowConstants; +import org.openide.LifecycleManager; +import org.openide.util.ImageUtilities; +import org.openide.util.NbBundle; +import org.openide.util.lookup.ServiceProvider; +import org.openide.windows.WindowManager; +import org.sleuthkit.autopsy.casemodule.CueBannerPanel; +import org.sleuthkit.autopsy.casemodule.StartupWindowInterface; +import org.sleuthkit.autopsy.core.UserPreferences; +import org.sleuthkit.autopsy.coreutils.NetworkUtils; +import org.sleuthkit.experimental.autoingest.AutoIngestDashboard; +import org.sleuthkit.experimental.autoingest.CaseImportPanel; +import org.sleuthkit.experimental.autoingest.ReviewModeCasePanel; + +/** + * The default implementation of the Autopsy startup window + */ +@ServiceProvider(service = StartupWindowInterface.class) +public final class StartupWindow extends JDialog implements StartupWindowInterface { + + private static final String TITLE = NbBundle.getMessage(StartupWindow.class, "StartupWindow.title.text"); + private static Dimension DIMENSIONS = new Dimension(750, 400); + private static CueBannerPanel welcomeWindow; + private static final long serialVersionUID = 1L; + private ReviewModeCasePanel caseManagementPanel = null; + private CaseImportPanel caseImportPanel = null; + private JTabbedPane copyPane = new JTabbedPane(); + private static final String LOCAL_HOST_NAME = NetworkUtils.getLocalHostName(); + + public StartupWindow() { + super(WindowManager.getDefault().getMainWindow(), TITLE, true); + init(); + } + + /** + * Shows the startup window. + */ + private void init() { + Dimension screenDimension = Toolkit.getDefaultToolkit().getScreenSize(); + + // set the popUp window / JFrame + setSize(DIMENSIONS); + int w = getSize().width; + int h = getSize().height; + + // set the location of the popUp Window on the center of the screen + setLocation((screenDimension.width - w) / 2, (screenDimension.height - h) / 2); + setLocationRelativeTo(WindowManager.getDefault().getMainWindow()); + + addPanelForMode(); + pack(); + setResizable(false); + } + + @Override + public void open() { + + if (caseManagementPanel != null) { + caseManagementPanel.updateView(); + caseManagementPanel.setCursor(Cursor.getDefaultCursor()); + } + + if (welcomeWindow != null) { + welcomeWindow.refresh(); + } + this.setLocationRelativeTo(WindowManager.getDefault().getMainWindow()); + setVisible(true); + } + + /** + * Closes the startup window. + */ + @Override + public void close() { + this.setVisible(false); + } + + /** + * Adds a panel to the dialog based on operational mode selected by the + * user. + */ + private void addPanelForMode() { + //UserPreferences.setMode(UserPreferences.SelectedMode.AUTOMATED); // ELTODO remove + UserPreferences.SelectedMode mode = UserPreferences.getMode(); + + switch (mode) { + case AUTOMATED: + this.setTitle(NbBundle.getMessage(StartupWindow.class, "StartupWindow.AutoIngestMode") + " (" + LOCAL_HOST_NAME + ")"); + setIconImage(ImageUtilities.loadImage("org/sleuthkit/autopsy/images/frame.gif", false)); //NON-NLS + this.addWindowListener(new WindowAdapter() { + @Override + public void windowClosing(WindowEvent e) { + AutoIngestDashboard.getInstance().shutdown(); + } + }); + setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); + add(AutoIngestDashboard.getInstance()); + break; + case REVIEW: + this.setTitle(NbBundle.getMessage(StartupWindow.class, "StartupWindow.ReviewMode") + " (" + LOCAL_HOST_NAME + ")"); + caseManagementPanel = new ReviewModeCasePanel(this); + setIconImage(ImageUtilities.loadImage("org/sleuthkit/autopsy/images/frame.gif", false)); //NON-NLS + add(caseManagementPanel); + break; + case COPYFILES: + this.setTitle(NbBundle.getMessage(StartupWindow.class, "StartupWindow.CopyAndImportMode") + " (" + LOCAL_HOST_NAME + ")"); + caseImportPanel = new CaseImportPanel(); + setIconImage(ImageUtilities.loadImage("org/sleuthkit/autopsy/images/frame.gif", false)); //NON-NLS + copyPane.add(NbBundle.getMessage(StartupWindow.class, "StartupWindow.CaseImportMode"), caseImportPanel); + this.addWindowListener(new WindowAdapter() { + @Override + public void windowClosing(WindowEvent e) { + LifecycleManager.getDefault().exit(); + } + }); + setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); + add(copyPane); + break; + default: + welcomeWindow = new CueBannerPanel(); + // add the command to close the window to the button on the Volume Detail Panel + welcomeWindow.setCloseButtonActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + close(); + } + }); + add(welcomeWindow); + break; + } + } +} diff --git a/Core/src/org/sleuthkit/autopsy/coordinationservice/CoordinationService.java b/Experimental/src/org/sleuthkit/autopsy/experimental/coordinationservice/CoordinationService.java similarity index 99% rename from Core/src/org/sleuthkit/autopsy/coordinationservice/CoordinationService.java rename to Experimental/src/org/sleuthkit/autopsy/experimental/coordinationservice/CoordinationService.java index 19dabb4381..6a025c203c 100644 --- a/Core/src/org/sleuthkit/autopsy/coordinationservice/CoordinationService.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/coordinationservice/CoordinationService.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.coordinationservice; +package org.sleuthkit.autopsy.experimental.coordinationservice; import java.util.HashMap; import java.util.Map; diff --git a/Core/src/org/sleuthkit/autopsy/autoingest/AutoIngestAlertFile.java b/Experimental/src/org/sleuthkit/experimental/autoingest/AutoIngestAlertFile.java similarity index 98% rename from Core/src/org/sleuthkit/autopsy/autoingest/AutoIngestAlertFile.java rename to Experimental/src/org/sleuthkit/experimental/autoingest/AutoIngestAlertFile.java index 4bd57ad39c..e755953b89 100644 --- a/Core/src/org/sleuthkit/autopsy/autoingest/AutoIngestAlertFile.java +++ b/Experimental/src/org/sleuthkit/experimental/autoingest/AutoIngestAlertFile.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.autoingest; +package org.sleuthkit.experimental.autoingest; import java.io.IOException; import java.nio.file.FileAlreadyExistsException; diff --git a/Core/src/org/sleuthkit/autopsy/autoingest/AutoIngestCase.java b/Experimental/src/org/sleuthkit/experimental/autoingest/AutoIngestCase.java similarity index 99% rename from Core/src/org/sleuthkit/autopsy/autoingest/AutoIngestCase.java rename to Experimental/src/org/sleuthkit/experimental/autoingest/AutoIngestCase.java index 0af2ae5749..dae90d5381 100644 --- a/Core/src/org/sleuthkit/autopsy/autoingest/AutoIngestCase.java +++ b/Experimental/src/org/sleuthkit/experimental/autoingest/AutoIngestCase.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.autoingest; +package org.sleuthkit.experimental.autoingest; import java.io.IOException; import java.nio.file.Files; diff --git a/Core/src/org/sleuthkit/autopsy/autoingest/AutoIngestCaseDeletedEvent.java b/Experimental/src/org/sleuthkit/experimental/autoingest/AutoIngestCaseDeletedEvent.java similarity index 97% rename from Core/src/org/sleuthkit/autopsy/autoingest/AutoIngestCaseDeletedEvent.java rename to Experimental/src/org/sleuthkit/experimental/autoingest/AutoIngestCaseDeletedEvent.java index 1fff7a7071..abcf4f5207 100644 --- a/Core/src/org/sleuthkit/autopsy/autoingest/AutoIngestCaseDeletedEvent.java +++ b/Experimental/src/org/sleuthkit/experimental/autoingest/AutoIngestCaseDeletedEvent.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.autoingest; +package org.sleuthkit.experimental.autoingest; import java.io.Serializable; import org.sleuthkit.autopsy.events.AutopsyEvent; diff --git a/Core/src/org/sleuthkit/autopsy/autoingest/AutoIngestCasePrioritizedEvent.java b/Experimental/src/org/sleuthkit/experimental/autoingest/AutoIngestCasePrioritizedEvent.java similarity index 97% rename from Core/src/org/sleuthkit/autopsy/autoingest/AutoIngestCasePrioritizedEvent.java rename to Experimental/src/org/sleuthkit/experimental/autoingest/AutoIngestCasePrioritizedEvent.java index 90435ededc..38ea02f97d 100644 --- a/Core/src/org/sleuthkit/autopsy/autoingest/AutoIngestCasePrioritizedEvent.java +++ b/Experimental/src/org/sleuthkit/experimental/autoingest/AutoIngestCasePrioritizedEvent.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.autoingest; +package org.sleuthkit.experimental.autoingest; import java.io.Serializable; import org.sleuthkit.autopsy.events.AutopsyEvent; diff --git a/Core/src/org/sleuthkit/autopsy/autoingest/AutoIngestDashboard.form b/Experimental/src/org/sleuthkit/experimental/autoingest/AutoIngestDashboard.form similarity index 81% rename from Core/src/org/sleuthkit/autopsy/autoingest/AutoIngestDashboard.form rename to Experimental/src/org/sleuthkit/experimental/autoingest/AutoIngestDashboard.form index 48bb6ab590..4b3da5fe9d 100644 --- a/Core/src/org/sleuthkit/autopsy/autoingest/AutoIngestDashboard.form +++ b/Experimental/src/org/sleuthkit/experimental/autoingest/AutoIngestDashboard.form @@ -170,7 +170,7 @@ - + @@ -194,7 +194,7 @@ - + @@ -218,7 +218,7 @@ - + @@ -232,10 +232,10 @@ - + - + @@ -245,10 +245,10 @@ - + - + @@ -261,7 +261,7 @@ - + @@ -271,7 +271,7 @@ - + @@ -281,17 +281,17 @@ - + - + - + @@ -301,10 +301,10 @@ - + - + @@ -314,10 +314,10 @@ - + - + @@ -327,10 +327,10 @@ - + - + @@ -341,10 +341,10 @@ - + - + @@ -354,10 +354,10 @@ - + - + @@ -367,10 +367,10 @@ - + - + @@ -380,10 +380,10 @@ - + - + @@ -397,7 +397,7 @@ - + @@ -410,17 +410,17 @@ - + - + - + @@ -433,7 +433,7 @@ - + @@ -444,7 +444,7 @@ - + @@ -454,7 +454,7 @@ - + @@ -463,4 +463,3 @@ - diff --git a/Core/src/org/sleuthkit/autopsy/autoingest/AutoIngestDashboard.java b/Experimental/src/org/sleuthkit/experimental/autoingest/AutoIngestDashboard.java similarity index 99% rename from Core/src/org/sleuthkit/autopsy/autoingest/AutoIngestDashboard.java rename to Experimental/src/org/sleuthkit/experimental/autoingest/AutoIngestDashboard.java index b40d01a77c..2c83b9c5ed 100644 --- a/Core/src/org/sleuthkit/autopsy/autoingest/AutoIngestDashboard.java +++ b/Experimental/src/org/sleuthkit/experimental/autoingest/AutoIngestDashboard.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.autoingest; +package org.sleuthkit.experimental.autoingest; import com.google.common.util.concurrent.ThreadFactoryBuilder; import java.awt.Cursor; @@ -58,7 +58,7 @@ import org.sleuthkit.autopsy.coreutils.NetworkUtils; import org.sleuthkit.autopsy.coreutils.PlatformUtil; import org.sleuthkit.autopsy.ingest.IngestManager; import org.sleuthkit.autopsy.ingest.IngestProgressSnapshotDialog; -import org.sleuthkit.autopsy.configuration.OptionsDialog; +import org.sleuthkit.autopsy.experimental.configuration.OptionsDialog; /** * A panel for monitoring automated ingest by a cluster, and for controlling diff --git a/Core/src/org/sleuthkit/autopsy/autoingest/AutoIngestJob.java b/Experimental/src/org/sleuthkit/experimental/autoingest/AutoIngestJob.java similarity index 99% rename from Core/src/org/sleuthkit/autopsy/autoingest/AutoIngestJob.java rename to Experimental/src/org/sleuthkit/experimental/autoingest/AutoIngestJob.java index 6ef9d4f7bb..81be23bbbb 100644 --- a/Core/src/org/sleuthkit/autopsy/autoingest/AutoIngestJob.java +++ b/Experimental/src/org/sleuthkit/experimental/autoingest/AutoIngestJob.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.autoingest; +package org.sleuthkit.experimental.autoingest; import java.io.Serializable; import java.nio.file.Path; diff --git a/Core/src/org/sleuthkit/autopsy/autoingest/AutoIngestJobCompletedEvent.java b/Experimental/src/org/sleuthkit/experimental/autoingest/AutoIngestJobCompletedEvent.java similarity index 96% rename from Core/src/org/sleuthkit/autopsy/autoingest/AutoIngestJobCompletedEvent.java rename to Experimental/src/org/sleuthkit/experimental/autoingest/AutoIngestJobCompletedEvent.java index 1695cbf20f..2af4171787 100644 --- a/Core/src/org/sleuthkit/autopsy/autoingest/AutoIngestJobCompletedEvent.java +++ b/Experimental/src/org/sleuthkit/experimental/autoingest/AutoIngestJobCompletedEvent.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.autoingest; +package org.sleuthkit.experimental.autoingest; import java.io.Serializable; diff --git a/Core/src/org/sleuthkit/autopsy/autoingest/AutoIngestJobEvent.java b/Experimental/src/org/sleuthkit/experimental/autoingest/AutoIngestJobEvent.java similarity index 96% rename from Core/src/org/sleuthkit/autopsy/autoingest/AutoIngestJobEvent.java rename to Experimental/src/org/sleuthkit/experimental/autoingest/AutoIngestJobEvent.java index c0e2178ad4..8c11c9fcbe 100644 --- a/Core/src/org/sleuthkit/autopsy/autoingest/AutoIngestJobEvent.java +++ b/Experimental/src/org/sleuthkit/experimental/autoingest/AutoIngestJobEvent.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.autoingest; +package org.sleuthkit.experimental.autoingest; import java.io.Serializable; import javax.annotation.concurrent.Immutable; diff --git a/Core/src/org/sleuthkit/autopsy/autoingest/AutoIngestJobLogger.java b/Experimental/src/org/sleuthkit/experimental/autoingest/AutoIngestJobLogger.java similarity index 98% rename from Core/src/org/sleuthkit/autopsy/autoingest/AutoIngestJobLogger.java rename to Experimental/src/org/sleuthkit/experimental/autoingest/AutoIngestJobLogger.java index 7672ffe64e..3a819d49d0 100644 --- a/Core/src/org/sleuthkit/autopsy/autoingest/AutoIngestJobLogger.java +++ b/Experimental/src/org/sleuthkit/experimental/autoingest/AutoIngestJobLogger.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.autoingest; +package org.sleuthkit.experimental.autoingest; import java.io.BufferedWriter; import java.io.File; @@ -29,9 +29,9 @@ import java.time.Instant; import java.util.Date; import java.util.logging.Level; import org.sleuthkit.autopsy.coreutils.NetworkUtils; -import org.sleuthkit.autopsy.coordinationservice.CoordinationService; -import org.sleuthkit.autopsy.coordinationservice.CoordinationService.Lock; -import org.sleuthkit.autopsy.coordinationservice.CoordinationService.CoordinationServiceException; +import org.sleuthkit.autopsy.experimental.coordinationservice.CoordinationService; +import org.sleuthkit.autopsy.experimental.coordinationservice.CoordinationService.Lock; +import org.sleuthkit.autopsy.experimental.coordinationservice.CoordinationService.CoordinationServiceException; import java.util.concurrent.TimeUnit; import java.util.List; import org.sleuthkit.autopsy.ingest.IngestModuleError; @@ -40,7 +40,7 @@ import org.sleuthkit.autopsy.ingest.IngestManager.IngestManagerException; /** * A logger for the processing of an auto ingest job by an auto ingest node. The * log messages are written to the case auto ingest log in the case directory. - * When an error message is logges, an alert file is also written to the case + * When an error message is logged, an alert file is also written to the case * directory. */ final class AutoIngestJobLogger { diff --git a/Core/src/org/sleuthkit/autopsy/autoingest/AutoIngestJobStartedEvent.java b/Experimental/src/org/sleuthkit/experimental/autoingest/AutoIngestJobStartedEvent.java similarity index 95% rename from Core/src/org/sleuthkit/autopsy/autoingest/AutoIngestJobStartedEvent.java rename to Experimental/src/org/sleuthkit/experimental/autoingest/AutoIngestJobStartedEvent.java index de6509dd7b..cbaabace0b 100644 --- a/Core/src/org/sleuthkit/autopsy/autoingest/AutoIngestJobStartedEvent.java +++ b/Experimental/src/org/sleuthkit/experimental/autoingest/AutoIngestJobStartedEvent.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.autoingest; +package org.sleuthkit.experimental.autoingest; import java.io.Serializable; diff --git a/Core/src/org/sleuthkit/autopsy/autoingest/AutoIngestJobStatusEvent.java b/Experimental/src/org/sleuthkit/experimental/autoingest/AutoIngestJobStatusEvent.java similarity index 96% rename from Core/src/org/sleuthkit/autopsy/autoingest/AutoIngestJobStatusEvent.java rename to Experimental/src/org/sleuthkit/experimental/autoingest/AutoIngestJobStatusEvent.java index b0468d1cc7..c331246670 100644 --- a/Core/src/org/sleuthkit/autopsy/autoingest/AutoIngestJobStatusEvent.java +++ b/Experimental/src/org/sleuthkit/experimental/autoingest/AutoIngestJobStatusEvent.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.autoingest; +package org.sleuthkit.experimental.autoingest; import java.io.Serializable; diff --git a/Core/src/org/sleuthkit/autopsy/autoingest/AutoIngestManager.java b/Experimental/src/org/sleuthkit/experimental/autoingest/AutoIngestManager.java similarity index 98% rename from Core/src/org/sleuthkit/autopsy/autoingest/AutoIngestManager.java rename to Experimental/src/org/sleuthkit/experimental/autoingest/AutoIngestManager.java index f3ba8b374f..8c2122b65b 100644 --- a/Core/src/org/sleuthkit/autopsy/autoingest/AutoIngestManager.java +++ b/Experimental/src/org/sleuthkit/experimental/autoingest/AutoIngestManager.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.autoingest; +package org.sleuthkit.experimental.autoingest; import java.io.Serializable; diff --git a/Core/src/org/sleuthkit/autopsy/autoingest/AutoIngestSystemLogger.java b/Experimental/src/org/sleuthkit/experimental/autoingest/AutoIngestSystemLogger.java similarity index 98% rename from Core/src/org/sleuthkit/autopsy/autoingest/AutoIngestSystemLogger.java rename to Experimental/src/org/sleuthkit/experimental/autoingest/AutoIngestSystemLogger.java index 296e3e8c1d..5bc00dad23 100644 --- a/Core/src/org/sleuthkit/autopsy/autoingest/AutoIngestSystemLogger.java +++ b/Experimental/src/org/sleuthkit/experimental/autoingest/AutoIngestSystemLogger.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.autoingest; +package org.sleuthkit.experimental.autoingest; import java.io.IOException; import java.nio.file.Path; diff --git a/Core/src/org/sleuthkit/autopsy/autoingest/Bundle.properties b/Experimental/src/org/sleuthkit/experimental/autoingest/Bundle.properties similarity index 100% rename from Core/src/org/sleuthkit/autopsy/autoingest/Bundle.properties rename to Experimental/src/org/sleuthkit/experimental/autoingest/Bundle.properties diff --git a/Core/src/org/sleuthkit/autopsy/autoingest/CaseImportPanel.form b/Experimental/src/org/sleuthkit/experimental/autoingest/CaseImportPanel.form similarity index 100% rename from Core/src/org/sleuthkit/autopsy/autoingest/CaseImportPanel.form rename to Experimental/src/org/sleuthkit/experimental/autoingest/CaseImportPanel.form diff --git a/Core/src/org/sleuthkit/autopsy/autoingest/CaseImportPanel.java b/Experimental/src/org/sleuthkit/experimental/autoingest/CaseImportPanel.java similarity index 99% rename from Core/src/org/sleuthkit/autopsy/autoingest/CaseImportPanel.java rename to Experimental/src/org/sleuthkit/experimental/autoingest/CaseImportPanel.java index 69eaf8b51a..1e14592230 100644 --- a/Core/src/org/sleuthkit/autopsy/autoingest/CaseImportPanel.java +++ b/Experimental/src/org/sleuthkit/experimental/autoingest/CaseImportPanel.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.autoingest; +package org.sleuthkit.experimental.autoingest; import java.awt.Color; import java.awt.Cursor; diff --git a/Core/src/org/sleuthkit/autopsy/autoingest/CaseStatus.java b/Experimental/src/org/sleuthkit/experimental/autoingest/CaseStatus.java similarity index 94% rename from Core/src/org/sleuthkit/autopsy/autoingest/CaseStatus.java rename to Experimental/src/org/sleuthkit/experimental/autoingest/CaseStatus.java index d57cc2ba3d..b1105347ff 100644 --- a/Core/src/org/sleuthkit/autopsy/autoingest/CaseStatus.java +++ b/Experimental/src/org/sleuthkit/experimental/autoingest/CaseStatus.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.autoingest; +package org.sleuthkit.experimental.autoingest; public enum CaseStatus { diff --git a/Core/src/org/sleuthkit/autopsy/autoingest/CaseStatusIconCellRenderer.java b/Experimental/src/org/sleuthkit/experimental/autoingest/CaseStatusIconCellRenderer.java similarity index 98% rename from Core/src/org/sleuthkit/autopsy/autoingest/CaseStatusIconCellRenderer.java rename to Experimental/src/org/sleuthkit/experimental/autoingest/CaseStatusIconCellRenderer.java index 10732fe2d2..09101b2a23 100644 --- a/Core/src/org/sleuthkit/autopsy/autoingest/CaseStatusIconCellRenderer.java +++ b/Experimental/src/org/sleuthkit/experimental/autoingest/CaseStatusIconCellRenderer.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.autoingest; +package org.sleuthkit.experimental.autoingest; import java.awt.Component; import javax.swing.ImageIcon; diff --git a/Core/src/org/sleuthkit/autopsy/autoingest/CenteredGrayableCellRenderer.java b/Experimental/src/org/sleuthkit/experimental/autoingest/CenteredGrayableCellRenderer.java similarity index 95% rename from Core/src/org/sleuthkit/autopsy/autoingest/CenteredGrayableCellRenderer.java rename to Experimental/src/org/sleuthkit/experimental/autoingest/CenteredGrayableCellRenderer.java index be382482a6..c15b3ef9ff 100644 --- a/Core/src/org/sleuthkit/autopsy/autoingest/CenteredGrayableCellRenderer.java +++ b/Experimental/src/org/sleuthkit/experimental/autoingest/CenteredGrayableCellRenderer.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.autoingest; +package org.sleuthkit.experimental.autoingest; import static javax.swing.SwingConstants.CENTER; diff --git a/Core/src/org/sleuthkit/autopsy/autoingest/CoordinationServiceNamespace.java b/Experimental/src/org/sleuthkit/experimental/autoingest/CoordinationServiceNamespace.java similarity index 95% rename from Core/src/org/sleuthkit/autopsy/autoingest/CoordinationServiceNamespace.java rename to Experimental/src/org/sleuthkit/experimental/autoingest/CoordinationServiceNamespace.java index 121588be12..687e21d841 100644 --- a/Core/src/org/sleuthkit/autopsy/autoingest/CoordinationServiceNamespace.java +++ b/Experimental/src/org/sleuthkit/experimental/autoingest/CoordinationServiceNamespace.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.autoingest; +package org.sleuthkit.experimental.autoingest; /** * RJCTODO diff --git a/Core/src/org/sleuthkit/autopsy/autoingest/DurationCellRenderer.java b/Experimental/src/org/sleuthkit/experimental/autoingest/DurationCellRenderer.java similarity index 98% rename from Core/src/org/sleuthkit/autopsy/autoingest/DurationCellRenderer.java rename to Experimental/src/org/sleuthkit/experimental/autoingest/DurationCellRenderer.java index 74da50e045..8e73c3e324 100644 --- a/Core/src/org/sleuthkit/autopsy/autoingest/DurationCellRenderer.java +++ b/Experimental/src/org/sleuthkit/experimental/autoingest/DurationCellRenderer.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.autoingest; +package org.sleuthkit.experimental.autoingest; import java.awt.Component; import java.time.Duration; diff --git a/Core/src/org/sleuthkit/autopsy/autoingest/FileExportRuleSet.java b/Experimental/src/org/sleuthkit/experimental/autoingest/FileExportRuleSet.java similarity index 99% rename from Core/src/org/sleuthkit/autopsy/autoingest/FileExportRuleSet.java rename to Experimental/src/org/sleuthkit/experimental/autoingest/FileExportRuleSet.java index 249ec7ea38..a2f2cd7ba9 100644 --- a/Core/src/org/sleuthkit/autopsy/autoingest/FileExportRuleSet.java +++ b/Experimental/src/org/sleuthkit/experimental/autoingest/FileExportRuleSet.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.autoingest; +package org.sleuthkit.experimental.autoingest; import java.io.Serializable; import java.sql.ResultSet; diff --git a/Core/src/org/sleuthkit/autopsy/autoingest/FileExportSettings.java b/Experimental/src/org/sleuthkit/experimental/autoingest/FileExportSettings.java similarity index 97% rename from Core/src/org/sleuthkit/autopsy/autoingest/FileExportSettings.java rename to Experimental/src/org/sleuthkit/experimental/autoingest/FileExportSettings.java index c4d3d777e8..b6dee434a5 100644 --- a/Core/src/org/sleuthkit/autopsy/autoingest/FileExportSettings.java +++ b/Experimental/src/org/sleuthkit/experimental/autoingest/FileExportSettings.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.autoingest; +package org.sleuthkit.experimental.autoingest; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -39,8 +39,8 @@ final class FileExportSettings implements Serializable { private static final String DEFAULT_MASTER_CATALOG_NAME = "interim"; private static final String DEFAULT_EXPORT_COMPLETED_FILE_NAME = "EXTRACTION_FINISHED"; private static final String DEFAULT_RULES_EVALUATED_NAME = "SORTER_FINISHED"; - private static final String SETTINGS_DIRECTORY = org.sleuthkit.autopsy.configuration.SharedConfiguration.FILE_EXPORTER_FOLDER; - private static final String SETTINGS_FILE_NAME = org.sleuthkit.autopsy.configuration.SharedConfiguration.FILE_EXPORTER_SETTINGS_FILE; + private static final String SETTINGS_DIRECTORY = org.sleuthkit.autopsy.experimental.configuration.SharedConfiguration.FILE_EXPORTER_FOLDER; + private static final String SETTINGS_FILE_NAME = org.sleuthkit.autopsy.experimental.configuration.SharedConfiguration.FILE_EXPORTER_SETTINGS_FILE; private TreeMap ruleSets; private String filesRootDirectory; private String reportsRootDirectory; diff --git a/Core/src/org/sleuthkit/autopsy/autoingest/FileExporter.java b/Experimental/src/org/sleuthkit/experimental/autoingest/FileExporter.java similarity index 99% rename from Core/src/org/sleuthkit/autopsy/autoingest/FileExporter.java rename to Experimental/src/org/sleuthkit/experimental/autoingest/FileExporter.java index 221b9e4d6d..06139e6a7b 100644 --- a/Core/src/org/sleuthkit/autopsy/autoingest/FileExporter.java +++ b/Experimental/src/org/sleuthkit/experimental/autoingest/FileExporter.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.autoingest; +package org.sleuthkit.experimental.autoingest; import com.fasterxml.jackson.core.JsonEncoding; import com.fasterxml.jackson.core.JsonFactory; @@ -45,7 +45,7 @@ import org.sleuthkit.datamodel.IngestModuleInfo; import org.sleuthkit.datamodel.SleuthkitCase; import org.sleuthkit.datamodel.TskCoreException; import org.sleuthkit.datamodel.TskData; -import org.sleuthkit.autopsy.autoingest.FileExportRuleSet.Rule; +import org.sleuthkit.experimental.autoingest.FileExportRuleSet.Rule; /** * Exports the files that satisfy user-defined file export rules from a set of diff --git a/Core/src/org/sleuthkit/autopsy/autoingest/FileExporterSettingsPanel.form b/Experimental/src/org/sleuthkit/experimental/autoingest/FileExporterSettingsPanel.form similarity index 87% rename from Core/src/org/sleuthkit/autopsy/autoingest/FileExporterSettingsPanel.form rename to Experimental/src/org/sleuthkit/experimental/autoingest/FileExporterSettingsPanel.form index e4d07837ab..c6f16d9c7a 100644 --- a/Core/src/org/sleuthkit/autopsy/autoingest/FileExporterSettingsPanel.form +++ b/Experimental/src/org/sleuthkit/experimental/autoingest/FileExporterSettingsPanel.form @@ -8,7 +8,7 @@ - + @@ -137,7 +137,7 @@ - + @@ -316,7 +316,7 @@ - + @@ -329,13 +329,13 @@ - + - + - + @@ -348,7 +348,7 @@ - + @@ -358,7 +358,7 @@ - + @@ -368,13 +368,13 @@ - + - + - + @@ -387,7 +387,7 @@ - + @@ -403,7 +403,7 @@ - + @@ -416,7 +416,7 @@ - + @@ -435,14 +435,14 @@ - + - + - + @@ -607,13 +607,13 @@ - + - + - + @@ -623,7 +623,7 @@ - + @@ -667,13 +667,13 @@ - + - + - + @@ -697,13 +697,13 @@ - + - + - + @@ -716,14 +716,14 @@ - + - + - + @@ -745,4 +745,4 @@ - + \ No newline at end of file diff --git a/Core/src/org/sleuthkit/autopsy/autoingest/FileExporterSettingsPanel.java b/Experimental/src/org/sleuthkit/experimental/autoingest/FileExporterSettingsPanel.java similarity index 99% rename from Core/src/org/sleuthkit/autopsy/autoingest/FileExporterSettingsPanel.java rename to Experimental/src/org/sleuthkit/experimental/autoingest/FileExporterSettingsPanel.java index 21e7ef3487..49c977ed62 100644 --- a/Core/src/org/sleuthkit/autopsy/autoingest/FileExporterSettingsPanel.java +++ b/Experimental/src/org/sleuthkit/experimental/autoingest/FileExporterSettingsPanel.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.autoingest; +package org.sleuthkit.experimental.autoingest; import com.github.lgooddatepicker.datetimepicker.DateTimePicker; import com.github.lgooddatepicker.optionalusertools.PickerUtilities; @@ -46,11 +46,11 @@ import javax.swing.JTextField; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import org.sleuthkit.autopsy.corecomponents.TextPrompt; -import org.sleuthkit.autopsy.autoingest.FileExportRuleSet.Rule; -import org.sleuthkit.autopsy.autoingest.FileExportRuleSet.Rule.FileMIMETypeCondition; -import org.sleuthkit.autopsy.autoingest.FileExportRuleSet.Rule.FileSizeCondition; -import org.sleuthkit.autopsy.autoingest.FileExportRuleSet.Rule.FileSizeCondition.SizeUnit; -import org.sleuthkit.autopsy.autoingest.FileExportRuleSet.Rule.RelationalOp; +import org.sleuthkit.experimental.autoingest.FileExportRuleSet.Rule; +import org.sleuthkit.experimental.autoingest.FileExportRuleSet.Rule.FileMIMETypeCondition; +import org.sleuthkit.experimental.autoingest.FileExportRuleSet.Rule.FileSizeCondition; +import org.sleuthkit.experimental.autoingest.FileExportRuleSet.Rule.FileSizeCondition.SizeUnit; +import org.sleuthkit.experimental.autoingest.FileExportRuleSet.Rule.RelationalOp; import org.sleuthkit.autopsy.coreutils.FileUtil; import java.util.logging.Level; import javax.swing.DefaultComboBoxModel; @@ -75,7 +75,7 @@ import org.sleuthkit.datamodel.BlackboardArtifact; import org.sleuthkit.datamodel.BlackboardAttribute; import org.sleuthkit.datamodel.SleuthkitCase; import org.sleuthkit.datamodel.TskCoreException; -import org.sleuthkit.autopsy.autoingest.FileExportRuleSet.Rule.ArtifactCondition; +import org.sleuthkit.experimental.autoingest.FileExportRuleSet.Rule.ArtifactCondition; import java.time.Instant; import java.time.LocalDateTime; import java.time.ZoneId; diff --git a/Core/src/org/sleuthkit/autopsy/autoingest/GrayableCellRenderer.java b/Experimental/src/org/sleuthkit/experimental/autoingest/GrayableCellRenderer.java similarity index 97% rename from Core/src/org/sleuthkit/autopsy/autoingest/GrayableCellRenderer.java rename to Experimental/src/org/sleuthkit/experimental/autoingest/GrayableCellRenderer.java index d67787ddb8..b15994cb72 100644 --- a/Core/src/org/sleuthkit/autopsy/autoingest/GrayableCellRenderer.java +++ b/Experimental/src/org/sleuthkit/experimental/autoingest/GrayableCellRenderer.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.autoingest; +package org.sleuthkit.experimental.autoingest; import java.awt.Color; import java.awt.Component; diff --git a/Core/src/org/sleuthkit/autopsy/autoingest/ImportDoneCallback.java b/Experimental/src/org/sleuthkit/experimental/autoingest/ImportDoneCallback.java similarity index 94% rename from Core/src/org/sleuthkit/autopsy/autoingest/ImportDoneCallback.java rename to Experimental/src/org/sleuthkit/experimental/autoingest/ImportDoneCallback.java index 5486a5bd1e..d250cb83e7 100644 --- a/Core/src/org/sleuthkit/autopsy/autoingest/ImportDoneCallback.java +++ b/Experimental/src/org/sleuthkit/experimental/autoingest/ImportDoneCallback.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.autoingest; +package org.sleuthkit.experimental.autoingest; public interface ImportDoneCallback { diff --git a/Core/src/org/sleuthkit/autopsy/autoingest/LongDateCellRenderer.java b/Experimental/src/org/sleuthkit/experimental/autoingest/LongDateCellRenderer.java similarity index 97% rename from Core/src/org/sleuthkit/autopsy/autoingest/LongDateCellRenderer.java rename to Experimental/src/org/sleuthkit/experimental/autoingest/LongDateCellRenderer.java index 44ce455173..2700fefb08 100644 --- a/Core/src/org/sleuthkit/autopsy/autoingest/LongDateCellRenderer.java +++ b/Experimental/src/org/sleuthkit/experimental/autoingest/LongDateCellRenderer.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.autoingest; +package org.sleuthkit.experimental.autoingest; import java.awt.Component; import java.text.SimpleDateFormat; diff --git a/Core/src/org/sleuthkit/autopsy/autoingest/Manifest.java b/Experimental/src/org/sleuthkit/experimental/autoingest/Manifest.java similarity index 98% rename from Core/src/org/sleuthkit/autopsy/autoingest/Manifest.java rename to Experimental/src/org/sleuthkit/experimental/autoingest/Manifest.java index 60debbe335..537e58581d 100644 --- a/Core/src/org/sleuthkit/autopsy/autoingest/Manifest.java +++ b/Experimental/src/org/sleuthkit/experimental/autoingest/Manifest.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.autoingest; +package org.sleuthkit.experimental.autoingest; import java.io.IOException; import java.io.Serializable; diff --git a/Core/src/org/sleuthkit/autopsy/autoingest/ManifestFileParser.java b/Experimental/src/org/sleuthkit/experimental/autoingest/ManifestFileParser.java similarity index 97% rename from Core/src/org/sleuthkit/autopsy/autoingest/ManifestFileParser.java rename to Experimental/src/org/sleuthkit/experimental/autoingest/ManifestFileParser.java index 737c6111cd..a1a1f0ab0e 100644 --- a/Core/src/org/sleuthkit/autopsy/autoingest/ManifestFileParser.java +++ b/Experimental/src/org/sleuthkit/experimental/autoingest/ManifestFileParser.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.autoingest; +package org.sleuthkit.experimental.autoingest; import java.nio.file.Path; diff --git a/Core/src/org/sleuthkit/autopsy/autoingest/ManifestNodeData.java b/Experimental/src/org/sleuthkit/experimental/autoingest/ManifestNodeData.java similarity index 98% rename from Core/src/org/sleuthkit/autopsy/autoingest/ManifestNodeData.java rename to Experimental/src/org/sleuthkit/experimental/autoingest/ManifestNodeData.java index c42553f9cb..25ab4f9ef7 100644 --- a/Core/src/org/sleuthkit/autopsy/autoingest/ManifestNodeData.java +++ b/Experimental/src/org/sleuthkit/experimental/autoingest/ManifestNodeData.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.autoingest; +package org.sleuthkit.experimental.autoingest; import java.nio.ByteBuffer; diff --git a/Core/src/org/sleuthkit/autopsy/autoingest/PathUtils.java b/Experimental/src/org/sleuthkit/experimental/autoingest/PathUtils.java similarity index 99% rename from Core/src/org/sleuthkit/autopsy/autoingest/PathUtils.java rename to Experimental/src/org/sleuthkit/experimental/autoingest/PathUtils.java index fe9c7239a4..608ae5d84a 100644 --- a/Core/src/org/sleuthkit/autopsy/autoingest/PathUtils.java +++ b/Experimental/src/org/sleuthkit/experimental/autoingest/PathUtils.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.autoingest; +package org.sleuthkit.experimental.autoingest; import java.io.File; import java.io.FilenameFilter; diff --git a/Core/src/org/sleuthkit/autopsy/autoingest/PathUtils.java.bak b/Experimental/src/org/sleuthkit/experimental/autoingest/PathUtils.java.bak similarity index 100% rename from Core/src/org/sleuthkit/autopsy/autoingest/PathUtils.java.bak rename to Experimental/src/org/sleuthkit/experimental/autoingest/PathUtils.java.bak diff --git a/Core/src/org/sleuthkit/autopsy/autoingest/ReviewModeCaseManager.java b/Experimental/src/org/sleuthkit/experimental/autoingest/ReviewModeCaseManager.java similarity index 97% rename from Core/src/org/sleuthkit/autopsy/autoingest/ReviewModeCaseManager.java rename to Experimental/src/org/sleuthkit/experimental/autoingest/ReviewModeCaseManager.java index 7755fd500c..f03cf4f93d 100644 --- a/Core/src/org/sleuthkit/autopsy/autoingest/ReviewModeCaseManager.java +++ b/Experimental/src/org/sleuthkit/experimental/autoingest/ReviewModeCaseManager.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.autoingest; +package org.sleuthkit.experimental.autoingest; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -37,8 +37,8 @@ import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.casemodule.CaseActionException; import org.sleuthkit.autopsy.casemodule.CaseNewAction; import org.sleuthkit.autopsy.core.UserPreferences; -import org.sleuthkit.autopsy.coordinationservice.CoordinationService; -import org.sleuthkit.autopsy.coordinationservice.CoordinationService.CoordinationServiceException; +import org.sleuthkit.autopsy.experimental.coordinationservice.CoordinationService; +import org.sleuthkit.autopsy.experimental.coordinationservice.CoordinationService.CoordinationServiceException; /** diff --git a/Core/src/org/sleuthkit/autopsy/autoingest/ReviewModeCasePanel.form b/Experimental/src/org/sleuthkit/experimental/autoingest/ReviewModeCasePanel.form similarity index 87% rename from Core/src/org/sleuthkit/autopsy/autoingest/ReviewModeCasePanel.form rename to Experimental/src/org/sleuthkit/experimental/autoingest/ReviewModeCasePanel.form index a0096a9e6d..9ec7660aa0 100644 --- a/Core/src/org/sleuthkit/autopsy/autoingest/ReviewModeCasePanel.form +++ b/Experimental/src/org/sleuthkit/experimental/autoingest/ReviewModeCasePanel.form @@ -76,7 +76,7 @@ - + @@ -112,7 +112,7 @@ - + @@ -163,7 +163,7 @@ - + @@ -176,7 +176,7 @@ - + @@ -189,7 +189,7 @@ - + @@ -202,7 +202,7 @@ - + @@ -216,7 +216,7 @@ - + @@ -225,10 +225,10 @@ - + - + @@ -239,7 +239,7 @@ - + diff --git a/Core/src/org/sleuthkit/autopsy/autoingest/ReviewModeCasePanel.java b/Experimental/src/org/sleuthkit/experimental/autoingest/ReviewModeCasePanel.java similarity index 99% rename from Core/src/org/sleuthkit/autopsy/autoingest/ReviewModeCasePanel.java rename to Experimental/src/org/sleuthkit/experimental/autoingest/ReviewModeCasePanel.java index 346f3794fc..4f3bc5be16 100644 --- a/Core/src/org/sleuthkit/autopsy/autoingest/ReviewModeCasePanel.java +++ b/Experimental/src/org/sleuthkit/experimental/autoingest/ReviewModeCasePanel.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.autoingest; +package org.sleuthkit.experimental.autoingest; import java.awt.Desktop; import java.nio.file.Paths; @@ -41,8 +41,8 @@ import java.awt.Cursor; import java.io.IOException; import org.openide.windows.WindowManager; import org.sleuthkit.autopsy.casemodule.CaseMetadata; -import org.sleuthkit.autopsy.autoingest.ReviewModeCaseManager.ReviewModeCaseManagerException; -import org.sleuthkit.autopsy.configuration.OptionsDialog; +import org.sleuthkit.experimental.autoingest.ReviewModeCaseManager.ReviewModeCaseManagerException; +import org.sleuthkit.autopsy.experimental.configuration.OptionsDialog; /** * A panel that allows a user to open cases created by automated ingest. diff --git a/Core/src/org/sleuthkit/autopsy/autoingest/ShortDateCellRenderer.java b/Experimental/src/org/sleuthkit/experimental/autoingest/ShortDateCellRenderer.java similarity index 97% rename from Core/src/org/sleuthkit/autopsy/autoingest/ShortDateCellRenderer.java rename to Experimental/src/org/sleuthkit/experimental/autoingest/ShortDateCellRenderer.java index 97584a2dea..364e43c079 100644 --- a/Core/src/org/sleuthkit/autopsy/autoingest/ShortDateCellRenderer.java +++ b/Experimental/src/org/sleuthkit/experimental/autoingest/ShortDateCellRenderer.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.autoingest; +package org.sleuthkit.experimental.autoingest; import java.awt.Component; import java.text.SimpleDateFormat; diff --git a/Core/src/org/sleuthkit/autopsy/autoingest/SingleUserCaseImporter.java b/Experimental/src/org/sleuthkit/experimental/autoingest/SingleUserCaseImporter.java similarity index 99% rename from Core/src/org/sleuthkit/autopsy/autoingest/SingleUserCaseImporter.java rename to Experimental/src/org/sleuthkit/experimental/autoingest/SingleUserCaseImporter.java index 735ab3f759..716a9fe2d6 100644 --- a/Core/src/org/sleuthkit/autopsy/autoingest/SingleUserCaseImporter.java +++ b/Experimental/src/org/sleuthkit/experimental/autoingest/SingleUserCaseImporter.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.autoingest; +package org.sleuthkit.experimental.autoingest; import java.awt.Dimension; import java.io.BufferedWriter; diff --git a/Core/src/org/sleuthkit/autopsy/autoingest/StateFile.java b/Experimental/src/org/sleuthkit/experimental/autoingest/StateFile.java similarity index 98% rename from Core/src/org/sleuthkit/autopsy/autoingest/StateFile.java rename to Experimental/src/org/sleuthkit/experimental/autoingest/StateFile.java index e2a6f896a4..9b6356f2eb 100644 --- a/Core/src/org/sleuthkit/autopsy/autoingest/StateFile.java +++ b/Experimental/src/org/sleuthkit/experimental/autoingest/StateFile.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.autoingest; +package org.sleuthkit.experimental.autoingest; import java.io.IOException; import java.nio.file.FileAlreadyExistsException; diff --git a/Core/src/org/sleuthkit/autopsy/autoingest/TimeStampUtils.java b/Experimental/src/org/sleuthkit/experimental/autoingest/TimeStampUtils.java similarity index 98% rename from Core/src/org/sleuthkit/autopsy/autoingest/TimeStampUtils.java rename to Experimental/src/org/sleuthkit/experimental/autoingest/TimeStampUtils.java index c032cd960d..0766bd15f1 100644 --- a/Core/src/org/sleuthkit/autopsy/autoingest/TimeStampUtils.java +++ b/Experimental/src/org/sleuthkit/experimental/autoingest/TimeStampUtils.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.autoingest; +package org.sleuthkit.experimental.autoingest; import java.text.SimpleDateFormat; import java.util.Calendar; diff --git a/nbproject/project.properties b/nbproject/project.properties index 8d6bea269f..603fe1850e 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -9,6 +9,7 @@ app.version=4.1.0 #build.type=RELEASE build.type=DEVELOPMENT +project.org.sleuthkit.autopsy.experimental=Experimental project.org.sleuthkit.autopsy.imagegallery=ImageGallery update_versions=false #custom JVM options @@ -28,7 +29,8 @@ modules=\ ${project.org.sleuthkit.autopsy.thunderbirdparser}:\ ${project.org.sleuthkit.autopsy.core}:\ ${project.org.sleuthkit.autopsy.corelibs}:\ - ${project.org.sleuthkit.autopsy.imagegallery} + ${project.org.sleuthkit.autopsy.imagegallery}:\ + ${project.org.sleuthkit.autopsy.experimental} project.org.sleuthkit.autopsy.core=Core project.org.sleuthkit.autopsy.corelibs=CoreLibs project.org.sleuthkit.autopsy.keywordsearch=KeywordSearch