Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D6F8497B4 for ; Wed, 1 Feb 2012 10:48:31 +0000 (UTC) Received: (qmail 89540 invoked by uid 500); 1 Feb 2012 10:48:30 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 89359 invoked by uid 500); 1 Feb 2012 10:48:23 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 89346 invoked by uid 99); 1 Feb 2012 10:48:22 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Feb 2012 10:48:22 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Feb 2012 10:48:20 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5C0B32388900 for ; Wed, 1 Feb 2012 10:47:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1239049 - /tomcat/trunk/java/org/apache/catalina/util/RequestUtil.java Date: Wed, 01 Feb 2012 10:47:59 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120201104759.5C0B32388900@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Wed Feb 1 10:47:58 2012 New Revision: 1239049 URL: http://svn.apache.org/viewvc?rev=1239049&view=rev Log: Remove the deprecated code Modified: tomcat/trunk/java/org/apache/catalina/util/RequestUtil.java Modified: tomcat/trunk/java/org/apache/catalina/util/RequestUtil.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/RequestUtil.java?rev=1239049&r1=1239048&r2=1239049&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/util/RequestUtil.java (original) +++ tomcat/trunk/java/org/apache/catalina/util/RequestUtil.java Wed Feb 1 10:47:58 2012 @@ -84,46 +84,6 @@ public final class RequestUtil { /** - * Normalize a relative URI path that may have relative values ("/./", - * "/../", and so on ) it it. WARNING - This method is - * useful only for normalizing application-generated paths. It does not - * try to perform security checks for malicious input. - * - * @param path Relative path to be normalized - * - * @deprecated Deprecated to resolve a circular package dependency and will - * be removed in Tomcat 8.0.x. Use {@link - * org.apache.tomcat.util.http.RequestUtil#normalize(String)} as - * a replacement. - */ - @Deprecated - public static String normalize(String path) { - return org.apache.tomcat.util.http.RequestUtil.normalize(path); - } - - - /** - * Normalize a relative URI path that may have relative values ("/./", - * "/../", and so on ) it it. WARNING - This method is - * useful only for normalizing application-generated paths. It does not - * try to perform security checks for malicious input. - * - * @param path Relative path to be normalized - * @param replaceBackSlash Should '\\' be replaced with '/' - * - * @deprecated Deprecated to resolve a circular package dependency and will - * be removed in Tomcat 8.0.x. Use {@link - * org.apache.tomcat.util.http.RequestUtil#normalize(String, - * boolean)} as a replacement. - */ - @Deprecated - public static String normalize(String path, boolean replaceBackSlash) { - return org.apache.tomcat.util.http.RequestUtil.normalize(path, - replaceBackSlash); - } - - - /** * Append request parameters from the specified String to the specified * Map. It is presumed that the specified Map is not accessed from any * other thread, so no synchronization is performed. --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org