Author: remm
Date: Sun Dec 3 17:48:14 2006
New Revision: 482011
URL: http://svn.apache.org/viewvc?view=rev&rev=482011
Log:
- Update jar list in Jasper.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/TldConfig.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.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=482011&r1=482010&r2=482011
==============================================================================
--- 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 Sun
Dec 3 17:48:14 2006
@@ -63,20 +63,16 @@
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 @@
private boolean rescan=true;
- private ArrayList listeners=new ArrayList();
+ private ArrayList<String> listeners = new ArrayList<String>();
// --------------------------------------------------------- Public Methods
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java?view=diff&rev=482011&r1=482010&r2=482011
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
Sun Dec 3 17:48:14 2006
@@ -93,7 +93,7 @@
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 @@
* 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 @@
noTldJars.add("ldapsec.jar");
noTldJars.add("localedata.jar");
noTldJars.add("dnsns.jar");
+ noTldJars.add("tools.jar");
+ noTldJars.add("sunpkcs11.jar");
}
public TldLocationsCache(ServletContext ctxt) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
