tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1237426 - /tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
Date Sun, 29 Jan 2012 19:30:27 GMT
Author: markt
Date: Sun Jan 29 19:30:27 2012
New Revision: 1237426

URL: http://svn.apache.org/viewvc?rev=1237426&view=rev
Log:
Remove deprecated code

Modified:
    tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java

Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1237426&r1=1237425&r2=1237426&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Sun Jan 29 19:30:27 2012
@@ -240,35 +240,6 @@ public class ContextConfig implements Li
 
 
     /**
-     * Return the location of the default context file
-     * @deprecated Never changed from default
-     */
-    @Deprecated
-    public String getDefaultContextXml() {
-        if( defaultContextXml == null ) {
-            defaultContextXml=Constants.DefaultContextXml;
-        }
-
-        return (this.defaultContextXml);
-
-    }
-
-
-    /**
-     * Set the location of the default context file
-     *
-     * @param path Absolute/relative path to the default context.xml
-     * @deprecated Unused
-     */
-    @Deprecated
-    public void setDefaultContextXml(String path) {
-
-        this.defaultContextXml = path;
-
-    }
-
-
-    /**
      * Sets custom mappings of login methods to authenticators.
      *
      * @param customAuthenticators Custom mappings of login methods to
@@ -519,7 +490,7 @@ public class ContextConfig implements Li
         }
         // set the default if we don't have any overrides
         if( defaultContextXml==null ) {
-            getDefaultContextXml();
+            defaultContextXml = Constants.DefaultContextXml;
         }
 
         if (!context.getOverride()) {



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message