diff --git a/Experimental/manifest.mf b/Experimental/manifest.mf index 0585710499..eb45e376b8 100644 --- a/Experimental/manifest.mf +++ b/Experimental/manifest.mf @@ -4,4 +4,4 @@ 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-Specification-Version: 1.0 -OpenIDE-Module-Install: org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/eventlisteners/Installer.class \ No newline at end of file +OpenIDE-Module-Install: org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/eventlisteners/Installer.class \ No newline at end of file diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/SharedConfiguration.java b/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/SharedConfiguration.java index 5141bb99e3..0811a52c2b 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/SharedConfiguration.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/SharedConfiguration.java @@ -79,7 +79,7 @@ public class SharedConfiguration { private static final String HASHDB_CONFIG_FILE_NAME = "hashLookup.settings"; //NON-NLS private static final String HASHDB_CONFIG_FILE_NAME_LEGACY = "hashsets.xml"; //NON-NLS public static final String FILE_EXPORTER_SETTINGS_FILE = "fileexporter.settings"; //NON-NLS - private static final String ENTERPRISE_ARTIFACTS_MANAGER_PROPERTIES_FILE = "EnterpriseArtifactManager.properties"; //NON-NLS + private static final String ENTERPRISE_ARTIFACTS_MANAGER_PROPERTIES_FILE = "EnterpriseArtifactsManager.properties"; //NON-NLS private static final String SHARED_CONFIG_VERSIONS = "SharedConfigVersions.txt"; //NON-NLS // Folders diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/Bundle.properties b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/Bundle.properties deleted file mode 100644 index 70d803fef9..0000000000 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/Bundle.properties +++ /dev/null @@ -1 +0,0 @@ -OpenIDE-Module-Name=Enterprise Artifact Manager diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/Bundle.properties b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/Bundle.properties new file mode 100644 index 0000000000..e6a776152e --- /dev/null +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/Bundle.properties @@ -0,0 +1 @@ +OpenIDE-Module-Name=Enterprise Artifacts Manager diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/README-POSTGRES-TESTING.md b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/README-POSTGRES-TESTING.md similarity index 100% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/README-POSTGRES-TESTING.md rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/README-POSTGRES-TESTING.md diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/README_MONGODB_TESTING.md b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/README_MONGODB_TESTING.md similarity index 100% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/README_MONGODB_TESTING.md rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/README_MONGODB_TESTING.md diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/actions/Bundle.properties b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/actions/Bundle.properties similarity index 98% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/actions/Bundle.properties rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/actions/Bundle.properties index dac0221be9..354357eb76 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/actions/Bundle.properties +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/actions/Bundle.properties @@ -1,5 +1,5 @@ /* - * Enterprise Artifact Manager + * Enterprise Artifacts Manager * * Copyright 2015-2017 Basis Technology Corp. * Contact: carrier sleuthkit org diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/actions/EamCaseEditDetailsPanel.form b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/actions/EamCaseEditDetailsPanel.form similarity index 84% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/actions/EamCaseEditDetailsPanel.form rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/actions/EamCaseEditDetailsPanel.form index 72193a718a..74fdc7424e 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/actions/EamCaseEditDetailsPanel.form +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/actions/EamCaseEditDetailsPanel.form @@ -60,14 +60,14 @@ - + - + @@ -79,7 +79,7 @@ - + @@ -139,56 +139,56 @@ - + - + - + - + - + - + - + - + @@ -198,8 +198,8 @@ - - + + @@ -282,7 +282,7 @@ - + @@ -307,56 +307,56 @@ - + - + - + - + - + - + - + - + @@ -369,8 +369,8 @@ - - + + @@ -441,49 +441,49 @@ - + - + - + - + - + - + - + @@ -499,7 +499,7 @@ - + diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/actions/EamCaseEditDetailsPanel.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/actions/EamCaseEditDetailsPanel.java similarity index 97% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/actions/EamCaseEditDetailsPanel.java rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/actions/EamCaseEditDetailsPanel.java index 195ac5c986..a691f7c867 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/actions/EamCaseEditDetailsPanel.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/actions/EamCaseEditDetailsPanel.java @@ -1,5 +1,5 @@ /* - * Enterprise Artifact Manager + * Enterprise Artifacts Manager * * Copyright 2015-2017 Basis Technology Corp. * Contact: carrier sleuthkit org @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.actions; +package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.actions; import java.awt.Cursor; import java.awt.event.ActionListener; @@ -31,14 +31,14 @@ import javax.swing.JTextArea; import javax.swing.JTextField; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamCase; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDbException; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamOrganization; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.optionspanel.AddNewOrganizationDialog; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDb; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamCase; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDbException; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamOrganization; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.optionspanel.AddNewOrganizationDialog; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDb; /** - * Handle editing details of cases within the Enterprise Artifact Manager + * Handle editing details of cases within the Enterprise Artifacts Manager */ public class EamCaseEditDetailsPanel extends JPanel { @@ -53,7 +53,7 @@ public class EamCaseEditDetailsPanel extends JPanel { private List orgs = null; /** - * Creates new form EnterpriseArtifactManagerCasedEditDetailsForm + * Creates new form EnterpriseArtifactsManagerCasedEditDetailsForm */ public EamCaseEditDetailsPanel(EamCase eamCase) { this.eamCase = eamCase; @@ -410,7 +410,7 @@ public class EamCaseEditDetailsPanel extends JPanel { private void bnApplyActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bnApplyActionPerformed // write content to db if (contentChanged) { - updateEnterpriseArtifactManagerCase(); + updateEnterpriseArtifactsManagerCase(); updateDb(); contentChanged = false; } @@ -504,7 +504,7 @@ public class EamCaseEditDetailsPanel extends JPanel { * Save changed value from text fields and text areas into the EamCase * object. */ - private void updateEnterpriseArtifactManagerCase() { + private void updateEnterpriseArtifactsManagerCase() { eamCase.setOrg(selectedOrg); eamCase.setExaminerName(tfExaminerNameText.getText()); eamCase.setExaminerEmail(tfExaminerEmailText.getText()); @@ -516,14 +516,14 @@ public class EamCaseEditDetailsPanel extends JPanel { setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); if (!dbManager.isEnabled()) { - LOGGER.log(Level.SEVERE, "Enteprise artifact manager database not enabled"); // NON-NLS + LOGGER.log(Level.SEVERE, "Enteprise artifacts manager database not enabled"); // NON-NLS return; } try { dbManager.updateCase(eamCase); } catch (IllegalArgumentException | EamDbException ex) { - LOGGER.log(Level.SEVERE, "Error connecting to enterprise artifact manager database", ex); // NON-NLS + LOGGER.log(Level.SEVERE, "Error connecting to enterprise artifacts manager database", ex); // NON-NLS } finally { setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); } diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/actions/EamEditCaseInfoAction.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/actions/EamEditCaseInfoAction.java similarity index 76% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/actions/EamEditCaseInfoAction.java rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/actions/EamEditCaseInfoAction.java index 2517a61fb8..4a06fde038 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/actions/EamEditCaseInfoAction.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/actions/EamEditCaseInfoAction.java @@ -1,5 +1,5 @@ /* - * Enterprise Artifact Manager + * Enterprise Artifacts Manager * * Copyright 2015-2017 Basis Technology Corp. * Contact: carrier sleuthkit org @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.actions; +package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.actions; import java.awt.Dimension; import java.awt.HeadlessException; @@ -39,23 +39,23 @@ import org.openide.util.actions.CallableSystemAction; import org.openide.windows.WindowManager; import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.coreutils.ModuleSettings; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamCase; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDbException; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDb; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamCase; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDbException; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDb; /** - * Action to update case details in enterprise artifact manager database + * Action to update case details in enterprise artifacts manager database */ @ActionID( category = "Case", - id = "org.sleuthkit.enterpriseartifactmanager.actions.EnterpriseArtifactManagerCaseEditCaseInfoAction" + id = "org.sleuthkit.enterpriseartifactsmanager.actions.EnterpriseArtifactsManagerCaseEditCaseInfoAction" ) @ActionRegistration( - displayName = "#CTL_EnterpriseArtifactManagerCaseEditCaseInfo", + displayName = "#CTL_EnterpriseArtifactsManagerCaseEditCaseInfo", lazy = false ) @ActionReference(path = "Menu/Case", position = 650, separatorAfter = 824) -@Messages("CTL_EnterpriseArtifactManagerCaseEditCaseInfo=Enterprise Artifact Manager Case Details") +@Messages("CTL_EnterpriseArtifactsManagerCaseEditCaseInfo=Enterprise Artifacts Manager Case Details") public final class EamEditCaseInfoAction extends CallableSystemAction implements ActionListener { private final static Logger LOGGER = Logger.getLogger(EamEditCaseInfoAction.class.getName()); @@ -63,7 +63,7 @@ public final class EamEditCaseInfoAction extends CallableSystemAction implements private static JDialog popUpWindow; EamEditCaseInfoAction() { - putValue(Action.NAME, Bundle.CTL_EnterpriseArtifactManagerCaseEditCaseInfo()); // put the action Name + putValue(Action.NAME, Bundle.CTL_EnterpriseArtifactsManagerCaseEditCaseInfo()); // put the action Name this.setEnabled(true); Case.addEventSubscriber(Case.Events.CURRENT_CASE.toString(), new PropertyChangeListener() { @Override @@ -75,7 +75,7 @@ public final class EamEditCaseInfoAction extends CallableSystemAction implements @Override public boolean isEnabled() { - boolean enabled = Boolean.valueOf(ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.enabled")); // NON-NLS + boolean enabled = Boolean.valueOf(ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.enabled")); // NON-NLS return enabled && Case.isCaseOpen(); } @@ -85,14 +85,14 @@ public final class EamEditCaseInfoAction extends CallableSystemAction implements } @Override - @Messages({"EnterpriseArtifactManagerCaseEditDetails.window.title=Edit Case Details"}) + @Messages({"EnterpriseArtifactsManagerCaseEditDetails.window.title=Edit Case Details"}) public void performAction() { if (popUpWindow == null) { String curCaseUUID = Case.getCurrentCase().getName(); // create the popUp window for it - String title = Bundle.EnterpriseArtifactManagerCaseEditDetails_window_title(); + String title = Bundle.EnterpriseArtifactsManagerCaseEditDetails_window_title(); popUpWindow = new JDialog((JFrame) WindowManager.getDefault().getMainWindow(), title, false); try { // query case details @@ -115,9 +115,9 @@ public final class EamEditCaseInfoAction extends CallableSystemAction implements popUpWindow.setVisible(true); } catch (HeadlessException ex) { - LOGGER.log(Level.WARNING, "Error displaying Enterprise Artifact Manager Case Properties window.", ex); //NON-NLS + LOGGER.log(Level.WARNING, "Error displaying Enterprise Artifacts Manager Case Properties window.", ex); //NON-NLS } catch (EamDbException ex) { - LOGGER.log(Level.WARNING, "Error connecting to Enterprise Artifact Manager databaes.", ex); // NON-NLS + LOGGER.log(Level.WARNING, "Error connecting to Enterprise Artifacts Manager databaes.", ex); // NON-NLS } } popUpWindow.setVisible(true); @@ -127,7 +127,7 @@ public final class EamEditCaseInfoAction extends CallableSystemAction implements @Override public String getName() { - return Bundle.CTL_EnterpriseArtifactManagerCaseEditCaseInfo(); + return Bundle.CTL_EnterpriseArtifactsManagerCaseEditCaseInfo(); } @Override diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/contentviewer/Bundle.properties b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/contentviewer/Bundle.properties similarity index 100% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/contentviewer/Bundle.properties rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/contentviewer/Bundle.properties diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/contentviewer/DataContentViewerOtherCases.form b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/contentviewer/DataContentViewerOtherCases.form similarity index 89% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/contentviewer/DataContentViewerOtherCases.form rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/contentviewer/DataContentViewerOtherCases.form index a807f4c8af..29d715b8e5 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/contentviewer/DataContentViewerOtherCases.form +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/contentviewer/DataContentViewerOtherCases.form @@ -11,28 +11,28 @@ - + - + - + - + @@ -122,7 +122,7 @@ - + diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/contentviewer/DataContentViewerOtherCases.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/contentviewer/DataContentViewerOtherCases.java similarity index 96% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/contentviewer/DataContentViewerOtherCases.java rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/contentviewer/DataContentViewerOtherCases.java index ce1834ea66..e0ad406386 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/contentviewer/DataContentViewerOtherCases.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/contentviewer/DataContentViewerOtherCases.java @@ -1,5 +1,5 @@ /* - * Enterprise Artifact Manager + * Enterprise Artifacts Manager * * Copyright 2015-2017 Basis Technology Corp. * Contact: carrier sleuthkit org @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.contentviewer; +package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.contentviewer; import java.awt.Component; import java.awt.event.ActionEvent; @@ -47,12 +47,13 @@ import org.openide.util.NbBundle.Messages; import org.openide.util.lookup.ServiceProvider; import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.corecomponentinterfaces.DataContentViewer; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamArtifact; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamArtifactInstance; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamArtifactUtil; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamCase; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDbException; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamGlobalFileInstance; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.contentviewer.Bundle; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamArtifact; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamArtifactInstance; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamArtifactUtil; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamCase; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDbException; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamGlobalFileInstance; import org.sleuthkit.datamodel.AbstractFile; import org.sleuthkit.datamodel.BlackboardArtifact; import org.sleuthkit.datamodel.BlackboardArtifactTag; @@ -60,7 +61,7 @@ import org.sleuthkit.datamodel.Content; import org.sleuthkit.datamodel.ContentTag; import org.sleuthkit.datamodel.TskCoreException; import org.sleuthkit.datamodel.TskException; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDb; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDb; /** * View correlation results from other cases @@ -358,12 +359,12 @@ public class DataContentViewerOtherCases extends javax.swing.JPanel implements D /** * Scan a Node for blackboard artifacts / content that we can correlate on - * and create the corresponding enterprise artifact manager artifacts for + * and create the corresponding enterprise artifacts manager artifacts for * display * * @param node The node to view * - * @return A collection of enterprise artifact manager artifacts to display + * @return A collection of enterprise artifacts manager artifacts to display */ private Collection getArtifactsFromCorrelatableAttributes(Node node) { Collection ret = new ArrayList<>(); @@ -446,7 +447,7 @@ public class DataContentViewerOtherCases extends javax.swing.JPanel implements D /** * Query the db for artifact instances from other cases correlated to the - * given enterprise artifact manager artifact. + * given enterprise artifacts manager artifact. * * @param eamArtifact The artifact to correlate against * @@ -471,11 +472,11 @@ public class DataContentViewerOtherCases extends javax.swing.JPanel implements D /** * Get the Global File Instances matching the given eamArtifact and convert - * them to Enterprise Artifact Manager Artifact Instancess. + * them to Enterprise Artifacts Manager Artifact Instancess. * * @param eamArtifact Artifact to use for ArtifactTypeEnum matching * - * @return List of Enterprise Artifact Manager Artifact Instances, empty + * @return List of Enterprise Artifacts Manager Artifact Instances, empty * list if none found */ public Collection getGlobalFileInstancesAsArtifactInstances(EamArtifact eamArtifact) { @@ -513,7 +514,7 @@ public class DataContentViewerOtherCases extends javax.swing.JPanel implements D } @Override - @Messages({"DataContentViewerOtherCases.table.nodbconnection=Cannot connect to enterprise artifact manager database."}) + @Messages({"DataContentViewerOtherCases.table.nodbconnection=Cannot connect to enterprise artifacts manager database."}) public void setNode(Node node) { EamDb dbManager = EamDb.getInstance(); if (!dbManager.isEnabled()) { diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/contentviewer/DataContentViewerOtherCasesTableCellRenderer.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/contentviewer/DataContentViewerOtherCasesTableCellRenderer.java similarity index 95% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/contentviewer/DataContentViewerOtherCasesTableCellRenderer.java rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/contentviewer/DataContentViewerOtherCasesTableCellRenderer.java index e795de5f32..d9c453b67e 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/contentviewer/DataContentViewerOtherCasesTableCellRenderer.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/contentviewer/DataContentViewerOtherCasesTableCellRenderer.java @@ -1,5 +1,5 @@ /* - * Enterprise Artifact Manager + * Enterprise Artifacts Manager * * Copyright 2015-2017 Basis Technology Corp. * Contact: carrier sleuthkit org @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.contentviewer; +package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.contentviewer; import java.awt.Color; import java.awt.Component; diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/contentviewer/DataContentViewerOtherCasesTableModel.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/contentviewer/DataContentViewerOtherCasesTableModel.java similarity index 90% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/contentviewer/DataContentViewerOtherCasesTableModel.java rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/contentviewer/DataContentViewerOtherCasesTableModel.java index a6e2a8817b..5977444044 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/contentviewer/DataContentViewerOtherCasesTableModel.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/contentviewer/DataContentViewerOtherCasesTableModel.java @@ -1,5 +1,5 @@ /* - * Enterprise Artifact Manager + * Enterprise Artifacts Manager * * Copyright 2015-2017 Basis Technology Corp. * Contact: carrier sleuthkit org @@ -16,14 +16,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.contentviewer; +package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.contentviewer; import java.util.ArrayList; import java.util.List; import javax.swing.table.AbstractTableModel; import org.openide.util.NbBundle.Messages; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamArtifact; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamArtifactInstance; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamArtifact; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamArtifactInstance; /** * Model for cells in data content viewer table @@ -34,8 +34,8 @@ public class DataContentViewerOtherCasesTableModel extends AbstractTableModel { "DataContentViewerOtherCasesTableModel.device=Device", "DataContentViewerOtherCasesTableModel.dataSource=Data Source", "DataContentViewerOtherCasesTableModel.path=Path", - "DataContentViewerOtherCasesTableModel.type=Correlation Type", - "DataContentViewerOtherCasesTableModel.value=Correlation Value", + "DataContentViewerOtherCasesTableModel.type=Artifact Type", + "DataContentViewerOtherCasesTableModel.value=Artifact Value", "DataContentViewerOtherCasesTableModel.scope=Scope", // was globalStatus "DataContentViewerOtherCasesTableModel.known=Known", // was knownStatus "DataContentViewerOtherCasesTableModel.comment=Comment", @@ -169,9 +169,9 @@ public class DataContentViewerOtherCasesTableModel extends AbstractTableModel { } /** - * Add one local Enterprise Artifact Manager Artifact to the table. + * Add one local Enterprise Artifacts Manager Artifact to the table. * - * @param eamArtifact Enterprise Artifact Manager Artifact to add to the + * @param eamArtifact Enterprise Artifacts Manager Artifact to add to the * table */ public void addEnterpriseArtifactManagerArtifact(EamArtifact eamArtifact) { diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/AbstractSqlEamDb.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/AbstractSqlEamDb.java similarity index 99% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/AbstractSqlEamDb.java rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/AbstractSqlEamDb.java index 07e579b43f..2d6425afd0 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/AbstractSqlEamDb.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/AbstractSqlEamDb.java @@ -1,5 +1,5 @@ /* - * Enterprise Artifact Manager + * Enterprise Artifacts Manager * * Copyright 2015-2017 Basis Technology Corp. * Contact: carrier sleuthkit org @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel; +package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel; import java.net.UnknownHostException; import java.util.ArrayList; diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/EamArtifact.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/EamArtifact.java similarity index 98% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/EamArtifact.java rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/EamArtifact.java index 2a2da560ab..090341023c 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/EamArtifact.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/EamArtifact.java @@ -1,5 +1,5 @@ /* - * Enterprise Artifact Manager + * Enterprise Artifacts Manager * * Copyright 2015-2017 Basis Technology Corp. * Contact: carrier sleuthkit org @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel; +package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel; import java.io.Serializable; import java.util.ArrayList; diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/EamArtifactInstance.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/EamArtifactInstance.java similarity index 86% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/EamArtifactInstance.java rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/EamArtifactInstance.java index 9b0f940782..821a291b95 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/EamArtifactInstance.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/EamArtifactInstance.java @@ -1,5 +1,5 @@ /* - * Enterprise Artifact Manager + * Enterprise Artifacts Manager * * Copyright 2015-2017 Basis Technology Corp. * Contact: carrier sleuthkit org @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel; +package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel; import java.io.Serializable; import org.openide.util.NbBundle.Messages; @@ -26,16 +26,16 @@ import org.openide.util.NbBundle.Messages; * Used to store info about a specific Artifact Instance. * */ -@Messages({"enterpriseartifactmanagerartifactinstances.globalStatus.local=Local", - "enterpriseartifactmanagerartifactinstances.globalStatus.global=Global", - "enterpriseartifactmanagerartifactinstances.knownStatus.bad=Bad", - "enterpriseartifactmanagerartifactinstances.knownStatus.known=Known", - "enterpriseartifactmanagerartifactinstances.knownStatus.unknown=Unknown"}) +@Messages({"EnterpriseArtifactsManagerArtifactInstances.globalStatus.local=Local", + "EnterpriseArtifactsManagerArtifactInstances.globalStatus.global=Global", + "EnterpriseArtifactsManagerArtifactInstances.knownStatus.bad=Bad", + "EnterpriseArtifactsManagerArtifactInstances.knownStatus.known=Known", + "EnterpriseArtifactsManagerArtifactInstances.knownStatus.unknown=Unknown"}) public class EamArtifactInstance implements Serializable { public enum GlobalStatus { - LOCAL(Bundle.enterpriseartifactmanagerartifactinstances_globalStatus_local()), - GLOBAL(Bundle.enterpriseartifactmanagerartifactinstances_globalStatus_global()); + LOCAL(Bundle.EnterpriseArtifactsManagerArtifactInstances_globalStatus_local()), + GLOBAL(Bundle.EnterpriseArtifactsManagerArtifactInstances_globalStatus_global()); private final String globalStatus; @@ -50,9 +50,9 @@ public class EamArtifactInstance implements Serializable { } public enum KnownStatus { - UNKNOWN(Bundle.enterpriseartifactmanagerartifactinstances_knownStatus_unknown()), - KNOWN(Bundle.enterpriseartifactmanagerartifactinstances_knownStatus_known()), - BAD(Bundle.enterpriseartifactmanagerartifactinstances_knownStatus_bad()); + UNKNOWN(Bundle.EnterpriseArtifactsManagerArtifactInstances_knownStatus_unknown()), + KNOWN(Bundle.EnterpriseArtifactsManagerArtifactInstances_knownStatus_known()), + BAD(Bundle.EnterpriseArtifactsManagerArtifactInstances_knownStatus_bad()); private final String knownStatus; diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/EamArtifactUtil.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/EamArtifactUtil.java similarity index 95% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/EamArtifactUtil.java rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/EamArtifactUtil.java index a5cc8a76b5..4741961e75 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/EamArtifactUtil.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/EamArtifactUtil.java @@ -1,5 +1,5 @@ /* - * Enterprise Artifact Manager + * Enterprise Artifacts Manager * * Copyright 2015-2017 Basis Technology Corp. * Contact: carrier sleuthkit org @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel; +package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel; import java.util.List; import java.util.logging.Level; @@ -40,9 +40,9 @@ public class EamArtifactUtil { public EamArtifactUtil() { } - @Messages({"enterpriseartifactmanagerartifact.emailaddresses.text=Email Addresses"}) + @Messages({"enterpriseartifactsmanagerartifact.emailaddresses.text=Email Addresses"}) public static String getEmailAddressAttrString() { - return Bundle.enterpriseartifactmanagerartifact_emailaddresses_text(); + return Bundle.enterpriseartifactsmanagerartifact_emailaddresses_text(); } /* @@ -104,7 +104,7 @@ public class EamArtifactUtil { /** * Convert a blackboard artifact to an EamArtifact * - * @param aType The enterprise artifact manager artifact type to create + * @param aType The enterprise artifacts manager artifact type to create * @param bbArtifact The blackboard artifact to convert * * @return diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/EamCase.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/EamCase.java similarity index 82% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/EamCase.java rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/EamCase.java index bb00175936..ad30eb5624 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/EamCase.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/EamCase.java @@ -1,5 +1,5 @@ /* - * Enterprise Artifact Manager + * Enterprise Artifacts Manager * * Copyright 2015-2017 Basis Technology Corp. * Contact: carrier sleuthkit org @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel; +package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel; import java.io.Serializable; import java.text.DateFormat; @@ -89,49 +89,49 @@ public class EamCase implements Serializable { return str.toString(); } - @Messages({"EnterpriseArtifactManagerCase.title.caseUUID=Case UUID: "}) + @Messages({"EnterpriseArtifactsManagerCase.title.caseUUID=Case UUID: "}) public String getTitleCaseUUID() { - return Bundle.EnterpriseArtifactManagerCase_title_caseUUID(); + return Bundle.EnterpriseArtifactsManagerCase_title_caseUUID(); } - @Messages({"EnterpriseArtifactManagerCase.title.creationDate=Creation Date: "}) + @Messages({"EnterpriseArtifactsManagerCase.title.creationDate=Creation Date: "}) public String getTitleCreationDate() { - return Bundle.EnterpriseArtifactManagerCase_title_creationDate(); + return Bundle.EnterpriseArtifactsManagerCase_title_creationDate(); } - @Messages({"EnterpriseArtifactManagerCase.title.caseDisplayName=Case Name: "}) + @Messages({"EnterpriseArtifactsManagerCase.title.caseDisplayName=Case Name: "}) public String getTitleCaseDisplayName() { - return Bundle.EnterpriseArtifactManagerCase_title_caseDisplayName(); + return Bundle.EnterpriseArtifactsManagerCase_title_caseDisplayName(); } - @Messages({"EnterpriseArtifactManagerCase.title.caseNumber=Case Number: "}) + @Messages({"EnterpriseArtifactsManagerCase.title.caseNumber=Case Number: "}) public String getTitleCaseNumber() { - return Bundle.EnterpriseArtifactManagerCase_title_caseNumber(); + return Bundle.EnterpriseArtifactsManagerCase_title_caseNumber(); } - @Messages({"EnterpriseArtifactManagerCase.title.examinerName=Examiner Name: "}) + @Messages({"EnterpriseArtifactsManagerCase.title.examinerName=Examiner Name: "}) public String getTitleExaminerName() { - return Bundle.EnterpriseArtifactManagerCase_title_examinerName(); + return Bundle.EnterpriseArtifactsManagerCase_title_examinerName(); } - @Messages({"EnterpriseArtifactManagerCase.title.examinerEmail=Examiner Email: "}) + @Messages({"EnterpriseArtifactsManagerCase.title.examinerEmail=Examiner Email: "}) public String getTitleExaminerEmail() { - return Bundle.EnterpriseArtifactManagerCase_title_examinerEmail(); + return Bundle.EnterpriseArtifactsManagerCase_title_examinerEmail(); } - @Messages({"EnterpriseArtifactManagerCase.title.examinerPhone=Examiner Phone: "}) + @Messages({"EnterpriseArtifactsManagerCase.title.examinerPhone=Examiner Phone: "}) public String getTitleExaminerPhone() { - return Bundle.EnterpriseArtifactManagerCase_title_examinerPhone(); + return Bundle.EnterpriseArtifactsManagerCase_title_examinerPhone(); } - @Messages({"EnterpriseArtifactManagerCase.title.org=Organization: "}) + @Messages({"EnterpriseArtifactsManagerCase.title.org=Organization: "}) public String getTitleOrganization() { - return Bundle.EnterpriseArtifactManagerCase_title_org(); + return Bundle.EnterpriseArtifactsManagerCase_title_org(); } - @Messages({"EnterpriseArtifactManagerCase.title.notes=Notes: "}) + @Messages({"EnterpriseArtifactsManagerCase.title.notes=Notes: "}) public String getTitleNotes() { - return Bundle.EnterpriseArtifactManagerCase_title_notes(); + return Bundle.EnterpriseArtifactsManagerCase_title_notes(); } public String getCaseDetailsOptionsPaneDialog() { diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/EamDataSource.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/EamDataSource.java similarity index 95% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/EamDataSource.java rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/EamDataSource.java index 448a7586c2..7f551c866a 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/EamDataSource.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/EamDataSource.java @@ -1,5 +1,5 @@ /* - * Enterprise Artifact Manager + * Enterprise Artifacts Manager * * Copyright 2015-2017 Basis Technology Corp. * Contact: carrier sleuthkit org @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel; +package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel; import java.io.Serializable; diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/EamDb.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/EamDb.java similarity index 99% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/EamDb.java rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/EamDb.java index b191a5abb0..a5b71de42a 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/EamDb.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/EamDb.java @@ -1,5 +1,5 @@ /* - * Enterprise Artifact Manager + * Enterprise Artifacts Manager * * Copyright 2015-2017 Basis Technology Corp. * Contact: carrier sleuthkit org @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel; +package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel; import java.util.List; diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/EamDbException.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/EamDbException.java similarity index 92% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/EamDbException.java rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/EamDbException.java index a0c32dfe7d..5f7e6019b2 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/EamDbException.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/EamDbException.java @@ -1,5 +1,5 @@ /* - * Enterprise Artifact Manager + * Enterprise Artifacts Manager * * Copyright 2015-2017 Basis Technology Corp. * Contact: carrier sleuthkit org @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel; +package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel; /* * An exception to be thrown by an artifact manager. diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/EamDbPlatformEnum.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/EamDbPlatformEnum.java similarity index 90% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/EamDbPlatformEnum.java rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/EamDbPlatformEnum.java index a0e8545243..bc02377430 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/EamDbPlatformEnum.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/EamDbPlatformEnum.java @@ -1,5 +1,5 @@ /* - * Enterprise Artifact Manager + * Enterprise Artifacts Manager * * Copyright 2015-2017 Basis Technology Corp. * Contact: carrier sleuthkit org @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel; +package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel; import org.sleuthkit.autopsy.coreutils.ModuleSettings; @@ -40,7 +40,7 @@ public enum EamDbPlatformEnum { * Load the selectedPlatform boolean from the config file, if it is set. */ private void loadSettings() { - String selectedPlatformString = ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.selectedPlatform"); // NON-NLS + String selectedPlatformString = ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.selectedPlatform"); // NON-NLS if (null != selectedPlatformString) { selected = this.toString().equalsIgnoreCase(selectedPlatformString); @@ -83,7 +83,7 @@ public enum EamDbPlatformEnum { selectedPlatform = p; } } - ModuleSettings.setConfigSetting("EnterpriseArtifactManager", "db.selectedPlatform", selectedPlatform.name()); // NON-NLS + ModuleSettings.setConfigSetting("EnterpriseArtifactsManager", "db.selectedPlatform", selectedPlatform.name()); // NON-NLS } /** diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/EamGlobalFileInstance.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/EamGlobalFileInstance.java similarity index 92% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/EamGlobalFileInstance.java rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/EamGlobalFileInstance.java index e9594d5f82..70067622f6 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/EamGlobalFileInstance.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/EamGlobalFileInstance.java @@ -1,5 +1,5 @@ /* - * Enterprise Artifact Manager + * Enterprise Artifacts Manager * * Copyright 2015-2017 Basis Technology Corp. * Contact: carrier sleuthkit org @@ -16,9 +16,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel; +package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamArtifactInstance.KnownStatus; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamArtifactInstance.KnownStatus; /** * Global file hash instance diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/EamGlobalSet.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/EamGlobalSet.java similarity index 93% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/EamGlobalSet.java rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/EamGlobalSet.java index e708d87e2e..a487dd61fa 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/EamGlobalSet.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/EamGlobalSet.java @@ -1,5 +1,5 @@ /* - * Enterprise Artifact Manager + * Enterprise Artifacts Manager * * Copyright 2015-2017 Basis Technology Corp. * Contact: carrier sleuthkit org @@ -16,12 +16,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel; +package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel; import java.time.LocalDate; /** - * A global set in the enterprise artifact manager database + * A global set in the enterprise artifacts manager database */ public class EamGlobalSet { diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/EamOrganization.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/EamOrganization.java similarity index 94% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/EamOrganization.java rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/EamOrganization.java index db0947720f..7ff863bbbd 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/EamOrganization.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/EamOrganization.java @@ -1,5 +1,5 @@ /* - * Enterprise Artifact Manager + * Enterprise Artifacts Manager * * Copyright 2015-2017 Basis Technology Corp. * Contact: carrier sleuthkit org @@ -16,10 +16,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel; +package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel; /** - * An organization in the enterprise artifact manager database + * An organization in the enterprise artifacts manager database */ public class EamOrganization { diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/PostgresEamDb.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/PostgresEamDb.java similarity index 98% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/PostgresEamDb.java rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/PostgresEamDb.java index ebd99fec56..52f60b1950 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/PostgresEamDb.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/PostgresEamDb.java @@ -1,5 +1,5 @@ /* - * Enterprise Artifact Manager + * Enterprise Artifacts Manager * * Copyright 2015-2017 Basis Technology Corp. * Contact: carrier sleuthkit org @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel; +package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel; import java.sql.Connection; import java.sql.SQLException; @@ -26,7 +26,7 @@ import org.apache.commons.dbcp2.BasicDataSource; import org.sleuthkit.autopsy.coreutils.Logger; /** - * Enterprise artifact manager database implementation using Postgres as a + * Enterprise artifacts manager database implementation using Postgres as a * backend */ public class PostgresEamDb extends AbstractSqlEamDb { @@ -306,7 +306,7 @@ public class PostgresEamDb extends AbstractSqlEamDb { protected Connection connect() throws EamDbException { synchronized (this) { if (!dbSettings.isEnabled()) { - throw new EamDbException("Enterprise artifact manager is not enabled"); // NON-NLS + throw new EamDbException("Enterprise artifacts manager is not enabled"); // NON-NLS } if (connectionPool == null) { diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/PostgresEamDbSettings.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/PostgresEamDbSettings.java similarity index 84% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/PostgresEamDbSettings.java rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/PostgresEamDbSettings.java index e1317d250d..7b08740354 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/PostgresEamDbSettings.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/PostgresEamDbSettings.java @@ -1,5 +1,5 @@ /* - * Enterprise Artifact Manager + * Enterprise Artifacts Manager * * Copyright 2015-2017 Basis Technology Corp. * Contact: carrier sleuthkit org @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel; +package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel; import java.sql.Connection; import java.sql.DriverManager; @@ -31,7 +31,7 @@ import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.coreutils.ModuleSettings; /** - * Settings for the Postgres implementation of the enterprise artifact manager + * Settings for the Postgres implementation of the enterprise artifacts manager * database */ public final class PostgresEamDbSettings { @@ -62,15 +62,15 @@ public final class PostgresEamDbSettings { } public void loadSettings() { - enabled = Boolean.valueOf(ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.enabled")); // NON-NLS + enabled = Boolean.valueOf(ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.enabled")); // NON-NLS - host = ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.postgresql.host"); // NON-NLS + host = ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.postgresql.host"); // NON-NLS if (host == null || host.isEmpty()) { host = DEFAULT_HOST; } try { - String portString = ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.postgresql.port"); // NON-NLS + String portString = ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.postgresql.port"); // NON-NLS if (portString == null || portString.isEmpty()) { port = DEFAULT_PORT; } else { @@ -83,13 +83,13 @@ public final class PostgresEamDbSettings { port = DEFAULT_PORT; } - dbName = ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.postgresql.dbName"); // NON-NLS + dbName = ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.postgresql.dbName"); // NON-NLS if (dbName == null || dbName.isEmpty()) { dbName = DEFAULT_DBNAME; } try { - String bulkThresholdString = ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.postgresql.bulkThreshold"); // NON-NLS + String bulkThresholdString = ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.postgresql.bulkThreshold"); // NON-NLS if (bulkThresholdString == null || bulkThresholdString.isEmpty()) { this.bulkThreshold = DEFAULT_BULK_THRESHHOLD; } else { @@ -102,17 +102,17 @@ public final class PostgresEamDbSettings { this.bulkThreshold = DEFAULT_BULK_THRESHHOLD; } - userName = ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.postgresql.user"); // NON-NLS + userName = ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.postgresql.user"); // NON-NLS if (userName == null || userName.isEmpty()) { userName = DEFAULT_USERNAME; } - password = ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.postgresql.password"); // NON-NLS + password = ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.postgresql.password"); // NON-NLS if (password == null || password.isEmpty()) { password = DEFAULT_PASSWORD; } - String badTagsStr = ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.badTags"); // NON-NLS + String badTagsStr = ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.badTags"); // NON-NLS if (badTagsStr == null || badTagsStr.isEmpty()) { badTagsStr = DEFAULT_BAD_TAGS; } @@ -120,14 +120,14 @@ public final class PostgresEamDbSettings { } public void saveSettings() { - ModuleSettings.setConfigSetting("EnterpriseArtifactManager", "db.enabled", Boolean.toString(isEnabled())); // NON-NLS - ModuleSettings.setConfigSetting("EnterpriseArtifactManager", "db.postgresql.host", getHost()); // NON-NLS - ModuleSettings.setConfigSetting("EnterpriseArtifactManager", "db.postgresql.port", Integer.toString(port)); // NON-NLS - ModuleSettings.setConfigSetting("EnterpriseArtifactManager", "db.postgresql.dbName", getDbName()); // NON-NLS - ModuleSettings.setConfigSetting("EnterpriseArtifactManager", "db.postgresql.bulkThreshold", Integer.toString(getBulkThreshold())); // NON-NLS - ModuleSettings.setConfigSetting("EnterpriseArtifactManager", "db.postgresql.user", getUserName()); // NON-NLS - ModuleSettings.setConfigSetting("EnterpriseArtifactManager", "db.postgresql.password", getPassword()); // NON-NLS - ModuleSettings.setConfigSetting("EnterpriseArtifactManager", "db.badTags", String.join(",", badTags)); // NON-NLS + ModuleSettings.setConfigSetting("EnterpriseArtifactsManager", "db.enabled", Boolean.toString(isEnabled())); // NON-NLS + ModuleSettings.setConfigSetting("EnterpriseArtifactsManager", "db.postgresql.host", getHost()); // NON-NLS + ModuleSettings.setConfigSetting("EnterpriseArtifactsManager", "db.postgresql.port", Integer.toString(port)); // NON-NLS + ModuleSettings.setConfigSetting("EnterpriseArtifactsManager", "db.postgresql.dbName", getDbName()); // NON-NLS + ModuleSettings.setConfigSetting("EnterpriseArtifactsManager", "db.postgresql.bulkThreshold", Integer.toString(getBulkThreshold())); // NON-NLS + ModuleSettings.setConfigSetting("EnterpriseArtifactsManager", "db.postgresql.user", getUserName()); // NON-NLS + ModuleSettings.setConfigSetting("EnterpriseArtifactsManager", "db.postgresql.password", getPassword()); // NON-NLS + ModuleSettings.setConfigSetting("EnterpriseArtifactsManager", "db.badTags", String.join(",", badTags)); // NON-NLS } /** @@ -186,12 +186,12 @@ public final class PostgresEamDbSettings { } public boolean isChanged() { - String hostString = ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.postgresql.host"); // NON-NLS - String portString = ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.postgresql.port"); // NON-NLS - String dbNameString = ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.postgresql.dbName"); // NON-NLS - String bulkThresholdString = ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.postgresql.bulkThreshold"); // NON-NLS - String userNameString = ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.postgresql.user"); // NON-NLS - String userPasswordString = ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.postgresql.password"); // NON-NLS + String hostString = ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.postgresql.host"); // NON-NLS + String portString = ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.postgresql.port"); // NON-NLS + String dbNameString = ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.postgresql.dbName"); // NON-NLS + String bulkThresholdString = ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.postgresql.bulkThreshold"); // NON-NLS + String userNameString = ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.postgresql.user"); // NON-NLS + String userPasswordString = ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.postgresql.password"); // NON-NLS return !host.equals(hostString) || !Integer.toString(port).equals(portString) || !dbName.equals(dbNameString) || !Integer.toString(bulkThreshold).equals(bulkThresholdString) diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/SqliteEamDb.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/SqliteEamDb.java similarity index 98% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/SqliteEamDb.java rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/SqliteEamDb.java index 35bb15d9a2..3e43ca97c1 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/SqliteEamDb.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/SqliteEamDb.java @@ -1,5 +1,5 @@ /* - * Enterprise Artifact Manager + * Enterprise Artifacts Manager * * Copyright 2015-2017 Basis Technology Corp. * Contact: carrier sleuthkit org @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel; +package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel; import java.io.File; import java.io.IOException; @@ -30,7 +30,7 @@ import org.apache.commons.dbcp2.BasicDataSource; import org.sleuthkit.autopsy.coreutils.Logger; /** - * Sqlite implementation of the enterprise artifact manager database + * Sqlite implementation of the enterprise artifacts manager database */ public class SqliteEamDb extends AbstractSqlEamDb { @@ -337,7 +337,7 @@ public class SqliteEamDb extends AbstractSqlEamDb { protected Connection connect() throws EamDbException { synchronized (this) { if (!dbSettings.isEnabled()) { - throw new EamDbException("Enterprise artifact manager is not enabled"); // NON-NLS + throw new EamDbException("Enterprise artifacts manager is not enabled"); // NON-NLS } if (connectionPool == null) { diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/SqliteEamDbSettings.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/SqliteEamDbSettings.java similarity index 87% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/SqliteEamDbSettings.java rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/SqliteEamDbSettings.java index 57ad12f661..ede8e04d51 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/datamodel/SqliteEamDbSettings.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/SqliteEamDbSettings.java @@ -1,5 +1,5 @@ /* - * Enterprise Artifact Manager + * Enterprise Artifacts Manager * * Copyright 2015-2017 Basis Technology Corp. * Contact: carrier sleuthkit org @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel; +package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel; import java.io.File; import java.io.IOException; @@ -35,7 +35,7 @@ import org.sleuthkit.autopsy.coreutils.ModuleSettings; import org.sleuthkit.autopsy.coreutils.PlatformUtil; /** - * Settings for the sqlite implementation of the enterprise artifact manager database + * Settings for the sqlite implementation of the enterprise artifacts manager database */ public final class SqliteEamDbSettings { @@ -59,20 +59,20 @@ public final class SqliteEamDbSettings { } public void loadSettings() { - enabled = Boolean.valueOf(ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.enabled")); // NON-NLS + enabled = Boolean.valueOf(ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.enabled")); // NON-NLS - dbName = ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.sqlite.dbName"); // NON-NLS + dbName = ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.sqlite.dbName"); // NON-NLS if (dbName == null || dbName.isEmpty()) { dbName = DEFAULT_DBNAME; } - dbDirectory = ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.sqlite.dbDirectory"); // NON-NLS + dbDirectory = ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.sqlite.dbDirectory"); // NON-NLS if (dbDirectory == null || dbDirectory.isEmpty()) { dbDirectory = DEFAULT_DBDIRECTORY; } try { - String bulkThresholdString = ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.sqlite.bulkThreshold"); // NON-NLS + String bulkThresholdString = ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.sqlite.bulkThreshold"); // NON-NLS if (bulkThresholdString == null || bulkThresholdString.isEmpty()) { this.bulkThreshold = DEFAULT_BULK_THRESHHOLD; } else { @@ -85,7 +85,7 @@ public final class SqliteEamDbSettings { this.bulkThreshold = DEFAULT_BULK_THRESHHOLD; } - String badTagsStr = ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.badTags"); // NON-NLS + String badTagsStr = ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.badTags"); // NON-NLS if (badTagsStr == null || badTagsStr.isEmpty()) { badTagsStr = DEFAULT_BAD_TAGS; } @@ -95,11 +95,11 @@ public final class SqliteEamDbSettings { public void saveSettings() { createAndVerifyDirectory(); - ModuleSettings.setConfigSetting("EnterpriseArtifactManager", "db.enabled", Boolean.toString(isEnabled())); // NON-NLS - ModuleSettings.setConfigSetting("EnterpriseArtifactManager", "db.sqlite.dbName", getDbName()); // NON-NLS - ModuleSettings.setConfigSetting("EnterpriseArtifactManager", "db.sqlite.dbDirectory", getDbDirectory()); // NON-NLS - ModuleSettings.setConfigSetting("EnterpriseArtifactManager", "db.sqlite.bulkThreshold", Integer.toString(getBulkThreshold())); // NON-NLS - ModuleSettings.setConfigSetting("EnterpriseArtifactManager", "db.badTags", String.join(",", badTags)); // NON-NLS + ModuleSettings.setConfigSetting("EnterpriseArtifactsManager", "db.enabled", Boolean.toString(isEnabled())); // NON-NLS + ModuleSettings.setConfigSetting("EnterpriseArtifactsManager", "db.sqlite.dbName", getDbName()); // NON-NLS + ModuleSettings.setConfigSetting("EnterpriseArtifactsManager", "db.sqlite.dbDirectory", getDbDirectory()); // NON-NLS + ModuleSettings.setConfigSetting("EnterpriseArtifactsManager", "db.sqlite.bulkThreshold", Integer.toString(getBulkThreshold())); // NON-NLS + ModuleSettings.setConfigSetting("EnterpriseArtifactsManager", "db.badTags", String.join(",", badTags)); // NON-NLS } public boolean createAndVerifyDirectory() { @@ -175,9 +175,9 @@ public final class SqliteEamDbSettings { } public boolean isChanged() { - String dbNameString = ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.sqlite.dbName"); // NON-NLS - String dbDirectoryString = ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.sqlite.dbDirectory"); // NON-NLS - String bulkThresholdString = ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.sqlite.bulkThreshold"); // NON-NLS + String dbNameString = ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.sqlite.dbName"); // NON-NLS + String dbDirectoryString = ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.sqlite.dbDirectory"); // NON-NLS + String bulkThresholdString = ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.sqlite.bulkThreshold"); // NON-NLS return !dbName.equals(dbNameString) || !dbDirectory.equals(dbDirectoryString) diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/docs/CONFIG.md b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/docs/CONFIG.md similarity index 100% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/docs/CONFIG.md rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/docs/CONFIG.md diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/docs/DEVELOP.md b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/docs/DEVELOP.md similarity index 100% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/docs/DEVELOP.md rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/docs/DEVELOP.md diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/docs/FEATURES.md b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/docs/FEATURES.md similarity index 100% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/docs/FEATURES.md rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/docs/FEATURES.md diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/eventlisteners/BadFileTagRunner.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/eventlisteners/BadFileTagRunner.java similarity index 73% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/eventlisteners/BadFileTagRunner.java rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/eventlisteners/BadFileTagRunner.java index 26c24db3b5..3bbbb1aebf 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/eventlisteners/BadFileTagRunner.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/eventlisteners/BadFileTagRunner.java @@ -1,5 +1,5 @@ /* - * Enterprise Artifact Manager + * Enterprise Artifacts Manager * * Copyright 2015-2017 Basis Technology Corp. * Contact: carrier sleuthkit org @@ -16,13 +16,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.eventlisteners; +package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.eventlisteners; import java.util.logging.Level; import org.sleuthkit.autopsy.coreutils.Logger; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamArtifact; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDbException; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDb; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamArtifact; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDbException; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDb; /** * Thread to send info to remote DB that tags a file as known bad. @@ -43,14 +43,14 @@ public class BadFileTagRunner implements Runnable { @Override public void run() { if (!dbManager.isEnabled()) { - LOGGER.log(Level.WARNING, "Enterprise artifact manager database not configured"); // NON-NLS + LOGGER.log(Level.WARNING, "Enterprise artifacts manager database not configured"); // NON-NLS return; } try { dbManager.setArtifactInstanceKnownBad(this.artifact); } catch (EamDbException ex) { - LOGGER.log(Level.SEVERE, "Error connecting to enterprise artifact manager database.", ex); //NON-NLS + LOGGER.log(Level.SEVERE, "Error connecting to enterprise artifacts manager database.", ex); //NON-NLS } } } diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/eventlisteners/CaseEventListener.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/eventlisteners/CaseEventListener.java similarity index 89% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/eventlisteners/CaseEventListener.java rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/eventlisteners/CaseEventListener.java index a78a6ad246..8ac53d556f 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/eventlisteners/CaseEventListener.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/eventlisteners/CaseEventListener.java @@ -1,5 +1,5 @@ /* - * Enterprise Artifact Manager + * Enterprise Artifacts Manager * * Copyright 2015-2017 Basis Technology Corp. * Contact: carrier sleuthkit org @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.eventlisteners; +package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.eventlisteners; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -29,13 +29,13 @@ import org.sleuthkit.autopsy.casemodule.events.ContentTagAddedEvent; import org.sleuthkit.autopsy.casemodule.events.DataSourceAddedEvent; import org.sleuthkit.autopsy.casemodule.services.TagsManager; import org.sleuthkit.autopsy.coreutils.Logger; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamArtifact; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamArtifactInstance; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamArtifactUtil; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamCase; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDataSource; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDbException; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamOrganization; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamArtifact; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamArtifactInstance; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamArtifactUtil; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamCase; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDataSource; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDbException; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamOrganization; import org.sleuthkit.datamodel.AbstractFile; import org.sleuthkit.datamodel.BlackboardArtifact; import org.sleuthkit.datamodel.BlackboardArtifactTag; @@ -45,10 +45,10 @@ import org.sleuthkit.datamodel.TagName; import org.sleuthkit.datamodel.TskCoreException; import org.sleuthkit.datamodel.TskData; import org.sleuthkit.datamodel.TskDataException; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDb; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDb; /** - * Listen for case events and update entries in the enterprise artifact manager + * Listen for case events and update entries in the enterprise artifacts manager * database accordingly */ @Messages({"caseeventlistener.evidencetag=Evidence"}) @@ -108,13 +108,13 @@ public class CaseEventListener implements PropertyChangeListener { EamArtifactInstance.GlobalStatus.LOCAL ); eamArtifact.addInstance(cei); - // send update to enterprise artifact manager db + // send update to enterprise artifacts manager db Runnable r = new BadFileTagRunner(eamArtifact); // TODO: send r into a thread pool instead Thread t = new Thread(r); t.start(); } catch (EamDbException ex) { - LOGGER.log(Level.SEVERE, "Error, unable to get correlation artifact type MD5 during CONTENT_TAG_ADDED event.", ex); + LOGGER.log(Level.SEVERE, "Error, unable to get FILES artifact type during CONTENT_TAG_ADDED event.", ex); } } } // CONTENT_TAG_ADDED @@ -142,7 +142,7 @@ public class CaseEventListener implements PropertyChangeListener { t.start(); } } catch (EamDbException ex) { - LOGGER.log(Level.SEVERE, "Error, unable to get correlation artifact types during BLACKBOARD_ARTIFACT_TAG_ADDED event.", ex); + LOGGER.log(Level.SEVERE, "Error, unable to get artifact types during BLACKBOARD_ARTIFACT_TAG_ADDED event.", ex); } } } // BLACKBOARD_ARTIFACT_TAG_ADDED @@ -162,7 +162,7 @@ public class CaseEventListener implements PropertyChangeListener { dbManager.newDataSource(new EamDataSource(deviceId, newDataSource.getName())); } } catch (EamDbException ex) { - LOGGER.log(Level.SEVERE, "Error connecting to enterprise artifact manager database.", ex); //NON-NLS + LOGGER.log(Level.SEVERE, "Error connecting to enterprise artifacts manager database.", ex); //NON-NLS } catch (TskCoreException | TskDataException ex) { LOGGER.log(Level.SEVERE, "Error getting data source from DATA_SOURCE_ADDED event content.", ex); //NON-NLS } @@ -218,7 +218,7 @@ public class CaseEventListener implements PropertyChangeListener { dbManager.newCase(curCeCase); } } catch (EamDbException ex) { - LOGGER.log(Level.SEVERE, "Error connecting to enterprise artifact manager database.", ex); //NON-NLS + LOGGER.log(Level.SEVERE, "Error connecting to enterprise artifacts manager database.", ex); //NON-NLS } } } // CURRENT_CASE diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/eventlisteners/IngestEventsListener.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/eventlisteners/IngestEventsListener.java similarity index 89% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/eventlisteners/IngestEventsListener.java rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/eventlisteners/IngestEventsListener.java index 820c23c4f9..11cf6c60cf 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/eventlisteners/IngestEventsListener.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/eventlisteners/IngestEventsListener.java @@ -1,5 +1,5 @@ /* - * Enterprise Artifact Manager + * Enterprise Artifacts Manager * * Copyright 2015-2017 Basis Technology Corp. * Contact: carrier sleuthkit org @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.eventlisteners; +package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.eventlisteners; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -34,17 +34,17 @@ import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.ingest.IngestManager; import org.sleuthkit.autopsy.ingest.IngestServices; import org.sleuthkit.autopsy.ingest.ModuleDataEvent; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamArtifact; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamArtifactUtil; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDbException; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamArtifact; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamArtifactUtil; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDbException; import org.sleuthkit.datamodel.AbstractFile; import org.sleuthkit.datamodel.BlackboardArtifact; import org.sleuthkit.datamodel.BlackboardAttribute; import org.sleuthkit.datamodel.TskCoreException; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDb; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDb; /** - * Listen for ingest events and update entries in the enterprise artifact manager database accordingly + * Listen for ingest events and update entries in the enterprise artifacts manager database accordingly */ public class IngestEventsListener { @@ -92,7 +92,7 @@ public class IngestEventsListener { List eamArtifacts = new ArrayList<>(); try { for (BlackboardArtifact bbArtifact : bbArtifacts) { - // eamArtifact will be null OR a EamArtifact containing one EnterpriseArtifactManagerArtifactInstance. + // eamArtifact will be null OR a EamArtifact containing one EnterpriseArtifactsManagerArtifactInstance. EamArtifact eamArtifact = EamArtifactUtil.fromBlackboardArtifact(bbArtifact, true, dbManager.getCorrelationArtifactTypes(), true); if (null != eamArtifact) { @@ -116,7 +116,7 @@ public class IngestEventsListener { } } } catch (EamDbException ex) { - LOGGER.log(Level.SEVERE, "Error getting enterprise artifact manager artifact types.", ex); + LOGGER.log(Level.SEVERE, "Error getting enterprise artifacts manager artifact types.", ex); } if (FALSE == eamArtifacts.isEmpty()) { // send update to entperirse artifact manager db @@ -148,17 +148,17 @@ public class IngestEventsListener { } } - @NbBundle.Messages({"enterpriseartifactmanager.prevcases.text=Previous Cases", - "enterpriseartifactmanager.ingestmodule.name=Enterprise Artifact Manager"}) + @NbBundle.Messages({"EnterpriseArtifactsManager.prevcases.text=Previous Cases", + "EnterpriseArtifactsManager.ingestmodule.name=Enterprise Artifacts Manager"}) private void postCorrelatedBadArtifactToBlackboard(BlackboardArtifact bbArtifact, List caseDisplayNames) { try { AbstractFile af = bbArtifact.getSleuthkitCase().getAbstractFileById(bbArtifact.getObjectID()); - String MODULE_NAME = Bundle.enterpriseartifactmanager_ingestmodule_name(); + String MODULE_NAME = Bundle.EnterpriseArtifactsManager_ingestmodule_name(); BlackboardArtifact tifArtifact = af.newArtifact(BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ARTIFACT_HIT); BlackboardAttribute att = new BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME, MODULE_NAME, - Bundle.enterpriseartifactmanager_prevcases_text()); + Bundle.EnterpriseArtifactsManager_prevcases_text()); BlackboardAttribute att2 = new BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_COMMENT, MODULE_NAME, "Previous Case: " + caseDisplayNames.stream().distinct().collect(Collectors.joining(",", "", ""))); tifArtifact.addAttribute(att); diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/eventlisteners/Installer.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/eventlisteners/Installer.java similarity index 89% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/eventlisteners/Installer.java rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/eventlisteners/Installer.java index fbe02008bf..73680f9120 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/eventlisteners/Installer.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/eventlisteners/Installer.java @@ -1,5 +1,5 @@ /* - * Enterprise Artifact Manager + * Enterprise Artifacts Manager * * Copyright 2015-2017 Basis Technology Corp. * Contact: carrier sleuthkit org @@ -16,14 +16,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.eventlisteners; +package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.eventlisteners; import java.beans.PropertyChangeListener; import org.openide.modules.ModuleInstall; import org.openide.util.actions.CallableSystemAction; import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.coreutils.Logger; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.actions.EamEditCaseInfoAction; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.actions.EamEditCaseInfoAction; /** * Install event listeners during module initialization diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/eventlisteners/NewArtifactsRunner.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/eventlisteners/NewArtifactsRunner.java similarity index 76% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/eventlisteners/NewArtifactsRunner.java rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/eventlisteners/NewArtifactsRunner.java index 69f9e916c5..79762b75a6 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/eventlisteners/NewArtifactsRunner.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/eventlisteners/NewArtifactsRunner.java @@ -1,5 +1,5 @@ /* - * Enterprise Artifact Manager + * Enterprise Artifacts Manager * * Copyright 2015-2017 Basis Technology Corp. * Contact: carrier sleuthkit org @@ -16,15 +16,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.eventlisteners; +package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.eventlisteners; import java.util.ArrayList; import java.util.Collection; import java.util.logging.Level; import org.sleuthkit.autopsy.coreutils.Logger; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamArtifact; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDbException; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDb; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamArtifact; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDbException; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDb; /** * Thread to insert a new artifact into remote DB. @@ -46,7 +46,7 @@ public class NewArtifactsRunner implements Runnable { @Override public void run() { if (!dbManager.isEnabled()) { - LOGGER.log(Level.WARNING, "Enterprise artifact manager database not configured"); // NON-NLS + LOGGER.log(Level.WARNING, "Enterprise artifacts manager database not configured"); // NON-NLS return; } @@ -55,7 +55,7 @@ public class NewArtifactsRunner implements Runnable { dbManager.addArtifact(eamArtifact); } } catch (EamDbException ex) { - LOGGER.log(Level.SEVERE, "Error connecting to enterprise artifact manager database.", ex); //NON-NLS + LOGGER.log(Level.SEVERE, "Error connecting to enterprise artifacts manager database.", ex); //NON-NLS } } diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/ingestmodule/IngestModule.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/ingestmodule/IngestModule.java similarity index 89% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/ingestmodule/IngestModule.java rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/ingestmodule/IngestModule.java index 04ace8dbb3..c706dc61a2 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/ingestmodule/IngestModule.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/ingestmodule/IngestModule.java @@ -1,5 +1,5 @@ /* - * Enterprise Artifact Manager + * Enterprise Artifacts Manager * * Copyright 2015-2017 Basis Technology Corp. * Contact: carrier sleuthkit org @@ -16,10 +16,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.ingestmodule; +package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.ingestmodule; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamCase; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDbException; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamCase; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDbException; import java.util.List; import java.util.logging.Level; import java.util.stream.Collectors; @@ -36,25 +36,25 @@ import org.sleuthkit.autopsy.ingest.IngestMessage; import org.sleuthkit.autopsy.ingest.IngestModuleReferenceCounter; import org.sleuthkit.autopsy.ingest.IngestServices; import org.sleuthkit.autopsy.ingest.ModuleDataEvent; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamArtifact; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamArtifactInstance; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDataSource; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamArtifact; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamArtifactInstance; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDataSource; import org.sleuthkit.datamodel.AbstractFile; import org.sleuthkit.datamodel.BlackboardArtifact; import org.sleuthkit.datamodel.BlackboardAttribute; import org.sleuthkit.datamodel.HashUtility; import org.sleuthkit.datamodel.TskCoreException; import org.sleuthkit.datamodel.TskData; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamOrganization; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamOrganization; import org.sleuthkit.datamodel.TskDataException; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDb; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDb; /** - * Ingest module for inserting entries into the enterprise artifact manager + * Ingest module for inserting entries into the enterprise artifacts manager * database on ingest of a data source */ -@Messages({"enterpriseartifactmanager.prevcases.text=Previous Cases", - "enterpriseartifactmanager.ingestmodule.name=Enterprise Artifact Manager"}) +@Messages({"enterpriseartifactsmanager.prevcases.text=Previous Cases", + "enterpriseartifactsmanager.ingestmodule.name=Enterprise Artifacts Manager"}) class IngestModule implements FileIngestModule { private final static Logger LOGGER = Logger.getLogger(IngestModule.class.getName()); @@ -69,7 +69,7 @@ class IngestModule implements FileIngestModule { @Override public ProcessResult process(AbstractFile af) { - if (Boolean.parseBoolean(ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.enabled")) == false + if (Boolean.parseBoolean(ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.enabled")) == false || EamDb.getInstance().isEnabled() == false) { /* * Not signaling an error for now. This is a workaround for the way @@ -171,12 +171,12 @@ class IngestModule implements FileIngestModule { // see ArtifactManagerTimeTester for details @Messages({ - "EnterpriseArtifactManager.notfyBubble.title=Enterprise Artifact Manager Not Initialized", - "EnterpriseArtifactManager.errorMessage.isNotEnabled=Enterprise artifact manager settings are not initialized, cannot run enteprise artifact manager ingest module." + "EnterpriseArtifactsManager.notfyBubble.title=Enterprise Artifacts Manager Not Initialized", + "EnterpriseArtifactsManager.errorMessage.isNotEnabled=Enterprise artifacts manager settings are not initialized, cannot run enteprise artifact manager ingest module." }) @Override public void startUp(IngestJobContext context) throws IngestModuleException { - if (Boolean.parseBoolean(ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.enabled")) == false + if (Boolean.parseBoolean(ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.enabled")) == false || EamDb.getInstance().isEnabled() == false) { /* * Not throwing the customary exception for now. This is a @@ -187,7 +187,7 @@ class IngestModule implements FileIngestModule { */ if (RuntimeProperties.runningWithGUI()) { if (1L == warningMsgRefCounter.incrementAndGet(jobId)) { - MessageNotifyUtil.Notify.warn(Bundle.EnterpriseArtifactManager_notfyBubble_title(), Bundle.EnterpriseArtifactManager_errorMessage_isNotEnabled()); + MessageNotifyUtil.Notify.warn(Bundle.EnterpriseArtifactsManager_notfyBubble_title(), Bundle.EnterpriseArtifactsManager_errorMessage_isNotEnabled()); } } return; @@ -257,10 +257,10 @@ class IngestModule implements FileIngestModule { private void postCorrelatedBadFileToBlackboard(AbstractFile abstractFile, List caseDisplayNames) { try { - String MODULE_NAME = Bundle.enterpriseartifactmanager_ingestmodule_name(); + String MODULE_NAME = Bundle.enterpriseartifactsmanager_ingestmodule_name(); BlackboardArtifact tifArtifact = abstractFile.newArtifact(BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT); BlackboardAttribute att = new BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME, MODULE_NAME, - Bundle.enterpriseartifactmanager_prevcases_text()); + Bundle.enterpriseartifactsmanager_prevcases_text()); BlackboardAttribute att2 = new BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_COMMENT, MODULE_NAME, "Previous Case: " + caseDisplayNames.stream().distinct().collect(Collectors.joining(",", "", ""))); tifArtifact.addAttribute(att); @@ -287,10 +287,10 @@ class IngestModule implements FileIngestModule { private void postCorrelatedHashHitToBlackboard(AbstractFile abstractFile) { try { - String MODULE_NAME = Bundle.enterpriseartifactmanager_ingestmodule_name(); + String MODULE_NAME = Bundle.enterpriseartifactsmanager_ingestmodule_name(); BlackboardArtifact tifArtifact = abstractFile.newArtifact(BlackboardArtifact.ARTIFACT_TYPE.TSK_HASHSET_HIT); BlackboardAttribute att = new BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME, MODULE_NAME, - Bundle.enterpriseartifactmanager_prevcases_text()); + Bundle.enterpriseartifactsmanager_prevcases_text()); tifArtifact.addAttribute(att); try { @@ -323,7 +323,7 @@ class IngestModule implements FileIngestModule { @Messages({"IngestModule.postToBB.fileName=File Name", "IngestModule.postToBB.md5Hash=MD5 Hash", "IngestModule.postToBB.hashSetSource=Source of Hash", - "IngestModule.postToBB.eamHit=Enterprise Artifact Manager", + "IngestModule.postToBB.eamHit=Enterprise Artifacts Manager", "# {0} - Name of file that is Known Bad", "IngestModule.postToBB.knownBadMsg=Known Bad: {0}"}) public void sendBadFileInboxMessage(BlackboardArtifact artifact, String name, String md5Hash) { diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/ingestmodule/IngestModuleFactory.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/ingestmodule/IngestModuleFactory.java similarity index 86% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/ingestmodule/IngestModuleFactory.java rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/ingestmodule/IngestModuleFactory.java index c09b19b267..278b56e8b9 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/ingestmodule/IngestModuleFactory.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/ingestmodule/IngestModuleFactory.java @@ -1,5 +1,5 @@ /* - * Enterprise Artifact Manager + * Enterprise Artifacts Manager * * Copyright 2015-2017 Basis Technology Corp. * Contact: carrier sleuthkit org @@ -16,17 +16,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.ingestmodule; +package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.ingestmodule; import org.openide.util.lookup.ServiceProvider; import org.sleuthkit.autopsy.ingest.FileIngestModule; import org.sleuthkit.autopsy.ingest.IngestModuleFactoryAdapter; import org.sleuthkit.autopsy.ingest.IngestModuleGlobalSettingsPanel; import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.optionspanel.GlobalSettingsPanel; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.optionspanel.GlobalSettingsPanel; /** - * Factory for enterprise artifact manager ingest modules + * Factory for enterprise artifacts manager ingest modules */ @ServiceProvider(service = org.sleuthkit.autopsy.ingest.IngestModuleFactory.class) public class IngestModuleFactory extends IngestModuleFactoryAdapter { @@ -34,7 +34,7 @@ public class IngestModuleFactory extends IngestModuleFactoryAdapter { private static final String VERSION_NUMBER = "0.8.0"; static String getModuleName() { - return java.util.ResourceBundle.getBundle("org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/Bundle") + return java.util.ResourceBundle.getBundle("org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/Bundle") .getString("OpenIDE-Module-Name"); } diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/license-enterpriseartifactmanager.txt b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/license-enterpriseartifactmanager.txt similarity index 95% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/license-enterpriseartifactmanager.txt rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/license-enterpriseartifactmanager.txt index 9e42551e15..4a3e9c3c1c 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/license-enterpriseartifactmanager.txt +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/license-enterpriseartifactmanager.txt @@ -1,5 +1,5 @@ /* - * Enterprise Artifact Manager + * Enterprise Artifacts Manager * * Copyright 2015-2017 Basis Technology Corp. * Contact: carrier sleuthkit org diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/AddNewOrganizationDialog.form b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/AddNewOrganizationDialog.form similarity index 87% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/AddNewOrganizationDialog.form rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/AddNewOrganizationDialog.form index 4b13dd1ca6..c8108d26f8 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/AddNewOrganizationDialog.form +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/AddNewOrganizationDialog.form @@ -104,7 +104,7 @@ - + @@ -114,7 +114,7 @@ - + @@ -124,42 +124,42 @@ - + - + - + - + - + - + diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/AddNewOrganizationDialog.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/AddNewOrganizationDialog.java similarity index 96% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/AddNewOrganizationDialog.java rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/AddNewOrganizationDialog.java index 672bbdcdbc..a996da8f1e 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/AddNewOrganizationDialog.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/AddNewOrganizationDialog.java @@ -1,5 +1,5 @@ /* - * Enterprise Artifact Manager + * Enterprise Artifacts Manager * * Copyright 2015-2017 Basis Technology Corp. * Contact: carrier sleuthkit org @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.optionspanel; +package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.optionspanel; import java.awt.Dimension; import java.awt.Toolkit; @@ -31,12 +31,12 @@ import org.netbeans.spi.options.OptionsPanelController; import org.openide.util.NbBundle.Messages; import org.openide.windows.WindowManager; import org.sleuthkit.autopsy.coreutils.Logger; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDbException; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamOrganization; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDb; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDbException; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamOrganization; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDb; /** - * Dialog to add a new organization to the enterprise artifact manager database + * Dialog to add a new organization to the enterprise artifacts manager database */ public class AddNewOrganizationDialog extends javax.swing.JDialog { diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties similarity index 93% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties index 9fd068c9e9..ccb83b2e46 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/Bundle.properties +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/Bundle.properties @@ -1,5 +1,5 @@ -OptionsCategory_Name_Enterprise_Artifact_Manager_Options=Enterprise Artifact Manager -OptionsCategory_Keywords_Enterprise_Artifact_Manager_Options=Enterprise Artifact Manager Settings +OptionsCategory_Name_Enterprise_Artifacts_Manager_Options=Enterprise Artifacts Manager +OptionsCategory_Keywords_Enterprise_Artifacts_Manager_Options=Enterprise Artifacts Manager Settings ImportHashDatabaseDialog.known.text=Known ImportHashDatabaseDialog.knownBad.text=Known Bad ImportHashDatabaseDialog.importHashDbMsg=Import Hash Database @@ -44,7 +44,7 @@ ImportHashDatabaseDialog.bnNewOrganization.text=Add New Organization ImportHashDatabaseDialog.tfDatabaseName.tooltip=Name for this database ImportHashDatabaseDialog.tfDatabaseVersion.tooltip.text=Database Version Number GlobalSettingsPanel.bnImportDatabase.actionCommand= -GlobalSettingsPanel.cbEnableEnterpriseArtifactManager.text=Enable Enterprise Artifact Manager +GlobalSettingsPanel.cbEnableEnterpriseArtifactsManager.text=Enable Enterprise Artifacts Manager GlobalSettingsPanel.bnManageTypes.text=Manage Artifact Types GlobalSettingsPanel.bnManageTags.actionCommand= GlobalSettingsPanel.bnManageTags.toolTipText= diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/EamOptionsPanelController.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/EamOptionsPanelController.java similarity index 83% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/EamOptionsPanelController.java rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/EamOptionsPanelController.java index d2bd655c6c..3c0fec984d 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/EamOptionsPanelController.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/EamOptionsPanelController.java @@ -1,5 +1,5 @@ /* - * Enterprise Artifact Manager + * Enterprise Artifacts Manager * * Copyright 2015-2017 Basis Technology Corp. * Contact: carrier sleuthkit org @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.optionspanel; +package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.optionspanel; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -33,11 +33,11 @@ import org.sleuthkit.autopsy.coreutils.Logger; /** * Controller for the main settings panel */ -@OptionsPanelController.TopLevelRegistration(categoryName = "#OptionsCategory_Name_Enterprise_Artifact_Manager_Options", +@OptionsPanelController.TopLevelRegistration(categoryName = "#OptionsCategory_Name_Enterprise_Artifacts_Manager_Options", iconBase = "org/sleuthkit/autopsy/experimental/images/options-icon.png", position = 14, - keywords = "#OptionsCategory_Keywords_Enterprise_Artifact_Manager_Options", - keywordsCategory = "EnterpriseArtifactManager") + keywords = "#OptionsCategory_Keywords_Enterprise_Artifacts_Manager_Options", + keywordsCategory = "EnterpriseArtifactsManager") public final class EamOptionsPanelController extends OptionsPanelController { private GlobalSettingsPanel panel; @@ -111,8 +111,8 @@ public final class EamOptionsPanelController extends OptionsPanelController { return panel; } - @Messages({"EnterpriseArtifactManagerOptionsController.moduleErr=Error processing value changes.", - "EnterpriseArtifactManagerOptionsController.moduleErr.msg=Value change processing failed."}) + @Messages({"EnterpriseArtifactsManagerOptionsController.moduleErr=Error processing value changes.", + "EnterpriseArtifactsManagerOptionsController.moduleErr.msg=Value change processing failed."}) void changed() { if (!changed) { changed = true; @@ -122,8 +122,8 @@ public final class EamOptionsPanelController extends OptionsPanelController { } catch (Exception ex) { LOGGER.log(Level.SEVERE, "Error processing property change", ex); //NON-NLS MessageNotifyUtil.Notify.show( - Bundle.EnterpriseArtifactManagerOptionsController_moduleErr(), - Bundle.EnterpriseArtifactManagerOptionsController_moduleErr_msg(), + Bundle.EnterpriseArtifactsManagerOptionsController_moduleErr(), + Bundle.EnterpriseArtifactsManagerOptionsController_moduleErr_msg(), MessageNotifyUtil.MessageType.ERROR); } } @@ -133,8 +133,8 @@ public final class EamOptionsPanelController extends OptionsPanelController { } catch (Exception e) { LOGGER.log(Level.SEVERE, "Error processing property change validation.", e); //NON-NLS MessageNotifyUtil.Notify.show( - Bundle.EnterpriseArtifactManagerOptionsController_moduleErr(), - Bundle.EnterpriseArtifactManagerOptionsController_moduleErr_msg(), + Bundle.EnterpriseArtifactsManagerOptionsController_moduleErr(), + Bundle.EnterpriseArtifactsManagerOptionsController_moduleErr_msg(), MessageNotifyUtil.MessageType.ERROR); } } diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/EamPostgresSettingsDialog.form b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/EamPostgresSettingsDialog.form similarity index 89% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/EamPostgresSettingsDialog.form rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/EamPostgresSettingsDialog.form index a61c8e59b5..31db936608 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/EamPostgresSettingsDialog.form +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/EamPostgresSettingsDialog.form @@ -152,35 +152,35 @@ - + - + - + - + - + @@ -197,7 +197,7 @@ - + @@ -207,7 +207,7 @@ - + @@ -217,7 +217,7 @@ - + diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/EamPostgresSettingsDialog.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/EamPostgresSettingsDialog.java similarity index 90% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/EamPostgresSettingsDialog.java rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/EamPostgresSettingsDialog.java index 9c182f59c4..148551ffce 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/EamPostgresSettingsDialog.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/EamPostgresSettingsDialog.java @@ -1,5 +1,5 @@ /* - * Enterprise Artifact Manager + * Enterprise Artifacts Manager * * Copyright 2015-2017 Basis Technology Corp. * Contact: carrier sleuthkit org @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.optionspanel; +package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.optionspanel; import java.awt.Color; import java.awt.Cursor; @@ -36,8 +36,8 @@ import org.openide.util.NbBundle.Messages; import org.openide.windows.WindowManager; import org.sleuthkit.autopsy.corecomponents.TextPrompt; import org.sleuthkit.autopsy.coreutils.Logger; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDbException; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.PostgresEamDbSettings; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDbException; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.PostgresEamDbSettings; /** * Settings panel for the postgres-specific options @@ -54,12 +54,12 @@ public class EamPostgresSettingsDialog extends javax.swing.JDialog { private Boolean hasChanged; /** - * Creates new form EnterpriseArtifactManagerPostgresSettingsDialog + * Creates new form EnterpriseArtifactsManagerPostgresSettingsDialog */ - @NbBundle.Messages({"EnterpriseArtifactManagerPostgresSettingsDialog.postgresSettingsMessage.text=PostgreSQL Database Settings"}) + @NbBundle.Messages({"EnterpriseArtifactsManagerPostgresSettingsDialog.postgresSettingsMessage.text=PostgreSQL Database Settings"}) public EamPostgresSettingsDialog() { super((JFrame) WindowManager.getDefault().getMainWindow(), - Bundle.EnterpriseArtifactManagerPostgresSettingsDialog_postgresSettingsMessage_text(), + Bundle.EnterpriseArtifactsManagerPostgresSettingsDialog_postgresSettingsMessage_text(), true); // NON-NLS textBoxes = new ArrayList<>(); @@ -108,18 +108,18 @@ public class EamPostgresSettingsDialog extends javax.swing.JDialog { /** * Add text prompts to all of the text fields. */ - @Messages({"EnterpriseArtifactManagerPostgresSettingsDialog.textPrompt.hostnameOrIP=Hostname or IP Address", - "EnterpriseArtifactManagerPostgresSettingsDialog.textPrompt.port=Port Number", - "EnterpriseArtifactManagerPostgresSettingsDialog.textPrompt.dbName=Database Name", - "EnterpriseArtifactManagerPostgresSettingsDialog.textPrompt.user=Database User", - "EnterpriseArtifactManagerPostgresSettingsDialog.textPrompt.password=Database User's Password"}) + @Messages({"EnterpriseArtifactsManagerPostgresSettingsDialog.textPrompt.hostnameOrIP=Hostname or IP Address", + "EnterpriseArtifactsManagerPostgresSettingsDialog.textPrompt.port=Port Number", + "EnterpriseArtifactsManagerPostgresSettingsDialog.textPrompt.dbName=Database Name", + "EnterpriseArtifactsManagerPostgresSettingsDialog.textPrompt.user=Database User", + "EnterpriseArtifactsManagerPostgresSettingsDialog.textPrompt.password=Database User's Password"}) private void setTextPrompts() { Collection textPrompts = new ArrayList<>(); - textPrompts.add(new TextPrompt(Bundle.EnterpriseArtifactManagerPostgresSettingsDialog_textPrompt_hostnameOrIP(), tbDbHostname)); - textPrompts.add(new TextPrompt(Bundle.EnterpriseArtifactManagerPostgresSettingsDialog_textPrompt_port(), tbDbPort)); - textPrompts.add(new TextPrompt(Bundle.EnterpriseArtifactManagerPostgresSettingsDialog_textPrompt_dbName(), tbDbName)); - textPrompts.add(new TextPrompt(Bundle.EnterpriseArtifactManagerPostgresSettingsDialog_textPrompt_user(), tbDbUsername)); - textPrompts.add(new TextPrompt(Bundle.EnterpriseArtifactManagerPostgresSettingsDialog_textPrompt_password(), tbDbPassword)); + textPrompts.add(new TextPrompt(Bundle.EnterpriseArtifactsManagerPostgresSettingsDialog_textPrompt_hostnameOrIP(), tbDbHostname)); + textPrompts.add(new TextPrompt(Bundle.EnterpriseArtifactsManagerPostgresSettingsDialog_textPrompt_port(), tbDbPort)); + textPrompts.add(new TextPrompt(Bundle.EnterpriseArtifactsManagerPostgresSettingsDialog_textPrompt_dbName(), tbDbName)); + textPrompts.add(new TextPrompt(Bundle.EnterpriseArtifactsManagerPostgresSettingsDialog_textPrompt_user(), tbDbUsername)); + textPrompts.add(new TextPrompt(Bundle.EnterpriseArtifactsManagerPostgresSettingsDialog_textPrompt_password(), tbDbPassword)); configureTextPrompts(textPrompts); } @@ -192,7 +192,7 @@ public class EamPostgresSettingsDialog extends javax.swing.JDialog { * * @return True or false. */ - @Messages({"EnterpriseArtifactManagerPostgresSettingsDialog.validation.incompleteFields=Fill in all values"}) + @Messages({"EnterpriseArtifactsManagerPostgresSettingsDialog.validation.incompleteFields=Fill in all values"}) private boolean checkFields() { boolean result = true; @@ -201,7 +201,7 @@ public class EamPostgresSettingsDialog extends javax.swing.JDialog { if (!dbPopulated) { // We don't even have everything filled out result = false; - lbTestDatabaseWarning.setText(Bundle.EnterpriseArtifactManagerPostgresSettingsDialog_validation_incompleteFields()); + lbTestDatabaseWarning.setText(Bundle.EnterpriseArtifactsManagerPostgresSettingsDialog_validation_incompleteFields()); } return result; } @@ -211,45 +211,45 @@ public class EamPostgresSettingsDialog extends javax.swing.JDialog { * * @return True or false. */ - @Messages({"EnterpriseArtifactManagerPostgresSettingsDialog.validation.invalidHost=Invalid database hostname.", - "EnterpriseArtifactManagerPostgresSettingsDialog.validation.invalidPort=Invalid database port number.", - "EnterpriseArtifactManagerPostgresSettingsDialog.validation.invalidDbName=Invalid database name.", - "EnterpriseArtifactManagerPostgresSettingsDialog.validation.invalidDbUser=Invalid database username.", - "EnterpriseArtifactManagerPostgresSettingsDialog.validation.invalidDbPassword=Invalid database password.",}) + @Messages({"EnterpriseArtifactsManagerPostgresSettingsDialog.validation.invalidHost=Invalid database hostname.", + "EnterpriseArtifactsManagerPostgresSettingsDialog.validation.invalidPort=Invalid database port number.", + "EnterpriseArtifactsManagerPostgresSettingsDialog.validation.invalidDbName=Invalid database name.", + "EnterpriseArtifactsManagerPostgresSettingsDialog.validation.invalidDbUser=Invalid database username.", + "EnterpriseArtifactsManagerPostgresSettingsDialog.validation.invalidDbPassword=Invalid database password.",}) private boolean databaseSettingsAreValid() { try { dbSettings.setHost(tbDbHostname.getText().trim()); } catch (EamDbException ex) { - lbTestDatabaseWarning.setText(Bundle.EnterpriseArtifactManagerPostgresSettingsDialog_validation_invalidHost()); + lbTestDatabaseWarning.setText(Bundle.EnterpriseArtifactsManagerPostgresSettingsDialog_validation_invalidHost()); return false; } try { dbSettings.setPort(Integer.valueOf(tbDbPort.getText().trim())); } catch (NumberFormatException | EamDbException ex) { - lbTestDatabaseWarning.setText(Bundle.EnterpriseArtifactManagerPostgresSettingsDialog_validation_invalidPort()); + lbTestDatabaseWarning.setText(Bundle.EnterpriseArtifactsManagerPostgresSettingsDialog_validation_invalidPort()); return false; } try { dbSettings.setDbName(tbDbName.getText().trim()); } catch (EamDbException ex) { - lbTestDatabaseWarning.setText(Bundle.EnterpriseArtifactManagerPostgresSettingsDialog_validation_invalidDbName()); + lbTestDatabaseWarning.setText(Bundle.EnterpriseArtifactsManagerPostgresSettingsDialog_validation_invalidDbName()); return false; } try { dbSettings.setUserName(tbDbUsername.getText().trim()); } catch (EamDbException ex) { - lbTestDatabaseWarning.setText(Bundle.EnterpriseArtifactManagerPostgresSettingsDialog_validation_invalidDbUser()); + lbTestDatabaseWarning.setText(Bundle.EnterpriseArtifactsManagerPostgresSettingsDialog_validation_invalidDbUser()); return false; } try { dbSettings.setPassword(tbDbPassword.getText().trim()); } catch (EamDbException ex) { - lbTestDatabaseWarning.setText(Bundle.EnterpriseArtifactManagerPostgresSettingsDialog_validation_invalidDbPassword()); + lbTestDatabaseWarning.setText(Bundle.EnterpriseArtifactsManagerPostgresSettingsDialog_validation_invalidDbPassword()); return false; } diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/EamSqliteSettingsDialog.form b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/EamSqliteSettingsDialog.form similarity index 87% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/EamSqliteSettingsDialog.form rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/EamSqliteSettingsDialog.form index 0f80f2de66..9ab466696d 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/EamSqliteSettingsDialog.form +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/EamSqliteSettingsDialog.form @@ -136,24 +136,24 @@ - + - + - + - + @@ -166,14 +166,14 @@ - + - + @@ -183,7 +183,7 @@ - + @@ -191,7 +191,7 @@ - + @@ -201,7 +201,7 @@ - + diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/EamSqliteSettingsDialog.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/EamSqliteSettingsDialog.java similarity index 92% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/EamSqliteSettingsDialog.java rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/EamSqliteSettingsDialog.java index 614e1905d7..e46288dd21 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/EamSqliteSettingsDialog.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/EamSqliteSettingsDialog.java @@ -1,5 +1,5 @@ /* - * Enterprise Artifact Manager + * Enterprise Artifacts Manager * * Copyright 2015-2017 Basis Technology Corp. * Contact: carrier sleuthkit org @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.optionspanel; +package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.optionspanel; import java.awt.Cursor; import java.awt.Dimension; @@ -36,8 +36,8 @@ import org.openide.util.ImageUtilities; import org.openide.util.NbBundle.Messages; import org.openide.windows.WindowManager; import org.sleuthkit.autopsy.coreutils.Logger; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDbException; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.SqliteEamDbSettings; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDbException; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.SqliteEamDbSettings; /** * Settings panel for the sqlite-specific options @@ -53,12 +53,12 @@ public class EamSqliteSettingsDialog extends javax.swing.JDialog { private Boolean hasChanged; /** - * Creates new form EnterpriseArtifactManagerSQLiteSettingsDialog + * Creates new form EnterpriseArtifactsManagerSQLiteSettingsDialog */ - @Messages({"EnterpriseArtifactManagerSQLiteSettingsDialog.sqliteSettingsMessage.text=SQLite Database Settings"}) + @Messages({"EnterpriseArtifactsManagerSQLiteSettingsDialog.sqliteSettingsMessage.text=SQLite Database Settings"}) public EamSqliteSettingsDialog() { super((JFrame) WindowManager.getDefault().getMainWindow(), - Bundle.EnterpriseArtifactManagerSQLiteSettingsDialog_sqliteSettingsMessage_text(), + Bundle.EnterpriseArtifactsManagerSQLiteSettingsDialog_sqliteSettingsMessage_text(), true); // NON-NLS this.dbSettings = new SqliteEamDbSettings(); @@ -91,12 +91,12 @@ public class EamSqliteSettingsDialog extends javax.swing.JDialog { bnTestDatabase.setEnabled(false); } - @Messages({"EnterpriseArtifactManagerSQLiteSettingsDialog.fileNameExtFilter.text=SQLite Database File"}) + @Messages({"EnterpriseArtifactsManagerSQLiteSettingsDialog.fileNameExtFilter.text=SQLite Database File"}) private void customizeFileChooser() { fcDatabasePath.setDragEnabled(false); fcDatabasePath.setFileSelectionMode(JFileChooser.FILES_ONLY); String[] EXTENSION = new String[]{"db"}; //NON-NLS - FileNameExtensionFilter filter = new FileNameExtensionFilter(Bundle.EnterpriseArtifactManagerSQLiteSettingsDialog_fileNameExtFilter_text(), EXTENSION); // NON-NLS + FileNameExtensionFilter filter = new FileNameExtensionFilter(Bundle.EnterpriseArtifactsManagerSQLiteSettingsDialog_fileNameExtFilter_text(), EXTENSION); // NON-NLS fcDatabasePath.setFileFilter(filter); fcDatabasePath.setMultiSelectionEnabled(false); } @@ -150,7 +150,7 @@ public class EamSqliteSettingsDialog extends javax.swing.JDialog { * Get the db file name and directory path from the file chooser and store * in dbSettings. */ - @Messages({"EnterpriseArtifactManagerSQLiteSettingsDialog.storeDbNameAndDirectory.failedToSetDbNamePathMsg=Database filename or directory path is missing. Try again."}) + @Messages({"EnterpriseArtifactsManagerSQLiteSettingsDialog.storeDbNameAndDirectory.failedToSetDbNamePathMsg=Database filename or directory path is missing. Try again."}) private void storeDbNameAndDirectory() { File databasePath = new File(tfDatabasePath.getText()); try { @@ -158,7 +158,7 @@ public class EamSqliteSettingsDialog extends javax.swing.JDialog { dbSettings.setDbDirectory(databasePath.getParent()); } catch (EamDbException ex) { LOGGER.log(Level.SEVERE, "Failed to set database name or directory path.", ex); // NON-NLS - JOptionPane.showMessageDialog(this, Bundle.EnterpriseArtifactManagerSQLiteSettingsDialog_storeDbNameAndDirectory_failedToSetDbNamePathMsg()); + JOptionPane.showMessageDialog(this, Bundle.EnterpriseArtifactsManagerSQLiteSettingsDialog_storeDbNameAndDirectory_failedToSetDbNamePathMsg()); } } @@ -309,7 +309,7 @@ public class EamSqliteSettingsDialog extends javax.swing.JDialog { pack(); }// //GEN-END:initComponents - @Messages({"EnterpriseArtifactManagerSQLiteSettingsDialog.chooserPath.failedToGetDbPathMsg=Selected database path is invalid. Try again."}) + @Messages({"EnterpriseArtifactsManagerSQLiteSettingsDialog.chooserPath.failedToGetDbPathMsg=Selected database path is invalid. Try again."}) private void bnDatabasePathFileOpenActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bnDatabasePathFileOpenActionPerformed if (fcDatabasePath.showOpenDialog(this) == JFileChooser.APPROVE_OPTION) { File databaseFile = fcDatabasePath.getSelectedFile(); @@ -319,7 +319,7 @@ public class EamSqliteSettingsDialog extends javax.swing.JDialog { } catch (IOException ex) { LOGGER.log(Level.SEVERE, "Failed to get path of selected database file", ex); // NON-NLS - JOptionPane.showMessageDialog(this, Bundle.EnterpriseArtifactManagerSQLiteSettingsDialog_chooserPath_failedToGetDbPathMsg()); + JOptionPane.showMessageDialog(this, Bundle.EnterpriseArtifactsManagerSQLiteSettingsDialog_chooserPath_failedToGetDbPathMsg()); } } }//GEN-LAST:event_bnDatabasePathFileOpenActionPerformed diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/GlobalSettingsPanel.form b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/GlobalSettingsPanel.form similarity index 86% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/GlobalSettingsPanel.form rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/GlobalSettingsPanel.form index 7af0708de0..29154fc5ea 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/GlobalSettingsPanel.form +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/GlobalSettingsPanel.form @@ -50,7 +50,7 @@ - + @@ -61,7 +61,7 @@ - + @@ -121,10 +121,10 @@ - + - + @@ -136,7 +136,7 @@ - + @@ -191,14 +191,14 @@ - + - + @@ -219,7 +219,7 @@ - + @@ -229,13 +229,13 @@ - + - + - + @@ -245,7 +245,7 @@ - + @@ -254,19 +254,19 @@ - + - + - + - + diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/GlobalSettingsPanel.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/GlobalSettingsPanel.java similarity index 91% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/GlobalSettingsPanel.java rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/GlobalSettingsPanel.java index 81a8969ec8..b0a2624224 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/GlobalSettingsPanel.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/GlobalSettingsPanel.java @@ -1,5 +1,5 @@ /* - * Enterprise Artifact Manager + * Enterprise Artifacts Manager * * Copyright 2015-2017 Basis Technology Corp. * Contact: carrier sleuthkit org @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.optionspanel; +package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.optionspanel; import org.sleuthkit.autopsy.coreutils.Logger; import java.beans.PropertyChangeEvent; @@ -31,11 +31,11 @@ import org.sleuthkit.autopsy.coreutils.ModuleSettings; import org.sleuthkit.autopsy.events.AutopsyEvent; import org.sleuthkit.autopsy.ingest.IngestManager; import org.sleuthkit.autopsy.ingest.IngestModuleGlobalSettingsPanel; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDbPlatformEnum; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDb; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDbPlatformEnum; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDb; /** - * Main settings panel for the enterprise artifact manager + * Main settings panel for the enterprise artifacts manager */ public final class GlobalSettingsPanel extends IngestModuleGlobalSettingsPanel implements OptionsPanel { @@ -49,7 +49,7 @@ public final class GlobalSettingsPanel extends IngestModuleGlobalSettingsPanel i private boolean comboboxSelectDatabaseTypeActionListenerActive; /** - * Creates new form EnterpriseArtifactManagerOptionsPanel + * Creates new form EnterpriseArtifactsManagerOptionsPanel */ public GlobalSettingsPanel() { ingestJobEventListener = new IngestJobEventPropertyChangeListener(); @@ -59,7 +59,7 @@ public final class GlobalSettingsPanel extends IngestModuleGlobalSettingsPanel i addIngestJobEventsListener(); } - @Messages({"GlobalSettingsPanel.title=Global Enterprise Artifact Manager Settings"}) + @Messages({"GlobalSettingsPanel.title=Global Enterprise Artifacts Manager Settings"}) private void customizeComponents() { setName(Bundle.GlobalSettingsPanel_title()); comboboxSelectDatabaseTypeActionListenerActive = false; // don't fire action listener while loading combobox content @@ -95,7 +95,7 @@ public final class GlobalSettingsPanel extends IngestModuleGlobalSettingsPanel i tbOops = new javax.swing.JTextField(); bnManageTags = new javax.swing.JButton(); bnManageTypes = new javax.swing.JButton(); - cbEnableEnterpriseArtifactManager = new javax.swing.JCheckBox(); + cbEnableEnterpriseArtifactsManager = new javax.swing.JCheckBox(); setName(""); // NOI18N @@ -209,11 +209,11 @@ public final class GlobalSettingsPanel extends IngestModuleGlobalSettingsPanel i .addGap(34, 34, 34)) ); - cbEnableEnterpriseArtifactManager.setFont(cbEnableEnterpriseArtifactManager.getFont().deriveFont(cbEnableEnterpriseArtifactManager.getFont().getStyle() & ~java.awt.Font.BOLD, 11)); - org.openide.awt.Mnemonics.setLocalizedText(cbEnableEnterpriseArtifactManager, org.openide.util.NbBundle.getMessage(GlobalSettingsPanel.class, "GlobalSettingsPanel.cbEnableEnterpriseArtifactManager.text")); // NOI18N - cbEnableEnterpriseArtifactManager.addItemListener(new java.awt.event.ItemListener() { + cbEnableEnterpriseArtifactsManager.setFont(cbEnableEnterpriseArtifactsManager.getFont().deriveFont(cbEnableEnterpriseArtifactsManager.getFont().getStyle() & ~java.awt.Font.BOLD, 11)); + org.openide.awt.Mnemonics.setLocalizedText(cbEnableEnterpriseArtifactsManager, org.openide.util.NbBundle.getMessage(GlobalSettingsPanel.class, "GlobalSettingsPanel.cbEnableEnterpriseArtifactsManager.text")); // NOI18N + cbEnableEnterpriseArtifactsManager.addItemListener(new java.awt.event.ItemListener() { public void itemStateChanged(java.awt.event.ItemEvent evt) { - cbEnableEnterpriseArtifactManagerItemStateChanged(evt); + cbEnableEnterpriseArtifactsManagerItemStateChanged(evt); } }); @@ -225,14 +225,14 @@ public final class GlobalSettingsPanel extends IngestModuleGlobalSettingsPanel i .addContainerGap() .addGroup(pnOverallPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(pnOverallPanelLayout.createSequentialGroup() - .addComponent(cbEnableEnterpriseArtifactManager, javax.swing.GroupLayout.PREFERRED_SIZE, 215, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(cbEnableEnterpriseArtifactsManager, javax.swing.GroupLayout.PREFERRED_SIZE, 215, javax.swing.GroupLayout.PREFERRED_SIZE) .addGap(0, 0, Short.MAX_VALUE)) .addComponent(pnSettings, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))) ); pnOverallPanelLayout.setVerticalGroup( pnOverallPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, pnOverallPanelLayout.createSequentialGroup() - .addComponent(cbEnableEnterpriseArtifactManager) + .addComponent(cbEnableEnterpriseArtifactsManager) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(pnSettings, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); @@ -253,16 +253,16 @@ public final class GlobalSettingsPanel extends IngestModuleGlobalSettingsPanel i ); }// //GEN-END:initComponents - private void cbEnableEnterpriseArtifactManagerItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_cbEnableEnterpriseArtifactManagerItemStateChanged + private void cbEnableEnterpriseArtifactsManagerItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_cbEnableEnterpriseArtifactsManagerItemStateChanged tbOops.setText(""); - if (!cbEnableEnterpriseArtifactManager.isSelected()) { + if (!cbEnableEnterpriseArtifactsManager.isSelected()) { enableAllSubComponents(false); firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); } else { enableDatabaseSubComponents(true); validateDatabaseSettings(); } - }//GEN-LAST:event_cbEnableEnterpriseArtifactManagerItemStateChanged + }//GEN-LAST:event_cbEnableEnterpriseArtifactsManagerItemStateChanged private void bnImportDatabaseActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bnImportDatabaseActionPerformed ImportHashDatabaseDialog dialog = new ImportHashDatabaseDialog(); @@ -337,9 +337,9 @@ public final class GlobalSettingsPanel extends IngestModuleGlobalSettingsPanel i enableAllSubComponents(false); - initiallyEnabled = Boolean.valueOf(ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.enabled")); // NON-NLS - cbEnableEnterpriseArtifactManager.setSelected(initiallyEnabled); // NON-NLS - String selectedPlatformString = ModuleSettings.getConfigSetting("EnterpriseArtifactManager", "db.selectedPlatform"); // NON-NLS + initiallyEnabled = Boolean.valueOf(ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.enabled")); // NON-NLS + cbEnableEnterpriseArtifactsManager.setSelected(initiallyEnabled); // NON-NLS + String selectedPlatformString = ModuleSettings.getConfigSetting("EnterpriseArtifactsManager", "db.selectedPlatform"); // NON-NLS dbConfigured = selectedPlatformString != null; if (dbConfigured) { @@ -366,7 +366,7 @@ public final class GlobalSettingsPanel extends IngestModuleGlobalSettingsPanel i boolean valid() { tbOops.setText(""); - if (cbEnableEnterpriseArtifactManager.isSelected()) { + if (cbEnableEnterpriseArtifactsManager.isSelected()) { return validateDatabaseSettings(); } else { return true; @@ -390,8 +390,8 @@ public final class GlobalSettingsPanel extends IngestModuleGlobalSettingsPanel i @Override public void saveSettings() { // Click OK on Global Settings Panel - ModuleSettings.setConfigSetting("EnterpriseArtifactManager", "db.enabled", Boolean.toString(cbEnableEnterpriseArtifactManager.isSelected())); // NON-NLS - if (cbEnableEnterpriseArtifactManager.isSelected()) { + ModuleSettings.setConfigSetting("EnterpriseArtifactsManager", "db.enabled", Boolean.toString(cbEnableEnterpriseArtifactsManager.isSelected())); // NON-NLS + if (cbEnableEnterpriseArtifactsManager.isSelected()) { EamDbPlatformEnum.saveSelectedPlatform(); EamDb dbManager = EamDb.getInstance(); dbManager.updateSettings(); @@ -437,13 +437,13 @@ public final class GlobalSettingsPanel extends IngestModuleGlobalSettingsPanel i } if (IngestManager.getInstance().isIngestRunning()) { - cbEnableEnterpriseArtifactManager.setEnabled(false); + cbEnableEnterpriseArtifactsManager.setEnabled(false); tbOops.setText(Bundle.GlobalSettingsPanel_validationErrMsg_ingestRunning()); enableAllSubComponents(false); } else { - cbEnableEnterpriseArtifactManager.setEnabled(true); + cbEnableEnterpriseArtifactsManager.setEnabled(true); tbOops.setText(""); - enableAllSubComponents(cbEnableEnterpriseArtifactManager.isSelected()); + enableAllSubComponents(cbEnableEnterpriseArtifactsManager.isSelected()); } } @@ -527,7 +527,7 @@ public final class GlobalSettingsPanel extends IngestModuleGlobalSettingsPanel i } /** - * Enables the "Manage Correlation Types" button. + * Enables the "Manage Artifact Types" button. * * @param enable * @@ -555,7 +555,7 @@ public final class GlobalSettingsPanel extends IngestModuleGlobalSettingsPanel i private javax.swing.JButton bnImportDatabase; private javax.swing.JButton bnManageTags; private javax.swing.JButton bnManageTypes; - private javax.swing.JCheckBox cbEnableEnterpriseArtifactManager; + private javax.swing.JCheckBox cbEnableEnterpriseArtifactsManager; private javax.swing.JComboBox comboboxSelectDatabaseType; private javax.swing.JScrollPane jScrollPane; private javax.swing.JLabel lbDatabasePlatform; diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/ImportHashDatabaseDialog.form b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/ImportHashDatabaseDialog.form similarity index 85% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/ImportHashDatabaseDialog.form rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/ImportHashDatabaseDialog.form index 6a0da84018..d79c67566d 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/ImportHashDatabaseDialog.form +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/ImportHashDatabaseDialog.form @@ -144,7 +144,7 @@ - + @@ -154,7 +154,7 @@ - + @@ -164,14 +164,14 @@ - + - + @@ -184,7 +184,7 @@ - + @@ -195,49 +195,49 @@ - + - + - + - + - + - + - + @@ -262,21 +262,21 @@ - + - + - + diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/ImportHashDatabaseDialog.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/ImportHashDatabaseDialog.java similarity index 97% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/ImportHashDatabaseDialog.java rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/ImportHashDatabaseDialog.java index e9fecdac1f..e1927401cd 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/ImportHashDatabaseDialog.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/ImportHashDatabaseDialog.java @@ -1,5 +1,5 @@ /* - * Enterprise Artifact Manager + * Enterprise Artifacts Manager * * Copyright 2015-2017 Basis Technology Corp. * Contact: carrier sleuthkit org @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.optionspanel; +package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.optionspanel; import java.awt.Dimension; import java.awt.Toolkit; @@ -47,12 +47,12 @@ import org.openide.util.NbBundle.Messages; import org.openide.windows.WindowManager; import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.coreutils.ModuleSettings; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamArtifactInstance; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDbException; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamGlobalFileInstance; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamGlobalSet; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamOrganization; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDb; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamArtifactInstance; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDbException; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamGlobalFileInstance; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamGlobalSet; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamOrganization; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDb; /** * Instances of this class allow a user to select an existing hash database and @@ -63,7 +63,7 @@ final class ImportHashDatabaseDialog extends javax.swing.JDialog { private static final Logger LOGGER = Logger.getLogger(ImportHashDatabaseDialog.class.getName()); private final JFileChooser fileChooser = new JFileChooser(); - private final static String LAST_FILE_PATH_KEY = "EnterpriseArtifactManagerImport_Path"; // NON-NLS + private final static String LAST_FILE_PATH_KEY = "EnterpriseArtifactsManagerImport_Path"; // NON-NLS private EamOrganization selectedOrg = null; private List orgs = null; private final Collection textBoxes; @@ -562,7 +562,7 @@ final class ImportHashDatabaseDialog extends javax.swing.JDialog { this.globalSetID = globalSetID; if (!dbManager.isEnabled()) { - throw new EamDbException("Enterprise artifact manager database settings were not properly initialized"); // NON-NLS + throw new EamDbException("Enterprise artifacts manager database settings were not properly initialized"); // NON-NLS } } diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/ManageArtifactTypesDialog.form b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/ManageArtifactTypesDialog.form similarity index 90% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/ManageArtifactTypesDialog.form rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/ManageArtifactTypesDialog.form index 58f3af5407..7ab23c86d5 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/ManageArtifactTypesDialog.form +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/ManageArtifactTypesDialog.form @@ -67,7 +67,7 @@ - + @@ -77,7 +77,7 @@ - + @@ -123,7 +123,7 @@ - + @@ -140,7 +140,7 @@ - + diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/ManageArtifactTypesDialog.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/ManageArtifactTypesDialog.java similarity index 95% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/ManageArtifactTypesDialog.java rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/ManageArtifactTypesDialog.java index 8a25cb6559..543e093f0d 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/ManageArtifactTypesDialog.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/ManageArtifactTypesDialog.java @@ -1,5 +1,5 @@ /* - * Enterprise Artifact Manager + * Enterprise Artifacts Manager * * Copyright 2015-2017 Basis Technology Corp. * Contact: carrier sleuthkit org @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.optionspanel; +package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.optionspanel; import java.awt.Dimension; import java.awt.Toolkit; @@ -32,13 +32,13 @@ import org.openide.util.Exceptions; import org.openide.util.NbBundle.Messages; import org.openide.windows.WindowManager; import org.sleuthkit.autopsy.coreutils.Logger; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamArtifact; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDbException; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDb; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamArtifact; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDbException; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDb; /** - * Dialog to handle management of correlation types handled by the enterprise - * artifact manager + * Dialog to handle management of artifact types handled by the enterprise + * artifacts manager */ final class ManageArtifactTypesDialog extends javax.swing.JDialog { @@ -251,7 +251,7 @@ final class ManageArtifactTypesDialog extends javax.swing.JDialog { dbManager.updateCorrelationArtifactType(aType); dispose(); } catch (EamDbException ex) { - LOGGER.log(Level.SEVERE, "Failed to updated Enterprise Artifact Manager artifact types with selections from dialog.", ex); // NON-NLS + LOGGER.log(Level.SEVERE, "Failed to updated Enterprise Artifacts Manager artifact types with selections from dialog.", ex); // NON-NLS lbWarningMsg.setText(Bundle.ManageArtifactTypesDialog_okbutton_failure()); } }); diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/ManageTagsDialog.form b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/ManageTagsDialog.form similarity index 92% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/ManageTagsDialog.form rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/ManageTagsDialog.form index 5316a3f44c..60a7cd7c1d 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/ManageTagsDialog.form +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/ManageTagsDialog.form @@ -59,7 +59,7 @@ - + @@ -69,7 +69,7 @@ - + diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/ManageTagsDialog.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/ManageTagsDialog.java similarity index 97% rename from Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/ManageTagsDialog.java rename to Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/ManageTagsDialog.java index 1053850a77..eb96bc9adc 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactmanager/optionspanel/ManageTagsDialog.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/optionspanel/ManageTagsDialog.java @@ -1,5 +1,5 @@ /* - * Enterprise Artifact Manager + * Enterprise Artifacts Manager * * Copyright 2015-2017 Basis Technology Corp. * Contact: carrier sleuthkit org @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.optionspanel; +package org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.optionspanel; import java.awt.Dimension; import java.awt.Toolkit; @@ -32,7 +32,7 @@ import org.openide.windows.WindowManager; import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.datamodel.TskCoreException; -import org.sleuthkit.autopsy.experimental.enterpriseartifactmanager.datamodel.EamDb; +import org.sleuthkit.autopsy.experimental.enterpriseartifactsmanager.datamodel.EamDb; /** * Instances of this class allow a user to select an existing hash database and