You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2016/08/30 16:54:24 UTC

svn commit: r1758428 - /tomcat/trunk/java/org/apache/catalina/Context.java

Author: markt
Date: Tue Aug 30 16:54:23 2016
New Revision: 1758428

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

Modified:
    tomcat/trunk/java/org/apache/catalina/Context.java

Modified: tomcat/trunk/java/org/apache/catalina/Context.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Context.java?rev=1758428&r1=1758427&r2=1758428&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Context.java Tue Aug 30 16:54:23 2016
@@ -32,7 +32,6 @@ import org.apache.catalina.deploy.Naming
 import org.apache.tomcat.ContextBind;
 import org.apache.tomcat.InstanceManager;
 import org.apache.tomcat.JarScanner;
-import org.apache.tomcat.util.buf.UDecoder;
 import org.apache.tomcat.util.descriptor.web.ApplicationParameter;
 import org.apache.tomcat.util.descriptor.web.ErrorPage;
 import org.apache.tomcat.util.descriptor.web.FilterDef;
@@ -870,44 +869,6 @@ public interface Context extends Contain
 
 
     /**
-     * Add a new servlet mapping, replacing any existing mapping for
-     * the specified pattern.
-     *
-     * @param pattern URL pattern to be mapped. The pattern will be % decoded
-     *                using UTF-8
-     * @param name    Name of the corresponding servlet to execute
-     *
-     * @deprecated Will be removed in Tomcat 9. Use
-     *             {@link #addServletMappingDecoded(String, String)}
-     */
-    @Deprecated
-    public default void addServletMapping(String pattern, String name) {
-        addServletMapping(pattern, name, false);
-    }
-
-
-    /**
-     * Add a new servlet mapping, replacing any existing mapping for
-     * the specified pattern.
-     *
-     * @param pattern     URL pattern to be mapped. The pattern will be %
-     *                    decoded using UTF-8
-     * @param name        Name of the corresponding servlet to execute
-     * @param jspWildcard true if name identifies the JspServlet and pattern
-     *                    contains a wildcard; false otherwise
-     *
-     * @deprecated Will be removed in Tomcat 9. Use
-     *             {@link #addServletMappingDecoded(String, String, boolean)}
-     */
-    @Deprecated
-    public default void addServletMapping(String pattern, String name,
-            boolean jspWildcard) {
-        addServletMappingDecoded(
-                UDecoder.URLDecode(pattern, "UTF-8"), name, jspWildcard);
-    }
-
-
-    /**
      * Add a new servlet mapping, replacing any existing mapping for
      * the specified pattern.
      *



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