Author: markt
Date: Fri Jun 14 07:40:09 2013
New Revision: 1492976
URL: http://svn.apache.org/r1492976
Log:
Add a comment on TLD JARs since no distinction is made between
TLDs provided by an application and by the container.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java
tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java?rev=1492976&r1=1492975&r2=1492976&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java Fri Jun 14
07:40:09 2013
@@ -289,11 +289,15 @@ public final class TldConfig implements
@Override
public void scan(JarURLConnection urlConn, boolean isWebapp)
throws IOException {
+ // Note: TLDs are processed the same way for application and
+ // container provided JARs.
tldScanJar(urlConn);
}
@Override
public void scan(File file, boolean isWebapp) {
+ // Note: TLDs are processed the same way for application and
+ // container provided JARs.
File metaInf = new File(file, "META-INF");
if (metaInf.isDirectory()) {
tldScanDir(metaInf);
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=1492976&r1=1492975&r2=1492976&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java Fri Jun
14 07:40:09 2013
@@ -257,11 +257,15 @@ public class TldLocationsCache {
@Override
public void scan(JarURLConnection urlConn, boolean isWebapp)
throws IOException {
+ // Note: TLDs are processed the same way for application and
+ // container provided JARs.
tldScanJar(urlConn);
}
@Override
public void scan(File file, boolean isWebapp) throws IOException {
+ // Note: TLDs are processed the same way for application and
+ // container provided JARs.
File metaInf = new File(file, "META-INF");
if (metaInf.isDirectory()) {
tldScanDir(metaInf);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
