feature: Update perspective menu and cleanup internals

31 files changed, 213 insertions, 36 deletions

diff --git a/plugins/org.eclipse.osee.ats/plugin.xml b/plugins/org.eclipse.osee.ats/plugin.xml
index 4c2c7bae007..f3905b5c7fe 100644
--- a/plugins/org.eclipse.osee.ats/plugin.xml
+++ b/plugins/org.eclipse.osee.ats/plugin.xml
@@ -62,7 +62,7 @@
 <extension point="org.eclipse.ui.perspectives">
    <perspective
          name="ATS"
-         class="org.eclipse.osee.ats.ATSPerspective"
+         class="org.eclipse.osee.ats.internal.ATSPerspective"
          fixed="false"
          id="org.eclipse.osee.ats.ATSPerspective"
          icon="images/atsPerspective.gif">
@@ -119,15 +119,6 @@
          name="Action View"
          id="org.eclipse.osee.ats.ActionWalkerView">
     </view>
-<!-- Don't allow access to this yet 
-    <view
-         class="org.eclipse.osee.ats.hyper.ActionSkyWalker"
-         icon="images/action.gif"
-         category="org.eclipse.osee.ats.category"
-         name="Action View"
-         id="org.eclipse.osee.ats.hyper.ActionSkyWalker">
-   </view>
--->
    <view
          category="org.eclipse.osee.ats.review.category"
          class="org.eclipse.osee.ats.review.ReviewNavigateView"
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenAtsPerspectiveAction.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenAtsPerspectiveAction.java
index db0c5053e80..0debf157e48 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenAtsPerspectiveAction.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/OpenAtsPerspectiveAction.java
@@ -12,7 +12,7 @@ package org.eclipse.osee.ats.actions;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.osee.ats.ATSPerspective;
+import org.eclipse.osee.ats.internal.ATSPerspective;
 import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.IWorkbenchWindowActionDelegate;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/ATSPerspective.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/ATSPerspective.java
index eebcd50d788..0c64b948e0e 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/ATSPerspective.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/internal/ATSPerspective.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.ats;
+package org.eclipse.osee.ats.internal;
 
 import org.eclipse.osee.ats.core.util.AtsUtilCore;
 import org.eclipse.osee.ats.navigate.NavigateView;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java
index 552a4afb1cb..8169114a72d 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java
@@ -23,7 +23,6 @@ import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtension;
 import org.eclipse.core.runtime.IExtensionPoint;
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.osee.ats.ATSPerspective;
 import org.eclipse.osee.ats.AtsImage;
 import org.eclipse.osee.ats.actions.NewAction;
 import org.eclipse.osee.ats.actions.NewGoal;
@@ -35,6 +34,7 @@ import org.eclipse.osee.ats.goal.GoalSearchWorkflowSearchItem;
 import org.eclipse.osee.ats.health.ValidateAtsDatabase;
 import org.eclipse.osee.ats.health.ValidateChangeReportByHrid;
 import org.eclipse.osee.ats.health.ValidateChangeReports;
+import org.eclipse.osee.ats.internal.ATSPerspective;
 import org.eclipse.osee.ats.internal.AtsPlugin;
 import org.eclipse.osee.ats.navigate.EmailTeamsItem.MemberType;
 import org.eclipse.osee.ats.notify.AtsNotificationNavigateItem;
diff --git a/plugins/org.eclipse.osee.coverage/plugin.xml b/plugins/org.eclipse.osee.coverage/plugin.xml
index ac0e8d122a4..d783ec9a6cd 100644
--- a/plugins/org.eclipse.osee.coverage/plugin.xml
+++ b/plugins/org.eclipse.osee.coverage/plugin.xml
@@ -20,6 +20,25 @@
                id="org.eclipse.osee.coverage.CoveragePerspective"
                name="Coverage"/>
       </extension>
