Not used any more ( were part of the mini-servlet on top of coyote )

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

diff --git a/modules/tomcat-lite/java/org/apache/tomcat/util/buf/UriNormalizer.java b/modules/tomcat-lite/java/org/apache/tomcat/util/buf/UriNormalizer.java
deleted file mode 100644 (file)
index 7e83978..0000000
--- a/modules/tomcat-lite/java/org/apache/tomcat/util/buf/UriNormalizer.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.tomcat.util.buf;
-
-import java.io.IOException;
-
-/**
- * 
- */
-public class UriNormalizer {
-
-    
-    public static void decodeRequest(MessageBytes decodedURI, 
-                                     MessageBytes requestURI,
-                                     UDecoder urlDecoder) throws IOException {
-      decodedURI.duplicate(requestURI);
-
-      if (decodedURI.getType() == MessageBytes.T_BYTES) {
-          // %xx decoding of the URL
-          urlDecoder.convert(decodedURI, false);
-          // Normalization
-          if (!normalize(decodedURI)) {
-              throw new IOException("Error normalizing");
-          }
-          // Character decoding
-          //convertURI(decodedURI, request);
-      } else {
-          // The URL is chars or String, and has been sent using an in-memory
-          // protocol handler, we have to assume the URL has been properly
-          // decoded already
-          decodedURI.toChars();
-      }
-    }
-
-    /**
-     * Normalize URI.
-     * <p>
-     * This method normalizes "\", "//", "/./" and "/../". This method will
-     * return false when trying to go above the root, or if the URI contains
-     * a null byte.
-     * 
-     * @param uriMB URI to be normalized
-     */
-    public static boolean normalize(MessageBytes uriMB) {
-
-        ByteChunk uriBC = uriMB.getByteChunk();
-        byte[] b = uriBC.getBytes();
-        int start = uriBC.getStart();
-        int end = uriBC.getEnd();
-
-        // URL * is acceptable
-        if ((end - start == 1) && b[start] == (byte) '*')
-          return true;
-
-        int pos = 0;
-        int index = 0;
-
-        // Replace '\' with '/'
-        // Check for null byte
-        for (pos = start; pos < end; pos++) {
-            if (b[pos] == (byte) '\\')
-                b[pos] = (byte) '/';
-            if (b[pos] == (byte) 0)
-                return false;
-        }
-
-        // The URL must start with '/'
-        if (b[start] != (byte) '/') {
-            return false;
-        }
-
-        // Replace "//" with "/"
-        for (pos = start; pos < (end - 1); pos++) {
-            if (b[pos] == (byte) '/') {
-                while ((pos + 1 < end) && (b[pos + 1] == (byte) '/')) {
-                    copyBytes(b, pos, pos + 1, end - pos - 1);
-                    end--;
-                }
-            }
-        }
-
-        // If the URI ends with "/." or "/..", then we append an extra "/"
-        // Note: It is possible to extend the URI by 1 without any side effect
-        // as the next character is a non-significant WS.
-        if (((end - start) >= 2) && (b[end - 1] == (byte) '.')) {
-            if ((b[end - 2] == (byte) '/') 
-                || ((b[end - 2] == (byte) '.') 
-                    && (b[end - 3] == (byte) '/'))) {
-                b[end] = (byte) '/';
-                end++;
-            }
-        }
-
-        uriBC.setEnd(end);
-
-        index = 0;
-
-        // Resolve occurrences of "/./" in the normalized path
-        while (true) {
-            index = uriBC.indexOf("/./", 0, 3, index);
-            if (index < 0)
-                break;
-            copyBytes(b, start + index, start + index + 2, 
-                      end - start - index - 2);
-            end = end - 2;
-            uriBC.setEnd(end);
-        }
-
-        index = 0;
-
-        // Resolve occurrences of "/../" in the normalized path
-        while (true) {
-            index = uriBC.indexOf("/../", 0, 4, index);
-            if (index < 0)
-                break;
-            // Prevent from going outside our context
-            if (index == 0)
-                return false;
-            int index2 = -1;
-            for (pos = start + index - 1; (pos >= 0) && (index2 < 0); pos --) {
-                if (b[pos] == (byte) '/') {
-                    index2 = pos;
-                }
-            }
-            copyBytes(b, start + index2, start + index + 3,
-                      end - start - index - 3);
-            end = end + index2 - index - 3;
-            uriBC.setEnd(end);
-            index = index2;
-        }
-
-        //uriBC.setBytes(b, start, end);
-        uriBC.setEnd(end);
-        return true;
-
-    }
-    
-    /**
-     * Copy an array of bytes to a different position. Used during 
-     * normalization.
-     */
-    public static void copyBytes(byte[] b, int dest, int src, int len) {
-        for (int pos = 0; pos < len; pos++) {
-            b[pos + dest] = b[pos + src];
-        }
-    }
-
-}
\ No newline at end of file

diff --git a/modules/tomcat-lite/java/org/apache/tomcat/util/http/HttpRequest.java b/modules/tomcat-lite/java/org/apache/tomcat/util/http/HttpRequest.java
deleted file mode 100644 (file)
index 3e1c81c..0000000
--- a/modules/tomcat-lite/java/org/apache/tomcat/util/http/HttpRequest.java
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package org.apache.tomcat.util.http;
-
-import org.apache.tomcat.util.buf.MessageBytes;
-import org.apache.tomcat.util.buf.UDecoder;
-
-/**
- * Simple request representation, public fields - no I/O or actions,
- * just a struct.
- * 
- * Based on Coyote request.
- * 
- * @author Costin Manolache
- */
-public class HttpRequest {
-    
-    // Same fields as in coyote - this is the primary info from request
-    
-    protected MessageBytes schemeMB;
-    
-    protected MessageBytes methodMB;
-    protected MessageBytes unparsedURIMB;
-    protected MessageBytes protoMB;
-    protected MimeHeaders headers;
-    
-    // Reference to 'real' request object
-    public Object nativeRequest;
-    public Object wrapperRequest;
-
-    protected MessageBytes remoteAddrMB;
-    protected MessageBytes remoteHostMB;
-    protected int remotePort;
-
-    protected MessageBytes localNameMB;
-    protected MessageBytes localAddrMB;
-    protected int localPort;
-
-    protected MessageBytes serverNameMB;
-    protected int serverPort = -1;
-    
-    public HttpRequest() {
-        schemeMB = 
-            MessageBytes.newInstance();
-        methodMB = MessageBytes.newInstance();
-        unparsedURIMB = MessageBytes.newInstance();
-        decodedUriMB = MessageBytes.newInstance();
-        requestURI = MessageBytes.newInstance();
-        protoMB = MessageBytes.newInstance();
-        headers = new MimeHeaders();
-        queryMB = MessageBytes.newInstance();
-        serverNameMB = MessageBytes.newInstance();
-        
-        parameters = new Parameters();
-        parameters.setQuery(queryMB);
-        parameters.setURLDecoder(urlDecoder);
-        //parameters.setHeaders(headers);
-        cookies = new Cookies(headers);
-        
-        initRemote();
-    }
-    
-    private void initRemote() {
-        remoteAddrMB = MessageBytes.newInstance();
-        localNameMB = MessageBytes.newInstance();
-        remoteHostMB = MessageBytes.newInstance();
-        localAddrMB = MessageBytes.newInstance();
-    }
-    
-    
-    public HttpRequest(MessageBytes scheme, MessageBytes method,
-            MessageBytes unparsedURI, MessageBytes protocol,
-            MimeHeaders mimeHeaders,
-            MessageBytes requestURI, 
-            MessageBytes decodedURI, 
-            MessageBytes query, Parameters params, 
-            MessageBytes serverName,
-            Cookies cookies) {
-        this.schemeMB = scheme;
-        this.methodMB = method;
-        this.unparsedURIMB = unparsedURI;
-        this.protoMB = protocol;
-        this.headers = mimeHeaders;
-        
-        this.requestURI = requestURI;
-        this.decodedUriMB = decodedURI;
-        this.queryMB = query;
-        this.parameters = params;
-        this.serverNameMB = serverName;
-        this.cookies = cookies;
-        initRemote();        
-    }
-
-
-    
-    // ==== Derived fields, computed after request is received ===
-    
-    protected MessageBytes requestURI;
-    protected MessageBytes queryMB;
-    protected MessageBytes decodedUriMB;
-    
-    // -----------------
-    protected Parameters parameters;
-    
-    protected MessageBytes contentTypeMB;
-
-    protected String charEncoding;
-    protected long contentLength = -1;
-
-    protected Cookies cookies;
-
-    // Avoid object creation:
-    protected UDecoder urlDecoder = new UDecoder();
-
-    
-    public void recycle() {
-        schemeMB.recycle();
-        methodMB.setString("GET");
-        unparsedURIMB.recycle();
-        protoMB.setString("HTTP/1.1");
-        headers.recycle();
-        
-        requestURI.recycle();
-        queryMB.recycle();
-        decodedUriMB.recycle();
-        
-        parameters.recycle();
-        contentTypeMB = null;
-        charEncoding = null;
-        contentLength = -1;
-        remoteAddrMB.recycle();
-        remoteHostMB.recycle();
-        cookies.recycle();
-    }
-    
-    public Parameters getParameters() {
-        return parameters;
-    }
-    
-    // For compatibility with coyote
-    public MessageBytes decodedURI() {
-        return decodedUriMB;
-    }
-
-    public MessageBytes requestURI() {
-        return requestURI;
-    }
-
-    public MessageBytes method() {
-        return methodMB;
-    }
-    
-    public String getHeader(String name) {
-        return headers.getHeader(name);
-    }
-
-    public MimeHeaders getMimeHeaders() {
-        return headers;
-    }
-    
-    /**
-     * Get the character encoding used for this request.
-     */
-    public String getCharacterEncoding() {
-
-        if (charEncoding != null)
-            return charEncoding;
-
-        charEncoding = ContentType.getCharsetFromContentType(getContentType());
-        return charEncoding;
-
-    }
-
-
-    public void setCharacterEncoding(String enc) {
-        this.charEncoding = enc;
-    }
-
-
-    public void setContentLength(int len) {
-        this.contentLength = len;
-    }
-
-
-    public int getContentLength() {
-        long length = getContentLengthLong();
-
-        if (length < Integer.MAX_VALUE) {
-            return (int) length;
-        }
-        return -1;
-    }
-
-    public long getContentLengthLong() {
-        if( contentLength > -1 ) return contentLength;
-
-        MessageBytes clB = headers.getUniqueValue("content-length");
-        contentLength = (clB == null || clB.isNull()) ? -1 : clB.getLong();
-
-        return contentLength;
-    }
-
-    public String getContentType() {
-        contentType();
-        if ((contentTypeMB == null) || contentTypeMB.isNull()) 
-            return null;
-        return contentTypeMB.toString();
-    }
-
-
-    public void setContentType(String type) {
-        contentTypeMB.setString(type);
-    }
-
-
-    public MessageBytes contentType() {
-        if (contentTypeMB == null || contentTypeMB.isNull())
-            contentTypeMB = headers.getValue("content-type");
-        return contentTypeMB;
-    }
-
-    public int getServerPort() {
-        return serverPort;
-    }
-    
-    public void setServerPort(int serverPort ) {
-        this.serverPort=serverPort;
-    }
-
-    public MessageBytes remoteAddr() {
-        return remoteAddrMB;
-    }
-
-    public MessageBytes remoteHost() {
-        return remoteHostMB;
-    }
-
-    public MessageBytes localName() {
-        return localNameMB;
-    }    
-
-    public MessageBytes localAddr() {
-        return localAddrMB;
-    }
-    
-    public int getRemotePort(){
-        return remotePort;
-    }
-        
-    public void setRemotePort(int port){
-        this.remotePort = port;
-    }
-    
-    public int getLocalPort(){
-        return localPort;
-    }
-        
-    public void setLocalPort(int port){
-        this.localPort = port;
-    }
-    
-    public MessageBytes queryString() {
-        return queryMB;
-    }
-    
-    public MessageBytes protocol() {
-        return protoMB;
-    }
-    
-    public MessageBytes scheme() {
-        return schemeMB;
-    }
-    
-    public MessageBytes serverName() {
-        return serverNameMB;
-    }
-
-    public MessageBytes unparsedURI() {
-        return unparsedURIMB;
-    }
-
-    public Cookies getCookies() {
-        return cookies;
-    }
-    
-    public UDecoder getURLDecoder() {
-        return urlDecoder;
-    }
-
-}
-

