Add new jar to TLD exclusion list

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

diff --git a/java/org/apache/catalina/startup/TldConfig.java b/java/org/apache/catalina/startup/TldConfig.java
index 1757b7c..1cf7b06 100644 (file)
--- a/java/org/apache/catalina/startup/TldConfig.java
+++ b/java/org/apache/catalina/startup/TldConfig.java
@@ -103,6 +103,7 @@ public final class TldConfig  implements LifecycleListener {
         noTldJars.add("jasper-jdt.jar");
         noTldJars.add("jsp-api.jar");
         noTldJars.add("servlet-api.jar");
+        noTldJars.add("tomcat-api.jar");
         noTldJars.add("tomcat-coyote.jar");
         noTldJars.add("tomcat-dbcp.jar");
         // i18n JARs

diff --git a/java/org/apache/jasper/compiler/TldLocationsCache.java b/java/org/apache/jasper/compiler/TldLocationsCache.java
index b86d231..6474293 100644 (file)
--- a/java/org/apache/jasper/compiler/TldLocationsCache.java
+++ b/java/org/apache/jasper/compiler/TldLocationsCache.java
@@ -131,6 +131,7 @@ public class TldLocationsCache {
         noTldJars.add("jasper-jdt.jar");
         noTldJars.add("jsp-api.jar");
         noTldJars.add("servlet-api.jar");
+        noTldJars.add("tomcat-api.jar");
         noTldJars.add("tomcat-coyote.jar");
         noTldJars.add("tomcat-dbcp.jar");
         // i18n JARs