Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoUtil.java2
-rw-r--r--plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/PopulateDemoDatabaseTest.java29
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/OseeInfoTest.java58
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/XSkynetCoreIntegrationTestSuite.java1
-rw-r--r--plugins/org.eclipse.osee.framework.core.client/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/server/HttpUrlBuilderClient.java39
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactURL.java54
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/JoinUtility.java1
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/OseeInfo.java (renamed from plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/OseeInfo.java)7
-rw-r--r--plugins/org.eclipse.osee.framework.ui.data.model.editor/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/input/OseeDataTypeFactory.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/OseePreferencePage.java7
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/DataSourceDetails.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/SkynetViews.java2
-rw-r--r--plugins/org.eclipse.osee.support.test.util/META-INF/MANIFEST.MF8
-rw-r--r--plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/TestUtil.java2
17 files changed, 130 insertions, 89 deletions
diff --git a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoUtil.java b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoUtil.java
index ead675dbdf..0e73168968 100644
--- a/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoUtil.java
+++ b/plugins/org.eclipse.osee.ats.client.demo/src/org/eclipse/osee/ats/client/demo/DemoUtil.java
@@ -17,11 +17,11 @@ import org.eclipse.osee.ats.api.data.AtsArtifactTypes;
import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
import org.eclipse.osee.ats.core.util.AtsUtilCore;
import org.eclipse.osee.framework.core.enums.DeletionFlag;
-import org.eclipse.osee.framework.database.core.OseeInfo;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.type.OseeStateException;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
+import org.eclipse.osee.framework.skynet.core.utility.OseeInfo;
public class DemoUtil {
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/PopulateDemoDatabaseTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/PopulateDemoDatabaseTest.java
index 6011f65150..7c423de8be 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/PopulateDemoDatabaseTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/PopulateDemoDatabaseTest.java
@@ -16,8 +16,6 @@ import org.eclipse.osee.ats.client.demo.DemoUtil;
import org.eclipse.osee.ats.client.demo.PopulateDemoActions;
import org.eclipse.osee.framework.core.client.ClientSessionManager;
import org.eclipse.osee.framework.core.client.OseeClientSession;
-import org.eclipse.osee.framework.database.core.ConnectionHandler;
-import org.eclipse.osee.framework.database.core.OseeInfo;
import org.eclipse.osee.framework.jdk.core.type.OseeStateException;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.jdk.core.util.OseeProperties;
@@ -31,9 +29,6 @@ import org.junit.BeforeClass;
*/
public class PopulateDemoDatabaseTest {
- private static final String INSERT_KEY_VALUE_SQL = "INSERT INTO osee_info (OSEE_KEY, OSEE_VALUE) VALUES (?, ?)";
- private static final String DELETE_KEY_SQL = "DELETE FROM osee_info WHERE OSEE_KEY = ?";
-
@BeforeClass
public static void setup() throws Exception {
if (!DemoUtil.isDbInitSuccessful()) {
@@ -69,28 +64,4 @@ public class PopulateDemoDatabaseTest {
}
}
- @org.junit.Test
- public void testMaxStaleness() throws InterruptedException {
-
- ConnectionHandler.runPreparedUpdate(INSERT_KEY_VALUE_SQL, "testKey", "testValue");
- String value = OseeInfo.getValue("testKey");
- Assert.assertEquals("testValue", value);
-
- ConnectionHandler.runPreparedUpdate(DELETE_KEY_SQL, "testKey");
- ConnectionHandler.runPreparedUpdate(INSERT_KEY_VALUE_SQL, "testKey", "testValue2");
- // Max Staleness is 3 weeks cached value shouldn't change
- value = OseeInfo.getValue("testKey");
- Assert.assertEquals("testValue", value);
-
- // Max Staleness is 1 second cached value shouldn't change even if we sleep for .8 seconds
- Thread.sleep(800);
- value = OseeInfo.getValue("testKey", (long) 1000);
- Assert.assertEquals("testValue", value);
-
- // Wait another .2 seconds and max staleness of 1 second will be exceeded and fresh value retrieved from DB
- Thread.sleep(800);
- value = OseeInfo.getValue("testKey", (long) 1000);
- Assert.assertEquals("testValue2", value);
- }
-
}
diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/OseeInfoTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/OseeInfoTest.java
new file mode 100644
index 0000000000..98b99db968
--- /dev/null
+++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/OseeInfoTest.java
@@ -0,0 +1,58 @@
+/*******************************************************************************
+ * Copyright (c) 2014 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.client.integration.tests.integration.skynet.core;
+
+import static org.eclipse.osee.client.demo.DemoChoice.OSEE_CLIENT_DEMO;
+import org.eclipse.osee.client.test.framework.OseeClientIntegrationRule;
+import org.eclipse.osee.client.test.framework.OseeLogMonitorRule;
+import org.eclipse.osee.framework.database.core.ConnectionHandler;
+import org.eclipse.osee.framework.skynet.core.utility.OseeInfo;
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+
+/**
+ * @author Donald G. Dunne
+ */
+public class OseeInfoTest {
+
+ private static final String INSERT_KEY_VALUE_SQL = "INSERT INTO osee_info (OSEE_KEY, OSEE_VALUE) VALUES (?, ?)";
+ private static final String DELETE_KEY_SQL = "DELETE FROM osee_info WHERE OSEE_KEY = ?";
+
+ @Rule
+ public OseeClientIntegrationRule integration = new OseeClientIntegrationRule(OSEE_CLIENT_DEMO);
+
+ @Rule
+ public OseeLogMonitorRule monitorRule = new OseeLogMonitorRule();
+
+ @Test
+ public void testMaxStaleness() throws InterruptedException {
+ ConnectionHandler.runPreparedUpdate(INSERT_KEY_VALUE_SQL, "testKey", "testValue");
+ String value = OseeInfo.getValue("testKey");
+ Assert.assertEquals("testValue", value);
+
+ ConnectionHandler.runPreparedUpdate(DELETE_KEY_SQL, "testKey");
+ ConnectionHandler.runPreparedUpdate(INSERT_KEY_VALUE_SQL, "testKey", "testValue2");
+ // Max Staleness is 3 weeks cached value shouldn't change
+ value = OseeInfo.getValue("testKey");
+ Assert.assertEquals("testValue", value);
+
+ // Max Staleness is 1 second cached value shouldn't change even if we sleep for .8 seconds
+ Thread.sleep(800);
+ value = OseeInfo.getValue("testKey", (long) 1000);
+ Assert.assertEquals("testValue", value);
+
+ // Wait another .2 seconds and max staleness of 1 second will be exceeded and fresh value retrieved from DB
+ Thread.sleep(800);
+ value = OseeInfo.getValue("testKey", (long) 1000);
+ Assert.assertEquals("testValue2", value);
+ }
+} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/XSkynetCoreIntegrationTestSuite.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/XSkynetCoreIntegrationTestSuite.java
index 5b83a23a24..392d8ec090 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/XSkynetCoreIntegrationTestSuite.java
+++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/XSkynetCoreIntegrationTestSuite.java
@@ -45,6 +45,7 @@ import org.junit.runners.Suite;
MergeManagerTest.class,
NativeArtifactTest.class,
OseeEnumerationValidationTest.class,
+ OseeInfoTest.class,
PurgeTransactionTest.class,
RelationCacheTest.class,
RelationDeletionTest.class,
diff --git a/plugins/org.eclipse.osee.framework.core.client/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.core.client/META-INF/MANIFEST.MF
index 98264ef5bc..057ddc0a4d 100644
--- a/plugins/org.eclipse.osee.framework.core.client/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.core.client/META-INF/MANIFEST.MF
@@ -8,11 +8,9 @@ Bundle-Vendor: Eclipse Open System Engineering Environment
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.core.runtime,
- org.eclipse.core.runtime.preferences,
org.eclipse.osee.framework.core.data,
org.eclipse.osee.framework.core.enums,
org.eclipse.osee.framework.core.exception,
- org.eclipse.osee.framework.core.services,
org.eclipse.osee.framework.core.util,
org.eclipse.osee.framework.database.core,
org.eclipse.osee.framework.jdk.core.type,
diff --git a/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/server/HttpUrlBuilderClient.java b/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/server/HttpUrlBuilderClient.java
index 1c08abdac0..dc024d7d27 100644
--- a/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/server/HttpUrlBuilderClient.java
+++ b/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/server/HttpUrlBuilderClient.java
@@ -18,7 +18,6 @@ import org.eclipse.osee.framework.core.client.CoreClientConstants;
import org.eclipse.osee.framework.core.client.OseeClientProperties;
import org.eclipse.osee.framework.core.client.internal.CoreClientActivator;
import org.eclipse.osee.framework.core.exception.OseeExceptions;
-import org.eclipse.osee.framework.database.core.OseeInfo;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.type.OseeStateException;
import org.eclipse.osee.framework.jdk.core.util.HttpUrlBuilder;
@@ -44,6 +43,12 @@ public final class HttpUrlBuilderClient {
return instance;
}
+ public boolean isUseConnectedServerUrl() {
+ boolean isUseConnectedServerUrl =
+ CoreClientActivator.getInstance().getPluginPreferences().getBoolean(USE_CONNECTED_SERVER_URL_FOR_PERM_LINKS);
+ return isUseConnectedServerUrl;
+ }
+
public String getUrlForLocalSkynetHttpServer(String context, Map<String, String> parameters) throws OseeStateException {
try {
return HttpUrlBuilder.createURL(getHttpLocalServerPrefix(), context, parameters);
@@ -66,30 +71,6 @@ public final class HttpUrlBuilderClient {
return normalize(address);
}
- public String getPermanentBaseUrl() throws OseeCoreException {
- String address = OseeInfo.getValue("osee.permanent.base.url");
- return normalize(address);
- }
-
- public String getSelectedPermanenrLinkUrl() throws OseeCoreException {
- boolean isUseConnectedServerUrl =
- CoreClientActivator.getInstance().getPluginPreferences().getBoolean(USE_CONNECTED_SERVER_URL_FOR_PERM_LINKS);
- String address = null;
- if (isUseConnectedServerUrl) {
- address = getApplicationServerPrefix();
- } else {
- try {
- address = getPermanentBaseUrl();
- } catch (Exception ex) {
- OseeLog.log(CoreClientActivator.class, Level.WARNING, ex);
- }
- if (!Strings.isValid(address)) {
- address = getApplicationServerPrefix();
- }
- }
- return normalize(address);
- }
-
private static String normalize(String address) {
String toReturn = address;
if (Strings.isValid(toReturn) && !toReturn.endsWith("/")) {
@@ -112,12 +93,4 @@ public final class HttpUrlBuilderClient {
return url;
}
- public String getPermanentLinkBaseUrl(String context, Map<String, String> parameters) throws OseeCoreException {
- try {
- return HttpUrlBuilder.createURL(getSelectedPermanenrLinkUrl(), context, parameters);
- } catch (UnsupportedEncodingException ex) {
- OseeExceptions.wrapAndThrow(ex);
- return null; // unreachable since wrapAndThrow() always throws an exception
- }
- }
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactURL.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactURL.java
index 199c65e482..f5ca650666 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactURL.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactURL.java
@@ -10,14 +10,21 @@
*******************************************************************************/
package org.eclipse.osee.framework.skynet.core.artifact;
+import java.io.UnsupportedEncodingException;
import java.net.URL;
import java.util.HashMap;
import java.util.Map;
+import java.util.logging.Level;
import org.eclipse.osee.framework.core.client.ClientSessionManager;
import org.eclipse.osee.framework.core.client.server.HttpUrlBuilderClient;
import org.eclipse.osee.framework.core.data.OseeServerContext;
import org.eclipse.osee.framework.core.exception.OseeExceptions;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
+import org.eclipse.osee.framework.jdk.core.util.HttpUrlBuilder;
+import org.eclipse.osee.framework.jdk.core.util.Strings;
+import org.eclipse.osee.framework.logging.OseeLog;
+import org.eclipse.osee.framework.skynet.core.internal.Activator;
+import org.eclipse.osee.framework.skynet.core.utility.OseeInfo;
/**
* @author Roberto E. Escobar
@@ -28,8 +35,7 @@ public class ArtifactURL {
Map<String, String> parameters = new HashMap<String, String>();
parameters.put("guid", artifact.getGuid());
parameters.put("branchUuid", String.valueOf(artifact.getBranch().getUuid()));
- String urlString =
- HttpUrlBuilderClient.getInstance().getPermanentLinkBaseUrl(OseeServerContext.ARTIFACT_CONTEXT, parameters);
+ String urlString = getPermanentLinkBaseUrl(OseeServerContext.ARTIFACT_CONTEXT, parameters);
URL url = null;
try {
url = new URL(urlString);
@@ -50,9 +56,7 @@ public class ArtifactURL {
parameters.put("transactionId", String.valueOf(artifact.getTransactionNumber()));
}
parameters.put("cmd", cmd);
- String urlString =
- HttpUrlBuilderClient.getInstance().getPermanentLinkBaseUrl(OseeServerContext.CLIENT_LOOPBACK_CONTEXT,
- parameters);
+ String urlString = getPermanentLinkBaseUrl(OseeServerContext.CLIENT_LOOPBACK_CONTEXT, parameters);
URL url = null;
try {
url = new URL(urlString);
@@ -65,4 +69,44 @@ public class ArtifactURL {
public static URL getOpenInOseeLink(final Artifact artifact) throws OseeCoreException {
return getOpenInOseeLink(artifact, "open.artifact");
}
+
+ public static String getPermanentLinkBaseUrl(String context, Map<String, String> parameters) throws OseeCoreException {
+ try {
+ return HttpUrlBuilder.createURL(getSelectedPermanenrLinkUrl(), context, parameters);
+ } catch (UnsupportedEncodingException ex) {
+ OseeExceptions.wrapAndThrow(ex);
+ return null; // unreachable since wrapAndThrow() always throws an exception
+ }
+ }
+
+ public static String getSelectedPermanenrLinkUrl() throws OseeCoreException {
+ HttpUrlBuilderClient httpBuilder = HttpUrlBuilderClient.getInstance();
+ String address = null;
+ if (httpBuilder.isUseConnectedServerUrl()) {
+ address = httpBuilder.getApplicationServerPrefix();
+ } else {
+ try {
+ address = getPermanentBaseUrl();
+ } catch (Exception ex) {
+ OseeLog.log(Activator.class, Level.WARNING, ex);
+ }
+ if (!Strings.isValid(address)) {
+ address = httpBuilder.getApplicationServerPrefix();
+ }
+ }
+ return normalize(address);
+ }
+
+ public static String getPermanentBaseUrl() throws OseeCoreException {
+ String address = OseeInfo.getValue("osee.permanent.base.url");
+ return normalize(address);
+ }
+
+ private static String normalize(String address) {
+ String toReturn = address;
+ if (Strings.isValid(toReturn) && !toReturn.endsWith("/")) {
+ toReturn += "/";
+ }
+ return toReturn;
+ }
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java
index 22ecae28db..4e87e51466 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/BranchManager.java
@@ -44,7 +44,6 @@ import org.eclipse.osee.framework.core.operation.OperationBuilder;
import org.eclipse.osee.framework.core.operation.Operations;
import org.eclipse.osee.framework.database.IOseeDatabaseService;
import org.eclipse.osee.framework.database.core.IOseeStatement;
-import org.eclipse.osee.framework.database.core.OseeInfo;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.Conditions;
import org.eclipse.osee.framework.jdk.core.util.Lib;
@@ -68,6 +67,7 @@ import org.eclipse.osee.framework.skynet.core.internal.ServiceUtil;
import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
import org.eclipse.osee.framework.skynet.core.utility.ArtifactJoinQuery;
import org.eclipse.osee.framework.skynet.core.utility.JoinUtility;
+import org.eclipse.osee.framework.skynet.core.utility.OseeInfo;
/**
* Provides access to all branches as well as support for creating branches of all types
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/JoinUtility.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/JoinUtility.java
index 6fa1e834af..c4c3203623 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/JoinUtility.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/JoinUtility.java
@@ -13,7 +13,6 @@ package org.eclipse.osee.framework.skynet.core.utility;
import java.util.Random;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.database.IOseeDatabaseService;
-import org.eclipse.osee.framework.database.core.OseeInfo;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.skynet.core.internal.ServiceUtil;
diff --git a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/OseeInfo.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/OseeInfo.java
index cd33394773..c7f52575db 100644
--- a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/OseeInfo.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/OseeInfo.java
@@ -8,14 +8,15 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.framework.database.core;
+package org.eclipse.osee.framework.skynet.core.utility;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.eclipse.osee.framework.database.IOseeDatabaseService;
-import org.eclipse.osee.framework.database.internal.ServiceUtil;
+import org.eclipse.osee.framework.database.core.ConnectionHandler;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.type.Pair;
+import org.eclipse.osee.framework.skynet.core.internal.ServiceUtil;
/**
* @author Donald G. Dunne
@@ -37,7 +38,7 @@ public class OseeInfo {
}
public static String getValue(String key, Long maxStaleness) throws OseeCoreException {
- return getValue(ServiceUtil.getDatabaseService(), key, maxStaleness);
+ return getValue(ServiceUtil.getOseeDatabaseService(), key, maxStaleness);
}
public static String getValue(IOseeDatabaseService service, String key) {
diff --git a/plugins/org.eclipse.osee.framework.ui.data.model.editor/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.ui.data.model.editor/META-INF/MANIFEST.MF
index daecfaf845..38938636fc 100644
--- a/plugins/org.eclipse.osee.framework.ui.data.model.editor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.ui.data.model.editor/META-INF/MANIFEST.MF
@@ -36,6 +36,7 @@ Import-Package: org.eclipse.osee.framework.core.client,
org.eclipse.osee.framework.skynet.core.importing,
org.eclipse.osee.framework.skynet.core.relation,
org.eclipse.osee.framework.skynet.core.types,
+ org.eclipse.osee.framework.skynet.core.utility,
org.eclipse.osee.framework.ui.plugin,
org.eclipse.osee.framework.ui.plugin.util,
org.eclipse.osee.framework.ui.plugin.views.property,
diff --git a/plugins/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/input/OseeDataTypeFactory.java b/plugins/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/input/OseeDataTypeFactory.java
index 1a09c66b23..39bc8131e2 100644
--- a/plugins/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/input/OseeDataTypeFactory.java
+++ b/plugins/org.eclipse.osee.framework.ui.data.model.editor/src/org/eclipse/osee/framework/ui/data/model/editor/input/OseeDataTypeFactory.java
@@ -14,9 +14,9 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.osee.framework.database.core.OseeInfo;
import org.eclipse.osee.framework.jdk.core.type.HashCollection;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
+import org.eclipse.osee.framework.skynet.core.utility.OseeInfo;
import org.eclipse.osee.framework.ui.data.model.editor.model.ArtifactDataType;
import org.eclipse.osee.framework.ui.data.model.editor.model.AttributeDataType;
import org.eclipse.osee.framework.ui.data.model.editor.model.DataTypeCache;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/OseePreferencePage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/OseePreferencePage.java
index 393a5e36e0..6cf24d7e47 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/OseePreferencePage.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/OseePreferencePage.java
@@ -24,6 +24,7 @@ import org.eclipse.osee.framework.jdk.core.util.Network;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.plugin.core.CorePreferences;
+import org.eclipse.osee.framework.skynet.core.artifact.ArtifactURL;
import org.eclipse.osee.framework.skynet.core.preferences.PreferenceConstants;
import org.eclipse.osee.framework.ui.skynet.internal.Activator;
import org.eclipse.swt.SWT;
@@ -119,18 +120,16 @@ public class OseePreferencePage extends PreferencePage implements IWorkbenchPref
}
private void setupUrlLinkButtons(Group group) {
- HttpUrlBuilderClient builder = HttpUrlBuilderClient.getInstance();
-
baseUrlCheckBox = new Button(group, SWT.RADIO);
try {
- baseUrlCheckBox.setText("Permanent Link: " + builder.getPermanentBaseUrl());
+ baseUrlCheckBox.setText("Permanent Link: " + ArtifactURL.getPermanentBaseUrl());
} catch (OseeCoreException ex) {
baseUrlCheckBox.setText("Permanent Link");
}
connectedUrlCheckBox = new Button(group, SWT.RADIO);
try {
- connectedUrlCheckBox.setText("Temporary Server Link: " + builder.getApplicationServerPrefix());
+ connectedUrlCheckBox.setText("Temporary Server Link: " + HttpUrlBuilderClient.getInstance().getApplicationServerPrefix());
} catch (OseeCoreException ex) {
connectedUrlCheckBox.setText("Temporary Server Link");
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/DataSourceDetails.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/DataSourceDetails.java
index c9623e9b30..6a0aee723f 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/DataSourceDetails.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/DataSourceDetails.java
@@ -15,9 +15,9 @@ import org.eclipse.jface.preference.PreferencePage;
import org.eclipse.osee.framework.core.client.ClientSessionManager;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
import org.eclipse.osee.framework.database.core.IOseeStatement;
-import org.eclipse.osee.framework.database.core.OseeInfo;
import org.eclipse.osee.framework.jdk.core.util.AHTML;
import org.eclipse.osee.framework.jdk.core.util.Lib;
+import org.eclipse.osee.framework.skynet.core.utility.OseeInfo;
import org.eclipse.osee.framework.ui.skynet.internal.Activator;
import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.swt.SWT;
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/SkynetViews.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/SkynetViews.java
index dbdcffdb9f..7d3613f835 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/SkynetViews.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/SkynetViews.java
@@ -12,10 +12,10 @@ package org.eclipse.osee.framework.ui.skynet.util;
import java.util.logging.Level;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
-import org.eclipse.osee.framework.database.core.OseeInfo;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.logging.OseeLog;
+import org.eclipse.osee.framework.skynet.core.utility.OseeInfo;
import org.eclipse.osee.framework.ui.skynet.internal.Activator;
import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.ui.IMemento;
diff --git a/plugins/org.eclipse.osee.support.test.util/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.support.test.util/META-INF/MANIFEST.MF
index 88e2f6a062..367b0cbd48 100644
--- a/plugins/org.eclipse.osee.support.test.util/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.support.test.util/META-INF/MANIFEST.MF
@@ -6,15 +6,11 @@ Bundle-Version: 0.20.0.qualifier
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.eclipse.osee.support.test.util
-Import-Package: org.eclipse.core.runtime,
- org.eclipse.osee.framework.core.client,
- org.eclipse.osee.framework.core.data,
+Import-Package: org.eclipse.osee.framework.core.client,
org.eclipse.osee.framework.core.exception,
- org.eclipse.osee.framework.database.core,
org.eclipse.osee.framework.jdk.core.type,
org.eclipse.osee.framework.jdk.core.util,
org.eclipse.osee.framework.jdk.core.util.io,
org.eclipse.osee.framework.logging,
- org.osgi.framework
-Require-Bundle: org.junit
+ org.eclipse.osee.framework.skynet.core.utility
Bundle-Vendor: Eclipse Open System Engineering Environment
diff --git a/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/TestUtil.java b/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/TestUtil.java
index de92d65503..2899815c96 100644
--- a/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/TestUtil.java
+++ b/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/TestUtil.java
@@ -14,13 +14,13 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.logging.Level;
import org.eclipse.osee.framework.core.client.ClientSessionManager;
-import org.eclipse.osee.framework.database.core.OseeInfo;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.type.OseeStateException;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.logging.IHealthStatus;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
+import org.eclipse.osee.framework.skynet.core.utility.OseeInfo;
/**
* @author Donald G. Dunne

Back to the top