diff --git a/modules/tomcat-lite/java/org/apache/tomcat/util/http/HttpResponse.java b/modules/tomcat-lite/java/org/apache/tomcat/util/http/HttpResponse.java
deleted file mode 100644 (file)
index 5693255..0000000
--- a/modules/tomcat-lite/java/org/apache/tomcat/util/http/HttpResponse.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package org.apache.tomcat.util.http;
-
-import org.apache.tomcat.util.buf.MessageBytes;
-
-/**
- * The data fields in a HTTP response and few helper and accessors.
- * No actions - just a struct.
- * 
- * Subset of coyte response.
- * 
- * @author Costin Manolache
- */
-public class HttpResponse {
-    // Primary fields 
-    // in coyote message is String, status is int
-    protected MessageBytes message = MessageBytes.newInstance();
-    protected MessageBytes proto = MessageBytes.newInstance();
-    protected MessageBytes statusBuffer = MessageBytes.newInstance();
-    protected MimeHeaders headers = new MimeHeaders();
-    public Object nativeResponse;
-       
-    boolean commited;
-    
-    public void recycle() {
-        getMimeHeaders().recycle();
-        message.recycle();
-        statusBuffer.setInt(200);
-        commited = false;
-    }
-    
-    public boolean isCommitted() {
-        return commited;
-    }
-
-    public void setCommitted(boolean b) {
-        commited = b;
-    }
-    
-    // Methods named for compat with coyote
-    
-    public void setStatus(int i) {
-        statusBuffer.setInt(i);
-    }
-    
-    public void setMessage(String s) {
-        message.setString(s);
-    }
-    
-    public String getMessage() {
-        return message.toString();
-    }
-    
-    public MessageBytes getMessageBuffer() {
-        return message;
-    }
-    
-    public MessageBytes protocol() {
-        return proto;
-    }
-    
-    public int getStatus() {
-        return statusBuffer.getInt();
-    }
-
-    public MessageBytes getStatusBuffer() {
-        return statusBuffer;
-    }
-    
-
-    public void addHeader(String name, String value) {
-        getMimeHeaders().addValue(name).setString(value);
-    }
-
-    public void setHeader(String name, String value) {
-        getMimeHeaders().setValue(name).setString(value);
-    }
-
-    public void setMimeHeaders(MimeHeaders resHeaders) {
-        this.headers = resHeaders;
-    }
-
-    public MimeHeaders getMimeHeaders() {
-        return headers;
-    }
-    
-    /**
-     * Warning: This method always returns <code>false<code> for Content-Type
-     * and Content-Length.
-     */
-    public boolean containsHeader(String name) {
-        return headers.getHeader(name) != null;
-    }
-
-    public void setContentLength(long length) {
-        MessageBytes clB = getMimeHeaders().getUniqueValue("content-length");
-        if (clB == null) {
-            clB = getMimeHeaders().addValue("content-length");
-        }        
-        clB.setLong(length);
-    }
-    
-    public long getContentLength() {
-        MessageBytes clB = getMimeHeaders().getUniqueValue("content-length");
-        return (clB == null || clB.isNull()) ? -1 : clB.getLong();
-    }
-    
-    public void setContentType(String contentType) {
-        MessageBytes clB = getMimeHeaders().getUniqueValue("content-type");
-        if (clB == null) {
-            setHeader("content-type", contentType);
-        } else {
-            clB.setString(contentType);
-        }
-    }
-    
-}
\ No newline at end of file