+         <extension point="org.eclipse.ui.actionSets">
+      <actionSet
+         label="OSEE Coverage"
+         visible="true"
+         id="osee.coverage.actionSet">
+			<menu
+            label="&amp;OSEE"
+            id="osee.product.oseeMenu">
+         </menu>         
+         <action
+               class="org.eclipse.osee.coverage.internal.OpenCoveragePerspectiveAction"
+               icon="images/coverage.gif"
+               id="org.eclipse.osee.coverage.internal.OpenCoveragePerspectiveAction"
+               label="OSEE &amp;Coverage"
+               menubarPath="osee.product.oseeMenu/main"
+               tooltip="Open OSEE Coverage Perspective">
+         </action>
+      </actionSet>
+      </extension>
       <extension
             point="org.eclipse.ui.perspectiveExtensions">
          <perspectiveExtension targetID="org.eclipse.ui.resourcePerspective">
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/internal/CoveragePerspectiveFactory.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/internal/CoveragePerspectiveFactory.java
index b69ef0ba6e8..728fae180d8 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/internal/CoveragePerspectiveFactory.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/internal/CoveragePerspectiveFactory.java
@@ -26,6 +26,7 @@ import org.eclipse.ui.IPerspectiveFactory;
  * @author Donald G. Dunne
  */
 public class CoveragePerspectiveFactory implements IPerspectiveFactory {
+   public static String ID = "org.eclipse.osee.coverage.CoveragePerspective";
 
    @Override
    public void createInitialLayout(IPageLayout layout) {
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/internal/OpenCoveragePerspectiveAction.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/internal/OpenCoveragePerspectiveAction.java
new file mode 100644
index 00000000000..ed0e1baa002
--- /dev/null
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/internal/OpenCoveragePerspectiveAction.java
@@ -0,0 +1,73 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Boeing.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Boeing - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.osee.coverage.internal;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.IWorkbenchWindowActionDelegate;
+
+/**
+ * Our sample action implements workbench action delegate. The action proxy will be created by the workbench and shown
+ * in the UI. When the user tries to use the action, this delegate will be created and execution will be delegated to
+ * it.
+ * 
+ * @see IWorkbenchWindowActionDelegate
+ */
+public class OpenCoveragePerspectiveAction implements IWorkbenchWindowActionDelegate {
+
+   public OpenCoveragePerspectiveAction() {
+      // do nothing
+   }
+
+   /**
+    * The action has been activated. The argument of the method represents the 'real' action sitting in the workbench
+    * UI.
+    * 
+    * @see IWorkbenchWindowActionDelegate#run
+    */
+   @Override
+   public void run(IAction action) {
+      AWorkbench.openPerspective(CoveragePerspectiveFactory.ID);
+   }
+
+   /**
+    * Selection in the workbench has been changed. We can change the state of the 'real' action here if we want, but
+    * this can only happen after the delegate has been created.
+    * 
+    * @see IWorkbenchWindowActionDelegate#selectionChanged
+    */
+   @Override
+   public void selectionChanged(IAction action, ISelection selection) {
+      // do nothing
+   }
+
+   /**
+    * We can use this method to dispose of any system resources we previously allocated.
+    * 
+    * @see IWorkbenchWindowActionDelegate#dispose
+    */
+   @Override
+   public void dispose() {
+      // do nothing
+   }
+
+   /**
+    * We will cache window object in order to be able to provide parent shell for the message dialog.
+    * 
+    * @see IWorkbenchWindowActionDelegate#init
+    */
+   @Override
+   public void init(IWorkbenchWindow window) {
+      // do nothing
+   }
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.define/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.define/META-INF/MANIFEST.MF
index 7edcaa77e3b..9fa0331f71b 100644
--- a/plugins/org.eclipse.osee.define/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.define/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: OSEE Define Plug-in (Incubation)
 Bundle-SymbolicName: org.eclipse.osee.define;singleton:=true
 Bundle-Version: 0.9.9.qualifier
 Eclipse-ExtensibleAPI: true
-Bundle-Activator: org.eclipse.osee.define.DefinePlugin
+Bundle-Activator: org.eclipse.osee.define.internal.DefinePlugin
 Bundle-Vendor: Eclipse Open System Engineering Environment
 Export-Package: org.eclipse.osee.define,
  org.eclipse.osee.define.artifact,
diff --git a/plugins/org.eclipse.osee.define/plugin.xml b/plugins/org.eclipse.osee.define/plugin.xml
index 804e937b9b7..9fd64b6cbff 100644
--- a/plugins/org.eclipse.osee.define/plugin.xml
+++ b/plugins/org.eclipse.osee.define/plugin.xml
@@ -41,7 +41,7 @@
       <extension
             point="org.eclipse.ui.perspectives">
          <perspective
-               class="org.eclipse.osee.define.DefinePerspectiveFactory"
+               class="org.eclipse.osee.define.internal.DefinePerspectiveFactory"
                fixed="false"
                icon="images/laser_16_16.gif"
                id="osee.define.PerspectiveFactory"
@@ -214,4 +214,23 @@
           className="org.eclipse.osee.define.traceability.report.PublishStdStpTraceability">
     </Operation>
  </extension>
+ <extension point="org.eclipse.ui.actionSets">
+      <actionSet
+         label="OSEE Define"
+         visible="true"
+         id="osee.define.actionSet">
+			<menu
+            label="&amp;OSEE"
+            id="osee.product.oseeMenu">
+         </menu>         
+         <action
+               class="org.eclipse.osee.define.internal.OpenDefinePerspectiveAction"
+               icon="images/laser_16_16.gif"
+               id="org.eclipse.osee.define.OpenDefinePerspectiveAction"
+               label="OSEE &amp;Define"
+               menubarPath="osee.product.oseeMenu/main"
+               tooltip="Open OSEE Define Perspective">
+         </action>
+      </actionSet>
+   </extension>
 </plugin>
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/artifact/Resolver.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/artifact/Resolver.java
index c80a2e1858a..0482a4afa3e 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/artifact/Resolver.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/artifact/Resolver.java
@@ -16,7 +16,7 @@ import javax.xml.transform.Source;
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.URIResolver;
 import javax.xml.transform.stream.StreamSource;
-import org.eclipse.osee.define.DefinePlugin;
+import org.eclipse.osee.define.internal.DefinePlugin;
 import org.eclipse.osee.framework.ui.plugin.OseeUiActivator;
 
 public class Resolver implements URIResolver {
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/DefinePerspectiveFactory.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/internal/DefinePerspectiveFactory.java
index b6a3917c1fa..0699f4daa7e 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/DefinePerspectiveFactory.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/internal/DefinePerspectiveFactory.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.define;
+package org.eclipse.osee.define.internal;
 
 import org.eclipse.osee.define.navigate.DefineNavigateView;
 import org.eclipse.osee.framework.ui.skynet.ArtifactExplorer;
@@ -27,6 +27,7 @@ import org.eclipse.ui.IPerspectiveFactory;
  * @author Robert A. Fisher
  */
 public class DefinePerspectiveFactory implements IPerspectiveFactory {
+   public static String ID = "osee.define.PerspectiveFactory";
 
    @Override
    public void createInitialLayout(IPageLayout layout) {
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/DefinePlugin.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/internal/DefinePlugin.java
index 13394f623b4..b6d1f1758ef 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/DefinePlugin.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/internal/DefinePlugin.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.define;
+package org.eclipse.osee.define.internal;
 
 import org.eclipse.osee.framework.ui.plugin.OseeUiActivator;
 
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/internal/OpenDefinePerspectiveAction.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/internal/OpenDefinePerspectiveAction.java
new file mode 100644
index 00000000000..f3cc178efce
--- /dev/null
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/internal/OpenDefinePerspectiveAction.java
@@ -0,0 +1,73 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Boeing.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Boeing - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.osee.define.internal;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.IWorkbenchWindowActionDelegate;
+
+/**
+ * Our sample action implements workbench action delegate. The action proxy will be created by the workbench and shown
+ * in the UI. When the user tries to use the action, this delegate will be created and execution will be delegated to
+ * it.
+ * 
+ * @see IWorkbenchWindowActionDelegate
+ */
+public class OpenDefinePerspectiveAction implements IWorkbenchWindowActionDelegate {
+
+   public OpenDefinePerspectiveAction() {
+      // do nothing
+   }
+
+   /**
+    * The action has been activated. The argument of the method represents the 'real' action sitting in the workbench
+    * UI.
+    * 
+    * @see IWorkbenchWindowActionDelegate#run
+    */
+   @Override
+   public void run(IAction action) {
+      AWorkbench.openPerspective(DefinePerspectiveFactory.ID);
+   }
+
+   /**
+    * Selection in the workbench has been changed. We can change the state of the 'real' action here if we want, but
+    * this can only happen after the delegate has been created.
+    * 
+    * @see IWorkbenchWindowActionDelegate#selectionChanged
+    */
+   @Override
+   public void selectionChanged(IAction action, ISelection selection) {
+      // do nothing
+   }
+
+   /**
+    * We can use this method to dispose of any system resources we previously allocated.
+    * 
+    * @see IWorkbenchWindowActionDelegate#dispose
+    */
+   @Override
+   public void dispose() {
+      // do nothing
+   }
+
+   /**
+    * We will cache window object in order to be able to provide parent shell for the message dialog.
+    * 
+    * @see IWorkbenchWindowActionDelegate#init
+    */
+   @Override
+   public void init(IWorkbenchWindow window) {
+      // do nothing
+   }
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/navigate/DefineNavigateViewItems.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/navigate/DefineNavigateViewItems.java
index 2881b14f9f3..5a52ea12bd9 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/navigate/DefineNavigateViewItems.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/navigate/DefineNavigateViewItems.java
@@ -18,7 +18,7 @@ import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtension;
 import org.eclipse.core.runtime.IExtensionPoint;
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.osee.define.DefinePlugin;
+import org.eclipse.osee.define.internal.DefinePlugin;
 import org.eclipse.osee.framework.logging.OseeLevel;
 import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.framework.ui.plugin.util.OpenPerspectiveNavigateItem;
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/relation/Import/ExtractTestRelations.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/relation/Import/ExtractTestRelations.java
index 73f0e665417..da003139431 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/relation/Import/ExtractTestRelations.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/relation/Import/ExtractTestRelations.java
@@ -19,7 +19,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
-import org.eclipse.osee.define.DefinePlugin;
+import org.eclipse.osee.define.internal.DefinePlugin;
 import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
 import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
 import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist;
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/ArtifactOperations.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/ArtifactOperations.java
index af4debdbc70..c1c6a7ee06c 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/ArtifactOperations.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/ArtifactOperations.java
@@ -17,7 +17,7 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.TreeSet;
 import java.util.logging.Level;
-import org.eclipse.osee.define.DefinePlugin;
+import org.eclipse.osee.define.internal.DefinePlugin;
 import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.jdk.core.type.HashCollection;
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/BranchTraceabilityOperation.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/BranchTraceabilityOperation.java
index 87860ceb6a7..c0492f64728 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/BranchTraceabilityOperation.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/BranchTraceabilityOperation.java
@@ -16,7 +16,7 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.define.DefinePlugin;
+import org.eclipse.osee.define.internal.DefinePlugin;
 import org.eclipse.osee.define.traceability.data.RequirementData;
 import org.eclipse.osee.framework.core.data.IArtifactType;
 import org.eclipse.osee.framework.core.data.IOseeBranch;
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/ImportTraceabilityWizard.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/ImportTraceabilityWizard.java
index 3be01de0ce4..2517335c634 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/ImportTraceabilityWizard.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/ImportTraceabilityWizard.java
@@ -13,7 +13,7 @@ package org.eclipse.osee.define.traceability;
 import java.io.File;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.osee.define.DefinePlugin;
+import org.eclipse.osee.define.internal.DefinePlugin;
 import org.eclipse.osee.framework.core.data.IOseeBranch;
 import org.eclipse.osee.framework.core.operation.Operations;
 import org.eclipse.osee.framework.logging.OseeLevel;
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/RequirementTraceabilityData.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/RequirementTraceabilityData.java
index 2c5b66f6ab7..afa7311947b 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/RequirementTraceabilityData.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/RequirementTraceabilityData.java
@@ -26,7 +26,7 @@ import java.util.logging.Level;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.osee.define.DefinePlugin;
+import org.eclipse.osee.define.internal.DefinePlugin;
 import org.eclipse.osee.define.traceability.data.RequirementData;
 import org.eclipse.osee.framework.core.data.IOseeBranch;
 import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/ScriptTraceabilityOperation.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/ScriptTraceabilityOperation.java
index 17e0c80275d..33d0487e950 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/ScriptTraceabilityOperation.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/ScriptTraceabilityOperation.java
@@ -20,7 +20,7 @@ import java.util.List;
 import java.util.regex.Pattern;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.define.DefinePlugin;
+import org.eclipse.osee.define.internal.DefinePlugin;
 import org.eclipse.osee.define.traceability.data.RequirementData;
 import org.eclipse.osee.framework.core.data.IArtifactType;
 import org.eclipse.osee.framework.core.data.IOseeBranch;
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/TraceUnitExtensionManager.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/TraceUnitExtensionManager.java
index ec5811ab0c4..bc11a5c6e84 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/TraceUnitExtensionManager.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/TraceUnitExtensionManager.java
@@ -20,7 +20,7 @@ import java.util.Set;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtension;
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.osee.define.DefinePlugin;
+import org.eclipse.osee.define.internal.DefinePlugin;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.jdk.core.util.Strings;
 import org.eclipse.osee.framework.plugin.core.util.ExtensionPoints;
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/action/FindTraceUnitEditorAction.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/action/FindTraceUnitEditorAction.java
index 96b543d1d03..1b96950e7f0 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/action/FindTraceUnitEditorAction.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/action/FindTraceUnitEditorAction.java
@@ -14,7 +14,7 @@ import java.util.logging.Level;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.osee.define.DefinePlugin;
+import org.eclipse.osee.define.internal.DefinePlugin;
 import org.eclipse.osee.define.traceability.jobs.FindTraceUnitJob;
 import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.framework.plugin.core.util.Jobs;
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/RemoveTraceMarksFromTraceUnits.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/RemoveTraceMarksFromTraceUnits.java
index 04c94fc00ae..547a72af014 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/RemoveTraceMarksFromTraceUnits.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/RemoveTraceMarksFromTraceUnits.java
@@ -27,7 +27,7 @@ import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.nebula.widgets.xviewer.XViewerColumn;
 import org.eclipse.nebula.widgets.xviewer.XViewerColumn.SortDataType;
-import org.eclipse.osee.define.DefinePlugin;
+import org.eclipse.osee.define.internal.DefinePlugin;
 import org.eclipse.osee.define.traceability.ITraceParser;
 import org.eclipse.osee.define.traceability.ITraceUnitResourceLocator;
 import org.eclipse.osee.define.traceability.TraceUnitExtensionManager;
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/TraceReportBlam.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/TraceReportBlam.java
index 17823ef1e69..f919b589d8a 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/TraceReportBlam.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/TraceReportBlam.java
@@ -26,7 +26,7 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.SubProgressMonitor;
 import org.eclipse.nebula.widgets.xviewer.XViewerColumn;
 import org.eclipse.nebula.widgets.xviewer.XViewerColumn.SortDataType;
-import org.eclipse.osee.define.DefinePlugin;
+import org.eclipse.osee.define.internal.DefinePlugin;
 import org.eclipse.osee.define.traceability.data.BaseTraceDataCache;
 import org.eclipse.osee.define.traceability.data.CodeUnitData;
 import org.eclipse.osee.define.traceability.data.RequirementData;
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/data/BaseTraceDataCache.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/data/BaseTraceDataCache.java
index f20d9e1c15e..abe4d636f1f 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/data/BaseTraceDataCache.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/data/BaseTraceDataCache.java
@@ -15,7 +15,7 @@ import java.util.Map;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.osee.define.DefinePlugin;
+import org.eclipse.osee.define.internal.DefinePlugin;
 import org.eclipse.osee.framework.core.data.IOseeBranch;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/importer/ImportTraceUnitPage.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/importer/ImportTraceUnitPage.java
index 87ae515bef7..a05af71405e 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/importer/ImportTraceUnitPage.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/importer/ImportTraceUnitPage.java
@@ -25,7 +25,7 @@ import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.osee.define.DefinePlugin;
+import org.eclipse.osee.define.internal.DefinePlugin;
 import org.eclipse.osee.define.traceability.TraceUnitExtensionManager;
 import org.eclipse.osee.define.traceability.TraceUnitExtensionManager.TraceHandler;
 import org.eclipse.osee.framework.core.data.IOseeBranch;
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/importer/ImportTraceUnitWizard.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/importer/ImportTraceUnitWizard.java
index a605ed53fa9..9005c5d8365 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/importer/ImportTraceUnitWizard.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/importer/ImportTraceUnitWizard.java
@@ -13,7 +13,7 @@ package org.eclipse.osee.define.traceability.importer;
 import java.net.URI;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.osee.define.DefinePlugin;
+import org.eclipse.osee.define.internal.DefinePlugin;
 import org.eclipse.osee.define.traceability.operations.ImportTraceUnitsOperation;
 import org.eclipse.osee.framework.core.data.IOseeBranch;
 import org.eclipse.osee.framework.core.operation.IOperation;
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/jobs/FindTraceUnitJob.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/jobs/FindTraceUnitJob.java
index d4eb229e2c2..7bd48951921 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/jobs/FindTraceUnitJob.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/jobs/FindTraceUnitJob.java
@@ -17,7 +17,7 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.IJobChangeEvent;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.core.runtime.jobs.JobChangeAdapter;
-import org.eclipse.osee.define.DefinePlugin;
+import org.eclipse.osee.define.internal.DefinePlugin;
 import org.eclipse.osee.define.traceability.operations.FindTraceUnitFromResource;
 import org.eclipse.osee.framework.core.model.Branch;
 import org.eclipse.osee.framework.plugin.core.util.IExceptionableRunnable;
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/FindTraceUnitFromResource.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/FindTraceUnitFromResource.java
index ffa7bec8916..1c9cf9c1096 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/FindTraceUnitFromResource.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/FindTraceUnitFromResource.java
@@ -21,7 +21,7 @@ import org.eclipse.core.filesystem.EFS;
 import org.eclipse.core.filesystem.IFileStore;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.osee.define.DefinePlugin;
+import org.eclipse.osee.define.internal.DefinePlugin;
 import org.eclipse.osee.define.traceability.ITraceUnitResourceLocator;
 import org.eclipse.osee.define.traceability.ResourceIdentifier;
 import org.eclipse.osee.define.traceability.TraceUnitExtensionManager;
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/TraceUnitToArtifactProcessor.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/TraceUnitToArtifactProcessor.java
index 10a7d3bebfc..28109bc2a42 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/TraceUnitToArtifactProcessor.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/operations/TraceUnitToArtifactProcessor.java
@@ -22,7 +22,7 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.nebula.widgets.xviewer.XViewerColumn;
 import org.eclipse.nebula.widgets.xviewer.XViewerColumn.SortDataType;
-import org.eclipse.osee.define.DefinePlugin;
+import org.eclipse.osee.define.internal.DefinePlugin;
 import org.eclipse.osee.define.traceability.AbstractSourceTagger;
 import org.eclipse.osee.define.traceability.TestUnitTagger;
 import org.eclipse.osee.define.traceability.TraceabilityExtractor;
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/utility/UriResourceContentFinder.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/utility/UriResourceContentFinder.java
index ca3438ecd57..76fb1508471 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/utility/UriResourceContentFinder.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/utility/UriResourceContentFinder.java
@@ -23,7 +23,7 @@ import org.eclipse.core.filesystem.EFS;
 import org.eclipse.core.filesystem.IFileInfo;
 import org.eclipse.core.filesystem.IFileStore;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osee.define.DefinePlugin;
+import org.eclipse.osee.define.internal.DefinePlugin;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.core.exception.OseeExceptions;
 import org.eclipse.osee.framework.jdk.core.type.HashCollection;