From 94c307999c4ed12d680ea1933e096fb8b9ad16ad Mon Sep 17 00:00:00 2001 From: Aron Roberts Date: Mon, 17 Mar 2014 14:27:12 -0700 Subject: [PATCH] CSPACE-6329: Rationalize name and value of constant. --- .../services/common/api/JEEServerDeployment.java | 4 +--- .../java/org/collectionspace/services/common/ServiceMain.java | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) 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 d8679686b..2fbb3659a 100644 --- 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 9d824d94a..a1e0e23ee 100644 --- 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 { } private String getCspaceServicesConfigDir() { - return getServerRootDir() + File.separator + JEEServerDeployment.CSPACE_SERVICES_DIR_PATH; + return getServerRootDir() + File.separator + JEEServerDeployment.CSPACE_CONFIG_SERVICES_DIR_PATH; } private String getNuxeoConfigDir() { -- 2.47.3