Author: markt
Date: Tue Apr 19 10:41:29 2011
New Revision: 1095012
URL: http://svn.apache.org/viewvc?rev=1095012&view=rev
Log:
Log JARs scanned for TLDs where no TLD is found.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java?rev=1095012&r1=1095011&r2=1095012&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java Tue Apr
19 10:41:29 2011
@@ -37,6 +37,8 @@ import org.apache.jasper.JasperException
import org.apache.jasper.util.ExceptionUtils;
import org.apache.jasper.xmlparser.ParserUtils;
import org.apache.jasper.xmlparser.TreeNode;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.JarScanner;
import org.apache.tomcat.JarScannerCallback;
@@ -75,6 +77,8 @@ import org.apache.tomcat.JarScannerCallb
public class TldLocationsCache {
+ private final Log log = LogFactory.getLog(TldLocationsCache.class);
+
/**
* The types of URI one may specify for a tag library
*/
@@ -376,6 +380,7 @@ public class TldLocationsCache {
JarFile jarFile = null;
String resourcePath = conn.getJarFileURL().toString();
+ boolean foundTld = false;
try {
conn.setUseCaches(false);
jarFile = conn.getJarFile();
@@ -385,6 +390,7 @@ public class TldLocationsCache {
String name = entry.getName();
if (!name.startsWith("META-INF/")) continue;
if (!name.endsWith(".tld")) continue;
+ foundTld = true;
InputStream stream = jarFile.getInputStream(entry);
tldScanStream(resourcePath, name, stream);
}
@@ -397,6 +403,10 @@ public class TldLocationsCache {
}
}
}
+ if (!foundTld) {
+ log.info(Localizer.getMessage("jsp.tldCache.noTldInJar",
+ resourcePath));
+ }
}
/*
Modified: tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1095012&r1=1095011&r2=1095012&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties Tue
Apr 19 10:41:29 2011
@@ -487,3 +487,5 @@ jsp.message.jsp_removed_idle=Removing id
jsp.message.jsp_unload_check=Checking JSPs for unload in context [{0}], JSP
count: {1} queue length: {2}
xmlParser.skipBomFail=Failed to skip BOM when parsing XML input stream
+
+jsp.tldCache.noTldInJar=No TLD files were found in [{0}]. Consider adding the
JAR to to the tomcat.util.scan.DefaultJarScanner.jarsToSkip in
CATALINA_BASE/catalina.properties
\ No newline at end of file
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1095012&r1=1095011&r2=1095012&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Apr 19 10:41:29 2011
@@ -111,6 +111,11 @@
Correct a regression in the fix for <bug>49916</bug> that resulted in
JSPs being compiled twice rather than just once. (markt)
</fix>
+ <add>
+ Log JARs that are scanned for TLDs where no TLD is found so that users
+ can easily identify JARs that can be added to the list of JARs to skip.
+ (markt)
+ </add>
</changelog>
</subsection>
<subsection name="Web applications">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
