Author: remm
Date: Tue Nov 28 18:39:45 2006
New Revision: 480346
URL: http://svn.apache.org/viewvc?view=rev&rev=480346
Log:
- Update JAR list for no-tld-scan.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java?view=diff&rev=480346&r1=480345&r2=480346
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java Tue
Nov 28 18:39:45 2006
@@ -77,35 +77,29 @@
*/
static {
noTldJars = new HashSet();
+ // Bootstrap JARs
+ noTldJars.add("bootstrap.jar");
+ noTldJars.add("commons-daemon.jar");
+ noTldJars.add("tomcat-juli.jar");
+ // Main JARs
+ noTldJars.add("annotations-api.jar");
noTldJars.add("catalina.jar");
noTldJars.add("catalina-ant.jar");
- noTldJars.add("catalina-cluster.jar");
- noTldJars.add("catalina-optional.jar");
- noTldJars.add("commons-el.jar");
- noTldJars.add("commons-logging-api.jar");
- noTldJars.add("commons-modeler.jar");
- noTldJars.add("jasper-compiler.jar");
- noTldJars.add("jasper-compiler-jdt.jar");
- noTldJars.add("jasper-runtime.jar");
+ noTldJars.add("catalina-ha.jar");
+ noTldJars.add("catalina-tribes.jar");
+ noTldJars.add("el-api.jar");
+ noTldJars.add("jasper.jar");
+ noTldJars.add("jasper-el.jar");
+ noTldJars.add("jasper-jdt.jar");
noTldJars.add("jsp-api.jar");
- noTldJars.add("naming-resources.jar");
- noTldJars.add("naming-factory.jar");
- noTldJars.add("naming-factory-dbcp.jar");
noTldJars.add("servlet-api.jar");
- noTldJars.add("servlets-cgi.jar");
- noTldJars.add("servlets-default.jar");
- noTldJars.add("servlets-invoker.jar");
- noTldJars.add("servlets-ssi.jar");
- noTldJars.add("servlets-webdav.jar");
- noTldJars.add("tomcat-ajp.jar");
noTldJars.add("tomcat-coyote.jar");
- noTldJars.add("tomcat-http.jar");
- noTldJars.add("tomcat-util.jar");
+ noTldJars.add("tomcat-dbcp.jar");
// i18n JARs
- noTldJars.add("catalina-i18n-en.jar");
- noTldJars.add("catalina-i18n-es.jar");
- noTldJars.add("catalina-i18n-fr.jar");
- noTldJars.add("catalina-i18n-ja.jar");
+ noTldJars.add("tomcat-i18n-en.jar");
+ noTldJars.add("tomcat-i18n-es.jar");
+ noTldJars.add("tomcat-i18n-fr.jar");
+ noTldJars.add("tomcat-i18n-ja.jar");
// Misc JARs not included with Tomcat
noTldJars.add("ant.jar");
noTldJars.add("commons-dbcp.jar");
@@ -125,6 +119,8 @@
noTldJars.add("ldapsec.jar");
noTldJars.add("localedata.jar");
noTldJars.add("dnsns.jar");
+ noTldJars.add("tools.jar");
+ noTldJars.add("sunpkcs11.jar");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
