- Update jar list in Jasper.

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

diff --git a/java/org/apache/catalina/startup/TldConfig.java b/java/org/apache/catalina/startup/TldConfig.java
index e39bdef..5affe35 100644 (file)
--- a/java/org/apache/catalina/startup/TldConfig.java
+++ b/java/org/apache/catalina/startup/TldConfig.java
@@ -63,20 +63,16 @@ import org.xml.sax.InputSource;
 public final class TldConfig  {
 
     // Names of JARs that are known not to contain any TLDs
-    private static HashSet noTldJars;
+    private static HashSet<String> noTldJars;
 
     private static org.apache.juli.logging.Log log=
         org.apache.juli.logging.LogFactory.getLog( TldConfig.class );
 
-    private static final String FILE_URL_PREFIX = "file:";
-    private static final int FILE_URL_PREFIX_LEN = FILE_URL_PREFIX.length();
-
-
     /*
      * Initializes the set of JARs that are known not to contain any TLDs
      */
     static {
-        noTldJars = new HashSet();
+        noTldJars = new HashSet<String>();
         // Bootstrap JARs
         noTldJars.add("bootstrap.jar");
         noTldJars.add("commons-daemon.jar");
@@ -158,7 +154,7 @@ public final class TldConfig  {
 
     private boolean rescan=true;
 
-    private ArrayList listeners=new ArrayList();
+    private ArrayList<String> listeners = new ArrayList<String>();
 
     // --------------------------------------------------------- Public Methods
 

diff --git a/java/org/apache/jasper/compiler/TldLocationsCache.java b/java/org/apache/jasper/compiler/TldLocationsCache.java
index b75a892..dd80cdc 100644 (file)
--- a/java/org/apache/jasper/compiler/TldLocationsCache.java
+++ b/java/org/apache/jasper/compiler/TldLocationsCache.java
@@ -93,7 +93,7 @@ public class TldLocationsCache {
     private static final String JAR_FILE_SUFFIX = ".jar";
 
     // Names of JARs that are known not to contain any TLDs
-    private static HashSet noTldJars;
+    private static HashSet<String> noTldJars;
 
     /**
      * The mapping of the 'global' tag library URI to the location (resource
@@ -115,48 +115,41 @@ public class TldLocationsCache {
      * Initializes the set of JARs that are known not to contain any TLDs
      */
     static {
-        noTldJars = new HashSet();
-        noTldJars.add("ant.jar");
+        noTldJars = new HashSet<String>();
+        // 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("catalina-i18n-fr.jar");
-        noTldJars.add("catalina-i18n-ja.jar");
-        noTldJars.add("catalina-i18n-es.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("servlet-api.jar");
+        noTldJars.add("tomcat-coyote.jar");
+        noTldJars.add("tomcat-dbcp.jar");
+        // i18n JARs
+        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");
-        noTldJars.add("commons-modeler.jar");
-        noTldJars.add("commons-logging-api.jar");
         noTldJars.add("commons-beanutils.jar");
         noTldJars.add("commons-fileupload-1.0.jar");
         noTldJars.add("commons-pool.jar");
         noTldJars.add("commons-digester.jar");
         noTldJars.add("commons-logging.jar");
         noTldJars.add("commons-collections.jar");
-        noTldJars.add("commons-el.jar");
-        noTldJars.add("jakarta-regexp-1.2.jar");
-        noTldJars.add("jasper-compiler.jar");
-        noTldJars.add("jasper-runtime.jar");
         noTldJars.add("jmx.jar");
         noTldJars.add("jmx-tools.jar");
-        noTldJars.add("jsp-api.jar");
-        noTldJars.add("jkshm.jar");
-        noTldJars.add("jkconfig.jar");
-        noTldJars.add("naming-common.jar");
-        noTldJars.add("naming-resources.jar");
-        noTldJars.add("naming-factory.jar");
-        noTldJars.add("naming-java.jar");
-        noTldJars.add("servlet-api.jar");
-        noTldJars.add("servlets-default.jar");
-        noTldJars.add("servlets-invoker.jar");
-        noTldJars.add("servlets-common.jar");
-        noTldJars.add("servlets-webdav.jar");
-        noTldJars.add("tomcat-util.jar");
-        noTldJars.add("tomcat-http11.jar");
-        noTldJars.add("tomcat-jni.jar");
-        noTldJars.add("tomcat-jk.jar");
-        noTldJars.add("tomcat-jk2.jar");
-        noTldJars.add("tomcat-coyote.jar");
         noTldJars.add("xercesImpl.jar");
         noTldJars.add("xmlParserAPIs.jar");
         noTldJars.add("xml-apis.jar");
@@ -165,6 +158,8 @@ public class TldLocationsCache {
         noTldJars.add("ldapsec.jar");
         noTldJars.add("localedata.jar");
         noTldJars.add("dnsns.jar");
+        noTldJars.add("tools.jar");
+        noTldJars.add("sunpkcs11.jar");
     }
     
     public TldLocationsCache(ServletContext ctxt) {