[jbossweb-commits] JBossWeb SVN: r339 - in branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache: catalina/session and 6 other directories.

Author: remy.maucherat(a)jboss.com Date: 2007-11-06 12:58:14 -0500 (Tue, 06 Nov 2007) New Revision: 339 Modified: branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/core/ContainerBase.java branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/core/NamingContextListener.java branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/core/StandardContext.java branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/session/ManagerBase.java branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/EmbeddedServletOptions.java branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/JspCompilationContext.java branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/compiler/Compiler.java branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/compiler/JspConfig.java branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/compiler/JspReader.java branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/compiler/JspRuntimeContext.java branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/compiler/SmapUtil.java branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/compiler/TagLibraryInfoImpl.java branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/compiler/TldLocationsCache.java branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/runtime/JspFactoryImpl.java branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/servlet/JspServlet.java branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/xmlparser/ParserUtils.java branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/xmlparser/UCSReader.java branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/xmlparser/UTF8Reader.java branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/tomcat/util/digester/Digester.java Log: - Apply Scott's hack to avoid commons-logging clashes (ASPATCH-234). Modified: branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/core/ContainerBase.java =================================================================== --- branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/core/ContainerBase.java 2007-11-05 17:59:04 UTC (rev 338) +++ branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/core/ContainerBase.java 2007-11-06 17:58:14 UTC (rev 339) @@ -183,12 +183,6 @@ /** - * The Logger implementation with which this Container is associated. - */ - protected Log logger = null; - - - /** * Associated logger name. */ protected String logName = null; @@ -377,10 +371,7 @@ */ public Log getLogger() { - if (logger != null) - return (logger); - logger = LogFactory.getLog(logName()); - return (logger); + return (log); } @@ -995,10 +986,6 @@ // Start our subordinate components, if any if ((loader != null) && (loader instanceof Lifecycle)) ((Lifecycle) loader).start(); - logger = null; - getLogger(); - if ((logger != null) && (logger instanceof Lifecycle)) - ((Lifecycle) logger).start(); if ((manager != null) && (manager instanceof Lifecycle)) ((Lifecycle) manager).start(); if ((cluster != null) && (cluster instanceof Lifecycle)) @@ -1086,9 +1073,6 @@ if ((manager != null) && (manager instanceof Lifecycle)) { ((Lifecycle) manager).stop(); } - if ((logger != null) && (logger instanceof Lifecycle)) { - ((Lifecycle) logger).stop(); - } if ((loader != null) && (loader instanceof Lifecycle)) { ((Lifecycle) loader).stop(); } Modified: branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/core/NamingContextListener.java =================================================================== --- branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/core/NamingContextListener.java 2007-11-05 17:59:04 UTC (rev 338) +++ branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/core/NamingContextListener.java 2007-11-06 17:58:14 UTC (rev 339) @@ -89,9 +89,6 @@ // ----------------------------------------------------- Instance Variables - protected Log logger = log; - - /** * Name of the associated naming context. */ @@ -206,7 +203,6 @@ if (container instanceof Context) { namingResources = ((Context) container).getNamingResources(); - logger = log; } else if (container instanceof Server) { namingResources = ((Server) container).getGlobalNamingResources(); } else { @@ -236,7 +232,7 @@ try { createNamingContext(); } catch (NamingException e) { - logger.error + log.error (sm.getString("naming.namingContextCreationFailed", e)); } @@ -249,7 +245,7 @@ (container, container, ((Container) container).getLoader().getClassLoader()); } catch (NamingException e) { - logger.error(sm.getString("naming.bindFailed", e)); + log.error(sm.getString("naming.bindFailed", e)); } } @@ -262,7 +258,7 @@ (container, container, this.getClass().getClassLoader()); } catch (NamingException e) { - logger.error(sm.getString("naming.bindFailed", e)); + log.error(sm.getString("naming.bindFailed", e)); } if (container instanceof StandardServer) { ((StandardServer) container).setGlobalNamingContext @@ -677,7 +673,7 @@ // Ignore because UserTransaction was obviously // added via ResourceLink } catch (NamingException e) { - logger.error(sm.getString("naming.bindFailed", e)); + log.error(sm.getString("naming.bindFailed", e)); } } @@ -687,7 +683,7 @@ compCtx.bind("Resources", ((Container) container).getResources()); } catch (NamingException e) { - logger.error(sm.getString("naming.bindFailed", e)); + log.error(sm.getString("naming.bindFailed", e)); } } @@ -760,7 +756,7 @@ createSubcontexts(envCtx, ejb.getName()); envCtx.bind(ejb.getName(), ref); } catch (NamingException e) { - logger.error(sm.getString("naming.bindFailed", e)); + log.error(sm.getString("naming.bindFailed", e)); } } @@ -827,23 +823,23 @@ } } } else { - logger.error(sm.getString("naming.invalidEnvEntryType", env.getName())); + log.error(sm.getString("naming.invalidEnvEntryType", env.getName())); } } catch (NumberFormatException e) { - logger.error(sm.getString("naming.invalidEnvEntryValue", env.getName())); + log.error(sm.getString("naming.invalidEnvEntryValue", env.getName())); } catch (IllegalArgumentException e) { - logger.error(sm.getString("naming.invalidEnvEntryValue", env.getName())); + log.error(sm.getString("naming.invalidEnvEntryValue", env.getName())); } // Binding the object to the appropriate name if (value != null) { try { - if (logger.isDebugEnabled()) - logger.debug(" Adding environment entry " + env.getName()); + if (log.isDebugEnabled()) + log.debug(" Adding environment entry " + env.getName()); createSubcontexts(envCtx, env.getName()); envCtx.bind(env.getName(), value); } catch (NamingException e) { - logger.error(sm.getString("naming.invalidEnvEntryValue", e)); + log.error(sm.getString("naming.invalidEnvEntryValue", e)); } } @@ -887,10 +883,10 @@ wsdlURL = ((Context) container). getServletContext(). getResource("/" + service.getWsdlfile()); - logger.debug(" Changing service ref wsdl file for /" + log.debug(" Changing service ref wsdl file for /" + service.getWsdlfile()); } catch (MalformedURLException e) { - logger.error(sm.getString("naming.wsdlFailed", e)); + log.error(sm.getString("naming.wsdlFailed", e)); } } if (wsdlURL == null) @@ -921,10 +917,10 @@ jaxrpcURL = ((Context) container). getServletContext(). getResource("/" + service.getJaxrpcmappingfile()); - logger.debug(" Changing service ref jaxrpc file for /" + log.debug(" Changing service ref jaxrpc file for /" + service.getJaxrpcmappingfile()); } catch (MalformedURLException e) { - logger.error(sm.getString("naming.wsdlFailed", e)); + log.error(sm.getString("naming.wsdlFailed", e)); } } if (jaxrpcURL == null) @@ -977,14 +973,14 @@ } try { - if (logger.isDebugEnabled()) { - logger.debug(" Adding service ref " + if (log.isDebugEnabled()) { + log.debug(" Adding service ref " + service.getName() + " " + ref); } createSubcontexts(envCtx, service.getName()); envCtx.bind(service.getName(), ref); } catch (NamingException e) { - logger.error(sm.getString("naming.bindFailed", e)); + log.error(sm.getString("naming.bindFailed", e)); } } @@ -1008,14 +1004,14 @@ ref.add(refAddr); } try { - if (logger.isDebugEnabled()) { - logger.debug(" Adding resource ref " + if (log.isDebugEnabled()) { + log.debug(" Adding resource ref " + resource.getName() + " " + ref); } createSubcontexts(envCtx, resource.getName()); envCtx.bind(resource.getName(), ref); } catch (NamingException e) { - logger.error(sm.getString("naming.bindFailed", e)); + log.error(sm.getString("naming.bindFailed", e)); } if ("javax.sql.DataSource".equals(ref.getClassName())) { @@ -1025,7 +1021,7 @@ Registry.getRegistry(null, null).registerComponent(actualResource, on, null); objectNames.put(resource.getName(), on); } catch (Exception e) { - logger.warn(sm.getString("naming.jmxRegistrationFailed", e)); + log.warn(sm.getString("naming.jmxRegistrationFailed", e)); } } @@ -1048,12 +1044,12 @@ ref.add(refAddr); } try { - if (logger.isDebugEnabled()) + if (log.isDebugEnabled()) log.debug(" Adding resource env ref " + resourceEnvRef.getName()); createSubcontexts(envCtx, resourceEnvRef.getName()); envCtx.bind(resourceEnvRef.getName(), ref); } catch (NamingException e) { - logger.error(sm.getString("naming.bindFailed", e)); + log.error(sm.getString("naming.bindFailed", e)); } } @@ -1071,12 +1067,12 @@ "UserTransaction".equals(resourceLink.getName()) ? compCtx : envCtx; try { - if (logger.isDebugEnabled()) + if (log.isDebugEnabled()) log.debug(" Adding resource link " + resourceLink.getName()); createSubcontexts(envCtx, resourceLink.getName()); ctx.bind(resourceLink.getName(), ref); } catch (NamingException e) { - logger.error(sm.getString("naming.bindFailed", e)); + log.error(sm.getString("naming.bindFailed", e)); } } @@ -1090,7 +1086,7 @@ try { envCtx.unbind(name); } catch (NamingException e) { - logger.error(sm.getString("naming.unbindFailed", e)); + log.error(sm.getString("naming.unbindFailed", e)); } } @@ -1104,7 +1100,7 @@ try { envCtx.unbind(name); } catch (NamingException e) { - logger.error(sm.getString("naming.unbindFailed", e)); + log.error(sm.getString("naming.unbindFailed", e)); } } @@ -1118,7 +1114,7 @@ try { envCtx.unbind(name); } catch (NamingException e) { - logger.error(sm.getString("naming.unbindFailed", e)); + log.error(sm.getString("naming.unbindFailed", e)); } } @@ -1132,7 +1128,7 @@ try { envCtx.unbind(name); } catch (NamingException e) { - logger.error(sm.getString("naming.unbindFailed", e)); + log.error(sm.getString("naming.unbindFailed", e)); } } @@ -1146,7 +1142,7 @@ try { envCtx.unbind(name); } catch (NamingException e) { - logger.error(sm.getString("naming.unbindFailed", e)); + log.error(sm.getString("naming.unbindFailed", e)); } ObjectName on = (ObjectName) objectNames.get(name); @@ -1165,7 +1161,7 @@ try { envCtx.unbind(name); } catch (NamingException e) { - logger.error(sm.getString("naming.unbindFailed", e)); + log.error(sm.getString("naming.unbindFailed", e)); } } @@ -1179,7 +1175,7 @@ try { envCtx.unbind(name); } catch (NamingException e) { - logger.error(sm.getString("naming.unbindFailed", e)); + log.error(sm.getString("naming.unbindFailed", e)); } } Modified: branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/core/StandardContext.java =================================================================== --- branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/core/StandardContext.java 2007-11-05 17:59:04 UTC (rev 338) +++ branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/core/StandardContext.java 2007-11-06 17:58:14 UTC (rev 339) @@ -4225,13 +4225,6 @@ // Binding thread oldCCL = bindThread(); - - // Initialize logger again. Other components might have used it too early, - // so it should be reset. - logger = null; - getLogger(); - if ((logger != null) && (logger instanceof Lifecycle)) - ((Lifecycle) logger).start(); if ((cluster != null) && (cluster instanceof Lifecycle)) ((Lifecycle) cluster).start(); @@ -4552,9 +4545,6 @@ if ((cluster != null) && (cluster instanceof Lifecycle)) { ((Lifecycle) cluster).stop(); } - if ((logger != null) && (logger instanceof Lifecycle)) { - ((Lifecycle) logger).stop(); - } if ((loader != null) && (loader instanceof Lifecycle)) { ((Lifecycle) loader).stop(); } Modified: branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/session/ManagerBase.java =================================================================== --- branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/session/ManagerBase.java 2007-11-05 17:59:04 UTC (rev 338) +++ branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/catalina/session/ManagerBase.java 2007-11-06 17:58:14 UTC (rev 339) @@ -65,7 +65,7 @@ */ public abstract class ManagerBase implements Manager, MBeanRegistration { - protected Log log = LogFactory.getLog(ManagerBase.class); + protected static Log log = LogFactory.getLog(ManagerBase.class); // ----------------------------------------------------- Instance Variables Modified: branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/EmbeddedServletOptions.java =================================================================== --- branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/EmbeddedServletOptions.java 2007-11-05 17:59:04 UTC (rev 338) +++ branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/EmbeddedServletOptions.java 2007-11-06 17:58:14 UTC (rev 339) @@ -41,7 +41,7 @@ public final class EmbeddedServletOptions implements Options { // Logger - private Log log = LogFactory.getLog(EmbeddedServletOptions.class); + private static Log log = LogFactory.getLog(EmbeddedServletOptions.class); private Properties settings = new Properties(); Modified: branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/JspCompilationContext.java =================================================================== --- branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/JspCompilationContext.java 2007-11-05 17:59:04 UTC (rev 338) +++ branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/JspCompilationContext.java 2007-11-06 17:58:14 UTC (rev 339) @@ -53,7 +53,7 @@ */ public class JspCompilationContext { - protected org.apache.commons.logging.Log log = + protected static org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(JspCompilationContext.class); protected Map<String, URL> tagFileJarUrls; Modified: branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/compiler/Compiler.java =================================================================== --- branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/compiler/Compiler.java 2007-11-05 17:59:04 UTC (rev 338) +++ branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/compiler/Compiler.java 2007-11-06 17:58:14 UTC (rev 339) @@ -45,7 +45,7 @@ */ public abstract class Compiler { - protected org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory + protected static org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory .getLog(Compiler.class); // ----------------------------------------------------- Instance Variables Modified: branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/compiler/JspConfig.java =================================================================== --- branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/compiler/JspConfig.java 2007-11-05 17:59:04 UTC (rev 338) +++ branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/compiler/JspConfig.java 2007-11-06 17:58:14 UTC (rev 339) @@ -44,7 +44,7 @@ private static final String WEB_XML = "/WEB-INF/web.xml"; // Logger - private Log log = LogFactory.getLog(JspConfig.class); + private static Log log = LogFactory.getLog(JspConfig.class); private Vector jspProperties = null; private ServletContext ctxt; Modified: branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/compiler/JspReader.java =================================================================== --- branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/compiler/JspReader.java 2007-11-05 17:59:04 UTC (rev 338) +++ branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/compiler/JspReader.java 2007-11-06 17:58:14 UTC (rev 339) @@ -53,7 +53,7 @@ /** * Logger. */ - private Log log = LogFactory.getLog(JspReader.class); + private static Log log = LogFactory.getLog(JspReader.class); /** * The current spot in the file. Modified: branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/compiler/JspRuntimeContext.java =================================================================== --- branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/compiler/JspRuntimeContext.java 2007-11-05 17:59:04 UTC (rev 338) +++ branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/compiler/JspRuntimeContext.java 2007-11-06 17:58:14 UTC (rev 339) @@ -58,7 +58,7 @@ public final class JspRuntimeContext { // Logger - private Log log = LogFactory.getLog(JspRuntimeContext.class); + private static Log log = LogFactory.getLog(JspRuntimeContext.class); /* * Counts how many times the webapp's JSPs have been reloaded. Modified: branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/compiler/SmapUtil.java =================================================================== --- branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/compiler/SmapUtil.java 2007-11-05 17:59:04 UTC (rev 338) +++ branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/compiler/SmapUtil.java 2007-11-06 17:58:14 UTC (rev 339) @@ -44,7 +44,7 @@ */ public class SmapUtil { - private org.apache.commons.logging.Log log= + private static org.apache.commons.logging.Log log= org.apache.commons.logging.LogFactory.getLog( SmapUtil.class ); //********************************************************************* @@ -189,7 +189,7 @@ // Installation logic (from Robert Field, JSR-045 spec lead) private static class SDEInstaller { - private org.apache.commons.logging.Log log= + private static org.apache.commons.logging.Log log= org.apache.commons.logging.LogFactory.getLog( SDEInstaller.class ); static final String nameSDE = "SourceDebugExtension"; Modified: branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/compiler/TagLibraryInfoImpl.java =================================================================== --- branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/compiler/TagLibraryInfoImpl.java 2007-11-05 17:59:04 UTC (rev 338) +++ branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/compiler/TagLibraryInfoImpl.java 2007-11-06 17:58:14 UTC (rev 339) @@ -64,7 +64,7 @@ class TagLibraryInfoImpl extends TagLibraryInfo implements TagConstants { // Logger - private Log log = LogFactory.getLog(TagLibraryInfoImpl.class); + private static Log log = LogFactory.getLog(TagLibraryInfoImpl.class); private JspCompilationContext ctxt; Modified: branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/compiler/TldLocationsCache.java =================================================================== --- branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/compiler/TldLocationsCache.java 2007-11-05 17:59:04 UTC (rev 338) +++ branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/compiler/TldLocationsCache.java 2007-11-06 17:58:14 UTC (rev 339) @@ -78,7 +78,7 @@ public class TldLocationsCache { // Logger - private Log log = LogFactory.getLog(TldLocationsCache.class); + private static Log log = LogFactory.getLog(TldLocationsCache.class); /** * The types of URI one may specify for a tag library Modified: branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/runtime/JspFactoryImpl.java =================================================================== --- branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/runtime/JspFactoryImpl.java 2007-11-05 17:59:04 UTC (rev 338) +++ branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/runtime/JspFactoryImpl.java 2007-11-06 17:58:14 UTC (rev 339) @@ -40,7 +40,7 @@ public class JspFactoryImpl extends JspFactory { // Logger - private Log log = LogFactory.getLog(JspFactoryImpl.class); + private static Log log = LogFactory.getLog(JspFactoryImpl.class); private static final String SPEC_VERSION = "2.1"; private static final boolean USE_POOL = Modified: branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/servlet/JspServlet.java =================================================================== --- branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/servlet/JspServlet.java 2007-11-05 17:59:04 UTC (rev 338) +++ branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/servlet/JspServlet.java 2007-11-06 17:58:14 UTC (rev 339) @@ -57,7 +57,7 @@ public class JspServlet extends HttpServlet implements PeriodicEventListener { // Logger - private Log log = LogFactory.getLog(JspServlet.class); + private static Log log = LogFactory.getLog(JspServlet.class); private ServletContext context; private ServletConfig config; Modified: branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/xmlparser/ParserUtils.java =================================================================== --- branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/xmlparser/ParserUtils.java 2007-11-05 17:59:04 UTC (rev 338) +++ branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/xmlparser/ParserUtils.java 2007-11-06 17:58:14 UTC (rev 339) @@ -192,7 +192,7 @@ class MyEntityResolver implements EntityResolver { // Logger - private Log log = LogFactory.getLog(MyEntityResolver.class); + private static Log log = LogFactory.getLog(MyEntityResolver.class); public InputSource resolveEntity(String publicId, String systemId) throws SAXException { @@ -221,7 +221,7 @@ class MyErrorHandler implements ErrorHandler { // Logger - private Log log = LogFactory.getLog(MyErrorHandler.class); + private static Log log = LogFactory.getLog(MyErrorHandler.class); public void warning(SAXParseException ex) throws SAXException { if (log.isDebugEnabled()) Modified: branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/xmlparser/UCSReader.java =================================================================== --- branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/xmlparser/UCSReader.java 2007-11-05 17:59:04 UTC (rev 338) +++ branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/xmlparser/UCSReader.java 2007-11-06 17:58:14 UTC (rev 339) @@ -31,7 +31,7 @@ */ public class UCSReader extends Reader { - private org.apache.commons.logging.Log log= + private static org.apache.commons.logging.Log log= org.apache.commons.logging.LogFactory.getLog( UCSReader.class ); // Modified: branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/xmlparser/UTF8Reader.java =================================================================== --- branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/xmlparser/UTF8Reader.java 2007-11-05 17:59:04 UTC (rev 338) +++ branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/jasper/xmlparser/UTF8Reader.java 2007-11-06 17:58:14 UTC (rev 339) @@ -31,7 +31,7 @@ public class UTF8Reader extends Reader { - private org.apache.commons.logging.Log log= + private static org.apache.commons.logging.Log log= org.apache.commons.logging.LogFactory.getLog( UTF8Reader.class ); // Modified: branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/tomcat/util/digester/Digester.java =================================================================== --- branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/tomcat/util/digester/Digester.java 2007-11-05 17:59:04 UTC (rev 338) +++ branches/JBOSSWEB_2_0_0_GA_CP/src/share/classes/org/apache/tomcat/util/digester/Digester.java 2007-11-06 17:58:14 UTC (rev 339) @@ -315,14 +315,14 @@ /** * The Log to which most logging calls will be made. */ - protected Log log = + protected static Log log = LogFactory.getLog("org.apache.commons.digester.Digester"); /** * The Log to which all SAX event related logging calls will be made. */ - protected Log saxLog = + protected static Log saxLog = LogFactory.getLog("org.apache.commons.digester.Digester.sax"); @@ -2339,8 +2339,6 @@ params.clear(); publicId = null; stack.clear(); - log = null; - saxLog = null; configured = false; } @@ -2555,9 +2553,6 @@ return; } - log = LogFactory.getLog("org.apache.commons.digester.Digester"); - saxLog = LogFactory.getLog("org.apache.commons.digester.Digester.sax"); - // Perform lazy configuration as needed initialize(); // call hook method for subclasses that want to be initialized once only // Nothing else required by default