Author: markt
Date: Tue Nov 12 09:55:31 2013
New Revision: 1540988
URL: http://svn.apache.org/r1540988
Log:
Rename
Modified:
tomcat/trunk/java/org/apache/jasper/JspC.java
tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java
tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java
tomcat/trunk/test/org/apache/jasper/servlet/TestTldScanner.java
Modified: tomcat/trunk/java/org/apache/jasper/JspC.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?rev=1540988&r1=1540987&r2=1540988&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspC.java Tue Nov 12 09:55:31 2013
@@ -1432,7 +1432,7 @@ public class JspC extends Task implement
} catch (SAXException e) {
throw new JasperException(e);
}
- tldLocationsCache = new TldLocationsCache(scanner.getTaglibMap());
+ tldLocationsCache = new
TldLocationsCache(scanner.getUriTldResourcePathMap());
context.setAttribute(TldLocationsCache.KEY, tldLocationsCache);
rctxt = new JspRuntimeContext(context, this);
jspConfig = new JspConfig(context);
Modified: tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java?rev=1540988&r1=1540987&r2=1540988&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java Tue Nov
12 09:55:31 2013
@@ -64,7 +64,7 @@ public class JasperInitializer implement
context.addListener(listener);
}
- Map<String, TldResourcePath> taglibMap = scanner.getTaglibMap();
+ Map<String, TldResourcePath> taglibMap =
scanner.getUriTldResourcePathMap();
try {
context.setAttribute(TldLocationsCache.KEY, new
TldLocationsCache(taglibMap));
} catch (IOException ioe) {
Modified: tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java?rev=1540988&r1=1540987&r2=1540988&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java (original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java Tue Nov 12
09:55:31 2013
@@ -60,8 +60,8 @@ public class TldScanner {
private static final String WEB_INF = "/WEB-INF/";
private final ServletContext context;
private final TldParser tldParser;
- private final Map<String, TldResourcePath> taglibMap = new HashMap<>();
- private final Map<TldResourcePath, TaglibXml> tldCache = new HashMap<>();
+ private final Map<String, TldResourcePath> uriTldResourcePathMap = new
HashMap<>();
+ private final Map<TldResourcePath, TaglibXml> tldResourcePathTaglibXmlMap
= new HashMap<>();
private final List<String> listeners = new ArrayList<>();
/**
@@ -97,12 +97,22 @@ public class TldScanner {
}
/**
- * Returns the taglib map built by this scanner.
+ * Returns the map of URI to TldResourcePath built by this scanner.
*
- * @return the taglib map
+ * @return the map of URI to TldResourcePath
*/
- public Map<String, TldResourcePath> getTaglibMap() {
- return taglibMap;
+ public Map<String, TldResourcePath> getUriTldResourcePathMap() {
+ return uriTldResourcePathMap;
+ }
+
+ /**
+ * Returns the map of TldResourcePath to parsed XML files built by this
+ * scanner.
+ *
+ * @return the map of TldResourcePath to parsed XML files
+ */
+ public Map<TldResourcePath,TaglibXml> getTldResourcePathTaglibXmlMap() {
+ return tldResourcePathTaglibXmlMap;
}
/**
@@ -148,7 +158,7 @@ public class TldScanner {
if (!resourcePath.startsWith("/")) {
resourcePath = WEB_INF + resourcePath;
}
- if (taglibMap.containsKey(taglibURI)) {
+ if (uriTldResourcePathMap.containsKey(taglibURI)) {
log.warn(Localizer.getMessage(MSG + ".webxmlSkip",
resourcePath,
taglibURI));
@@ -172,8 +182,8 @@ public class TldScanner {
}
// parse TLD but store using the URI supplied in the descriptor
TaglibXml tld = tldParser.parse(tldResourcePath);
- taglibMap.put(taglibURI, tldResourcePath);
- tldCache.put(tldResourcePath, tld);
+ uriTldResourcePathMap.put(taglibURI, tldResourcePath);
+ tldResourcePathTaglibXmlMap.put(tldResourcePath, tld);
if (tld.getListeners() != null) {
listeners.addAll(tld.getListeners());
}
@@ -230,18 +240,18 @@ public class TldScanner {
}
private void parseTld(TldResourcePath path) throws IOException,
SAXException {
- if (tldCache.containsKey(path)) {
+ if (tldResourcePathTaglibXmlMap.containsKey(path)) {
// TLD has already been parsed as a result of processing web.xml
return;
}
TaglibXml tld = tldParser.parse(path);
String uri = tld.getUri();
if (uri != null) {
- if (!taglibMap.containsKey(uri)) {
- taglibMap.put(uri, path);
+ if (!uriTldResourcePathMap.containsKey(uri)) {
+ uriTldResourcePathMap.put(uri, path);
}
}
- tldCache.put(path, tld);
+ tldResourcePathTaglibXmlMap.put(path, tld);
if (tld.getListeners() != null) {
listeners.addAll(tld.getListeners());
}
Modified: tomcat/trunk/test/org/apache/jasper/servlet/TestTldScanner.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/servlet/TestTldScanner.java?rev=1540988&r1=1540987&r2=1540988&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/servlet/TestTldScanner.java (original)
+++ tomcat/trunk/test/org/apache/jasper/servlet/TestTldScanner.java Tue Nov 12
09:55:31 2013
@@ -36,7 +36,7 @@ public class TestTldScanner extends Tomc
TldScanner scanner = new TldScanner(context.getServletContext(), true,
true);
scanner.scan();
- Assert.assertEquals(5, scanner.getTaglibMap().size());
+ Assert.assertEquals(5, scanner.getUriTldResourcePathMap().size());
Assert.assertEquals(1, scanner.getListeners().size());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
