Followup to r991959.

Forgot the two classes.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@991965 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/core/StandardEngine.java b/java/org/apache/catalina/core/StandardEngine.java
index a463f44..0c53865 100644 (file)
--- a/java/org/apache/catalina/core/StandardEngine.java
+++ b/java/org/apache/catalina/core/StandardEngine.java
@@ -22,6 +22,7 @@ import org.apache.catalina.AccessLog;
 import org.apache.catalina.Container;
 import org.apache.catalina.Context;
 import org.apache.catalina.Engine;
+import org.apache.catalina.Globals;
 import org.apache.catalina.Host;
 import org.apache.catalina.LifecycleException;
 import org.apache.catalina.Realm;
@@ -198,10 +199,10 @@ public class StandardEngine extends ContainerBase implements Engine {
 
     public String getBaseDir() {
         if( baseDir==null ) {
-            baseDir=System.getProperty("catalina.base");
+            baseDir=System.getProperty(Globals.CATALINA_BASE_PROP);
         }
         if( baseDir==null ) {
-            baseDir=System.getProperty("catalina.home");
+            baseDir=System.getProperty(Globals.CATALINA_HOME_PROP);
         }
         return baseDir;
     }

diff --git a/java/org/apache/catalina/startup/ContextConfig.java b/java/org/apache/catalina/startup/ContextConfig.java
index 7949751..f2c9504 100644 (file)
--- a/java/org/apache/catalina/startup/ContextConfig.java
+++ b/java/org/apache/catalina/startup/ContextConfig.java
@@ -530,7 +530,7 @@ public class ContextConfig
         if( engineC instanceof StandardEngine ) {
             return ((StandardEngine)engineC).getBaseDir();
         }
-        return System.getProperty("catalina.base");
+        return System.getProperty(Globals.CATALINA_BASE_PROP);
     }
 
     
@@ -671,7 +671,7 @@ public class ContextConfig
             canonicalAppBase = canonicalAppBase.getCanonicalFile();
         } else {
             canonicalAppBase = 
-                new File(System.getProperty("catalina.base"), appBase)
+                new File(System.getProperty(Globals.CATALINA_BASE_PROP), appBase)
                 .getCanonicalFile();
         }
 
@@ -778,7 +778,7 @@ public class ContextConfig
             if (!docBaseFile.isAbsolute()) {
                 File file = new File(appBase);
                 if (!file.isAbsolute()) {
-                    file = new File(System.getProperty("catalina.base"), appBase);
+                    file = new File(System.getProperty(Globals.CATALINA_BASE_PROP), appBase);
                 }
                 docBaseFile = new File(file, docBase);
             }
@@ -1145,7 +1145,7 @@ public class ContextConfig
      */
     protected File getConfigBase() {
         File configBase = 
-            new File(System.getProperty("catalina.base"), "conf");
+            new File(System.getProperty(Globals.CATALINA_BASE_PROP), "conf");
         if (!configBase.exists()) {
             return null;
         }