Return-Path: 
 <dev-return-111232-apmail-tomcat-dev-archive=tomcat.apache.org@tomcat.apache.org>
Delivered-To: apmail-tomcat-dev-archive@www.apache.org
Received: (qmail 80119 invoked from network); 5 Nov 2010 18:00:38 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 5 Nov 2010 18:00:38 -0000
Received: (qmail 57893 invoked by uid 500); 5 Nov 2010 18:01:09 -0000
Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org
Received: (qmail 57835 invoked by uid 500); 5 Nov 2010 18:01:09 -0000
Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@tomcat.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@tomcat.apache.org>
List-Post: <mailto:dev@tomcat.apache.org>
List-Id: <dev.tomcat.apache.org>
Reply-To: "Tomcat Developers List" <dev@tomcat.apache.org>
Delivered-To: mailing list dev@tomcat.apache.org
Received: (qmail 57826 invoked by uid 99); 5 Nov 2010 18:01:09 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Nov 2010 18:01:09 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Fri, 05 Nov 2010 18:01:07 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 48BD9238897F; Fri,  5 Nov 2010 17:59:52 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1031683 - in /tomcat/trunk/java/org/apache/catalina:
 Host.java
 core/StandardHost.java
Date: Fri, 05 Nov 2010 17:59:52 -0000
To: dev@tomcat.apache.org
From: markt@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20101105175952.48BD9238897F@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: markt
Date: Fri Nov  5 17:59:51 2010
New Revision: 1031683

URL: http://svn.apache.org/viewvc?rev=1031683&view=rev
Log:
Remove unused method

Modified:
    tomcat/trunk/java/org/apache/catalina/Host.java
    tomcat/trunk/java/org/apache/catalina/core/StandardHost.java

Modified: tomcat/trunk/java/org/apache/catalina/Host.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Host.java?rev=1031683&r1=1031682&r2=1031683&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Host.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Host.java Fri Nov  5 17:59:51 2010
@@ -167,15 +167,6 @@ public interface Host extends Container 
 
 
     /**
-     * Return the Context that would be used to process the specified
-     * host-relative request URI, if any; otherwise return <code>null</code>.
-     *
-     * @param uri Request URI to be mapped
-     */
-    public Context map(String uri);
-
-
-    /**
      * Remove the specified alias name from the aliases for this Host.
      *
      * @param alias Alias name to be removed

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardHost.java?rev=1031683&r1=1031682&r2=1031683&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardHost.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardHost.java Fri Nov  5 17:59:51 2010
@@ -643,56 +643,6 @@ public class StandardHost extends Contai
 
 
     /**
-     * Return the Context that would be used to process the specified
-     * host-relative request URI, if any; otherwise return <code>null</code>.
-     *
-     * @param uri Request URI to be mapped
-     */
-    @Override
-    public Context map(String uri) {
-
-        if (log.isDebugEnabled())
-            log.debug("Mapping request URI '" + uri + "'");
-        if (uri == null)
-            return (null);
-
-        // Match on the longest possible context path prefix
-        if (log.isTraceEnabled())
-            log.trace("  Trying the longest context path prefix");
-        Context context = null;
-        String mapuri = uri;
-        while (true) {
-            context = (Context) findChild(mapuri);
-            if (context != null)
-                break;
-            int slash = mapuri.lastIndexOf('/');
-            if (slash < 0)
-                break;
-            mapuri = mapuri.substring(0, slash);
-        }
-
-        // If no Context matches, select the default Context
-        if (context == null) {
-            if (log.isTraceEnabled())
-                log.trace("  Trying the default context");
-            context = (Context) findChild("");
-        }
-
-        // Complain if no Context has been selected
-        if (context == null) {
-            log.error(sm.getString("standardHost.mappingError", uri));
-            return (null);
-        }
-
-        // Return the mapped Context (if any)
-        if (log.isDebugEnabled())
-            log.debug(" Mapped to context '" + context.getPath() + "'");
-        return (context);
-
-    }
-
-
-    /**
      * Remove the specified alias name from the aliases for this Host.
      *
      * @param alias Alias name to be removed



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