CSPACE-6329: Rationalize name and value of constant.

diff --git a/services/common-api/src/main/java/org/collectionspace/services/common/api/JEEServerDeployment.java b/services/common-api/src/main/java/org/collectionspace/services/common/api/JEEServerDeployment.java
index d8679686b8783717cd7555559e3b8167a09f1aaa..2fbb3659a909df193803ec022474a4033d20f60b 100644 (file)
--- a/services/common-api/src/main/java/org/collectionspace/services/common/api/JEEServerDeployment.java
+++ b/services/common-api/src/main/java/org/collectionspace/services/common/api/JEEServerDeployment.java
@@ -7,9 +7,7 @@ public interface JEEServerDeployment {
     final public static String CSPACE_DIR_NAME = "cspace";
     final public static String SERVICES_DIR_NAME = "services";
     final public static String CONFIG_DIR_PATH = CONFIG_DIR_NAME + File.separator + SERVICES_DIR_NAME;
-    
-    final public static String CSPACE_SERVICES_DIR_PATH = CSPACE_DIR_NAME + File.separator + CONFIG_DIR_NAME +
-               File.separator + SERVICES_DIR_NAME;
+    final public static String CSPACE_CONFIG_SERVICES_DIR_PATH = CSPACE_DIR_NAME + File.separator + CONFIG_DIR_PATH;
 
     final public static String TENANT_BINDINGS_FILENAME_PREFIX = "tenant-bindings";
     final public static String TENANT_BINDINGS_PROTOTYPE_FILENAME = TENANT_BINDINGS_FILENAME_PREFIX + "-proto.xml";

diff --git a/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java b/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java
index 9d824d94a6992cf897c84cf0bf8ae3ec27f1f524..a1e0e23eec46b4392375585725a104cda919d6c7 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java
@@ -395,7 +395,7 @@ public class ServiceMain {
     }\r
 \r
     private String getCspaceServicesConfigDir() {\r
-        return getServerRootDir() + File.separator + JEEServerDeployment.CSPACE_SERVICES_DIR_PATH;\r
+        return getServerRootDir() + File.separator + JEEServerDeployment.CSPACE_CONFIG_SERVICES_DIR_PATH;\r
     }\r
     \r
     private String getNuxeoConfigDir() {\r