Author: remy.maucherat(a)jboss.com Date: 2009-06-03 10:05:53 -0400 (Wed, 03 Jun 2009) New Revision: 1077 Modified: trunk/java/org/apache/catalina/deploy/jsp/TagLibraryInfo.java trunk/java/org/apache/catalina/startup/ContextConfig.java Log: - Taglibs may declare tag files, which are more or less JSPs. Jasper must thus know the Jar in which the TLD was located. Modified: trunk/java/org/apache/catalina/deploy/jsp/TagLibraryInfo.java =================================================================== --- trunk/java/org/apache/catalina/deploy/jsp/TagLibraryInfo.java 2009-06-03 12:36:00 UTC (rev 1076) +++ trunk/java/org/apache/catalina/deploy/jsp/TagLibraryInfo.java 2009-06-03 14:05:53 UTC (rev 1077) @@ -84,6 +84,8 @@ */ protected String info; // optional + protected String location; + public String getPrefix() { return prefix; } @@ -180,4 +182,12 @@ this.validator = validator; } + public String getLocation() { + return location; + } + + public void setLocation(String location) { + this.location = location; + } + } Modified: trunk/java/org/apache/catalina/startup/ContextConfig.java =================================================================== --- trunk/java/org/apache/catalina/startup/ContextConfig.java 2009-06-03 12:36:00 UTC (rev 1076) +++ trunk/java/org/apache/catalina/startup/ContextConfig.java 2009-06-03 14:05:53 UTC (rev 1077) @@ -629,6 +629,7 @@ } finally { tldDigester.reset(); } + tagLibraryInfo.setLocation(""); context.addJspTagLibrary(tagLibraryInfo); } } @@ -662,8 +663,9 @@ while (jarTLDsIterator.hasNext()) { stream = jarFile.getInputStream(jarFile.getEntry(jarTLDsIterator.next())); synchronized (tldDigester) { + TagLibraryInfo tagLibraryInfo = new TagLibraryInfo(); try { - tldDigester.push(context); + tldDigester.push(tagLibraryInfo); tldDigester.parse(new InputSource(stream)); } finally { tldDigester.reset(); @@ -675,6 +677,8 @@ } } } + tagLibraryInfo.setLocation(jarPath); + context.addJspTagLibrary(tagLibraryInfo); } } } catch (Exception e) {