"Team Workflow" - 6323G - "Move OSEE client configuration to the application server"

6 files changed, 7 insertions, 5 deletions

diff --git a/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF b/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF
index ddc93eff239..d88a68118f8 100644
--- a/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF
+++ b/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF
@@ -29,6 +29,8 @@ Require-Bundle: org.eclipse.ui,
 Bundle-ActivationPolicy: lazy

 Bundle-Vendor: Eclipse.org

 Import-Package: org.eclipse.nebula.widgets.calendarcombo,

+ org.eclipse.osee.framework.core.connection,

+ org.eclipse.osee.framework.core.enums,

  org.eclipse.osee.framework.db.connection,

  org.eclipse.osee.framework.db.connection.core,

  org.eclipse.osee.framework.db.connection.core.query,

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ApplicationServerStatusContributionItem.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ApplicationServerStatusContributionItem.java
index df694bcac32..7b5bb140d30 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ApplicationServerStatusContributionItem.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ApplicationServerStatusContributionItem.java
@@ -12,8 +12,8 @@ package org.eclipse.osee.framework.ui.skynet;
 
 import org.eclipse.jface.action.IContributionItem;
 import org.eclipse.jface.action.IStatusLineManager;
+import org.eclipse.osee.framework.core.connection.OseeApplicationServer;
 import org.eclipse.osee.framework.db.connection.IApplicationServerConnectionListener;
-import org.eclipse.osee.framework.db.connection.core.OseeApplicationServer;
 import org.eclipse.osee.framework.db.connection.exception.OseeDataStoreException;
 import org.eclipse.osee.framework.ui.plugin.util.OverlayImage;
 import org.eclipse.swt.graphics.Image;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/snapshot/RemoteSnapshotManager.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/snapshot/RemoteSnapshotManager.java
index a80227c8ceb..dae8b2dfb73 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/snapshot/RemoteSnapshotManager.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/snapshot/RemoteSnapshotManager.java
@@ -23,9 +23,9 @@ import java.util.HashMap;
 import java.util.Map;

 import java.util.logging.Level;

 import java.util.logging.Logger;

+import org.eclipse.osee.framework.core.connection.OseeApplicationServerContext;

 import org.eclipse.osee.framework.jdk.core.type.Pair;

 import org.eclipse.osee.framework.jdk.core.util.HttpProcessor;

-import org.eclipse.osee.framework.jdk.core.util.OseeApplicationServerContext;

 import org.eclipse.osee.framework.jdk.core.util.Strings;

 import org.eclipse.osee.framework.jdk.core.util.HttpProcessor.AcquireResult;

 import org.eclipse.osee.framework.logging.OseeLog;

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/ConfigurationDetails.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/ConfigurationDetails.java
index 3102fb489a7..74cea91d609 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/ConfigurationDetails.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/ConfigurationDetails.java
@@ -24,9 +24,9 @@ import org.eclipse.jface.viewers.CellLabelProvider;
 import org.eclipse.jface.viewers.TableViewer;

 import org.eclipse.jface.viewers.TableViewerColumn;

 import org.eclipse.jface.viewers.ViewerCell;

+import org.eclipse.osee.framework.core.connection.OseeApplicationServer;

 import org.eclipse.osee.framework.db.connection.ConnectionHandler;

 import org.eclipse.osee.framework.db.connection.OseeDbConnection;

-import org.eclipse.osee.framework.db.connection.core.OseeApplicationServer;

 import org.eclipse.osee.framework.db.connection.exception.OseeDataStoreException;

 import org.eclipse.osee.framework.db.connection.info.DbInformation;

 import org.eclipse.osee.framework.jdk.core.util.Strings;

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeUtility.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeUtility.java
index a537c19b23e..a46f79b714b 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeUtility.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeUtility.java
@@ -21,7 +21,7 @@ import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;

 import org.eclipse.core.runtime.jobs.Job;

 import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.osee.framework.db.connection.core.ConflictType;

+import org.eclipse.osee.framework.core.enums.ConflictType;

 import org.eclipse.osee.framework.db.connection.exception.ArtifactDoesNotExist;

 import org.eclipse.osee.framework.db.connection.exception.MultipleArtifactsExist;

 import org.eclipse.osee.framework.jdk.core.util.AFile;

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXViewer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXViewer.java
index 7e7ae8bf4aa..1355192931e 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXViewer.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXViewer.java
@@ -17,7 +17,7 @@ import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.action.Separator;

 import org.eclipse.jface.dialogs.MessageDialog;

 import org.eclipse.jface.wizard.WizardDialog;

-import org.eclipse.osee.framework.db.connection.core.ConflictType;

+import org.eclipse.osee.framework.core.enums.ConflictType;

 import org.eclipse.osee.framework.db.connection.exception.MergeChangesInArtifactException;

 import org.eclipse.osee.framework.skynet.core.conflict.Conflict;

 import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;