luehe 2003/03/05 09:58:44
Modified: jasper2/src/share/org/apache/jasper/compiler
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
1.12 +6 -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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- TldLocationsCache.java 22 Jan 2003 20:08:24 -0000 1.11
+++ TldLocationsCache.java 5 Mar 2003 17:58:44 -0000 1.12
@@ -169,7 +169,7 @@
try {
processWebDotXml();
processJars();
- processTldsInFileSystem();
+ processTldsInFileSystem("/WEB-INF/");
initialized = true;
} catch (JasperException ex) {
log.error(Localizer.getMessage("jsp.error.internal.tldinit"), ex);
@@ -319,12 +319,15 @@
* 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]