diff --git a/modules/tomcat-lite/java/org/apache/tomcat/util/http/MimeMap.java b/modules/tomcat-lite/java/org/apache/tomcat/util/http/MimeMap.java
deleted file mode 100644 (file)
index 50a1d62..0000000
--- a/modules/tomcat-lite/java/org/apache/tomcat/util/http/MimeMap.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package org.apache.tomcat.util.http;
-
-import java.net.*;
-import java.util.*;
-
-
-/**
- * A mime type map that implements the java.net.FileNameMap interface.
- *
- * @author James Duncan Davidson [duncan@eng.sun.com]
- * @author Jason Hunter [jch@eng.sun.com]
- */
-public class MimeMap implements FileNameMap {
-
-    // Defaults - all of them are "well-known" types,
-    // you can add using normal web.xml.
-    
-    public static final Hashtable<String,String> defaultMap =
-        new Hashtable<String,String>(101);
-    static {
-        defaultMap.put("txt", "text/plain");
-        defaultMap.put("css", "text/css");
-        defaultMap.put("html","text/html");
-        defaultMap.put("htm", "text/html");
-        defaultMap.put("gif", "image/gif");
-        defaultMap.put("jpg", "image/jpeg");
-        defaultMap.put("jpe", "image/jpeg");
-        defaultMap.put("jpeg", "image/jpeg");
-        defaultMap.put("png", "image/png");
-                defaultMap.put("java", "text/plain");
-        defaultMap.put("body", "text/html");
-        defaultMap.put("rtx", "text/richtext");
-        defaultMap.put("tsv", "text/tab-separated-values");
-        defaultMap.put("etx", "text/x-setext");
-        defaultMap.put("ps", "application/x-postscript");
-        defaultMap.put("class", "application/java");
-        defaultMap.put("csh", "application/x-csh");
-        defaultMap.put("sh", "application/x-sh");
-        defaultMap.put("tcl", "application/x-tcl");
-        defaultMap.put("tex", "application/x-tex");
-        defaultMap.put("texinfo", "application/x-texinfo");
-        defaultMap.put("texi", "application/x-texinfo");
-        defaultMap.put("t", "application/x-troff");
-        defaultMap.put("tr", "application/x-troff");
-        defaultMap.put("roff", "application/x-troff");
-        defaultMap.put("man", "application/x-troff-man");
-        defaultMap.put("me", "application/x-troff-me");
-        defaultMap.put("ms", "application/x-wais-source");
-        defaultMap.put("src", "application/x-wais-source");
-        defaultMap.put("zip", "application/zip");
-        defaultMap.put("bcpio", "application/x-bcpio");
-        defaultMap.put("cpio", "application/x-cpio");
-        defaultMap.put("gtar", "application/x-gtar");
-        defaultMap.put("shar", "application/x-shar");
-        defaultMap.put("sv4cpio", "application/x-sv4cpio");
-        defaultMap.put("sv4crc", "application/x-sv4crc");
-        defaultMap.put("tar", "application/x-tar");
-        defaultMap.put("ustar", "application/x-ustar");
-        defaultMap.put("dvi", "application/x-dvi");
-        defaultMap.put("hdf", "application/x-hdf");
-        defaultMap.put("latex", "application/x-latex");
-        defaultMap.put("bin", "application/octet-stream");
-        defaultMap.put("oda", "application/oda");
-        defaultMap.put("pdf", "application/pdf");
-        defaultMap.put("ps", "application/postscript");
-        defaultMap.put("eps", "application/postscript");
-        defaultMap.put("ai", "application/postscript");
-        defaultMap.put("rtf", "application/rtf");
-        defaultMap.put("nc", "application/x-netcdf");
-        defaultMap.put("cdf", "application/x-netcdf");
-        defaultMap.put("cer", "application/x-x509-ca-cert");
-        defaultMap.put("exe", "application/octet-stream");
-        defaultMap.put("gz", "application/x-gzip");
-        defaultMap.put("Z", "application/x-compress");
-        defaultMap.put("z", "application/x-compress");
-        defaultMap.put("hqx", "application/mac-binhex40");
-        defaultMap.put("mif", "application/x-mif");
-        defaultMap.put("ief", "image/ief");
-        defaultMap.put("tiff", "image/tiff");
-        defaultMap.put("tif", "image/tiff");
-        defaultMap.put("ras", "image/x-cmu-raster");
-        defaultMap.put("pnm", "image/x-portable-anymap");
-        defaultMap.put("pbm", "image/x-portable-bitmap");
-        defaultMap.put("pgm", "image/x-portable-graymap");
-        defaultMap.put("ppm", "image/x-portable-pixmap");
-        defaultMap.put("rgb", "image/x-rgb");
-        defaultMap.put("xbm", "image/x-xbitmap");
-        defaultMap.put("xpm", "image/x-xpixmap");
-        defaultMap.put("xwd", "image/x-xwindowdump");
-        defaultMap.put("au", "audio/basic");
-        defaultMap.put("snd", "audio/basic");
-        defaultMap.put("aif", "audio/x-aiff");
-        defaultMap.put("aiff", "audio/x-aiff");
-        defaultMap.put("aifc", "audio/x-aiff");
-        defaultMap.put("wav", "audio/x-wav");
-        defaultMap.put("mpeg", "video/mpeg");
-        defaultMap.put("mpg", "video/mpeg");
-        defaultMap.put("mpe", "video/mpeg");
-        defaultMap.put("qt", "video/quicktime");
-        defaultMap.put("mov", "video/quicktime");
-        defaultMap.put("avi", "video/x-msvideo");
-        defaultMap.put("movie", "video/x-sgi-movie");
-        defaultMap.put("avx", "video/x-rad-screenplay");
-        defaultMap.put("wrl", "x-world/x-vrml");
-        defaultMap.put("mpv2", "video/mpeg2");
-        
-        /* Add XML related MIMEs */
-        
-        defaultMap.put("xml", "text/xml");
-        defaultMap.put("xsl", "text/xml");        
-        defaultMap.put("svg", "image/svg+xml");
-        defaultMap.put("svgz", "image/svg+xml");
-        defaultMap.put("wbmp", "image/vnd.wap.wbmp");
-        defaultMap.put("wml", "text/vnd.wap.wml");
-        defaultMap.put("wmlc", "application/vnd.wap.wmlc");
-        defaultMap.put("wmls", "text/vnd.wap.wmlscript");
-        defaultMap.put("wmlscriptc", "application/vnd.wap.wmlscriptc");
-    }
-    
-
-    private Hashtable<String,String> map = new Hashtable<String,String>();
-
-    public void addContentType(String extn, String type) {
-        map.put(extn, type.toLowerCase());
-    }
-
-    public Enumeration getExtensions() {
-        return map.keys();
-    }
-
-    public String getMimeType(String ext) {
-        return getContentTypeFor(ext);
-    }
-    
-    public String getContentType(String extn) {
-        String type = (String)map.get(extn.toLowerCase());
-        if( type == null ) type=(String)defaultMap.get( extn );
-        return type;
-    }
-
-    public void removeContentType(String extn) {
-        map.remove(extn.toLowerCase());
-    }
-
-    /** Get extension of file, without fragment id
-     */
-    public static String getExtension( String fileName ) {
-        // play it safe and get rid of any fragment id
-        // that might be there
-        int length=fileName.length();
-        
-        int newEnd = fileName.lastIndexOf('#');
-        if( newEnd== -1 ) newEnd=length;
-        // Instead of creating a new string.
-        //         if (i != -1) {
-        //             fileName = fileName.substring(0, i);
-        //         }
-        int i = fileName.lastIndexOf('.', newEnd );
-        if (i != -1) {
-             return  fileName.substring(i + 1, newEnd );
-        } else {
-            // no extension, no content type
-            return null;
-        }
-    }
-    
-    public String getContentTypeFor(String fileName) {
-        String extn=getExtension( fileName );
-        if (extn!=null) {
-            return getContentType(extn);
-        } else {
-            // no extension, no content type
-            return null;
-        }
-    }
-
-}

