luehe 2003/09/26 12:31:16
Modified: catalina/src/share/org/apache/catalina/startup
TldConfig.java CatalinaProperties.java
catalina.properties
Log:
Reverted patch for JAR exclusion list
Revision Changes Path
1.30 +6 -39
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/TldConfig.java
Index: TldConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/TldConfig.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- TldConfig.java 25 Sep 2003 19:27:59 -0000 1.29
+++ TldConfig.java 26 Sep 2003 19:31:16 -0000 1.30
@@ -108,31 +108,12 @@
*/
public final class TldConfig {
- // Names of JARs that are known not to contain any TLDs
- private static HashSet noTldJars;
-
private static org.apache.commons.logging.Log log=
org.apache.commons.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 {
- String value = CatalinaProperties.getProperty("noTldJars");
- if (value != null) {
- noTldJars = new HashSet();
- StringTokenizer tokenizer = new StringTokenizer(value, ",");
- while (tokenizer.hasMoreElements()) {
- noTldJars.add(tokenizer.nextToken());
- }
- }
- }
-
-
// ----------------------------------------------------- Instance Variables
/**
@@ -752,19 +733,13 @@
* location that all web applications have access to (e.g.,
* <CATALINA_HOME>/common/lib).
*
- * The set of shared JARs to be scanned for TLDs is narrowed down by
- * the list of JARs specified as the value of the <tt>noTldJars</tt>
- * property in catalina.properties, which are known not to contain any
- * TLDs.
- *
* @return Map of JAR file paths
*/
private Map getJarPaths() {
HashMap jarPathMap = null;
- ClassLoader webappLoader = Thread.currentThread().getContextClassLoader();
- ClassLoader loader = webappLoader;
+ ClassLoader loader = Thread.currentThread().getContextClassLoader();
while (loader != null) {
if (loader instanceof URLClassLoader) {
URL[] urls = ((URLClassLoader) loader).getURLs();
@@ -786,19 +761,11 @@
if (!path.endsWith(".jar")) {
continue;
}
- /*
- * Scan all JARs from WEB-INF/lib, plus any shared JARs
- * that are not known not to contain any TLDs
- */
- if (loader == webappLoader
- || noTldJars == null
- || !noTldJars.contains(file.getName())) {
- if (jarPathMap == null) {
- jarPathMap = new HashMap();
- jarPathMap.put(path, file);
- } else if (!jarPathMap.containsKey(path)) {
- jarPathMap.put(path, file);
- }
+ if (jarPathMap == null) {
+ jarPathMap = new HashMap();
+ jarPathMap.put(path, file);
+ } else if (!jarPathMap.containsKey(path)) {
+ jarPathMap.put(path, file);
}
}
}
1.3 +4 -17
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/CatalinaProperties.java
Index: CatalinaProperties.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/CatalinaProperties.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CatalinaProperties.java 24 Sep 2003 19:09:29 -0000 1.2
+++ CatalinaProperties.java 26 Sep 2003 19:31:16 -0000 1.3
@@ -117,19 +117,6 @@
}
- /**
- * Sets the property with the specified key to the specified value.
- *
- * @param key the property key
- * @param value the property value
- * @return the previous value of the specified key in the property
- * list, or <code>null</code> if it did not have one.
- */
- public static Object setProperty(String key, String value) {
- return properties.setProperty(key, value);
- }
-
-
// --------------------------------------------------------- Public Methods
1.4 +0 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/catalina.properties
Index: catalina.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/catalina.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- catalina.properties 23 Sep 2003 19:47:52 -0000 1.3
+++ catalina.properties 26 Sep 2003 19:31:16 -0000 1.4
@@ -53,8 +53,3 @@
# repositories
# "foo/bar.jar": Add bar.jar as a class repository
shared.loader=${catalina.home}/shared/classes,${catalina.home}/shared/lib/*.jar
-
-#
-# List of comma-separated names of JAR files that are known not to contain
-# any TLDs
-noTldJars=ant.jar,catalina.jar,catalina-ant.jar,catalina-cluster.jar,catalina-optional.jar,catalina-i18n-fr.jar,catalina-i18n-ja.jar,catalina-i18n-es.jar,commons-dbcp.jar,commons-modeler.jar,commons-logging-api.jar,commons-beanutils.jar,commons-fileupload-1.0.jar,commons-pool.jar,commons-digester.jar,commons-logging.jar,commons-collections.jar,commons-el.jar,jakarta-regexp-1.2.jar,jasper-compiler.jar,jasper-runtime.jar,jmx.jar,jmx-tools.jar,jsp-api.jar,jkshm.jar,jkconfig.jar,naming-common.jar,naming-resources.jar,naming-factory.jar,naming-java.jar,servlet-api.jar,servlets-default.jar,servlets-invoker.jar,servlets-common.jar,servlets-webdav.jar,tomcat-util.jar,tomcat-http11.jar,tomcat-jni.jar,tomcat-jk.jar,tomcat-jk2.jar,tomcat-coyote.jar,xercesImpl.jar,xmlParserAPIs.jar,sunjce_provider.jar,ldapsec.jar,localedata.jar,dnsns.jar
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
