CSPACE-6617: Change catalina.home references to catalina.base.

diff --git a/services/JaxRsServiceProvider/src/main/resources/log4j.properties b/services/JaxRsServiceProvider/src/main/resources/log4j.properties
index 15c9a4b206a6e0abcfeb12ad5887b4922cff1d84..8d82fe061b7d5b67695ebb73f40d13fc44d7dac9 100644 (file)
--- a/services/JaxRsServiceProvider/src/main/resources/log4j.properties
+++ b/services/JaxRsServiceProvider/src/main/resources/log4j.properties
@@ -24,7 +24,7 @@ log4j.appender.error.Threshold=WARN
 # The "cspace_appender" appender - the standout CollectionSpace services log file appender
 #
 log4j.appender.cspace_appender=org.apache.log4j.RollingFileAppender
-log4j.appender.cspace_appender.File=${catalina.home}/logs/cspace-services.log
+log4j.appender.cspace_appender.File=${catalina.base}/logs/cspace-services.log
 log4j.appender.cspace_appender.MaxFileSize=5000KB
 # Keep ten backup files
 log4j.appender.cspace_appender.MaxBackupIndex=10
@@ -35,7 +35,7 @@ log4j.appender.cspace_appender.layout.ConversionPattern=%d %-5p [%t] [%c:%L] %m%
 # CollectionSpace Services Performance appender
 #
 log4j.appender.cspace_perf_appender=org.apache.log4j.RollingFileAppender
-log4j.appender.cspace_perf_appender.File=${catalina.home}/logs/cspace-services-perf.log
+log4j.appender.cspace_perf_appender.File=${catalina.base}/logs/cspace-services-perf.log
 log4j.appender.cspace_perf_appender.MaxFileSize=5000KB
 # Keep ten backup files
 log4j.appender.cspace_perf_appender.MaxBackupIndex=10

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 710a21fe97a0f22a8f47ea135f4ad60f1e536648..5c5931a80c295cc2a49ab82deab8088a1151bd0c 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
@@ -60,7 +60,7 @@ public class ServiceMain {
     private static volatile ServiceMain instance = null;
     private static volatile boolean initFailed = false;
 
-    private static final String SERVER_HOME_PROPERTY = "catalina.home";
+    private static final String SERVER_HOME_PROPERTY = "catalina.base";
        private static final boolean USE_APP_GENERATED_CONFIG = true;
        
        private static ServletContext servletContext = null;