Remove use of deprecated code

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

diff --git a/java/org/apache/catalina/startup/Catalina.java b/java/org/apache/catalina/startup/Catalina.java
index bc2e5d4..483ca72 100644 (file)
--- a/java/org/apache/catalina/startup/Catalina.java
+++ b/java/org/apache/catalina/startup/Catalina.java
@@ -182,8 +182,7 @@ public class Catalina extends Embedded {
     public void process(String args[]) {
 
         setAwait(true);
-        setCatalinaHome();
-        setCatalinaBase();
+        initDirs();
         try {
             if (arguments(args)) {
                 if (starting) {
@@ -442,26 +441,6 @@ public class Catalina extends Embedded {
 
 
     /**
-     * Set the <code>catalina.base</code> System property to the current
-     * working directory if it has not been set.
-     * @deprecated Use initDirs()
-     */
-    @Deprecated
-    public void setCatalinaBase() {
-        initDirs();
-    }
-
-    /**
-     * Set the <code>catalina.home</code> System property to the current
-     * working directory if it has not been set.
-     * @deprecated Use initDirs()
-     */
-    @Deprecated
-    public void setCatalinaHome() {
-        initDirs();
-    }
-
-    /**
      * Start a new server instance.
      */
     public void load() {