luehe 2003/03/05 10:05:19
Modified: jasper2/src/share/org/apache/jasper/compiler Tag:
tomcat_4_branch TldLocationsCache.java
Log:
Applied patch provided by Ryan Lubke to also consider any of the
subdirectories of /WEB-INF (and not just the /WEB-INF directory
itself) when looking for TLDs
Revision Changes Path
No revision
No revision
1.4.2.2 +8 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TldLocationsCache.java
Index: TldLocationsCache.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TldLocationsCache.java,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- TldLocationsCache.java 16 Dec 2002 21:23:25 -0000 1.4.2.1
+++ TldLocationsCache.java 5 Mar 2003 18:05:19 -0000 1.4.2.2
@@ -156,7 +156,7 @@
try {
processWebDotXml();
processJars();
- processTldsInFileSystem();
+ processTldsInFileSystem("/WEB-INF/");
initialized = true;
} catch (JasperException ex) {
Constants.message("jsp.error.internal.tldinit",
@@ -279,12 +279,17 @@
* an implicit map entry to the taglib map for any TLD that has a <uri>
* element.
*/
- private void processTldsInFileSystem() throws JasperException {
- Set dirList = ctxt.getResourcePaths("/WEB-INF/");
+ private void processTldsInFileSystem(String startPath)
+ throws JasperException {
+
+ Set dirList = ctxt.getResourcePaths(startPath);
if (dirList != null) {
Iterator it = dirList.iterator();
while (it.hasNext()) {
String path = (String) it.next();
+ if (path.endsWith("/")) {
+ processTldsInFileSystem(path);
+ }
if (!path.endsWith(".tld")) {
continue;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