diff --git a/modules/tomcat-lite/java/org/apache/tomcat/util/http/mapper/BaseMapper.java b/modules/tomcat-lite/java/org/apache/tomcat/util/http/mapper/BaseMapper.java
deleted file mode 100644 (file)
index c9c9f67..0000000
--- a/modules/tomcat-lite/java/org/apache/tomcat/util/http/mapper/BaseMapper.java
+++ /dev/null
@@ -1,1460 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package org.apache.tomcat.util.http.mapper;
-
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tomcat.util.buf.Ascii;
-import org.apache.tomcat.util.buf.CharChunk;
-import org.apache.tomcat.util.buf.MessageBytes;
-
-/**
- * Mapper, which implements the servlet API mapping rules (which are derived
- * from the HTTP rules).
- * 
- * This class doesn't use JNDI.
- *
- * @author Remy Maucherat
- */
-public class BaseMapper {
-
-
-
-    private static final org.apache.juli.logging.Log logger =
-        org.apache.juli.logging.LogFactory.getLog(Mapper.class);
-    // ----------------------------------------------------- Instance Variables
-
-
-    /**
-     * Array containing the virtual hosts definitions.
-     */
-    protected Host[] hosts = new Host[0];
-
-
-    /**
-     * Default host name.
-     */
-    protected String defaultHostName = null;
-
-    /**
-     * Context associated with this wrapper, used for wrapper mapping.
-     */
-    protected Context context = new Context();
-
-
-    // --------------------------------------------------------- Public Methods
-
-
-    /**
-     * Get default host.
-     *
-     * @return Default host name
-     */
-    public String getDefaultHostName() {
-        return defaultHostName;
-    }
-
-
-    /**
-     * Set default host.
-     *
-     * @param defaultHostName Default host name
-     */
-    public void setDefaultHostName(String defaultHostName) {
-        this.defaultHostName = defaultHostName;
-    }
-
-    /**
-     * Add a new host to the mapper.
-     *
-     * @param name Virtual host name
-     * @param host Host object
-     */
-    public synchronized void addHost(String name, String[] aliases,
-                                     Object host) {
-        Host[] newHosts = new Host[hosts.length + 1];
-        Host newHost = new Host();
-        ContextList contextList = new ContextList();
-        newHost.name = name;
-        newHost.contextList = contextList;
-        newHost.object = host;
-        if (insertMap(hosts, newHosts, newHost)) {
-            hosts = newHosts;
-        }
-        for (int i = 0; i < aliases.length; i++) {
-            newHosts = new Host[hosts.length + 1];
-            newHost = new Host();
-            newHost.name = aliases[i];
-            newHost.contextList = contextList;
-            newHost.object = host;
-            if (insertMap(hosts, newHosts, newHost)) {
-                hosts = newHosts;
-            }
-        }
-    }
-
-
-    /**
-     * Remove a host from the mapper.
-     *
-     * @param name Virtual host name
-     */
-    public synchronized void removeHost(String name) {
-        // Find and remove the old host
-        int pos = find(hosts, name);
-        if (pos < 0) {
-            return;
-        }
-        Object host = hosts[pos].object;
-        Host[] newHosts = new Host[hosts.length - 1];
-        if (removeMap(hosts, newHosts, name)) {
-            hosts = newHosts;
-        }
-        // Remove all aliases (they will map to the same host object)
-        for (int i = 0; i < newHosts.length; i++) {
-            if (newHosts[i].object == host) {
-                Host[] newHosts2 = new Host[hosts.length - 1];
-                if (removeMap(hosts, newHosts2, newHosts[i].name)) {
-                    hosts = newHosts2;
-                }
-            }
-        }
-    }
-
-    /**
-     * Add an alias to an existing host.
-     * @param name  The name of the host
-     * @param alias The alias to add
-     */
-    public synchronized void addHostAlias(String name, String alias) {
-        int pos = find(hosts, name);
-        if (pos < 0) {
-            // Should not be adding an alias for a host that doesn't exist but
-            // just in case...
-            return;
-        }
-        Host realHost = hosts[pos];
-        
-        Host[] newHosts = new Host[hosts.length + 1];
-        Host newHost = new Host();
-        newHost.name = alias;
-        newHost.contextList = realHost.contextList;
-        newHost.object = realHost;
-        if (insertMap(hosts, newHosts, newHost)) {
-            hosts = newHosts;
-        }
-    }
-
-    /**
-     * Remove a host alias
-     * @param alias The alias to remove
-     */
-    public synchronized void removeHostAlias(String alias) {
-        // Find and remove the alias
-        int pos = find(hosts, alias);
-        if (pos < 0) {
-            return;
-        }
-        Host[] newHosts = new Host[hosts.length - 1];
-        if (removeMap(hosts, newHosts, alias)) {
-            hosts = newHosts;
-        }
-
-    }
-
-    public String[] getHosts() {
-        String hostN[] = new String[hosts.length];
-        for( int i = 0; i < hosts.length; i++ ) {
-            hostN[i] = hosts[i].name;
-        }
-        return hostN;
-    }
-
-
-    /**
-     * Set context, used for wrapper mapping (request dispatcher).
-     *
-     * @param welcomeResources Welcome files defined for this context
-     * @param resources Static resources of the context
-     */
-    public void setContext(String path, String[] welcomeResources,
-                           javax.naming.Context resources) {
-        context.name = path;
-        context.welcomeResources = welcomeResources;
-        context.resources = resources;
-    }
-
-
-    /**
-     * Add a new Context to an existing Host.
-     *
-     * @param hostName Virtual host name this context belongs to
-     * @param path Context path
-     * @param context Context object
-     * @param welcomeResources Welcome files defined for this context
-     * @param resources Static resources of the context
-     */
-    public void addContext
-        (String hostName, String path, Object context,
-         String[] welcomeResources, javax.naming.Context resources) {
-
-        Host[] hosts = this.hosts;
-        int pos = find(hosts, hostName);
-        if( pos <0 ) {
-            addHost(hostName, new String[0], "");
-            hosts = this.hosts;
-            pos = find(hosts, hostName);
-        }
-        if (pos < 0) {
-            logger.error("No host found: " + hostName);
-        }
-        Host host = hosts[pos];
-        if (host.name.equals(hostName)) {
-            int slashCount = slashCount(path);
-            synchronized (host) {
-                Context[] contexts = host.contextList.contexts;
-                // Update nesting
-                if (slashCount > host.contextList.nesting) {
-                    host.contextList.nesting = slashCount;
-                }
-                Context[] newContexts = new Context[contexts.length + 1];
-                Context newContext = new Context();
-                newContext.name = path;
-                newContext.object = context;
-                newContext.welcomeResources = welcomeResources;
-                newContext.resources = resources;
-                if (insertMap(contexts, newContexts, newContext)) {
-                    host.contextList.contexts = newContexts;
-                }
-            }
-        }
-
-    }
-
-
-    /**
-     * Remove a context from an existing host.
-     *
-     * @param hostName Virtual host name this context belongs to
-     * @param path Context path
-     */
-    public void removeContext(String hostName, String path) {
-        Host[] hosts = this.hosts;
-        int pos = find(hosts, hostName);
-        if (pos < 0) {
-            return;
-        }
-        Host host = hosts[pos];
-        if (host.name.equals(hostName)) {
-            synchronized (host) {
-                Context[] contexts = host.contextList.contexts;
-                if( contexts.length == 0 ){
-                    return;
-                }
-                Context[] newContexts = new Context[contexts.length - 1];
-                if (removeMap(contexts, newContexts, path)) {
-                    host.contextList.contexts = newContexts;
-                    // Recalculate nesting
-                    host.contextList.nesting = 0;
-                    for (int i = 0; i < newContexts.length; i++) {
-                        int slashCount = slashCount(newContexts[i].name);
-                        if (slashCount > host.contextList.nesting) {
-                            host.contextList.nesting = slashCount;
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-
-    /**
-     * Return all contexts, in //HOST/PATH form
-     *
-     * @return The context names
-     */
-    public String[] getContextNames() {
-        List<String> list = new ArrayList<String>();
-        for( int i=0; i<hosts.length; i++ ) {
-            for( int j=0; j<hosts[i].contextList.contexts.length; j++ ) {
-                String cname=hosts[i].contextList.contexts[j].name;
-                list.add("//" + hosts[i].name +
-                        (cname.startsWith("/") ? cname : "/"));
-            }
-        }
-        String res[] = new String[list.size()];
-        return list.toArray(res);
-    }
-
-
-    /**
-     * Add a new Wrapper to an existing Context.
-     *
-     * @param hostName Virtual host name this wrapper belongs to
-     * @param contextPath Context path this wrapper belongs to
-     * @param path Wrapper mapping
-     * @param wrapper Wrapper object
-     */
-    public void addWrapper(String hostName, String contextPath, String path,
-                           Object wrapper) {
-        addWrapper(hostName, contextPath, path, wrapper, false);
-    }
-
-
-    public void addWrapper(String hostName, String contextPath, String path,
-                           Object wrapper, boolean jspWildCard) {
-        Host[] hosts = this.hosts;
-        int pos = find(hosts, hostName);
-        if (pos < 0) {
-            return;
-        }
-        Host host = hosts[pos];
-        if (host.name.equals(hostName)) {
-            Context[] contexts = host.contextList.contexts;
-            int pos2 = find(contexts, contextPath);
-            if( pos2<0 ) {
-                logger.error("No context found: " + contextPath );
-                return;
-            }
-            Context context = contexts[pos2];
-            if (context.name.equals(contextPath)) {
-                addWrapper(context, path, wrapper, jspWildCard);
-            }
-        }
-    }
-
-
-    /**
-     * Add a wrapper to the context associated with this wrapper.
-     *
-     * @param path Wrapper mapping
-     * @param wrapper The Wrapper object
-     */
-    public void addWrapper(String path, Object wrapper) {
-        addWrapper(context, path, wrapper);
-    }
-
-
-    public void addWrapper(String path, Object wrapper, boolean jspWildCard) {
-        addWrapper(context, path, wrapper, jspWildCard);
-    }
-
-
-    protected void addWrapper(Context context, String path, Object wrapper) {
-        addWrapper(context, path, wrapper, false);
-    }
-
-
-    /**
-     * Adds a wrapper to the given context.
-     *
-     * @param context The context to which to add the wrapper
-     * @param path Wrapper mapping
-     * @param wrapper The Wrapper object
-     * @param jspWildCard true if the wrapper corresponds to the JspServlet
-     * and the mapping path contains a wildcard; false otherwise
-     */
-    protected void addWrapper(Context context, String path, Object wrapper,
-                              boolean jspWildCard) {
-
-        synchronized (context) {
-            Wrapper newWrapper = new Wrapper();
-            newWrapper.object = wrapper;
-            newWrapper.jspWildCard = jspWildCard;
-            if (path.endsWith("/*")) {
-                // Wildcard wrapper
-                newWrapper.name = path.substring(0, path.length() - 2);
-                Wrapper[] oldWrappers = context.wildcardWrappers;
-                Wrapper[] newWrappers =
-                    new Wrapper[oldWrappers.length + 1];
-                if (insertMap(oldWrappers, newWrappers, newWrapper)) {
-                    context.wildcardWrappers = newWrappers;
-                    int slashCount = slashCount(newWrapper.name);
-                    if (slashCount > context.nesting) {
-                        context.nesting = slashCount;
-                    }
-                }
-            } else if (path.startsWith("*.")) {
-                // Extension wrapper
-                newWrapper.name = path.substring(2);
-                Wrapper[] oldWrappers = context.extensionWrappers;
-                Wrapper[] newWrappers =
-                    new Wrapper[oldWrappers.length + 1];
-                if (insertMap(oldWrappers, newWrappers, newWrapper)) {
-                    context.extensionWrappers = newWrappers;
-                }
-            } else if (path.equals("/")) {
-                // Default wrapper
-                newWrapper.name = "";
-                context.defaultWrapper = newWrapper;
-            } else {
-                // Exact wrapper
-                newWrapper.name = path;
-                Wrapper[] oldWrappers = context.exactWrappers;
-                Wrapper[] newWrappers =
-                    new Wrapper[oldWrappers.length + 1];
-                if (insertMap(oldWrappers, newWrappers, newWrapper)) {
-                    context.exactWrappers = newWrappers;
-                }
-            }
-        }
-    }
-
-
-    /**
-     * Remove a wrapper from the context associated with this wrapper.
-     *
-     * @param path Wrapper mapping
-     */
-    public void removeWrapper(String path) {
-        removeWrapper(context, path);
-    }
-
-
-    /**
-     * Remove a wrapper from an existing context.
-     *
-     * @param hostName Virtual host name this wrapper belongs to
-     * @param contextPath Context path this wrapper belongs to
-     * @param path Wrapper mapping
-     */
-    public void removeWrapper
-        (String hostName, String contextPath, String path) {
-        Host[] hosts = this.hosts;
-        int pos = find(hosts, hostName);
-        if (pos < 0) {
-            return;
-        }
-        Host host = hosts[pos];
-        if (host.name.equals(hostName)) {
-            Context[] contexts = host.contextList.contexts;
-            int pos2 = find(contexts, contextPath);
-            if (pos2 < 0) {
-                return;
-            }
-            Context context = contexts[pos2];
-            if (context.name.equals(contextPath)) {
-                removeWrapper(context, path);
-            }
-        }
-    }
-
-    protected void removeWrapper(Context context, String path) {
-        synchronized (context) {
-            if (path.endsWith("/*")) {
-                // Wildcard wrapper
-                String name = path.substring(0, path.length() - 2);
-                Wrapper[] oldWrappers = context.wildcardWrappers;
-                Wrapper[] newWrappers =
-                    new Wrapper[oldWrappers.length - 1];
-                if (removeMap(oldWrappers, newWrappers, name)) {
-                    // Recalculate nesting
-                    context.nesting = 0;
-                    for (int i = 0; i < newWrappers.length; i++) {
-                        int slashCount = slashCount(newWrappers[i].name);
-                        if (slashCount > context.nesting) {
-                            context.nesting = slashCount;
-                        }
-                    }
-                    context.wildcardWrappers = newWrappers;
-                }
-            } else if (path.startsWith("*.")) {
-                // Extension wrapper
-                String name = path.substring(2);
-                Wrapper[] oldWrappers = context.extensionWrappers;
-                Wrapper[] newWrappers =
-                    new Wrapper[oldWrappers.length - 1];
-                if (removeMap(oldWrappers, newWrappers, name)) {
-                    context.extensionWrappers = newWrappers;
-                }
-            } else if (path.equals("/")) {
-                // Default wrapper
-                context.defaultWrapper = null;
-            } else {
-                // Exact wrapper
-                String name = path;
-                Wrapper[] oldWrappers = context.exactWrappers;
-                Wrapper[] newWrappers =
-                    new Wrapper[oldWrappers.length - 1];
-                if (removeMap(oldWrappers, newWrappers, name)) {
-                    context.exactWrappers = newWrappers;
-                }
-            }
-        }
-    }
-
-    public String getWrappersString( String host, String context ) {
-        String names[]=getWrapperNames(host, context);
-        StringBuilder sb=new StringBuilder();
-        for( int i=0; i<names.length; i++ ) {
-            sb.append(names[i]).append(":");
-        }
-        return sb.toString();
-    }
-
-    public String[] getWrapperNames( String host, String context ) {
-        List<String> list = new ArrayList<String>();
-        if( host==null ) host="";
-        if( context==null ) context="";
-        for( int i=0; i<hosts.length; i++ ) {
-            if( ! host.equals( hosts[i].name ))
-                continue;
-            for( int j=0; j<hosts[i].contextList.contexts.length; j++ ) {
-                if( ! context.equals( hosts[i].contextList.contexts[j].name))
-                    continue;
-                // found the context
-                Context ctx=hosts[i].contextList.contexts[j];
-                list.add( ctx.defaultWrapper.path);
-                for( int k=0; k<ctx.exactWrappers.length; k++ ) {
-                    list.add( ctx.exactWrappers[k].path);
-                }
-                for( int k=0; k<ctx.wildcardWrappers.length; k++ ) {
-                    list.add( ctx.wildcardWrappers[k].path + "*");
-                }
-                for( int k=0; k<ctx.extensionWrappers.length; k++ ) {
-                    list.add( "*." + ctx.extensionWrappers[k].path);
-                }
-            }
-        }
-        String res[]=new String[list.size()];
-        return list.toArray(res);
-    }
-
-
-
-    /**
-     * Map the specified host name and URI, mutating the given mapping data.
-     *
-     * @param host Virtual host name
-     * @param uri URI
-     * @param mappingData This structure will contain the result of the mapping
-     *                    operation
-     */
-    public void map(MessageBytes host, MessageBytes uri,
-                    MappingData mappingData)
-        throws Exception {
-
-        if (host.isNull()) {
-            host.getCharChunk().append(defaultHostName);
-        }
-        host.toChars();
-        uri.toChars();
-        internalMap(host.getCharChunk(), uri.getCharChunk(), mappingData);
-
-    }
-
-
-    /**
-     * Map the specified URI relative to the context,
-     * mutating the given mapping data.
-     *
-     * @param uri URI
-     * @param mappingData This structure will contain the result of the mapping
-     *                    operation
-     */
-    public void map(MessageBytes uri, MappingData mappingData)
-        throws Exception {
-
-        uri.toChars();
-        CharChunk uricc = uri.getCharChunk();
-        uricc.setLimit(-1);
-        internalMapWrapper(context, uricc, mappingData);
-
-    }
-
-
-    // -------------------------------------------------------- Private Methods
-
-
-    /**
-     * Map the specified URI.
-     */
-    private final void internalMap(CharChunk host, CharChunk uri,
-                                   MappingData mappingData)
-        throws Exception {
-
-        uri.setLimit(-1);
-
-        Context[] contexts = null;
-        Context context = null;
-        int nesting = 0;
-
-        // Virtual host mapping
-        if (mappingData.host == null) {
-            Host[] hosts = this.hosts;
-            int pos = findIgnoreCase(hosts, host);
-            if ((pos != -1) && (host.equalsIgnoreCase(hosts[pos].name))) {
-                mappingData.host = hosts[pos].object;
-                contexts = hosts[pos].contextList.contexts;
-                nesting = hosts[pos].contextList.nesting;
-            } else {
-                if (defaultHostName == null) {
-                    return;
-                }
-                pos = find(hosts, defaultHostName);
-                if ((pos != -1) && (defaultHostName.equals(hosts[pos].name))) {
-                    mappingData.host = hosts[pos].object;
-                    contexts = hosts[pos].contextList.contexts;
-                    nesting = hosts[pos].contextList.nesting;
-                } else {
-                    return;
-                }
-            }
-        }
-
-        // Context mapping
-        if (mappingData.context == null) {
-            int pos = find(contexts, uri);
-            if (pos == -1) {
-                return;
-            }
-
-            int lastSlash = -1;
-            int uriEnd = uri.getEnd();
-            int length = -1;
-            boolean found = false;
-            while (pos >= 0) {
-                if (uri.startsWith(contexts[pos].name)) {
-                    length = contexts[pos].name.length();
-                    if (uri.getLength() == length) {
-                        found = true;
-                        break;
-                    } else if (uri.startsWithIgnoreCase("/", length)) {
-                        found = true;
-                        break;
-                    }
-                }
-                if (lastSlash == -1) {
-                    lastSlash = nthSlash(uri, nesting + 1);
-                } else {
-                    lastSlash = lastSlash(uri);
-                }
-                uri.setEnd(lastSlash);
-                pos = find(contexts, uri);
-            }
-            uri.setEnd(uriEnd);
-
-            if (!found) {
-                if (contexts[0].name.equals("")) {
-                    context = contexts[0];
-                }
-            } else {
-                context = contexts[pos];
-            }
-            if (context != null) {
-                mappingData.context = context.object;
-                mappingData.contextPath.setString(context.name);
-            }
-        }
-
-        // Wrapper mapping
-        if ((context != null) && (mappingData.wrapper == null)) {
-            internalMapWrapper(context, uri, mappingData);
-        }
-
-    }
-
-
-    /**
-     * Wrapper mapping.
-     */
-    private final void internalMapWrapper(Context context, CharChunk path,
-                                          MappingData mappingData)
-        throws Exception {
-
-        int pathOffset = path.getOffset();
-        int pathEnd = path.getEnd();
-        int servletPath = pathOffset;
-        boolean noServletPath = false;
-
-        int length = context.name.length();
-        if (length != (pathEnd - pathOffset)) {
-            servletPath = pathOffset + length;
-        } else {
-            noServletPath = true;
-            path.append('/');
-            pathOffset = path.getOffset();
-            pathEnd = path.getEnd();
-            servletPath = pathOffset+length;
-        }
-
-        path.setOffset(servletPath);
-
-        // Rule 1 -- Exact Match
-        Wrapper[] exactWrappers = context.exactWrappers;
-        internalMapExactWrapper(exactWrappers, path, mappingData);
-
-        // Rule 2 -- Prefix Match
-        boolean checkJspWelcomeFiles = false;
-        Wrapper[] wildcardWrappers = context.wildcardWrappers;
-        if (mappingData.wrapper == null) {
-            internalMapWildcardWrapper(wildcardWrappers, context.nesting, 
-                                       path, mappingData);
-            if (mappingData.wrapper != null && mappingData.jspWildCard) {
-                char[] buf = path.getBuffer();
-                if (buf[pathEnd - 1] == '/') {
-                    /*
-                     * Path ending in '/' was mapped to JSP servlet based on
-                     * wildcard match (e.g., as specified in url-pattern of a
-                     * jsp-property-group.
-                     * Force the context's welcome files, which are interpreted
-                     * as JSP files (since they match the url-pattern), to be
-                     * considered. See Bugzilla 27664.
-                     */ 
-                    mappingData.wrapper = null;
-                    checkJspWelcomeFiles = true;
-                } else {
-                    // See Bugzilla 27704
-                    mappingData.wrapperPath.setChars(buf, path.getStart(),
-                                                     path.getLength());
-                    mappingData.pathInfo.recycle();
-                }
-            }
-        }
-
-        if(mappingData.wrapper == null && noServletPath) {
-            // The path is empty, redirect to "/"
-            mappingData.redirectPath.setChars
-                (path.getBuffer(), pathOffset, pathEnd);
-            path.setEnd(pathEnd - 1);
-            return;
-        }
-
-        // Rule 3 -- Extension Match
-        Wrapper[] extensionWrappers = context.extensionWrappers;
-        if (mappingData.wrapper == null && !checkJspWelcomeFiles) {
-            internalMapExtensionWrapper(extensionWrappers, path, mappingData);
-        }
-
-        // Rule 4 -- Welcome resources processing for servlets
-        if (mappingData.wrapper == null) {
-            boolean checkWelcomeFiles = checkJspWelcomeFiles;
-            if (!checkWelcomeFiles) {
-                char[] buf = path.getBuffer();
-                checkWelcomeFiles = (buf[pathEnd - 1] == '/');
-            }
-            if (checkWelcomeFiles) {
-                for (int i = 0; (i < context.welcomeResources.length)
-                         && (mappingData.wrapper == null); i++) {
-                    path.setOffset(pathOffset);
-                    path.setEnd(pathEnd);
-                    path.append(context.welcomeResources[i], 0,
-                                context.welcomeResources[i].length());
-                    path.setOffset(servletPath);
-
-                    // Rule 4a -- Welcome resources processing for exact macth
-                    internalMapExactWrapper(exactWrappers, path, mappingData);
-
-                    // Rule 4b -- Welcome resources processing for prefix match
-                    if (mappingData.wrapper == null) {
-                        internalMapWildcardWrapper
-                            (wildcardWrappers, context.nesting, 
-                             path, mappingData);
-                    }
-
-                    // Rule 4c -- Welcome resources processing
-                    //            for physical folder
-                    if (mappingData.wrapper == null
-                        && context.resources != null) {
-                        String pathStr = path.toString();
-                        
-                        mapWelcomResource(context, path, mappingData,
-                                extensionWrappers, pathStr);
-                        
-                    }
-                }
-
-                path.setOffset(servletPath);
-                path.setEnd(pathEnd);
-            }
-                                        
-        }
-
-
-        // Rule 7 -- Default servlet
-        if (mappingData.wrapper == null && !checkJspWelcomeFiles) {
-            if (context.defaultWrapper != null) {
-                mappingData.wrapper = context.defaultWrapper.object;
-                mappingData.requestPath.setChars
-                    (path.getBuffer(), path.getStart(), path.getLength());
-                mappingData.wrapperPath.setChars
-                    (path.getBuffer(), path.getStart(), path.getLength());
-            }
-            // Redirection to a folder
-            char[] buf = path.getBuffer();
-            if (context.resources != null && buf[pathEnd -1 ] != '/') {
-                String pathStr = path.toString();
-                mapDefaultServlet(context, path, mappingData, pathOffset,
-                        pathStr);
-            }
-        }
-
-        path.setOffset(pathOffset);
-        path.setEnd(pathEnd);
-
-    }
-
-
-    /**
-     * Exact mapping.
-     */
-    private final void internalMapExactWrapper
-        (Wrapper[] wrappers, CharChunk path, MappingData mappingData) {
-        int pos = find(wrappers, path);
-        if ((pos != -1) && (path.equals(wrappers[pos].name))) {
-            mappingData.requestPath.setString(wrappers[pos].name);
-            mappingData.wrapperPath.setString(wrappers[pos].name);
-            mappingData.wrapper = wrappers[pos].object;
-        }
-    }
-
-
-    /**
-     * Wildcard mapping.
-     */
-    private final void internalMapWildcardWrapper
-        (Wrapper[] wrappers, int nesting, CharChunk path, 
-         MappingData mappingData) {
-
-        int pathEnd = path.getEnd();
-
-        int lastSlash = -1;
-        int length = -1;
-        int pos = find(wrappers, path);
-        if (pos != -1) {
-            boolean found = false;
-            while (pos >= 0) {
-                if (path.startsWith(wrappers[pos].name)) {
-                    length = wrappers[pos].name.length();
-                    if (path.getLength() == length) {
-                        found = true;
-                        break;
-                    } else if (path.startsWithIgnoreCase("/", length)) {
-                        found = true;
-                        break;
-                    }
-                }
-                if (lastSlash == -1) {
-                    lastSlash = nthSlash(path, nesting + 1);
-                } else {
-                    lastSlash = lastSlash(path);
-                }
-                path.setEnd(lastSlash);
-                pos = find(wrappers, path);
-            }
-            path.setEnd(pathEnd);
-            if (found) {
-                mappingData.wrapperPath.setString(wrappers[pos].name);
-                if (path.getLength() > length) {
-                    mappingData.pathInfo.setChars
-                        (path.getBuffer(),
-                         path.getOffset() + length,
-                         path.getLength() - length);
-                }
-                mappingData.requestPath.setChars
-                    (path.getBuffer(), path.getOffset(), path.getLength());
-                mappingData.wrapper = wrappers[pos].object;
-                mappingData.jspWildCard = wrappers[pos].jspWildCard;
-            }
-        }
-    }
-
-
-    /**
-     * Extension mappings.
-     */
-    protected final void internalMapExtensionWrapper
-        (Wrapper[] wrappers, CharChunk path, MappingData mappingData) {
-        char[] buf = path.getBuffer();
-        int pathEnd = path.getEnd();
-        int servletPath = path.getOffset();
-        int slash = -1;
-        for (int i = pathEnd - 1; i >= servletPath; i--) {
-            if (buf[i] == '/') {
-                slash = i;
-                break;
-            }
-        }
-        if (slash >= 0) {
-            int period = -1;
-            for (int i = pathEnd - 1; i > slash; i--) {
-                if (buf[i] == '.') {
-                    period = i;
-                    break;
-                }
-            }
-            if (period >= 0) {
-                path.setOffset(period + 1);
-                path.setEnd(pathEnd);
-                int pos = find(wrappers, path);
-                if ((pos != -1)
-                    && (path.equals(wrappers[pos].name))) {
-                    mappingData.wrapperPath.setChars
-                        (buf, servletPath, pathEnd - servletPath);
-                    mappingData.requestPath.setChars
-                        (buf, servletPath, pathEnd - servletPath);
-                    mappingData.wrapper = wrappers[pos].object;
-                }
-                path.setOffset(servletPath);
-                path.setEnd(pathEnd);
-            }
-        }
-    }
-
-
-    /**
-     * Find a map elemnt given its name in a sorted array of map elements.
-     * This will return the index for the closest inferior or equal item in the
-     * given array.
-     */
-    private static final int find(MapElement[] map, CharChunk name) {
-        return find(map, name, name.getStart(), name.getEnd());
-    }
-
-
-    /**
-     * Find a map elemnt given its name in a sorted array of map elements.
-     * This will return the index for the closest inferior or equal item in the
-     * given array.
-     */
-    private static final int find(MapElement[] map, CharChunk name,
-                                  int start, int end) {
-
-        int a = 0;
-        int b = map.length - 1;
-
-        // Special cases: -1 and 0
-        if (b == -1) {
-            return -1;
-        }
-        
-        if (compare(name, start, end, map[0].name) < 0 ) {
-            return -1;
-        }         
-        if (b == 0) {
-            return 0;
-        }
-
-        int i = 0;
-        while (true) {
-            i = (b + a) / 2;
-            int result = compare(name, start, end, map[i].name);
-            if (result == 1) {
-                a = i;
-            } else if (result == 0) {
-                return i;
-            } else {
-                b = i;
-            }
-            if ((b - a) == 1) {
-                int result2 = compare(name, start, end, map[b].name);
-                if (result2 < 0) {
-                    return a;
-                } else {
-                    return b;
-                }
-            }
-        }
-
-    }
-
-    /**
-     * Find a map elemnt given its name in a sorted array of map elements.
-     * This will return the index for the closest inferior or equal item in the
-     * given array.
-     */
-    private static final int findIgnoreCase(MapElement[] map, CharChunk name) {
-        return findIgnoreCase(map, name, name.getStart(), name.getEnd());
-    }
-
-
-    /**
-     * Find a map elemnt given its name in a sorted array of map elements.
-     * This will return the index for the closest inferior or equal item in the
-     * given array.
-     */
-    private static final int findIgnoreCase(MapElement[] map, CharChunk name,
-                                  int start, int end) {
-
-        int a = 0;
-        int b = map.length - 1;
-
-        // Special cases: -1 and 0
-        if (b == -1) {
-            return -1;
-        }
-        if (compareIgnoreCase(name, start, end, map[0].name) < 0 ) {
-            return -1;
-        }         
-        if (b == 0) {
-            return 0;
-        }
-
-        int i = 0;
-        while (true) {
-            i = (b + a) / 2;
-            int result = compareIgnoreCase(name, start, end, map[i].name);
-            if (result == 1) {
-                a = i;
-            } else if (result == 0) {
-                return i;
-            } else {
-                b = i;
-            }
-            if ((b - a) == 1) {
-                int result2 = compareIgnoreCase(name, start, end, map[b].name);
-                if (result2 < 0) {
-                    return a;
-                } else {
-                    return b;
-                }
-            }
-        }
-
-    }
-
-
-    /**
-     * Find a map element given its name in a sorted array of map elements.
-     * This will return the index for the closest inferior or equal item in the
-     * given array.
-     */
-    private static final int find(MapElement[] map, String name) {
-
-        int a = 0;
-        int b = map.length - 1;
-
-        // Special cases: -1 and 0
-        if (b == -1) {
-            return -1;
-        }
-        
-        if (name.compareTo(map[0].name) < 0) {
-            return -1;
-        } 
-        if (b == 0) {
-            return 0;
-        }
-
-        int i = 0;
-        while (true) {
-            i = (b + a) / 2;
-            int result = name.compareTo(map[i].name);
-            if (result > 0) {
-                a = i;
-            } else if (result == 0) {
-                return i;
-            } else {
-                b = i;
-            }
-            if ((b - a) == 1) {
-                int result2 = name.compareTo(map[b].name);
-                if (result2 < 0) {
-                    return a;
-                } else {
-                    return b;
-                }
-            }
-        }
-
-    }
-
-
-    /**
-     * Compare given char chunk with String.
-     * Return -1, 0 or +1 if inferior, equal, or superior to the String.
-     */
-    private static final int compare(CharChunk name, int start, int end,
-                                     String compareTo) {
-        int result = 0;
-        char[] c = name.getBuffer();
-        int len = compareTo.length();
-        if ((end - start) < len) {
-            len = end - start;
-        }
-        for (int i = 0; (i < len) && (result == 0); i++) {
-            if (c[i + start] > compareTo.charAt(i)) {
-                result = 1;
-            } else if (c[i + start] < compareTo.charAt(i)) {
-                result = -1;
-            }
-        }
-        if (result == 0) {
-            if (compareTo.length() > (end - start)) {
-                result = -1;
-            } else if (compareTo.length() < (end - start)) {
-                result = 1;
-            }
-        }
-        return result;
-    }
-
-
-    /**
-     * Compare given char chunk with String ignoring case.
-     * Return -1, 0 or +1 if inferior, equal, or superior to the String.
-     */
-    private static final int compareIgnoreCase(CharChunk name, int start, int end,
-                                     String compareTo) {
-        int result = 0;
-        char[] c = name.getBuffer();
-        int len = compareTo.length();
-        if ((end - start) < len) {
-            len = end - start;
-        }
-        for (int i = 0; (i < len) && (result == 0); i++) {
-            if (Ascii.toLower(c[i + start]) > Ascii.toLower(compareTo.charAt(i))) {
-                result = 1;
-            } else if (Ascii.toLower(c[i + start]) < Ascii.toLower(compareTo.charAt(i))) {
-                result = -1;
-            }
-        }
-        if (result == 0) {
-            if (compareTo.length() > (end - start)) {
-                result = -1;
-            } else if (compareTo.length() < (end - start)) {
-                result = 1;
-            }
-        }
-        return result;
-    }
-
-
-    /**
-     * Find the position of the last slash in the given char chunk.
-     */
-    private static final int lastSlash(CharChunk name) {
-
-        char[] c = name.getBuffer();
-        int end = name.getEnd();
-        int start = name.getStart();
-        int pos = end;
-
-        while (pos > start) {
-            if (c[--pos] == '/') {
-                break;
-            }
-        }
-
-        return (pos);
-
-    }
-
-
-    /**
-     * Find the position of the nth slash, in the given char chunk.
-     */
-    private static final int nthSlash(CharChunk name, int n) {
-
-        char[] c = name.getBuffer();
-        int end = name.getEnd();
-        int start = name.getStart();
-        int pos = start;
-        int count = 0;
-
-        while (pos < end) {
-            if ((c[pos++] == '/') && ((++count) == n)) {
-                pos--;
-                break;
-            }
-        }
-
-        return (pos);
-
-    }
-
-
-    /**
-     * Return the slash count in a given string.
-     */
-    private static final int slashCount(String name) {
-        int pos = -1;
-        int count = 0;
-        while ((pos = name.indexOf('/', pos + 1)) != -1) {
-            count++;
-        }
-        return count;
-    }
-
-
-    /**
-     * Insert into the right place in a sorted MapElement array, and prevent
-     * duplicates.
-     */
-    private static final boolean insertMap
-        (MapElement[] oldMap, MapElement[] newMap, MapElement newElement) {
-        int pos = find(oldMap, newElement.name);
-        if ((pos != -1) && (newElement.name.equals(oldMap[pos].name))) {
-            return false;
-        }
-        System.arraycopy(oldMap, 0, newMap, 0, pos + 1);
-        newMap[pos + 1] = newElement;
-        System.arraycopy
-            (oldMap, pos + 1, newMap, pos + 2, oldMap.length - pos - 1);
-        return true;
-    }
-
-
-    /**
-     * Insert into the right place in a sorted MapElement array.
-     */
-    private static final boolean removeMap
-        (MapElement[] oldMap, MapElement[] newMap, String name) {
-        int pos = find(oldMap, name);
-        if ((pos != -1) && (name.equals(oldMap[pos].name))) {
-            System.arraycopy(oldMap, 0, newMap, 0, pos);
-            System.arraycopy(oldMap, pos + 1, newMap, pos,
-                             oldMap.length - pos - 1);
-            return true;
-        }
-        return false;
-    }
-
-
-    // ------------------------------------------------- MapElement Inner Class
-
-
-    protected static abstract class MapElement {
-
-        public String name = null;
-        public Object object = null;
-
-    }
-
-
-    // ------------------------------------------------------- Host Inner Class
-
-
-    protected static final class Host
-        extends MapElement {
-
-        public ContextList contextList = null;
-
-    }
-
-
-    // ------------------------------------------------ ContextList Inner Class
-
-
-    protected static final class ContextList {
-
-        public Context[] contexts = new Context[0];
-        public int nesting = 0;
-
-    }
-
-
-    // ---------------------------------------------------- Context Inner Class
-
-
-    protected static final class Context
-        extends MapElement {
-
-        public String path = null;
-        public String[] welcomeResources = new String[0];
-        public Object resources = null;
-        public Wrapper defaultWrapper = null;
-        public Wrapper[] exactWrappers = new Wrapper[0];
-        public Wrapper[] wildcardWrappers = new Wrapper[0];
-        public Wrapper[] extensionWrappers = new Wrapper[0];
-        public int nesting = 0;
-
-    }
-
-
-    // ---------------------------------------------------- Wrapper Inner Class
-
-
-    protected static class Wrapper
-        extends MapElement {
-
-        public String path = null;
-        public boolean jspWildCard = false;
-    }
-
-
-    // -------------------------------------------------------- Testing Methods
-
-    // FIXME: Externalize this
-    /*
-    public static void main(String args[]) {
-
-        try {
-
-        Mapper mapper = new Mapper();
-        System.out.println("Start");
-
-        mapper.addHost("sjbjdvwsbvhrb", new String[0], "blah1");
-        mapper.addHost("sjbjdvwsbvhr/", new String[0], "blah1");
-        mapper.addHost("wekhfewuifweuibf", new String[0], "blah2");
-        mapper.addHost("ylwrehirkuewh", new String[0], "blah3");
-        mapper.addHost("iohgeoihro", new String[0], "blah4");
-        mapper.addHost("fwehoihoihwfeo", new String[0], "blah5");
-        mapper.addHost("owefojiwefoi", new String[0], "blah6");
-        mapper.addHost("iowejoiejfoiew", new String[0], "blah7");
-        mapper.addHost("iowejoiejfoiew", new String[0], "blah17");
-        mapper.addHost("ohewoihfewoih", new String[0], "blah8");
-        mapper.addHost("fewohfoweoih", new String[0], "blah9");
-        mapper.addHost("ttthtiuhwoih", new String[0], "blah10");
-        mapper.addHost("lkwefjwojweffewoih", new String[0], "blah11");
-        mapper.addHost("zzzuyopjvewpovewjhfewoih", new String[0], "blah12");
-        mapper.addHost("xxxxgqwiwoih", new String[0], "blah13");
-        mapper.addHost("qwigqwiwoih", new String[0], "blah14");
-
-        System.out.println("Map:");
-        for (int i = 0; i < mapper.hosts.length; i++) {
-            System.out.println(mapper.hosts[i].name);
-        }
-
-        mapper.setDefaultHostName("ylwrehirkuewh");
-
-        String[] welcomes = new String[2];
-        welcomes[0] = "boo/baba";
-        welcomes[1] = "bobou";
-
-        mapper.addContext("iowejoiejfoiew", "", "context0", new String[0], null);
-        mapper.addContext("iowejoiejfoiew", "/foo", "context1", new String[0], null);
-        mapper.addContext("iowejoiejfoiew", "/foo/bar", "context2", welcomes, null);
-        mapper.addContext("iowejoiejfoiew", "/foo/bar/bla", "context3", new String[0], null);
-
-        mapper.addWrapper("iowejoiejfoiew", "/foo/bar", "/fo/*", "wrapper0");
-        mapper.addWrapper("iowejoiejfoiew", "/foo/bar", "/", "wrapper1");
-        mapper.addWrapper("iowejoiejfoiew", "/foo/bar", "/blh", "wrapper2");
-        mapper.addWrapper("iowejoiejfoiew", "/foo/bar", "*.jsp", "wrapper3");
-        mapper.addWrapper("iowejoiejfoiew", "/foo/bar", "/blah/bou/*", "wrapper4");
-        mapper.addWrapper("iowejoiejfoiew", "/foo/bar", "/blah/bobou/*", "wrapper5");
-        mapper.addWrapper("iowejoiejfoiew", "/foo/bar", "*.htm", "wrapper6");
-
-        MappingData mappingData = new MappingData();
-        MessageBytes host = MessageBytes.newInstance();
-        host.setString("iowejoiejfoiew");
-        MessageBytes uri = MessageBytes.newInstance();
-        uri.setString("/foo/bar/blah/bobou/foo");
-        uri.toChars();
-        uri.getCharChunk().setLimit(-1);
-
-        mapper.map(host, uri, mappingData);
-        System.out.println("MD Host:" + mappingData.host);
-        System.out.println("MD Context:" + mappingData.context);
-        System.out.println("MD Wrapper:" + mappingData.wrapper);
-
-        System.out.println("contextPath:" + mappingData.contextPath);
-        System.out.println("wrapperPath:" + mappingData.wrapperPath);
-        System.out.println("pathInfo:" + mappingData.pathInfo);
-        System.out.println("redirectPath:" + mappingData.redirectPath);
-
-        mappingData.recycle();
-        mapper.map(host, uri, mappingData);
-        System.out.println("MD Host:" + mappingData.host);
-        System.out.println("MD Context:" + mappingData.context);
-        System.out.println("MD Wrapper:" + mappingData.wrapper);
-
-        System.out.println("contextPath:" + mappingData.contextPath);
-        System.out.println("wrapperPath:" + mappingData.wrapperPath);
-        System.out.println("pathInfo:" + mappingData.pathInfo);
-        System.out.println("redirectPath:" + mappingData.redirectPath);
-
-        for (int i = 0; i < 1000000; i++) {
-            mappingData.recycle();
-            mapper.map(host, uri, mappingData);
-        }
-
-        long time = System.currentTimeMillis();
-        for (int i = 0; i < 1000000; i++) {
-            mappingData.recycle();
-            mapper.map(host, uri, mappingData);
-        }
-        System.out.println("Elapsed:" + (System.currentTimeMillis() - time));
-
-        System.out.println("MD Host:" + mappingData.host);
-        System.out.println("MD Context:" + mappingData.context);
-        System.out.println("MD Wrapper:" + mappingData.wrapper);
-
-        System.out.println("contextPath:" + mappingData.contextPath);
-        System.out.println("wrapperPath:" + mappingData.wrapperPath);
-        System.out.println("requestPath:" + mappingData.requestPath);
-        System.out.println("pathInfo:" + mappingData.pathInfo);
-        System.out.println("redirectPath:" + mappingData.redirectPath);
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-    }
-    */
-
-
-
-    /** 
-     * Filesystem-dependent method:
-     *  if pathStr corresponds to a directory, we'll need to redirect with / 
-     *  at end. 
-     */
-    protected void mapDefaultServlet(Context context, CharChunk path,
-                                     MappingData mappingData, int pathOffset,
-                                     String pathStr) throws IOException {
-        File file = new File((String) context.resources, pathStr);
-
-        if (file.isDirectory()) {
-            // Note: this mutates the path: do not do any processing 
-            // after this (since we set the redirectPath, there 
-            // shouldn't be any)
-            path.setOffset(pathOffset);
-            path.append('/');
-            mappingData.redirectPath.setChars
-                (path.getBuffer(), path.getStart(), path.getLength());
-        } else {
-            mappingData.requestPath.setString(pathStr);
-            mappingData.wrapperPath.setString(pathStr);
-        }
-    }
-
-
-    /**
-     * Filesystem dependent method: 
-     *  check if a resource exists in filesystem. 
-     */
-    protected void mapWelcomResource(Context context, CharChunk path,
-                               MappingData mappingData,
-                               Wrapper[] extensionWrappers, String pathStr) {
-        File file = new File((String) context.resources, pathStr);
-        if (file.exists() && !file.isDirectory()) {
-            internalMapExtensionWrapper(extensionWrappers,
-                                        path, mappingData);
-            if (mappingData.wrapper == null
-                && context.defaultWrapper != null) {
-                mappingData.wrapper =
-                    context.defaultWrapper.object;
-                mappingData.requestPath.setChars
-                    (path.getBuffer(), path.getStart(), 
-                     path.getLength());
-                mappingData.wrapperPath.setChars
-                    (path.getBuffer(), path.getStart(), 
-                     path.getLength());
-                mappingData.requestPath.setString(pathStr);
-                mappingData.wrapperPath.setString(pathStr);
-            }
-        }
-    }
-
-    
-}