Servlet DTD and JSP spec are both quite clear that a <taglib-location> is <quote...

relative to the root of the web application</quote>

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

diff --git a/java/org/apache/catalina/startup/TldConfig.java b/java/org/apache/catalina/startup/TldConfig.java
index e8b1bf6..1757b7c 100644 (file)
--- a/java/org/apache/catalina/startup/TldConfig.java
+++ b/java/org/apache/catalina/startup/TldConfig.java
@@ -507,11 +507,6 @@ public final class TldConfig  implements LifecycleListener {
         String taglibs[] = context.findTaglibs();
         for (int i = 0; i < taglibs.length; i++) {
             String resourcePath = context.findTaglib(taglibs[i]);
-            // FIXME - Servlet 2.4 DTD implies that the location MUST be
-            // a context-relative path starting with '/'?
-            if (!resourcePath.startsWith("/")) {
-                resourcePath = "/WEB-INF/" + resourcePath;
-            }
             if (log.isTraceEnabled()) {
                 log.trace("   Adding path '" + resourcePath +
                     "' for URI '" + taglibs[i] + "'");