Author: markt
Date: Tue Nov 19 21:05:50 2013
New Revision: 1543577
URL: http://svn.apache.org/r1543577
Log:
Rename for consistency with the rest of the Tomcat code base
Modified:
tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldParser.java
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=1543577&r1=1543576&r2=1543577&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java Tue Nov
19 21:05:50 2013
@@ -42,7 +42,7 @@ public class JasperInitializer implement
*/
public static final String VALIDATE =
"org.apache.jasper.validateDescriptors";
private static final String MSG =
"org.apache.jasper.servlet.JasperInitializer";
- private static final Log LOG = LogFactory.getLog(JasperInitializer.class);
+ private static final Log log = LogFactory.getLog(JasperInitializer.class);
/**
* Preload classes required at runtime by a JSP servlet so that
@@ -77,8 +77,8 @@ public class JasperInitializer implement
@Override
public void onStartup(Set<Class<?>> types, ServletContext context) throws
ServletException {
- if (LOG.isDebugEnabled()) {
- LOG.debug(Localizer.getMessage(MSG + ".onStartup",
context.getServletContextName()));
+ if (log.isDebugEnabled()) {
+ log.debug(Localizer.getMessage(MSG + ".onStartup",
context.getServletContextName()));
}
boolean validate =
Boolean.parseBoolean(context.getInitParameter(VALIDATE));
Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java?rev=1543577&r1=1543576&r2=1543577&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tagplugin/TagPluginParser.java
Tue Nov 19 21:05:50 2013
@@ -37,7 +37,7 @@ import org.xml.sax.SAXException;
* Parser for Tag Plugin descriptors.
*/
public class TagPluginParser {
- private static final Log LOG = LogFactory.getLog(TagPluginParser.class);
+ private static final Log log = LogFactory.getLog(TagPluginParser.class);
private static final String PREFIX = "tag-plugins/tag-plugin";
private final Digester digester;
private final Map<String, String> plugins = new HashMap<>();
@@ -58,7 +58,7 @@ public class TagPluginParser {
source.setByteStream(is);
digester.parse(source);
if (!handler.getWarnings().isEmpty() ||
!handler.getErrors().isEmpty()) {
- handler.logFindings(LOG, source.getSystemId());
+ handler.logFindings(log, source.getSystemId());
if (!handler.getErrors().isEmpty()) {
// throw the first to indicate there was a error during
processing
throw handler.getErrors().iterator().next();
Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldParser.java?rev=1543577&r1=1543576&r2=1543577&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldParser.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldParser.java Tue
Nov 19 21:05:50 2013
@@ -32,7 +32,7 @@ import org.xml.sax.SAXException;
* Parses a Tag Library Descriptor.
*/
public class TldParser {
- private static final Log LOG = LogFactory.getLog(TldParser.class);
+ private static final Log log = LogFactory.getLog(TldParser.class);
private final Digester digester;
public TldParser(boolean namespaceAware, boolean validation) {
@@ -55,7 +55,7 @@ public class TldParser {
source.setByteStream(is);
digester.parse(source);
if (!handler.getWarnings().isEmpty() ||
!handler.getErrors().isEmpty()) {
- handler.logFindings(LOG, source.getSystemId());
+ handler.logFindings(log, source.getSystemId());
if (!handler.getErrors().isEmpty()) {
// throw the first to indicate there was a error during
processing
throw handler.getErrors().iterator().next();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
