Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordonald.g.dunne2016-03-20 20:18:00 +0000
committerRyan D. Brooks2016-03-20 20:18:00 +0000
commite32808ee6889bab4a670eff4a5099b57a6a4ff9f (patch)
tree527f3bcb49249955c1902c4ff2276b8383fd2f65 /plugins/org.eclipse.osee.orcs.db
parent6a06492b77f5147d712462432f5bab83923e4f49 (diff)
downloadorg.eclipse.osee-e32808ee6889bab4a670eff4a5099b57a6a4ff9f.tar.gz
org.eclipse.osee-e32808ee6889bab4a670eff4a5099b57a6a4ff9f.tar.xz
org.eclipse.osee-e32808ee6889bab4a670eff4a5099b57a6a4ff9f.zip
refinement: Consolidate osee.application.server constants
Diffstat (limited to 'plugins/org.eclipse.osee.orcs.db')
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/accessor/OseeInfoDataAccessor.java16
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/resource/ResourceConstants.java5
2 files changed, 10 insertions, 11 deletions
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/accessor/OseeInfoDataAccessor.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/accessor/OseeInfoDataAccessor.java
index 9b21961a93e..e298081af11 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/accessor/OseeInfoDataAccessor.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/accessor/OseeInfoDataAccessor.java
@@ -14,6 +14,7 @@ import java.io.File;
import java.sql.DatabaseMetaData;
import java.util.HashSet;
import java.util.Set;
+import org.eclipse.osee.framework.core.data.OseeClient;
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.Strings;
@@ -26,7 +27,6 @@ import org.eclipse.osee.logger.Log;
import org.eclipse.osee.orcs.core.ds.DataStoreConstants;
import org.eclipse.osee.orcs.core.ds.KeyValueDataAccessor;
import org.eclipse.osee.orcs.db.internal.SqlProvider;
-import org.eclipse.osee.orcs.db.internal.resource.ResourceConstants;
public class OseeInfoDataAccessor implements KeyValueDataAccessor {
@@ -69,7 +69,7 @@ public class OseeInfoDataAccessor implements KeyValueDataAccessor {
@Override
public String getValue(String key) throws OseeCoreException {
String toReturn = null;
- if (ResourceConstants.BINARY_DATA_PATH.equals(key)) {
+ if (OseeClient.OSEE_APPLICATION_SERVER_DATA.equals(key)) {
toReturn = getOseeApplicationServerData();
} else if (SqlProvider.SQL_DATABASE_HINTS_SUPPORTED_KEY.equals(key)) {
toReturn = String.valueOf(areHintsSupported());
@@ -88,9 +88,9 @@ public class OseeInfoDataAccessor implements KeyValueDataAccessor {
@Override
public boolean putValue(String key, String value) throws OseeCoreException {
boolean wasUpdated = false;
- if (ResourceConstants.BINARY_DATA_PATH.equals(key)) {
- throw new OseeStateException(BINARY_DATA_ERROR_MSG, ResourceConstants.BINARY_DATA_PATH,
- ResourceConstants.BINARY_DATA_PATH);
+ if (OseeClient.OSEE_APPLICATION_SERVER_DATA.equals(key)) {
+ throw new OseeStateException(BINARY_DATA_ERROR_MSG, OseeClient.OSEE_APPLICATION_SERVER_DATA,
+ OseeClient.OSEE_APPLICATION_SERVER_DATA);
} else if (SqlProvider.SQL_DATABASE_HINTS_SUPPORTED_KEY.equals(key)) {
throw new OseeStateException(DB_KEY_ERROR_MSG, SqlProvider.SQL_DATABASE_HINTS_SUPPORTED_KEY);
} else if (SqlProvider.SQL_RECURSIVE_WITH_KEY.equals(key)) {
@@ -109,7 +109,7 @@ public class OseeInfoDataAccessor implements KeyValueDataAccessor {
/**
* Check Tag Queue on start up. Entries found in the tag queue are tagged by the server on start up.
- *
+ *
* @return whether tag queue should be checked upon server start-up.
*/
public static boolean isCheckTagQueueOnStartupAllowed() {
@@ -118,7 +118,7 @@ public class OseeInfoDataAccessor implements KeyValueDataAccessor {
/**
* Get location for OSEE application server binary data
- *
+ *
* @return OSEE application server binary data path
*/
public String getOseeApplicationServerData() {
@@ -136,7 +136,7 @@ public class OseeInfoDataAccessor implements KeyValueDataAccessor {
}
private String internalGetOseeApplicationServerData() {
- String toReturn = System.getProperty(ResourceConstants.BINARY_DATA_PATH);
+ String toReturn = System.getProperty(OseeClient.OSEE_APPLICATION_SERVER_DATA);
if (!Strings.isValid(toReturn)) {
String userHome = System.getProperty("user.home");
if (Strings.isValid(userHome)) {
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/resource/ResourceConstants.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/resource/ResourceConstants.java
index d32bc665925..14228e092ed 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/resource/ResourceConstants.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/resource/ResourceConstants.java
@@ -11,6 +11,7 @@
package org.eclipse.osee.orcs.db.internal.resource;
import java.io.File;
+import org.eclipse.osee.framework.core.data.OseeClient;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.orcs.core.SystemPreferences;
@@ -27,8 +28,6 @@ public final class ResourceConstants {
public static final String EXCHANGE_RESOURCE_PROTOCOL = "exchange";
public static final String ATTRIBUTE_RESOURCE_PROTOCOL = "attr";
- public static final String BINARY_DATA_PATH = "osee.application.server.data";
-
public static String getExchangeDataPath(SystemPreferences preferences) throws OseeCoreException {
String binaryDataPath = getBinaryDataPath(preferences);
return binaryDataPath + File.separator + ResourceConstants.EXCHANGE_RESOURCE_PROTOCOL + File.separator;
@@ -40,6 +39,6 @@ public final class ResourceConstants {
}
public static String getBinaryDataPath(SystemPreferences preferences) throws OseeCoreException {
- return preferences.getValue(ResourceConstants.BINARY_DATA_PATH);
+ return preferences.getValue(OseeClient.OSEE_APPLICATION_SERVER_DATA);
}
}

Back to the top