[jboss-cvs] Repository SVN: r849 - in apache-tomcat/5.5.23.patch01-brew: lib and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jul 26 23:37:58 EDT 2007
Author: vivekl at redhat.com
Date: 2007-07-26 23:37:58 -0400 (Thu, 26 Jul 2007)
New Revision: 849
Added:
apache-tomcat/5.5.23.patch01-brew/src/tomcat5-5.5-CVE-2007-2449.patch
apache-tomcat/5.5.23.patch01-brew/src/tomcat5-5.5-CVE-2007-2450.patch
apache-tomcat/5.5.23.patch01-brew/src/tomcat5-5.5.23-ASPATCH-234-u.patch
Modified:
apache-tomcat/5.5.23.patch01-brew/component-info.xml
apache-tomcat/5.5.23.patch01-brew/lib/catalina-manager.jar
apache-tomcat/5.5.23.patch01-brew/lib/catalina-optional.jar
apache-tomcat/5.5.23.patch01-brew/lib/catalina.jar
apache-tomcat/5.5.23.patch01-brew/lib/jasper-compiler-jdt.jar
apache-tomcat/5.5.23.patch01-brew/lib/jasper-compiler.jar
apache-tomcat/5.5.23.patch01-brew/lib/jasper-runtime.jar
apache-tomcat/5.5.23.patch01-brew/lib/naming-resources.jar
apache-tomcat/5.5.23.patch01-brew/lib/servlets-default.jar
apache-tomcat/5.5.23.patch01-brew/lib/servlets-invoker.jar
apache-tomcat/5.5.23.patch01-brew/lib/servlets-webdav.jar
apache-tomcat/5.5.23.patch01-brew/lib/tomcat-ajp.jar
apache-tomcat/5.5.23.patch01-brew/lib/tomcat-apr.jar
apache-tomcat/5.5.23.patch01-brew/lib/tomcat-coyote.jar
apache-tomcat/5.5.23.patch01-brew/lib/tomcat-http.jar
apache-tomcat/5.5.23.patch01-brew/lib/tomcat-util.jar
Log:
- Rebuild and add new patch for reference
Modified: apache-tomcat/5.5.23.patch01-brew/component-info.xml
===================================================================
--- apache-tomcat/5.5.23.patch01-brew/component-info.xml 2007-07-27 03:05:14 UTC (rev 848)
+++ apache-tomcat/5.5.23.patch01-brew/component-info.xml 2007-07-27 03:37:58 UTC (rev 849)
@@ -6,7 +6,7 @@
projectHome="http://tomcat.apache.org"
description="Tomcat 5.5 servlet 2.4 web container"
scm=":ext:cvs.devel.redhat.com:/cvs/dist/tomcat5"
- tag="tomcat5-5_5_23-0jpp_3_jb_2">
+ tag="tomcat5-5_5_23-0jpp_3_jb_3">
<!-- Built using JDK 1.4 -->
<artifact id="catalina-manager.jar"/>
<artifact id="catalina-optional.jar"/>
Modified: apache-tomcat/5.5.23.patch01-brew/lib/catalina-manager.jar
===================================================================
(Binary files differ)
Modified: apache-tomcat/5.5.23.patch01-brew/lib/catalina-optional.jar
===================================================================
(Binary files differ)
Modified: apache-tomcat/5.5.23.patch01-brew/lib/catalina.jar
===================================================================
(Binary files differ)
Modified: apache-tomcat/5.5.23.patch01-brew/lib/jasper-compiler-jdt.jar
===================================================================
(Binary files differ)
Modified: apache-tomcat/5.5.23.patch01-brew/lib/jasper-compiler.jar
===================================================================
(Binary files differ)
Modified: apache-tomcat/5.5.23.patch01-brew/lib/jasper-runtime.jar
===================================================================
(Binary files differ)
Modified: apache-tomcat/5.5.23.patch01-brew/lib/naming-resources.jar
===================================================================
(Binary files differ)
Modified: apache-tomcat/5.5.23.patch01-brew/lib/servlets-default.jar
===================================================================
(Binary files differ)
Modified: apache-tomcat/5.5.23.patch01-brew/lib/servlets-invoker.jar
===================================================================
(Binary files differ)
Modified: apache-tomcat/5.5.23.patch01-brew/lib/servlets-webdav.jar
===================================================================
(Binary files differ)
Modified: apache-tomcat/5.5.23.patch01-brew/lib/tomcat-ajp.jar
===================================================================
(Binary files differ)
Modified: apache-tomcat/5.5.23.patch01-brew/lib/tomcat-apr.jar
===================================================================
(Binary files differ)
Modified: apache-tomcat/5.5.23.patch01-brew/lib/tomcat-coyote.jar
===================================================================
(Binary files differ)
Modified: apache-tomcat/5.5.23.patch01-brew/lib/tomcat-http.jar
===================================================================
(Binary files differ)
Modified: apache-tomcat/5.5.23.patch01-brew/lib/tomcat-util.jar
===================================================================
(Binary files differ)
Added: apache-tomcat/5.5.23.patch01-brew/src/tomcat5-5.5-CVE-2007-2449.patch
===================================================================
--- apache-tomcat/5.5.23.patch01-brew/src/tomcat5-5.5-CVE-2007-2449.patch (rev 0)
+++ apache-tomcat/5.5.23.patch01-brew/src/tomcat5-5.5-CVE-2007-2449.patch 2007-07-27 03:37:58 UTC (rev 849)
@@ -0,0 +1,104 @@
+Index: servletapi/jsr152/examples/source.jsp
+===================================================================
+--- servletapi/jsr152/examples/source.jsp (revision 547082)
++++ servletapi/jsr152/examples/source.jsp (revision 547083)
+@@ -17,4 +17,4 @@
+ <%@ taglib uri="http://jakarta.apache.org/tomcat/examples-taglib"
+ prefix="eg" %>
+
+-<eg:ShowSource jspFile="<%= request.getQueryString() %>"/>
++<eg:ShowSource jspFile="<%= util.HTMLFilter.filter(request.getQueryString()) %>"/>
+Index: servletapi/jsr152/examples/snp/snoop.html
+===================================================================
+--- servletapi/jsr152/examples/snp/snoop.html (revision 547082)
++++ servletapi/jsr152/examples/snp/snoop.html (revision 547083)
+@@ -24,8 +24,8 @@
+ <body bgcolor="#FFFFFF">
+ <p><font color="#0000FF"><a href="snoop.jsp"><img src="../images/execute.gif" align="right" border="0"></a><a href="../index.html"><img src="../images/return.gif" width="24" height="24" align="right" border="0"></a></font></p>
+
+-<h3><a href="snoop.jsp.html">Source Code for Request Parameters Example<font color="#0000FF"></a>
+- </font> </h3>
++<h3><a href="snoop.jsp.html">Source Code for Request Parameters Example<font color="#0000FF">
++ </font></a></h3>
+
+ </body>
+ </html>
+Index: servletapi/jsr152/examples/snp/snoop.jsp
+===================================================================
+--- servletapi/jsr152/examples/snp/snoop.jsp (revision 547082)
++++ servletapi/jsr152/examples/snp/snoop.jsp (revision 547083)
+@@ -19,37 +19,38 @@
+ <body bgcolor="white">
+ <h1> Request Information </h1>
+ <font size="4">
+-JSP Request Method: <% out.print(util.HTMLFilter.filter(request.getMethod())); %>
++JSP Request Method: <%= util.HTMLFilter.filter(request.getMethod()) %>
+ <br>
+-Request URI: <%= request.getRequestURI() %>
++Request URI: <%= util.HTMLFilter.filter(request.getRequestURI()) %>
+ <br>
+-Request Protocol: <%= request.getProtocol() %>
++Request Protocol: <%= util.HTMLFilter.filter(request.getProtocol()) %>
+ <br>
+-Servlet path: <%= request.getServletPath() %>
++Servlet path: <%= util.HTMLFilter.filter(request.getServletPath()) %>
+ <br>
+-Path info: <% out.print(util.HTMLFilter.filter(request.getPathInfo())); %>
++Path info: <%= util.HTMLFilter.filter(request.getPathInfo()) %>
+ <br>
+-Query string: <% out.print(util.HTMLFilter.filter(request.getQueryString())); %>
++Query string: <%= util.HTMLFilter.filter(request.getQueryString()) %>
+ <br>
+ Content length: <%= request.getContentLength() %>
+ <br>
+-Content type: <% out.print(util.HTMLFilter.filter(request.getContentType())); %>
++Content type: <%= util.HTMLFilter.filter(request.getContentType()) %>
+ <br>
+-Server name: <%= request.getServerName() %>
++Server name: <%= util.HTMLFilter.filter(request.getServerName()) %>
+ <br>
+ Server port: <%= request.getServerPort() %>
+ <br>
+-Remote user: <%= request.getRemoteUser() %>
++Remote user: <%= util.HTMLFilter.filter(request.getRemoteUser()) %>
+ <br>
+-Remote address: <%= request.getRemoteAddr() %>
++Remote address: <%= util.HTMLFilter.filter(request.getRemoteAddr()) %>
+ <br>
+-Remote host: <%= request.getRemoteHost() %>
++Remote host: <%= util.HTMLFilter.filter(request.getRemoteHost()) %>
+ <br>
+-Authorization scheme: <%= request.getAuthType() %>
++Authorization scheme: <%= util.HTMLFilter.filter(request.getAuthType()) %>
+ <br>
+ Locale: <%= request.getLocale() %>
+ <hr>
+-The browser you are using is <% out.print(util.HTMLFilter.filter(request.getHeader("User-Agent"))); %>
++The browser you are using is
++<%= util.HTMLFilter.filter(request.getHeader("User-Agent")) %>
+ <hr>
+ </font>
+ </body>
+Index: servletapi/jsr152/examples/security/protected/index.jsp
+===================================================================
+--- servletapi/jsr152/examples/security/protected/index.jsp (revision 547082)
++++ servletapi/jsr152/examples/security/protected/index.jsp (revision 547083)
+@@ -27,14 +27,16 @@
+ </head>
+ <body bgcolor="white">
+
+-You are logged in as remote user <b><%= request.getRemoteUser() %></b>
++You are logged in as remote user
++<b><%= util.HTMLFilter.filter(request.getRemoteUser()) %></b>
+ in session <b><%= session.getId() %></b><br><br>
+
+ <%
+ if (request.getUserPrincipal() != null) {
+ %>
+ Your user principal name is
+- <b><%= request.getUserPrincipal().getName() %></b><br><br>
++ <b><%= util.HTMLFilter.filter(request.getUserPrincipal().getName()) %></b>
++ <br><br>
+ <%
+ } else {
+ %>
Added: apache-tomcat/5.5.23.patch01-brew/src/tomcat5-5.5-CVE-2007-2450.patch
===================================================================
--- apache-tomcat/5.5.23.patch01-brew/src/tomcat5-5.5-CVE-2007-2450.patch (rev 0)
+++ apache-tomcat/5.5.23.patch01-brew/src/tomcat5-5.5-CVE-2007-2450.patch 2007-07-27 03:37:58 UTC (rev 849)
@@ -0,0 +1,52 @@
+Index: container/webapps/host-manager/WEB-INF/classes/org/apache/catalina/hostmanager/HTMLHostManagerServlet.java
+===================================================================
+--- container/webapps/host-manager/WEB-INF/classes/org/apache/catalina/hostmanager/HTMLHostManagerServlet.java (revision 547081)
++++ container/webapps/host-manager/WEB-INF/classes/org/apache/catalina/hostmanager/HTMLHostManagerServlet.java (revision 547082)
+@@ -32,6 +32,7 @@
+
+ import org.apache.catalina.Container;
+ import org.apache.catalina.Host;
++import org.apache.catalina.util.RequestUtil;
+ import org.apache.catalina.util.ServerInfo;
+
+ /**
+@@ -195,7 +196,11 @@
+ // Message Section
+ args = new Object[3];
+ args[0] = sm.getString("htmlHostManagerServlet.messageLabel");
+- args[1] = (message == null || message.length() == 0) ? "OK" : message;
++ if (message == null || message.length() == 0) {
++ args[1] = "OK";
++ } else {
++ args[1] = RequestUtil.filter(message);
++ }
+ writer.print(MessageFormat.format(Constants.MESSAGE_SECTION, args));
+
+ // Manager Section
+Index: container/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java
+===================================================================
+--- container/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java (revision 547081)
++++ container/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java (revision 547082)
+@@ -107,8 +107,7 @@
+ message = stop(path);
+ } else {
+ message =
+- sm.getString("managerServlet.unknownCommand",
+- RequestUtil.filter(command));
++ sm.getString("managerServlet.unknownCommand", command);
+ }
+
+ list(request, response, message);
+@@ -282,7 +281,11 @@
+ // Message Section
+ args = new Object[3];
+ args[0] = sm.getString("htmlManagerServlet.messageLabel");
+- args[1] = (message == null || message.length() == 0) ? "OK" : message;
++ if (message == null || message.length() == 0) {
++ args[1] = "OK";
++ } else {
++ args[1] = RequestUtil.filter(message);
++ }
+ writer.print(MessageFormat.format(Constants.MESSAGE_SECTION, args));
+
+ // Manager Section
Added: apache-tomcat/5.5.23.patch01-brew/src/tomcat5-5.5.23-ASPATCH-234-u.patch
===================================================================
--- apache-tomcat/5.5.23.patch01-brew/src/tomcat5-5.5.23-ASPATCH-234-u.patch (rev 0)
+++ apache-tomcat/5.5.23.patch01-brew/src/tomcat5-5.5.23-ASPATCH-234-u.patch 2007-07-27 03:37:58 UTC (rev 849)
@@ -0,0 +1,623 @@
+--- ./connectors/util/java/org/apache/tomcat/util/digester/Digester.java.p22 2007-03-05 10:27:39.000000000 -0500
++++ ./connectors/util/java/org/apache/tomcat/util/digester/Digester.java 2007-07-26 19:05:06.000000000 -0400
+@@ -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,10 @@
+ params.clear();
+ publicId = null;
+ stack.clear();
++ /*
+ log = null;
+ saxLog = null;
++ */
+ configured = false;
+
+ }
+@@ -2555,8 +2557,8 @@
+ return;
+ }
+
+- log = LogFactory.getLog("org.apache.commons.digester.Digester");
+- saxLog = LogFactory.getLog("org.apache.commons.digester.Digester.sax");
++ //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
+--- ./container/catalina/src/share/org/apache/catalina/core/ContainerBase.java.p22 2007-03-05 10:27:43.000000000 -0500
++++ ./container/catalina/src/share/org/apache/catalina/core/ContainerBase.java 2007-07-26 19:05:12.000000000 -0400
+@@ -183,8 +183,8 @@
+
+ /**
+ * The Logger implementation with which this Container is associated.
+- */
+ protected Log logger = null;
++ */
+
+
+ /**
+@@ -376,10 +376,13 @@
+ */
+ public Log getLogger() {
+
++ /*
+ if (logger != null)
+ return (logger);
+ logger = LogFactory.getLog(logName());
+ return (logger);
++ */
++ return log;
+
+ }
+
+@@ -994,10 +997,12 @@
+ // 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))
+@@ -1085,9 +1090,11 @@
+ 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();
+ }
+--- ./container/catalina/src/share/org/apache/catalina/core/NamingContextListener.java.p22 2007-03-05 10:27:43.000000000 -0500
++++ ./container/catalina/src/share/org/apache/catalina/core/NamingContextListener.java 2007-07-26 19:05:17.000000000 -0400
+@@ -81,7 +81,7 @@
+ // ----------------------------------------------------- Instance Variables
+
+
+- protected Log logger = log;
++ //protected Log log = log;
+
+
+ /**
+@@ -189,7 +189,6 @@
+
+ if (container instanceof Context) {
+ namingResources = ((Context) container).getNamingResources();
+- logger = log;
+ } else if (container instanceof Server) {
+ namingResources = ((Server) container).getGlobalNamingResources();
+ } else {
+@@ -219,7 +218,7 @@
+ try {
+ createNamingContext();
+ } catch (NamingException e) {
+- logger.error
++ log.error
+ (sm.getString("naming.namingContextCreationFailed", e));
+ }
+
+@@ -232,7 +231,7 @@
+ (container, container,
+ ((Container) container).getLoader().getClassLoader());
+ } catch (NamingException e) {
+- logger.error(sm.getString("naming.bindFailed", e));
++ log.error(sm.getString("naming.bindFailed", e));
+ }
+ }
+
+@@ -245,7 +244,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
+@@ -625,7 +624,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));
+ }
+ }
+
+@@ -635,7 +634,7 @@
+ compCtx.bind("Resources",
+ ((Container) container).getResources());
+ } catch (NamingException e) {
+- logger.error(sm.getString("naming.bindFailed", e));
++ log.error(sm.getString("naming.bindFailed", e));
+ }
+ }
+
+@@ -706,7 +705,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));
+ }
+
+ }
+@@ -773,23 +772,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));
+ }
+ }
+
+@@ -824,14 +823,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())) {
+@@ -841,7 +840,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));
+ }
+ }
+
+@@ -864,12 +863,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));
+ }
+
+ }
+@@ -887,12 +886,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));
+ }
+
+ }
+@@ -906,7 +905,7 @@
+ try {
+ envCtx.unbind(name);
+ } catch (NamingException e) {
+- logger.error(sm.getString("naming.unbindFailed", e));
++ log.error(sm.getString("naming.unbindFailed", e));
+ }
+
+ }
+@@ -920,7 +919,7 @@
+ try {
+ envCtx.unbind(name);
+ } catch (NamingException e) {
+- logger.error(sm.getString("naming.unbindFailed", e));
++ log.error(sm.getString("naming.unbindFailed", e));
+ }
+
+ }
+@@ -934,7 +933,7 @@
+ try {
+ envCtx.unbind(name);
+ } catch (NamingException e) {
+- logger.error(sm.getString("naming.unbindFailed", e));
++ log.error(sm.getString("naming.unbindFailed", e));
+ }
+
+ }
+@@ -948,7 +947,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);
+@@ -967,7 +966,7 @@
+ try {
+ envCtx.unbind(name);
+ } catch (NamingException e) {
+- logger.error(sm.getString("naming.unbindFailed", e));
++ log.error(sm.getString("naming.unbindFailed", e));
+ }
+
+ }
+@@ -981,7 +980,7 @@
+ try {
+ envCtx.unbind(name);
+ } catch (NamingException e) {
+- logger.error(sm.getString("naming.unbindFailed", e));
++ log.error(sm.getString("naming.unbindFailed", e));
+ }
+
+ }
+--- ./container/catalina/src/share/org/apache/catalina/core/StandardContext.java.p22 2007-03-05 10:27:43.000000000 -0500
++++ ./container/catalina/src/share/org/apache/catalina/core/StandardContext.java 2007-07-26 19:05:26.000000000 -0400
+@@ -103,7 +103,7 @@
+ *
+ * @author Craig R. McClanahan
+ * @author Remy Maucherat
+- * @version $Revision: 513599 $ $Date: 2007-03-01 19:34:17 -0700 (Thu, 01 Mar 2007) $
++ * @version $Revision: 522870 $ $Date: 2007-03-27 04:37:32 -0700 (Tue, 27 Mar 2007) $
+ */
+
+ public class StandardContext
+@@ -4115,10 +4115,12 @@
+
+ // 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();
+@@ -4353,9 +4355,6 @@
+ // Stop our filters
+ filterStop();
+
+- // Stop our application listeners
+- listenerStop();
+-
+ // Stop ContainerBackgroundProcessor thread
+ super.threadStop();
+
+@@ -4363,6 +4362,9 @@
+ ((Lifecycle) manager).stop();
+ }
+
++ // Stop our application listeners
++ listenerStop();
++
+ // Finalize our character set mapper
+ setCharsetMapper(null);
+
+@@ -4391,9 +4393,11 @@
+ 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();
+ }
+--- ./container/catalina/src/share/org/apache/catalina/session/ManagerBase.java.p22 2007-03-05 10:27:45.000000000 -0500
++++ ./container/catalina/src/share/org/apache/catalina/session/ManagerBase.java 2007-07-26 19:05:40.000000000 -0400
+@@ -62,7 +62,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
+
+--- ./container/catalina/src/share/org/apache/catalina/valves/ValveBase.java.p22 2007-03-05 10:27:47.000000000 -0500
++++ ./container/catalina/src/share/org/apache/catalina/valves/ValveBase.java 2007-07-26 19:05:47.000000000 -0400
+@@ -51,7 +51,7 @@
+ * management and lifecycle support.
+ *
+ * @author Craig R. McClanahan
+- * @version $Revision: 466608 $ $Date: 2006-10-21 17:10:15 -0600 (Sat, 21 Oct 2006) $
++ * @version $Revision: 466608 $ $Date: 2006-10-21 16:10:15 -0700 (Sat, 21 Oct 2006) $
+ */
+
+ public abstract class ValveBase
+--- ./jasper/src/share/org/apache/jasper/compiler/Compiler.java.p22 2007-03-05 10:27:58.000000000 -0500
++++ ./jasper/src/share/org/apache/jasper/compiler/Compiler.java 2007-07-26 19:05:53.000000000 -0400
+@@ -44,7 +44,7 @@
+ * @author Mark Roth
+ */
+ public abstract class Compiler {
+- protected org.apache.commons.logging.Log log=
++ protected static org.apache.commons.logging.Log log=
+ org.apache.commons.logging.LogFactory.getLog( Compiler.class );
+
+ // ----------------------------------------------------------------- Static
+--- ./jasper/src/share/org/apache/jasper/compiler/JspConfig.java.p22 2007-03-05 10:27:58.000000000 -0500
++++ ./jasper/src/share/org/apache/jasper/compiler/JspConfig.java 2007-07-26 19:05:59.000000000 -0400
+@@ -43,7 +43,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;
+--- ./jasper/src/share/org/apache/jasper/compiler/JspReader.java.p22 2007-03-05 10:27:58.000000000 -0500
++++ ./jasper/src/share/org/apache/jasper/compiler/JspReader.java 2007-07-26 19:06:06.000000000 -0400
+@@ -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.
+--- ./jasper/src/share/org/apache/jasper/compiler/JspRuntimeContext.java.p22 2007-03-05 10:27:58.000000000 -0500
++++ ./jasper/src/share/org/apache/jasper/compiler/JspRuntimeContext.java 2007-07-26 19:06:11.000000000 -0400
+@@ -59,7 +59,7 @@
+ public final class JspRuntimeContext implements Runnable {
+
+ // 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.
+--- ./jasper/src/share/org/apache/jasper/compiler/SmapUtil.java.p22 2007-03-05 10:27:58.000000000 -0500
++++ ./jasper/src/share/org/apache/jasper/compiler/SmapUtil.java 2007-07-26 19:06:17.000000000 -0400
+@@ -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";
+--- ./jasper/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java.p22 2007-03-05 10:27:58.000000000 -0500
++++ ./jasper/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java 2007-07-26 19:06:22.000000000 -0400
+@@ -63,7 +63,7 @@
+ class TagLibraryInfoImpl extends TagLibraryInfo implements TagConstants {
+
+ // Logger
+- private Log log = LogFactory.getLog(TagLibraryInfoImpl.class);
++ private static Log log = LogFactory.getLog(TagLibraryInfoImpl.class);
+
+ private Hashtable jarEntries;
+ private JspCompilationContext ctxt;
+--- ./jasper/src/share/org/apache/jasper/compiler/TldLocationsCache.java.p22 2007-03-05 10:27:59.000000000 -0500
++++ ./jasper/src/share/org/apache/jasper/compiler/TldLocationsCache.java 2007-07-26 19:06:26.000000000 -0400
+@@ -79,7 +79,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
+--- ./jasper/src/share/org/apache/jasper/runtime/JspFactoryImpl.java.p22 2007-03-05 10:27:59.000000000 -0500
++++ ./jasper/src/share/org/apache/jasper/runtime/JspFactoryImpl.java 2007-07-26 19:06:51.000000000 -0400
+@@ -38,7 +38,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.0";
+ private static final boolean USE_POOL =
+--- ./jasper/src/share/org/apache/jasper/runtime/PageContextImpl.java.p22 2007-03-05 10:27:59.000000000 -0500
++++ ./jasper/src/share/org/apache/jasper/runtime/PageContextImpl.java 2007-07-26 19:06:57.000000000 -0400
+@@ -66,7 +66,7 @@
+ public class PageContextImpl extends PageContext implements VariableResolver {
+
+ // Logger
+- private Log log;
++ private static Log log = LogFactory.getLog(PageContextImpl.class);
+
+ // The expression evaluator, for evaluating EL expressions.
+ private static ExpressionEvaluatorImpl elExprEval
+@@ -101,7 +101,6 @@
+ * Constructor.
+ */
+ PageContextImpl(JspFactory factory) {
+- log = LogFactory.getLog(getClass());
+
+ this.variableResolver = new VariableResolverImpl(this);
+ this.outs = new BodyContentImpl[0];
+--- ./jasper/src/share/org/apache/jasper/servlet/JspServlet.java.p22 2007-03-05 10:27:59.000000000 -0500
++++ ./jasper/src/share/org/apache/jasper/servlet/JspServlet.java 2007-07-26 19:07:01.000000000 -0400
+@@ -56,7 +56,7 @@
+ public class JspServlet extends HttpServlet {
+
+ // Logger
+- private Log log = LogFactory.getLog(JspServlet.class);
++ private static Log log = LogFactory.getLog(JspServlet.class);
+
+ private ServletContext context;
+ private ServletConfig config;
+--- ./jasper/src/share/org/apache/jasper/servlet/JspServletWrapper.java.p22 2007-03-05 10:27:59.000000000 -0500
++++ ./jasper/src/share/org/apache/jasper/servlet/JspServletWrapper.java 2007-07-26 19:07:06.000000000 -0400
+@@ -63,7 +63,7 @@
+ public class JspServletWrapper {
+
+ // Logger
+- private Log log = LogFactory.getLog(JspServletWrapper.class);
++ private static Log log = LogFactory.getLog(JspServletWrapper.class);
+
+ private Servlet theServlet;
+ private String jspUri;
+--- ./jasper/src/share/org/apache/jasper/xmlparser/ParserUtils.java.p22 2007-03-05 10:27:59.000000000 -0500
++++ ./jasper/src/share/org/apache/jasper/xmlparser/ParserUtils.java 2007-07-26 19:07:15.000000000 -0400
+@@ -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())
+--- ./jasper/src/share/org/apache/jasper/xmlparser/UCSReader.java.p22 2007-03-05 10:27:59.000000000 -0500
++++ ./jasper/src/share/org/apache/jasper/xmlparser/UCSReader.java 2007-07-26 19:07:20.000000000 -0400
+@@ -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 );
+
+ //
+--- ./jasper/src/share/org/apache/jasper/xmlparser/UTF8Reader.java.p22 2007-03-05 10:27:59.000000000 -0500
++++ ./jasper/src/share/org/apache/jasper/xmlparser/UTF8Reader.java 2007-07-26 19:07:25.000000000 -0400
+@@ -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 );
+
+ //
+--- ./jasper/src/share/org/apache/jasper/EmbeddedServletOptions.java.p22 2007-03-05 10:27:58.000000000 -0500
++++ ./jasper/src/share/org/apache/jasper/EmbeddedServletOptions.java 2007-07-26 19:06:31.000000000 -0400
+@@ -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();
+
+--- ./jasper/src/share/org/apache/jasper/JspC.java.p22 2007-03-05 10:27:58.000000000 -0500
++++ ./jasper/src/share/org/apache/jasper/JspC.java 2007-07-26 19:06:39.000000000 -0400
+@@ -95,7 +95,7 @@
+ "clsid:8AD9C840-044E-11D1-B3E9-00805F499D93";
+
+ /** Logger (set by constructor.) */
+- private Log log;
++ private static Log log = LogFactory.getLog(JspC.class);
+
+ private static final String SWITCH_VERBOSE = "-v";
+ private static final String SWITCH_HELP = "-help";
+@@ -257,7 +257,6 @@
+
+ /** Constructor. */
+ public JspC() {
+- log = LogFactory.getLog(getClass());
+ }
+
+ public void setArgs(String[] arg) throws JasperException {
+--- ./jasper/src/share/org/apache/jasper/JspCompilationContext.java.p22 2007-03-05 10:27:58.000000000 -0500
++++ ./jasper/src/share/org/apache/jasper/JspCompilationContext.java 2007-07-26 19:06:44.000000000 -0400
+@@ -52,7 +52,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);
+
+ private Hashtable tagFileJarUrls;
+--- ./build.xml.p22 2007-03-05 10:27:32.000000000 -0500
++++ ./build.xml 2007-07-26 19:05:00.000000000 -0400
+@@ -72,6 +72,7 @@
+ <!-- Bugzilla 37977: http://issues.apache.org/bugzilla/show_bug.cgi?id=37977 -->
+ <!-- hackish: inputstring="t${line.separator}" is t+<enter> for svn -->
+ <!-- to temporarily accept the certificate of svn.apache.org. -->
++ <!--
+ <exec dir="${basedir}"
+ executable="svn"
+ inputstring="t${line.separator}"
+@@ -80,6 +81,7 @@
+ <arg value="${svnroot}/${current.loc}" />
+ <arg value="${basedir}" />
+ </exec>
++ -->
+
+ </target>
+
More information about the jboss-cvs-commits
mailing list