Nabble - Tomcat - Dev

svn commit: r834340 - /tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java

2009-11-09T20:54:34Z

Author: costin
Date: Tue Nov 10 04:54:34 2009
New Revision: 834340

URL: http://svn.apache.org/viewvc?rev=834340&view=rev
Log:
Invalidate the session - so it can't be resumed.
Not sure what else we can do using this hook - we could switch to SSLEngine, but that's pretty large change.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?rev=834340&r1=834339&r2=834340&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java Tue Nov 10 04:54:34 2009
@@ -178,6 +178,7 @@
if (completed) {
try {
log.warn("SSL renegotiation is disabled, closing connection");
+ event.getSession().invalidate();
event.getSocket().close();
} catch (IOException e) {
// ignore

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

Re: svn commit: r834289 - /tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java

2009-11-09T20:36:51Z

Right, need to invalidate as well.

The request will not be executed - how can he continue the attack ?

On Mon, Nov 9, 2009 at 7:49 PM, Bill Barker <billwbarker@...> wrote:

>
> <costin@...> wrote in message
> news:20091110010244.4F838238888F@......
> > Author: costin
> > Date: Tue Nov 10 01:02:43 2009
> > New Revision: 834289
> >
> > URL: http://svn.apache.org/viewvc?rev=834289&view=rev
> > Log:
> > Fix for the SSL midm - disable client re-negotiation, connection will be
> > closed.
> >
> >
> > Modified:
> >
> > tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
> >
> > Modified:
> > tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
> > URL:
> >
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?rev=834289&r1=834288&r2=834289&view=diff
> >
> ==============================================================================
> > ---
> > tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
> > (original)
> > +++
> > tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
> > Tue Nov 10 01:02:43 2009
> > @@ -42,6 +42,8 @@
> > import java.util.Vector;
> >
> > import javax.net.ssl.CertPathTrustManagerParameters;
> > +import javax.net.ssl.HandshakeCompletedEvent;
> > +import javax.net.ssl.HandshakeCompletedListener;
> > import javax.net.ssl.KeyManager;
> > import javax.net.ssl.KeyManagerFactory;
> > import javax.net.ssl.ManagerFactoryParameters;
> > @@ -93,6 +95,9 @@
> > private static final int defaultSessionCacheSize = 0;
> > private static final int defaultSessionTimeout = 86400;
> >
> > + private static final boolean midmMode =
> > +
> > "true".equals(System.getProperty("enable_ssl_mitm_vulnerability"));
> > +
> > static org.apache.juli.logging.Log log =
> >
> > org.apache.juli.logging.LogFactory.getLog(JSSESocketFactory.class);
> >
> > @@ -154,12 +159,34 @@
> > SSLSocket asock = null;
> > try {
> > asock = (SSLSocket)socket.accept();
> > + if (!midmMode) {
> > + asock.addHandshakeCompletedListener(
> > + new DisableSslRenegotiation());
> > + }
> > configureClientAuth(asock);
> > } catch (SSLException e){
> > throw new SocketException("SSL handshake error" +
> e.toString());
> > }
> > return asock;
> > }
> > +
> > + private static class DisableSslRenegotiation
> > + implements HandshakeCompletedListener {
> > + private volatile boolean completed = false;
> > +
> > + public void handshakeCompleted(HandshakeCompletedEvent event) {
> > + if (completed) {
> > + try {
> > + log.warn("SSL renegotiation is disabled, closing
> > connection");
> > + event.getSocket().close();
>
> This is just a nuisance. The black-hat can simply reconnect and request to
> resume the session. At the very least, the session would need to be
> invalidated as well. But from what I've read, even this isn't a very
> effective mitigation tactic. Since we are notified after the handshake is
> done, the black-hat already has all the information she needs to continue
> the attack.
>
> > + } catch (IOException e) {
> > + // ignore
> > + }
> > + }
> > + completed = true;
> > + }
> > + }
> > +
> >
> > @Override
> > public void handshake(Socket sock) throws IOException {
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@...
> For additional commands, e-mail: dev-help@...
>
>

Re: svn commit: r834289 - /tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java

2009-11-09T19:49:34Z

<costin@...> wrote in message
news:20091110010244.4F838238888F@......

> Author: costin
> Date: Tue Nov 10 01:02:43 2009
> New Revision: 834289
>
> URL: http://svn.apache.org/viewvc?rev=834289&view=rev
> Log:
> Fix for the SSL midm - disable client re-negotiation, connection will be
> closed.
>
>
> Modified:
>
> tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
>
> Modified:
> tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?rev=834289&r1=834288&r2=834289&view=diff
> ==============================================================================
> ---
> tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
> (original)
> +++
> tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
> Tue Nov 10 01:02:43 2009
> @@ -42,6 +42,8 @@
> import java.util.Vector;
>
> import javax.net.ssl.CertPathTrustManagerParameters;
> +import javax.net.ssl.HandshakeCompletedEvent;
> +import javax.net.ssl.HandshakeCompletedListener;
> import javax.net.ssl.KeyManager;
> import javax.net.ssl.KeyManagerFactory;
> import javax.net.ssl.ManagerFactoryParameters;
> @@ -93,6 +95,9 @@
> private static final int defaultSessionCacheSize = 0;
> private static final int defaultSessionTimeout = 86400;
>
> + private static final boolean midmMode =
> +
> "true".equals(System.getProperty("enable_ssl_mitm_vulnerability"));
> +
> static org.apache.juli.logging.Log log =
>
> org.apache.juli.logging.LogFactory.getLog(JSSESocketFactory.class);
>
> @@ -154,12 +159,34 @@
> SSLSocket asock = null;
> try {
> asock = (SSLSocket)socket.accept();
> + if (!midmMode) {
> + asock.addHandshakeCompletedListener(
> + new DisableSslRenegotiation());
> + }
> configureClientAuth(asock);
> } catch (SSLException e){
> throw new SocketException("SSL handshake error" + e.toString());
> }
> return asock;
> }
> +
> + private static class DisableSslRenegotiation
> + implements HandshakeCompletedListener {
> + private volatile boolean completed = false;
> +
> + public void handshakeCompleted(HandshakeCompletedEvent event) {
> + if (completed) {
> + try {
> + log.warn("SSL renegotiation is disabled, closing
> connection");
> + event.getSocket().close();

This is just a nuisance. The black-hat can simply reconnect and request to
resume the session. At the very least, the session would need to be
invalidated as well. But from what I've read, even this isn't a very
effective mitigation tactic. Since we are notified after the handshake is
done, the black-hat already has all the information she needs to continue
the attack.

> + } catch (IOException e) {
> + // ignore
> + }
> + }
> + completed = true;
> + }
> + }
> +
>
> @Override
> public void handshake(Socket sock) throws IOException {

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

svn commit: r834290 - in /tomcat/trunk/test/org/apache/catalina/startup: TestTomcatSSL.java test.keystore

2009-11-09T17:04:14Z

Author: costin
Date: Tue Nov 10 01:04:13 2009
New Revision: 834290

URL: http://svn.apache.org/viewvc?rev=834290&view=rev
Log:
Test case for the MITM/ssl re-negotiation, also a unit test for a simple ssl request
( to check the fix didn't broke anything and ssl still works )

Added:
tomcat/trunk/test/org/apache/catalina/startup/TestTomcatSSL.java (with props)
tomcat/trunk/test/org/apache/catalina/startup/test.keystore (with props)

Added: tomcat/trunk/test/org/apache/catalina/startup/TestTomcatSSL.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestTomcatSSL.java?rev=834290&view=auto
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TestTomcatSSL.java (added)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestTomcatSSL.java Tue Nov 10 01:04:13 2009
@@ -0,0 +1,153 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.catalina.startup;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import javax.net.ssl.HandshakeCompletedEvent;
+import javax.net.ssl.HandshakeCompletedListener;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.SSLSocket;
+import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+
+import org.apache.tomcat.util.buf.ByteChunk;
+
+/**
+ * Requires test.keystore (checked in), generated with:
+ * keytool -genkey -alias tomcat -keyalg RSA
+ * pass: changeit
+ * CN: localhost ( for hostname validation )
+ */
+public class TestTomcatSSL extends TomcatBaseTest {
+ static TrustManager[] trustAllCerts = new TrustManager[] {
+ new X509TrustManager() {
+ public java.security.cert.X509Certificate[] getAcceptedIssuers() {
+ return null;
+ }
+ public void checkClientTrusted(java.security.cert.X509Certificate[] certs, String authType) {
+ }
+ public void checkServerTrusted(java.security.cert.X509Certificate[] certs, String authType) {
+ }
+ }
+ };
+
+ private void initSsl(Tomcat tomcat) {
+ tomcat.getConnector().setSecure(true);
+ tomcat.getConnector().setProperty("SSLEnabled", "true");
+ tomcat.getConnector().setProperty("sslProtocol",
+ "tls");
+ // test runs in output/tmp
+ tomcat.getConnector().setAttribute("keystore",
+ "../../test/org/apache/catalina/startup/test.keystore");
+ }
+
+
+ public void testSimpleSsl() throws Exception {
+ // Install the all-trusting trust manager so https:// works
+ // with unsigned certs.
+
+ // TODO: cleanup ?
+ try {
+ SSLContext sc = SSLContext.getInstance("SSL");
+ sc.init(null, trustAllCerts, new java.security.SecureRandom());
+ javax.net.ssl.HttpsURLConnection.setDefaultSSLSocketFactory(
+ sc.getSocketFactory());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ Tomcat tomcat = getTomcatInstance();
+
+ File appDir =
+ new File("output/build/webapps/examples");
+ tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());
+ initSsl(tomcat);
+
+ tomcat.start();
+ ByteChunk res = getUrl("https://localhost:" + getPort() +
+ "/examples/servlets/servlet/HelloWorldExample");
+ assertTrue(res.toString().indexOf("<h1>Hello World!</h1>") > 0);
+ }
+
+ boolean handshakeDone = false;
+
+ public void testReHandshake() throws Exception {
+ Tomcat tomcat = getTomcatInstance();
+
+ File appDir =
+ new File("output/build/webapps/examples");
+ // app dir is relative to server home
+ tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath());
+
+ initSsl(tomcat);
+
+ tomcat.start();
+ SSLContext sslCtx = SSLContext.getInstance("TLS");
+ sslCtx.init(null, trustAllCerts, new java.security.SecureRandom());
+ SSLSocketFactory socketFactory = sslCtx.getSocketFactory();
+ SSLSocket socket = (SSLSocket) socketFactory.createSocket("localhost", getPort());
+
+ socket.addHandshakeCompletedListener(new HandshakeCompletedListener() {
+ @Override
+ public void handshakeCompleted(HandshakeCompletedEvent event) {
+ handshakeDone = true;
+ }
+ });
+
+ OutputStream os = socket.getOutputStream();
+ os.write("GET /examples/servlets/servlet/HelloWorldExample HTTP/1.0\n".getBytes());
+ os.flush();
+
+ InputStream is = socket.getInputStream();
+
+ // Doesn't seem to work..
+ socket.getSession().invalidate();
+ socket.startHandshake();
+ handshakeDone = false;
+ byte[] b = new byte[0];
+ int maxTries = 60; // 60 * 1000 = example 1 minute time out
+ socket.setSoTimeout(1000);
+ for (int i = 0; i < maxTries; i++) {
+ try {
+ is.read(b);
+ } catch (IOException e) {
+ // timeout
+ }
+ if (handshakeDone) {
+ break;
+ }
+ }
+ SSLSession session = socket.getSession();
+ os = socket.getOutputStream();
+
+ try {
+ os.write("Host: localhost\n\n".getBytes());
+ } catch (IOException ex) {
+ // success - connection closed
+ return;
+ }
+
+ fail("Re-negotiation worked");
+
+ }
+}

Propchange: tomcat/trunk/test/org/apache/catalina/startup/TestTomcatSSL.java
------------------------------------------------------------------------------
svn:eol-style = native

Added: tomcat/trunk/test/org/apache/catalina/startup/test.keystore
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/test.keystore?rev=834290&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tomcat/trunk/test/org/apache/catalina/startup/test.keystore
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

svn commit: r834289 - /tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java

2009-11-09T17:02:44Z

Author: costin
Date: Tue Nov 10 01:02:43 2009
New Revision: 834289

URL: http://svn.apache.org/viewvc?rev=834289&view=rev
Log:
Fix for the SSL midm - disable client re-negotiation, connection will be closed.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?rev=834289&r1=834288&r2=834289&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java Tue Nov 10 01:02:43 2009
@@ -42,6 +42,8 @@
import java.util.Vector;

import javax.net.ssl.CertPathTrustManagerParameters;
+import javax.net.ssl.HandshakeCompletedEvent;
+import javax.net.ssl.HandshakeCompletedListener;
import javax.net.ssl.KeyManager;
import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.ManagerFactoryParameters;
@@ -93,6 +95,9 @@
private static final int defaultSessionCacheSize = 0;
private static final int defaultSessionTimeout = 86400;

+ private static final boolean midmMode =
+ "true".equals(System.getProperty("enable_ssl_mitm_vulnerability"));
+
static org.apache.juli.logging.Log log =
org.apache.juli.logging.LogFactory.getLog(JSSESocketFactory.class);

@@ -154,12 +159,34 @@
SSLSocket asock = null;
try {
asock = (SSLSocket)socket.accept();
+ if (!midmMode) {
+ asock.addHandshakeCompletedListener(
+ new DisableSslRenegotiation());
+ }
configureClientAuth(asock);
} catch (SSLException e){
throw new SocketException("SSL handshake error" + e.toString());
}
return asock;
}
+
+ private static class DisableSslRenegotiation
+ implements HandshakeCompletedListener {
+ private volatile boolean completed = false;
+
+ public void handshakeCompleted(HandshakeCompletedEvent event) {
+ if (completed) {
+ try {
+ log.warn("SSL renegotiation is disabled, closing connection");
+ event.getSocket().close();
+ } catch (IOException e) {
+ // ignore
+ }
+ }
+ completed = true;
+ }
+ }
+

@Override
public void handshake(Socket sock) throws IOException {

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

svn commit: r834286 - in /tomcat/trunk/java/org/apache/catalina/startup: LocalStrings.properties WebXml.java

2009-11-09T16:31:25Z

Author: markt
Date: Tue Nov 10 00:31:25 2009
New Revision: 834286

URL: http://svn.apache.org/viewvc?rev=834286&view=rev
Log:
Add merge code for the remaining elements in web.xml

Modified:
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/startup/WebXml.java

Modified: tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=834286&r1=834285&r2=834286&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties Tue Nov 10 00:31:25 2009
@@ -115,9 +115,11 @@
webXml.duplicateResourceRef=Duplicate resource-ref name
webXml.reservedName=A web.xml file was detected using a reserved name [{0}]. The name element will be ignored for this fragment.
webXml.mergeConflictDisplayName=The display name was defined in multiple fragments with different values including fragment with name [{0}] located at [{1}]
-webXml.mergeConflictErrorPage=The Error Page for [{0}] was defined in multiple fragments including fragment with name [{1}] located at [{2}]
-webXml.mergeConflictListener=Listener [{0}] was defined in multiple fragments including fragment with name [{1}] located at [{2}]
-webXml.mergeConflictLoginConfig=A LoginConfig was defined in multiple fragments including fragment with name [{1}] located at [{2}]
-webXml.mergeConflictResource=The Resource [{0}] was defined in multiple fragments including fragment with name [{1}] located at [{2}]
-webXml.mergeConflictString=The [{0}] with name [{1}] was defined in multiple fragments including fragment with name [{2}] located at [{3}]
+webXml.mergeConflictErrorPage=The Error Page for [{0}] was defined inconsistently in multiple fragments including fragment with name [{1}] located at [{2}]
+webXml.mergeConflictFilter=The Filter [{0}] was defined inconsistently in multiple fragments including fragment with name [{1}] located at [{2}]
+webXml.mergeConflictLoginConfig=A LoginConfig was defined inconsistently in multiple fragments including fragment with name [{1}] located at [{2}]
+webXml.mergeConflictResource=The Resource [{0}] was defined inconsistently in multiple fragments including fragment with name [{1}] located at [{2}]
+webXml.mergeConflictFilter=The Servlet [{0}] was defined inconsistently in multiple fragments including fragment with name [{1}] located at [{2}]
+webXml.mergeConflictSessionTimeout=The session timeout was defined inconsistently in multiple fragments with different values including fragment with name [{0}] located at [{1}]
+webXml.mergeConflictString=The [{0}] with name [{1}] was defined inconsistently in multiple fragments including fragment with name [{2}] located at [{3}]
webXml.multipleOther=Multiple others entries in ordering

Modified: tomcat/trunk/java/org/apache/catalina/startup/WebXml.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/WebXml.java?rev=834286&r1=834285&r2=834286&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/WebXml.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/WebXml.java Tue Nov 10 00:31:25 2009
@@ -250,6 +250,7 @@
}
welcomeFiles.add(welcomeFile);
}
+ public Set<String> getWelcomeFiles() { return welcomeFiles; }

// error-page
private Map<String,ErrorPage> errorPages = new HashMap<String,ErrorPage>();
@@ -341,11 +342,12 @@
// TODO: Should support multiple description elements with language
// TODO: Should support multiple display-names elements with language
// TODO: Should support multiple icon elements ???
- private Set<ContextService> serviceRefs = new HashSet<ContextService>();
+ private Map<String,ContextService> serviceRefs =
+ new HashMap<String,ContextService>();
public void addServiceRef(ContextService serviceRef) {
- serviceRefs.add(serviceRef);
+ serviceRefs.put(serviceRef.getName(), serviceRef);
}
- public Set<ContextService> getServiceRefs() { return serviceRefs; }
+ public Map<String,ContextService> getServiceRefs() { return serviceRefs; }

// resource-ref
// TODO: Should support multiple description elements with language
@@ -512,7 +514,7 @@
for (String role : securityRoles) {
context.addSecurityRole(role);
}
- for (ContextService service : serviceRefs) {
+ for (ContextService service : serviceRefs.values()) {
context.getNamingResources().addService(service);
}
for (ServletDef servlet : servlets.values()) {
@@ -660,6 +662,27 @@
}

for (WebXml fragment : fragments) {
+ for (Map.Entry<String,FilterDef> entry :
+ fragment.getFilters().entrySet()) {
+ if (filters.containsKey(entry.getKey())) {
+ mergeFilter(entry.getValue(),
+ filters.get(entry.getKey()), false);
+ } else {
+ if (!(mergeFilter(entry.getValue(),
+ temp.getFilters().get(entry.getKey()), true))) {
+ log.error(sm.getString(
+ "webXml.mergeConflictFilter",
+ entry.getKey(),
+ fragment.getName(),
+ fragment.getURL()));
+
+ return false;
+ }
+ }
+ }
+ }
+
+ for (WebXml fragment : fragments) {
for (JspPropertyGroup jspPropertyGroup : fragment.getJspPropertyGroups()) {
// Always additive
addJspPropertyGroup(jspPropertyGroup);
@@ -757,8 +780,77 @@
}
}

+ for (WebXml fragment : fragments) {
+ if (!mergeResourceMap(fragment.getServiceRefs(), serviceRefs,
+ temp.getServiceRefs(), mergeInjectionFlags, fragment)) {
+ return false;
+ }
+ }
+ serviceRefs.putAll(temp.getServiceRefs());
+ mergeInjectionFlags.clear();
+
+ for (WebXml fragment : fragments) {
+ for (Map.Entry<String,String> mapping :
+ fragment.getServletMappings().entrySet()) {
+ // Always additive
+ addServletMapping(mapping.getKey(), mapping.getValue());
+ }
+ }
+
+ for (WebXml fragment : fragments) {
+ for (Map.Entry<String,ServletDef> entry :
+ fragment.getServlets().entrySet()) {
+ if (servlets.containsKey(entry.getKey())) {
+ mergeServlet(entry.getValue(),
+ servlets.get(entry.getKey()), false);
+ } else {
+ if (!(mergeServlet(entry.getValue(),
+ temp.getServlets().get(entry.getKey()), true))) {
+ log.error(sm.getString(
+ "webXml.mergeConflictServlet",
+ entry.getKey(),
+ fragment.getName(),
+ fragment.getURL()));
+
+ return false;
+ }
+ }
+ }
+ }
+

- // TODO SERVLET3 - Merge remaining elements
+ if (sessionTimeout == null) {
+ for (WebXml fragment : fragments) {
+ Integer value = fragment.getSessionTimeout();
+ if (value != null) {
+ if (temp.getSessionTimeout() == null) {
+ temp.setSessionTimeout(value.toString());
+ } else {
+ log.error(sm.getString(
+ "webXml.mergeConflictSessionTimeout",
+ fragment.getName(),
+ fragment.getURL()));
+ return false;
+ }
+ }
+ }
+ sessionTimeout = temp.getSessionTimeout();
+ }
+
+ for (WebXml fragment : fragments) {
+ if (!mergeMap(fragment.getTaglibs(), taglibs,
+ temp.getTaglibs(), fragment, "Taglibs")) {
+ return false;
+ }
+ }
+ taglibs.putAll(temp.getTaglibs());
+
+ for (WebXml fragment : fragments) {
+ for (String welcomeFile : fragment.getWelcomeFiles()) {
+ // Always additive
+ addWelcomeFile(welcomeFile);
+ }
+ }

return true;
}
@@ -828,4 +920,88 @@
}
return true;
}
+
+ private boolean mergeFilter(FilterDef src, FilterDef dest, boolean failOnConflict) {
+ if (src.isAsyncSupported() != dest.isAsyncSupported()) {
+ // Always fail
+ return false;
+ }
+
+ if (dest.getFilterClass() == null) {
+ dest.setFilterClass(src.getFilterClass());
+ } else if (src.getFilterClass() != null) {
+ if (failOnConflict &&
+ !src.getFilterClass().equals(dest.getFilterClass())) {
+ return false;
+ }
+ }
+
+ for (Map.Entry<String,String> srcEntry :
+ src.getParameterMap().entrySet()) {
+ if (dest.getParameterMap().containsKey(srcEntry.getKey())) {
+ if (failOnConflict && !dest.getParameterMap().get(
+ srcEntry.getKey()).equals(srcEntry.getValue())) {
+ return false;
+ }
+ } else {
+ dest.addInitParameter(srcEntry.getKey(), srcEntry.getValue());
+ }
+ }
+ return true;
+ }
+
+ private boolean mergeServlet(ServletDef src, ServletDef dest, boolean failOnConflict) {
+ // These tests should be unnecessary...
+ if (dest.getServletClass() != null && dest.getJspFile() != null) {
+ return false;
+ }
+ if (src.getServletClass() != null && src.getJspFile() != null) {
+ return false;
+ }
+
+
+ if (dest.getServletClass() == null && dest.getJspFile() == null) {
+ dest.setServletClass(src.getServletClass());
+ dest.setJspFile(src.getJspFile());
+ } else if (failOnConflict) {
+ if (src.getServletClass() != null &&
+ (dest.getJspFile() != null ||
+ !src.getServletClass().equals(dest.getServletClass()))) {
+ return false;
+ }
+ if (src.getJspFile() != null &&
+ (dest.getServletClass() != null ||
+ !src.getJspFile().equals(dest.getJspFile()))) {
+ return false;
+ }
+ }
+
+ // Additive
+ for (SecurityRoleRef securityRoleRef : src.getSecurityRoleRefs()) {
+ dest.addSecurityRoleRef(securityRoleRef);
+ }
+
+ if (dest.getLoadOnStartup() == null) {
+ dest.setLoadOnStartup(src.getServletClass());
+ } else if (src.getLoadOnStartup() != null) {
+ if (failOnConflict &&
+ !src.getLoadOnStartup().equals(dest.getLoadOnStartup())) {
+ return false;
+ }
+ }
+
+ for (Map.Entry<String,String> srcEntry :
+ src.getParameterMap().entrySet()) {
+ if (dest.getParameterMap().containsKey(srcEntry.getKey())) {
+ if (failOnConflict && !dest.getParameterMap().get(
+ srcEntry.getKey()).equals(srcEntry.getValue())) {
+ return false;
+ }
+ } else {
+ dest.addInitParameter(srcEntry.getKey(), srcEntry.getValue());
+ }
+ }
+ return true;
+ }
+
}

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

Re: SSL & Tomcat

2009-11-09T16:17:42Z

Costin Manolache wrote:
> Unless someone has a better solution - I'll submit the fix ( tonight ), will
> disable re-negotiation for
> Jsse-mode.
> I added a system property to allow people how don't care about this, IMO by
> default it should
> be on.

Sounds good. Any chance it could be a connector property rather than a
system property? If you don't have a chance to do this I can always make
that change (and do some testing) tomorrow.

> Also got the test case to work - please let me know if it's acceptable to
> commit it, it depends
> on having a .keystore with a 'localhost' cert, didn't find any other SSL
> tests in the suite.

Add the keystore to svn as well. That way, the test should always work.

> Forgot that you need to read() after startHandshake() - just cut&pasted the
> code from
> JsseSupport and it worked.

Mark

> Costin
>
> On Mon, Nov 9, 2009 at 1:32 PM, Costin Manolache <costin@...> wrote:
>
>>
>> On Mon, Nov 9, 2009 at 10:47 AM, Costin Manolache <costin@...>wrote:
>>
>>>
>>> On Mon, Nov 9, 2009 at 8:04 AM, Konstantin Kolinko <
>>> knst.kolinko@...> wrote:
>>>
>>>> 2009/11/9 Mark Thomas <markt@...>:
>>>>> Summarising the information gathered so far from various channels
>>>>> (thanks to Bill B., Bill W. & Rainer who have done most of the actual
>>>>> work to find the info below).
>>>>>
>>>>> BIO/NIO connectors using JSSE.
>>>>> Vulnerable when renegotiation is triggered by the client or server.
>>>>> We could prevent server initiated renegotiation (and probably break the
>>>>> majority of configurations using CLIENT-CERT).
>>>>> We can't do anything to prevent client initiated renegotiation.
>>>>>
>>>>> APR/native connector using OpenSSL
>>>>> It is vulnerable when renegotiation is triggered by the client or by
>>>> the
>>>>> server.
>>>>> Client triggered negotiation is supported.
>>>>> Server triggered negotiation will be supported from 1.1.17 onwards.
>>>>>
>>>>> OpenSSL 0.9.8l disables negotiation by default
>>>>>
>>>>>
>>>>> In terms of what this means for users:
>>>>>
>>>>> BIO/NIO
>>>>> - There isn't anything we can do in Tomcat to stop client
>>>>> initiated renegotiation so it is a case of waiting for the JVM
>>>>> vendors to respond.
>>>>>
>>>>> APR/native
>>>>> - Re-building their current version with 0.9.8l will protect
>>>>> users at the risk of breaking any configurations that
>>>>> require renegotiation.
>>>>> - We can release 1.1.17 with the binaries built with 0.9.8l. This
>>>>> will also protect users at the risk of breaking any
>>>>> configurations that require renegotiation. Mladen is doing this
>>>>> now.
>>>>> - Supporting renegotiation whilst avoiding the vulnerability will
>>>>> require a protocol fix. In the meantime, we could port port
>>>>> r833582 from httpd which would disable client triggered
>>>>> renegotiation for OpenSSL < 0.9.8l (which may help some users
>>>>> who can't easily change their OpenSSl version and release 1.1.18
>>>>> with this fix
>>>>> - Once the protocol is fixed, release 1.1.next bundled with the
>>>>> appropriate version of OpenSSL
>>>>>
>>>>>
>>>>> Have I got my facts right above? If so, any objections to posting the
>>>>> above to the users@ and announce@ lists along with adding something to
>>>>> the security pages?
>>>>>
>>>>> Mark
>>>>>
>>>> +1
>>>>
>>>> s/negotiation/renegotiation/
>>>> s/port port/port/
>>>>
>>>> A question:
>>>> My understanding of renegotiation is that it changes SSL session. Is
>>>> it possible to observe changes in the value of SSL sessionId? I doubt
>>>> so, but may be?
>>>>
>>> AFAIK you can reuse the session ID across negotiations ( it's a nice
>>> optimization BTW, too
>>> bad we're not using, it can speed up SSL connections a lot ), I'm not sure
>>> if it changes
>>> within a renegotation, but AFAIK when you start any negotiation you can
>>> specify you want
>>> to reuse the old session id. But if I understand the exploit correctly -
>>> they would want a different
>>> cypher, and if you reuse the session you reuse the old one.
>>>
>>>
>>> Maybe we can modify JSSESupport.Listener to break the connection if
>>> handshakeCompleted is
>>> called > once in a connection ? That is besides disabling server-initiated
>>> handshakes.
>>>
>>>
>> BTW - confirmed that JSSESupport.Listener is called when client does
>> re-negotiate, but it is not called on the first
>> negotiation ( it's added too late ).
>>
>> However it's pretty easy to add a listener earlier, patch attached - it
>> should break all client re-negotiations, so we don't need
>> to wait for a JDK fix.
>>
>> I wrote a small unit test - but I'm can't seem to get jsse client to
>> re-negotiate for the test, can only do it using command line
>> openssl. The patch seems to work - but you need so system properties or
>> flags if we want to let people
>> disable this ( "allowManInTheMiddle" is a good name for a flag ). Also
>> the test needs a bit of work.
>>
>> If anyone has more time, my 20% is getting low ....
>>
>>
>> Costin
>>
>>
>>
>>> Costin
>>>
>>>
>>>
>>>> We read that value once and provide it to our users as
>>>> "javax.servlet.request.ssl_session" request attribute.
>>>>
>>>> Regarding valves (as mentioned in issue 48157):
>>>> I understand, that that is not sufficient, but if anyone wants to
>>>> check against malformed headers, they can do so.
>>>>
>>>> Best regards,
>>>> Konstantin Kolinko
>>>>
>>>> ---------------------------------------------------------------------
>>>> To unsubscribe, e-mail: dev-unsubscribe@...
>>>> For additional commands, e-mail: dev-help@...
>>>>
>>>>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

Re: SSL & Tomcat

2009-11-09T16:09:50Z

Unless someone has a better solution - I'll submit the fix ( tonight ), will
disable re-negotiation for
Jsse-mode.
I added a system property to allow people how don't care about this, IMO by
default it should
be on.

Also got the test case to work - please let me know if it's acceptable to
commit it, it depends
on having a .keystore with a 'localhost' cert, didn't find any other SSL
tests in the suite.
Forgot that you need to read() after startHandshake() - just cut&pasted the
code from
JsseSupport and it worked.

Costin

On Mon, Nov 9, 2009 at 1:32 PM, Costin Manolache <costin@...> wrote:

>
>
> On Mon, Nov 9, 2009 at 10:47 AM, Costin Manolache <costin@...>wrote:
>
>>
>>
>> On Mon, Nov 9, 2009 at 8:04 AM, Konstantin Kolinko <
>> knst.kolinko@...> wrote:
>>
>>> 2009/11/9 Mark Thomas <markt@...>:
>>> > Summarising the information gathered so far from various channels
>>> > (thanks to Bill B., Bill W. & Rainer who have done most of the actual
>>> > work to find the info below).
>>> >
>>> > BIO/NIO connectors using JSSE.
>>> > Vulnerable when renegotiation is triggered by the client or server.
>>> > We could prevent server initiated renegotiation (and probably break the
>>> > majority of configurations using CLIENT-CERT).
>>> > We can't do anything to prevent client initiated renegotiation.
>>> >
>>> > APR/native connector using OpenSSL
>>> > It is vulnerable when renegotiation is triggered by the client or by
>>> the
>>> > server.
>>> > Client triggered negotiation is supported.
>>> > Server triggered negotiation will be supported from 1.1.17 onwards.
>>> >
>>> > OpenSSL 0.9.8l disables negotiation by default
>>> >
>>> >
>>> > In terms of what this means for users:
>>> >
>>> > BIO/NIO
>>> > - There isn't anything we can do in Tomcat to stop client
>>> > initiated renegotiation so it is a case of waiting for the JVM
>>> > vendors to respond.
>>> >
>>> > APR/native
>>> > - Re-building their current version with 0.9.8l will protect
>>> > users at the risk of breaking any configurations that
>>> > require renegotiation.
>>> > - We can release 1.1.17 with the binaries built with 0.9.8l. This
>>> > will also protect users at the risk of breaking any
>>> > configurations that require renegotiation. Mladen is doing this
>>> > now.
>>> > - Supporting renegotiation whilst avoiding the vulnerability will
>>> > require a protocol fix. In the meantime, we could port port
>>> > r833582 from httpd which would disable client triggered
>>> > renegotiation for OpenSSL < 0.9.8l (which may help some users
>>> > who can't easily change their OpenSSl version and release 1.1.18
>>> > with this fix
>>> > - Once the protocol is fixed, release 1.1.next bundled with the
>>> > appropriate version of OpenSSL
>>> >
>>> >
>>> > Have I got my facts right above? If so, any objections to posting the
>>> > above to the users@ and announce@ lists along with adding something to
>>> > the security pages?
>>> >
>>> > Mark
>>> >
>>>
>>> +1
>>>
>>> s/negotiation/renegotiation/
>>> s/port port/port/
>>>
>>> A question:
>>> My understanding of renegotiation is that it changes SSL session. Is
>>> it possible to observe changes in the value of SSL sessionId? I doubt
>>> so, but may be?
>>>
>>
>> AFAIK you can reuse the session ID across negotiations ( it's a nice
>> optimization BTW, too
>> bad we're not using, it can speed up SSL connections a lot ), I'm not sure
>> if it changes
>> within a renegotation, but AFAIK when you start any negotiation you can
>> specify you want
>> to reuse the old session id. But if I understand the exploit correctly -
>> they would want a different
>> cypher, and if you reuse the session you reuse the old one.
>>
>>
>> Maybe we can modify JSSESupport.Listener to break the connection if
>> handshakeCompleted is
>> called > once in a connection ? That is besides disabling server-initiated
>> handshakes.
>>
>>
>
> BTW - confirmed that JSSESupport.Listener is called when client does
> re-negotiate, but it is not called on the first
> negotiation ( it's added too late ).
>
> However it's pretty easy to add a listener earlier, patch attached - it
> should break all client re-negotiations, so we don't need
> to wait for a JDK fix.
>
> I wrote a small unit test - but I'm can't seem to get jsse client to
> re-negotiate for the test, can only do it using command line
> openssl. The patch seems to work - but you need so system properties or
> flags if we want to let people
> disable this ( "allowManInTheMiddle" is a good name for a flag ). Also
> the test needs a bit of work.
>
> If anyone has more time, my 20% is getting low ....
>
>
> Costin
>
>
>
>> Costin
>>
>>
>>
>>> We read that value once and provide it to our users as
>>> "javax.servlet.request.ssl_session" request attribute.
>>>
>>> Regarding valves (as mentioned in issue 48157):
>>> I understand, that that is not sufficient, but if anyone wants to
>>> check against malformed headers, they can do so.
>>>
>>> Best regards,
>>> Konstantin Kolinko
>>>
>>> ---------------------------------------------------------------------
>>> To unsubscribe, e-mail: dev-unsubscribe@...
>>> For additional commands, e-mail: dev-help@...
>>>
>>>
>>
>

broken link on tomcat resource page

2009-11-09T15:53:06Z

Last week I noticed the link to Filip's old tomcat 16,000 concurrent
connections was broken on the resources page.

http://tomcat.apache.org/resources.html

peter lin

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

svn commit: r834262 - /tomcat/tc5.5.x/trunk/STATUS.txt

2009-11-09T14:35:06Z

Author: markt
Date: Mon Nov 9 22:35:04 2009
New Revision: 834262

URL: http://svn.apache.org/viewvc?rev=834262&view=rev
Log:
Cookie changes proposal

Modified:
tomcat/tc5.5.x/trunk/STATUS.txt

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=834262&r1=834261&r2=834262&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Mon Nov 9 22:35:04 2009
@@ -186,3 +186,15 @@
http://svn.apache.org/viewvc?rev=834047&view=rev
+1: markt
-1:
+
+* Backport cookie changes
+ - Add option to control treatment of / as a separator
+ - Single quote is not a spearator
+ - Link ALWAYS_ADD_EXPIRES so STRICT_SERVLET_COMPLIANCE
+ - Add option to enforce cookie naming rules
+ - Add option to allow = in cookie values
+ - Auto switching is not a spec breach
+ - Auto switch on use of comment
+ http://people.apache.org/~markt/patches/2009-11-09-tc5-cookies.patch
+ +1: markt
+ -1:
\ No newline at end of file

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

svn commit: r834260 - /tomcat/tc6.0.x/trunk/STATUS.txt

2009-11-09T14:34:35Z

Author: markt
Date: Mon Nov 9 22:34:35 2009
New Revision: 834260

URL: http://svn.apache.org/viewvc?rev=834260&view=rev
Log:
Cookie changes proposal

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=834260&r1=834259&r2=834260&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Nov 9 22:34:35 2009
@@ -378,3 +378,15 @@
http://svn.apache.org/viewvc?rev=834047&view=rev
+1: markt
-1:
+
+* Backport cookie changes
+ - Add option to control treatment of / as a separator
+ - Single quote is not a spearator
+ - Link ALWAYS_ADD_EXPIRES so STRICT_SERVLET_COMPLIANCE
+ - Add option to enforce cookie naming rules
+ - Add option to allow = in cookie values
+ - Auto switching is not a spec breach
+ - Auto switch on use of comment
+ http://people.apache.org/~markt/patches/2009-11-09-tc6-cookies.patch
+ +1: markt
+ -1:

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

Re: SSL & Tomcat

2009-11-09T13:32:04Z

On Mon, Nov 9, 2009 at 10:47 AM, Costin Manolache <costin@...> wrote:

On Mon, Nov 9, 2009 at 8:04 AM, Konstantin Kolinko <knst.kolinko@...> wrote:

2009/11/9 Mark Thomas <markt@...>:

> Summarising the information gathered so far from various channels
> (thanks to Bill B., Bill W. & Rainer who have done most of the actual
> work to find the info below).
>
> BIO/NIO connectors using JSSE.
> Vulnerable when renegotiation is triggered by the client or server.
> We could prevent server initiated renegotiation (and probably break the
> majority of configurations using CLIENT-CERT).
> We can't do anything to prevent client initiated renegotiation.
>
> APR/native connector using OpenSSL
> It is vulnerable when renegotiation is triggered by the client or by the
> server.
> Client triggered negotiation is supported.
> Server triggered negotiation will be supported from 1.1.17 onwards.
>
> OpenSSL 0.9.8l disables negotiation by default
>
>
> In terms of what this means for users:
>
> BIO/NIO
> - There isn't anything we can do in Tomcat to stop client
> initiated renegotiation so it is a case of waiting for the JVM
> vendors to respond.
>
> APR/native
> - Re-building their current version with 0.9.8l will protect
> users at the risk of breaking any configurations that
> require renegotiation.
> - We can release 1.1.17 with the binaries built with 0.9.8l. This
> will also protect users at the risk of breaking any
> configurations that require renegotiation. Mladen is doing this
> now.
> - Supporting renegotiation whilst avoiding the vulnerability will
> require a protocol fix. In the meantime, we could port port
> r833582 from httpd which would disable client triggered
> renegotiation for OpenSSL < 0.9.8l (which may help some users
> who can't easily change their OpenSSl version and release 1.1.18
> with this fix
> - Once the protocol is fixed, release 1.1.next bundled with the
> appropriate version of OpenSSL
>
>
> Have I got my facts right above? If so, any objections to posting the
> above to the users@ and announce@ lists along with adding something to
> the security pages?
>
> Mark
>

+1

s/negotiation/renegotiation/
s/port port/port/

A question:
My understanding of renegotiation is that it changes SSL session. Is
it possible to observe changes in the value of SSL sessionId? I doubt
so, but may be?

AFAIK you can reuse the session ID across negotiations ( it's a nice optimization BTW, too
bad we're not using, it can speed up SSL connections a lot ), I'm not sure if it changes

within a renegotation, but AFAIK when you start any negotiation you can specify you want
to reuse the old session id. But if I understand the exploit correctly - they would want a different
cypher, and if you reuse the session you reuse the old one.

Maybe we can modify JSSESupport.Listener to break the connection if handshakeCompleted is
called > once in a connection ? That is besides disabling server-initiated handshakes.

BTW - confirmed that JSSESupport.Listener is called when client does re-negotiate, but it is not called on the first

negotiation ( it's added too late ).

However it's pretty easy to add a listener earlier, patch attached - it should break all client re-negotiations, so we don't need

to wait for a JDK fix.

I wrote a small unit test - but I'm can't seem to get jsse client to re-negotiate for the test, can only do it using command line

openssl. The patch seems to work - but you need so system properties or flags if we want to let people

disable this ( "allowManInTheMiddle" is a good name for a flag ). Also the test needs a bit of work.

If anyone has more time, my 20% is getting low ....

Costin

Costin

We read that value once and provide it to our users as
"javax.servlet.request.ssl_session" request attribute.

Regarding valves (as mentioned in issue 48157):
I understand, that that is not sufficient, but if anyone wants to
check against malformed headers, they can do so.

Best regards,
Konstantin Kolinko

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

[TestTomcatSSL.java]

/* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.apache.catalina.startup; import java.io.BufferedInputStream; import java.io.File; import java.io.InputStream; import java.io.OutputStream; import java.net.Socket; import javax.net.ssl.HandshakeCompletedEvent; import javax.net.ssl.HandshakeCompletedListener; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSocket; import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.TrustManager; import javax.net.ssl.X509TrustManager; import org.apache.tomcat.util.buf.ByteChunk; /** * Requires: * keytool -genkey -alias tomcat -keyalg RSA * pass: changeit * CN: localhost ( for hostname validation ) */ public class TestTomcatSSL extends TomcatBaseTest { static TrustManager[] trustAllCerts = new TrustManager[] { new X509TrustManager() { public java.security.cert.X509Certificate[] getAcceptedIssuers() { return null; } public void checkClientTrusted(java.security.cert.X509Certificate[] certs, String authType) { } public void checkServerTrusted(java.security.cert.X509Certificate[] certs, String authType) { } } }; static { // Install the all-trusting trust manager try { SSLContext sc = SSLContext.getInstance("SSL"); sc.init(null, trustAllCerts, new java.security.SecureRandom()); javax.net.ssl.HttpsURLConnection.setDefaultSSLSocketFactory( sc.getSocketFactory()); } catch (Exception e) { e.printStackTrace(); } } public void testHandshake() throws Exception { Tomcat tomcat = getTomcatInstance(); File appDir = new File("output/build/webapps/examples"); // app dir is relative to server home tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath()); tomcat.getConnector().setSecure(true); tomcat.getConnector().setProperty("SSLEnabled", "true"); tomcat.getConnector().setProperty("sslProtocol", "tls"); tomcat.start(); ByteChunk res = getUrl("https://localhost:" + getPort() + "/examples/servlets/servlet/HelloWorldExample"); assertTrue(res.toString().indexOf("<h1>Hello World!</h1>") > 0); } public void testReHandshake() throws Exception { Tomcat tomcat = getTomcatInstance(); File appDir = new File("output/build/webapps/examples"); // app dir is relative to server home tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath()); tomcat.getConnector().setSecure(true); tomcat.getConnector().setProperty("SSLEnabled", "true"); tomcat.getConnector().setProperty("sslProtocol", "tls"); tomcat.start(); SSLContext sslCtx = SSLContext.getInstance("TLS"); sslCtx.init(null, trustAllCerts, new java.security.SecureRandom()); SSLSocketFactory socketFactory = sslCtx.getSocketFactory(); SSLSocket socket = (SSLSocket) socketFactory.createSocket("localhost", getPort()); socket.addHandshakeCompletedListener(new HandshakeCompletedListener() { @Override public void handshakeCompleted(HandshakeCompletedEvent event) { System.err.println("Handshake done"); } }); OutputStream os = socket.getOutputStream(); os.write("GET /examples/servlets/servlet/HelloWorldExample HTTP/1.0\n".getBytes()); socket.getSession().invalidate(); socket.startHandshake(); os.write("Host: localhost\n\n".getBytes()); InputStream is = socket.getInputStream(); ByteChunk out = new ByteChunk(); BufferedInputStream bis = new BufferedInputStream(is); byte[] buf = new byte[2048]; int rd = 0; while((rd = bis.read(buf)) > 0) { out.append(buf, 0, rd); } assertTrue(out.toString().indexOf("<h1>Hello World!</h1>") > 0); } }

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

svn commit: r834238 - in /tomcat/trunk/java/org/apache: catalina/tribes/util/StringManager.java naming/StringManager.java tomcat/util/res/StringManager.java

2009-11-09T13:18:02Z

Author: markt
Date: Mon Nov 9 21:18:01 2009
New Revision: 834238

URL: http://svn.apache.org/viewvc?rev=834238&view=rev
Log:
Align all three StringManager implementations

Modified:
tomcat/trunk/java/org/apache/catalina/tribes/util/StringManager.java
tomcat/trunk/java/org/apache/naming/StringManager.java
tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java

Modified: tomcat/trunk/java/org/apache/catalina/tribes/util/StringManager.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/util/StringManager.java?rev=834238&r1=834237&r2=834238&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/util/StringManager.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/util/StringManager.java Mon Nov 9 21:18:01 2009
@@ -1,21 +1,20 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/

-
package org.apache.catalina.tribes.util;

import java.text.MessageFormat;
@@ -23,7 +22,6 @@
import java.util.Locale;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
-import java.net.URLClassLoader;

/**
* An internationalization / localization helper class which reduces
@@ -44,8 +42,12 @@
* <p>Please see the documentation for java.util.ResourceBundle for
* more information.
*
+ * @version $Revision$ $Date$
+ *
* @author James Duncan Davidson [duncan@...]
* @author James Todd [gonzo@...]
+ * @author Mel Martinez [mmartinez@...]
+ * @see java.util.ResourceBundle
*/

public class StringManager {
@@ -53,11 +55,8 @@
/**
* The ResourceBundle for this StringManager.
*/
-
private ResourceBundle bundle;
-
- private static org.apache.juli.logging.Log log=
- org.apache.juli.logging.LogFactory.getLog( StringManager.class );
+ private Locale locale;

/**
* Creates a new StringManager for a given package. This is a
@@ -67,60 +66,62 @@
*
* @param packageName Name of package to create StringManager for.
*/
-
private StringManager(String packageName) {
String bundleName = packageName + ".LocalStrings";
try {
- bundle = ResourceBundle.getBundle(bundleName);
- return;
+ bundle = ResourceBundle.getBundle(bundleName, Locale.getDefault());
} catch( MissingResourceException ex ) {
- // Try from the current loader ( that's the case for trusted apps )
- ClassLoader cl=Thread.currentThread().getContextClassLoader();
+ // Try from the current loader (that's the case for trusted apps)
+ // Should only be required if using a TC5 style classloader structure
+ // where common != shared != server
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
if( cl != null ) {
try {
- bundle=ResourceBundle.getBundle(bundleName, Locale.getDefault(), cl);
- return;
+ bundle = ResourceBundle.getBundle(
+ bundleName, Locale.getDefault(), cl);
} catch(MissingResourceException ex2) {
+ // Ignore
}
}
- if( cl==null )
- cl=this.getClass().getClassLoader();
-
- if (log.isDebugEnabled())
- log.debug("Can't find resource " + bundleName +
- " " + cl);
- if( cl instanceof URLClassLoader ) {
- if (log.isDebugEnabled())
- log.debug( ((URLClassLoader)cl).getURLs());
- }
+ }
+ // Get the actual locale, which may be different from the requested one
+ if (bundle != null) {
+ locale = bundle.getLocale();
}
}

/**
- * Get a string from the underlying resource bundle.
- *
- * @param key The resource name
+ Get a string from the underlying resource bundle or return
+ null if the String is not found.
+
+ @param key to desired resource String
+ @return resource String matching <i>key</i> from underlying
+ bundle or null if not found.
+ @throws IllegalArgumentException if <i>key</i> is null.
*/
public String getString(String key) {
- return MessageFormat.format(getStringInternal(key), (Object [])null);
- }
+ if(key == null){
+ String msg = "key may not have a null value";

-
- protected String getStringInternal(String key) {
- if (key == null) {
- String msg = "key is null";
-
- throw new NullPointerException(msg);
+ throw new IllegalArgumentException(msg);
}

String str = null;

- if( bundle==null )
- return key;
try {
str = bundle.getString(key);
- } catch (MissingResourceException mre) {
- str = "Cannot find message associated with key '" + key + "'";
+ } catch(MissingResourceException mre) {
+ //bad: shouldn't mask an exception the following way:
+ // str = "[cannot find message associated with key '" + key + "' due to " + mre + "]";
+ // because it hides the fact that the String was missing
+ // from the calling code.
+ //good: could just throw the exception (or wrap it in another)
+ // but that would probably cause much havoc on existing
+ // code.
+ //better: consistent with container pattern to
+ // simply return null. Calling code can then do
+ // a null check.
+ str = null;
}

return str;
@@ -130,109 +131,26 @@
* Get a string from the underlying resource bundle and format
* it with the given set of arguments.
*
- * @param key The resource name
- * @param args Formatting directives
+ * @param key
+ * @param args
*/
-
- public String getString(String key, Object[] args) {
- String iString = null;
- String value = getStringInternal(key);
-
- // this check for the runtime exception is some pre 1.1.6
- // VM's don't do an automatic toString() on the passed in
- // objects and barf out
-
- try {
- // ensure the arguments are not null so pre 1.2 VM's don't barf
- Object nonNullArgs[] = args;
- for (int i=0; i<args.length; i++) {
- if (args[i] == null) {
- if (nonNullArgs==args) nonNullArgs = args.clone();
- nonNullArgs[i] = "null";
- }
- }
-
- iString = MessageFormat.format(value, nonNullArgs);
- } catch (IllegalArgumentException iae) {
- StringBuilder buf = new StringBuilder();
- buf.append(value);
- for (int i = 0; i < args.length; i++) {
- buf.append(" arg[" + i + "]=" + args[i]);
- }
- iString = buf.toString();
+ public String getString(final String key, final Object... args) {
+ String value = getString(key);
+ if (value == null) {
+ value = key;
}
- return iString;
- }
-
- /**
- * Get a string from the underlying resource bundle and format it
- * with the given object argument. This argument can of course be
- * a String object.
- *
- * @param key The resource name
- * @param arg Formatting directive
- */
-
- public String getString(String key, Object arg) {
- Object[] args = new Object[] {arg};
- return getString(key, args);
- }
-
- /**
- * Get a string from the underlying resource bundle and format it
- * with the given object arguments. These arguments can of course
- * be String objects.
- *
- * @param key The resource name
- * @param arg1 Formatting directive
- * @param arg2 Formatting directive
- */

- public String getString(String key, Object arg1, Object arg2) {
- Object[] args = new Object[] {arg1, arg2};
- return getString(key, args);
+ MessageFormat mf = new MessageFormat(value);
+ mf.setLocale(locale);
+ return mf.format(args, new StringBuffer(), null).toString();
}

- /**
- * Get a string from the underlying resource bundle and format it
- * with the given object arguments. These arguments can of course
- * be String objects.
- *
- * @param key The resource name
- * @param arg1 Formatting directive
- * @param arg2 Formatting directive
- * @param arg3 Formatting directive
- */
-
- public String getString(String key, Object arg1, Object arg2,
- Object arg3) {
- Object[] args = new Object[] {arg1, arg2, arg3};
- return getString(key, args);
- }
-
- /**
- * Get a string from the underlying resource bundle and format it
- * with the given object arguments. These arguments can of course
- * be String objects.
- *
- * @param key The resource name
- * @param arg1 Formatting directive
- * @param arg2 Formatting directive
- * @param arg3 Formatting directive
- * @param arg4 Formatting directive
- */
-
- public String getString(String key, Object arg1, Object arg2,
- Object arg3, Object arg4) {
- Object[] args = new Object[] {arg1, arg2, arg3, arg4};
- return getString(key, args);
- }
// --------------------------------------------------------------
// STATIC SUPPORT METHODS
// --------------------------------------------------------------

private static Hashtable<String, StringManager> managers =
- new Hashtable<String,StringManager>();
+ new Hashtable<String, StringManager>();

/**
* Get the StringManager for a particular package. If a manager for
@@ -241,14 +159,13 @@
*
* @param packageName The package name
*/
-
public synchronized static final StringManager getManager(String packageName) {
StringManager mgr = managers.get(packageName);
-
if (mgr == null) {
mgr = new StringManager(packageName);
managers.put(packageName, mgr);
}
return mgr;
}
+
}

Modified: tomcat/trunk/java/org/apache/naming/StringManager.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/StringManager.java?rev=834238&r1=834237&r2=834238&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/StringManager.java (original)
+++ tomcat/trunk/java/org/apache/naming/StringManager.java Mon Nov 9 21:18:01 2009
@@ -1,25 +1,25 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */

package org.apache.naming;

import java.text.MessageFormat;
import java.util.Hashtable;
+import java.util.Locale;
import java.util.MissingResourceException;
import java.util.ResourceBundle;

@@ -42,8 +42,12 @@
* <p>Please see the documentation for java.util.ResourceBundle for
* more information.
*
+ * @version $Revision$ $Date$
+ *
* @author James Duncan Davidson [duncan@...]
* @author James Todd [gonzo@...]
+ * @author Mel Martinez [mmartinez@...]
+ * @see java.util.ResourceBundle
*/

public class StringManager {
@@ -51,8 +55,8 @@
/**
* The ResourceBundle for this StringManager.
*/
-
private ResourceBundle bundle;
+ private Locale locale;

/**
* Creates a new StringManager for a given package. This is a
@@ -62,31 +66,62 @@
*
* @param packageName Name of package to create StringManager for.
*/
-
private StringManager(String packageName) {
- String bundleName = packageName + ".LocalStrings";
- bundle = ResourceBundle.getBundle(bundleName);
+ String bundleName = packageName + ".LocalStrings";
+ try {
+ bundle = ResourceBundle.getBundle(bundleName, Locale.getDefault());
+ } catch( MissingResourceException ex ) {
+ // Try from the current loader (that's the case for trusted apps)
+ // Should only be required if using a TC5 style classloader structure
+ // where common != shared != server
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ if( cl != null ) {
+ try {
+ bundle = ResourceBundle.getBundle(
+ bundleName, Locale.getDefault(), cl);
+ } catch(MissingResourceException ex2) {
+ // Ignore
+ }
+ }
+ }
+ // Get the actual locale, which may be different from the requested one
+ if (bundle != null) {
+ locale = bundle.getLocale();
+ }
}

/**
- * Get a string from the underlying resource bundle.
- *
- * @param key
+ Get a string from the underlying resource bundle or return
+ null if the String is not found.
+
+ @param key to desired resource String
+ @return resource String matching <i>key</i> from underlying
+ bundle or null if not found.
+ @throws IllegalArgumentException if <i>key</i> is null.
*/
-
public String getString(String key) {
- if (key == null) {
- String msg = "key is null";
+ if(key == null){
+ String msg = "key may not have a null value";

- throw new NullPointerException(msg);
+ throw new IllegalArgumentException(msg);
}

String str = null;

try {
- str = bundle.getString(key);
- } catch (MissingResourceException mre) {
- str = "Cannot find message associated with key '" + key + "'";
+ str = bundle.getString(key);
+ } catch(MissingResourceException mre) {
+ //bad: shouldn't mask an exception the following way:
+ // str = "[cannot find message associated with key '" + key + "' due to " + mre + "]";
+ // because it hides the fact that the String was missing
+ // from the calling code.
+ //good: could just throw the exception (or wrap it in another)
+ // but that would probably cause much havoc on existing
+ // code.
+ //better: consistent with container pattern to
+ // simply return null. Calling code can then do
+ // a null check.
+ str = null;
}

return str;
@@ -99,121 +134,38 @@
* @param key
* @param args
*/
-
- public String getString(String key, Object[] args) {
- String iString = null;
+ public String getString(final String key, final Object... args) {
String value = getString(key);
+ if (value == null) {
+ value = key;
+ }

- // this check for the runtime exception is some pre 1.1.6
- // VM's don't do an automatic toString() on the passed in
- // objects and barf out
-
- try {
- // ensure the arguments are not null so pre 1.2 VM's don't barf
- Object nonNullArgs[] = args;
- for (int i=0; i<args.length; i++) {
- if (args[i] == null) {
- if (nonNullArgs==args) nonNullArgs = args.clone();
- nonNullArgs[i] = "null";
- }
- }
-
- iString = MessageFormat.format(value, nonNullArgs);
- } catch (IllegalArgumentException iae) {
- StringBuilder buf = new StringBuilder();
- buf.append(value);
- for (int i = 0; i < args.length; i++) {
- buf.append(" arg[" + i + "]=" + args[i]);
- }
- iString = buf.toString();
- }
- return iString;
- }
-
- /**
- * Get a string from the underlying resource bundle and format it
- * with the given object argument. This argument can of course be
- * a String object.
- *
- * @param key
- * @param arg
- */
-
- public String getString(String key, Object arg) {
- Object[] args = new Object[] {arg};
- return getString(key, args);
- }
-
- /**
- * Get a string from the underlying resource bundle and format it
- * with the given object arguments. These arguments can of course
- * be String objects.
- *
- * @param key
- * @param arg1
- * @param arg2
- */
-
- public String getString(String key, Object arg1, Object arg2) {
- Object[] args = new Object[] {arg1, arg2};
- return getString(key, args);
- }
-
- /**
- * Get a string from the underlying resource bundle and format it
- * with the given object arguments. These arguments can of course
- * be String objects.
- *
- * @param key
- * @param arg1
- * @param arg2
- * @param arg3
- */
-
- public String getString(String key, Object arg1, Object arg2,
- Object arg3) {
- Object[] args = new Object[] {arg1, arg2, arg3};
- return getString(key, args);
+ MessageFormat mf = new MessageFormat(value);
+ mf.setLocale(locale);
+ return mf.format(args, new StringBuffer(), null).toString();
}
-
- /**
- * Get a string from the underlying resource bundle and format it
- * with the given object arguments. These arguments can of course
- * be String objects.
- *
- * @param key
- * @param arg1
- * @param arg2
- * @param arg3
- * @param arg4
- */

- public String getString(String key, Object arg1, Object arg2,
- Object arg3, Object arg4) {
- Object[] args = new Object[] {arg1, arg2, arg3, arg4};
- return getString(key, args);
- }
// --------------------------------------------------------------
// STATIC SUPPORT METHODS
// --------------------------------------------------------------

- private static Hashtable<String,StringManager> managers =
- new Hashtable<String,StringManager>();
+ private static Hashtable<String, StringManager> managers =
+ new Hashtable<String, StringManager>();

/**
* Get the StringManager for a particular package. If a manager for
* a package already exists, it will be reused, else a new
* StringManager will be created and returned.
*
- * @param packageName
+ * @param packageName The package name
*/
-
public synchronized static final StringManager getManager(String packageName) {
- StringManager mgr = managers.get(packageName);
- if (mgr == null) {
- mgr = new StringManager(packageName);
- managers.put(packageName, mgr);
- }
- return mgr;
+ StringManager mgr = managers.get(packageName);
+ if (mgr == null) {
+ mgr = new StringManager(packageName);
+ managers.put(packageName, mgr);
+ }
+ return mgr;
}
+
}

Modified: tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java?rev=834238&r1=834237&r2=834238&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java Mon Nov 9 21:18:01 2009
@@ -80,6 +80,7 @@
bundle = ResourceBundle.getBundle(
bundleName, Locale.getDefault(), cl);
} catch(MissingResourceException ex2) {
+ // Ignore
}
}
}

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

svn commit: r834233 - in /tomcat/trunk/java/org/apache: catalina/connector/ catalina/core/ catalina/ha/ catalina/ha/session/ catalina/ha/tcp/ catalina/session/ catalina/tribes/membership/ catalina/tribes/transport/ catalina/tribes/transport/nio/ catali...

2009-11-09T13:06:38Z

Author: markt
Date: Mon Nov 9 21:06:37 2009
New Revision: 834233

URL: http://svn.apache.org/viewvc?rev=834233&view=rev
Log:
StringManagers should be static final

Modified:
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java
tomcat/trunk/java/org/apache/catalina/core/JasperListener.java
tomcat/trunk/java/org/apache/catalina/ha/ClusterListener.java
tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
tomcat/trunk/java/org/apache/catalina/session/StoreBase.java
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java
tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
tomcat/trunk/java/org/apache/catalina/valves/SemaphoreValve.java
tomcat/trunk/java/org/apache/naming/NamingContext.java
tomcat/trunk/java/org/apache/naming/SelectorContext.java
tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java
tomcat/trunk/java/org/apache/naming/resources/ProxyDirContext.java
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=834233&r1=834232&r2=834233&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Mon Nov 9 21:06:37 2009
@@ -187,7 +187,7 @@
/**
* The string manager for this package.
*/
- protected StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=834233&r1=834232&r2=834233&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Mon Nov 9 21:06:37 2009
@@ -106,7 +106,7 @@
/**
* The string manager for this package.
*/
- protected StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

Modified: tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java?rev=834233&r1=834232&r2=834233&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java Mon Nov 9 21:06:37 2009
@@ -76,7 +76,7 @@
/**
* The string manager for this package.
*/
- private StringManager sm =
+ private static final StringManager sm =
StringManager.getManager(Constants.Package);

// It should be null - and fail if not set

Modified: tomcat/trunk/java/org/apache/catalina/core/JasperListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/JasperListener.java?rev=834233&r1=834232&r2=834233&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/JasperListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/JasperListener.java Mon Nov 9 21:06:37 2009
@@ -43,7 +43,7 @@
/**
* The string manager for this package.
*/
- protected StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

Modified: tomcat/trunk/java/org/apache/catalina/ha/ClusterListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/ClusterListener.java?rev=834233&r1=834232&r2=834233&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/ClusterListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/ClusterListener.java Mon Nov 9 21:06:37 2009
@@ -45,7 +45,7 @@
/**
* The string manager for this package.
*/
- protected StringManager sm = StringManager.getManager(Constants.Package);
+ protected static final StringManager sm = StringManager.getManager(Constants.Package);

protected CatalinaCluster cluster = null;

Modified: tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java?rev=834233&r1=834232&r2=834233&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java Mon Nov 9 21:06:37 2009
@@ -123,7 +123,7 @@
/**
* The string manager for this package.
*/
- protected StringManager sm = StringManager.getManager(Constants.Package);
+ protected static final StringManager sm = StringManager.getManager(Constants.Package);

/**
* Has this component been started yet?

Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java?rev=834233&r1=834232&r2=834233&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java Mon Nov 9 21:06:37 2009
@@ -119,7 +119,7 @@
/**
* The string manager for this package.
*/
- protected StringManager sm = StringManager.getManager(Constants.Package);
+ protected static final StringManager sm = StringManager.getManager(Constants.Package);

/**
* The cluster name to join

Modified: tomcat/trunk/java/org/apache/catalina/session/StoreBase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StoreBase.java?rev=834233&r1=834232&r2=834233&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/StoreBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/StoreBase.java Mon Nov 9 21:06:37 2009
@@ -70,7 +70,7 @@
/**
* The string manager for this package.
*/
- protected StringManager sm = StringManager.getManager(Constants.Package);
+ protected static final StringManager sm = StringManager.getManager(Constants.Package);

/**
* The Manager with which this JDBCStore is associated.

Modified: tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java?rev=834233&r1=834232&r2=834233&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java Mon Nov 9 21:06:37 2009
@@ -52,7 +52,7 @@
/**
* The string manager for this package.
*/
- protected StringManager sm = StringManager.getManager(Constants.Package);
+ protected static final StringManager sm = StringManager.getManager(Constants.Package);

/**
* The descriptive information about this implementation.

Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java?rev=834233&r1=834232&r2=834233&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java Mon Nov 9 21:06:37 2009
@@ -42,7 +42,7 @@
/**
* The string manager for this package.
*/
- protected StringManager sm = StringManager.getManager(Constants.Package);
+ protected static final StringManager sm = StringManager.getManager(Constants.Package);

Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java?rev=834233&r1=834232&r2=834233&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java Mon Nov 9 21:06:37 2009
@@ -51,7 +51,7 @@
/**
* The string manager for this package.
*/
- protected StringManager sm = StringManager.getManager(Constants.Package);
+ protected static final StringManager sm = StringManager.getManager(Constants.Package);

/**
* The descriptive information about this implementation.

Modified: tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java?rev=834233&r1=834232&r2=834233&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java Mon Nov 9 21:06:37 2009
@@ -199,7 +199,7 @@
/**
* The string manager for this package.
*/
- protected StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

Modified: tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java?rev=834233&r1=834232&r2=834233&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java Mon Nov 9 21:06:37 2009
@@ -77,7 +77,7 @@
/**
* The string manager for this package.
*/
- protected StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

Modified: tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java?rev=834233&r1=834232&r2=834233&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java Mon Nov 9 21:06:37 2009
@@ -230,7 +230,7 @@
/**
* The string manager for this package.
*/
- private StringManager sm = StringManager.getManager(Constants.Package);
+ private static final StringManager sm = StringManager.getManager(Constants.Package);

/**

Modified: tomcat/trunk/java/org/apache/catalina/valves/SemaphoreValve.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/SemaphoreValve.java?rev=834233&r1=834232&r2=834233&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/SemaphoreValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/SemaphoreValve.java Mon Nov 9 21:06:37 2009
@@ -65,7 +65,7 @@
/**
* The string manager for this package.
*/
- private StringManager sm =
+ private static final StringManager sm =
StringManager.getManager(Constants.Package);

Modified: tomcat/trunk/java/org/apache/naming/NamingContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/NamingContext.java?rev=834233&r1=834232&r2=834233&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/NamingContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/NamingContext.java Mon Nov 9 21:06:37 2009
@@ -108,7 +108,7 @@
/**
* The string manager for this package.
*/
- protected StringManager sm = StringManager.getManager(Constants.Package);
+ protected static final StringManager sm = StringManager.getManager(Constants.Package);

/**

Modified: tomcat/trunk/java/org/apache/naming/SelectorContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/SelectorContext.java?rev=834233&r1=834232&r2=834233&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/SelectorContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/SelectorContext.java Mon Nov 9 21:06:37 2009
@@ -95,7 +95,7 @@
/**
* The string manager for this package.
*/
- protected StringManager sm = StringManager.getManager(Constants.Package);
+ protected static final StringManager sm = StringManager.getManager(Constants.Package);

/**

Modified: tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java?rev=834233&r1=834232&r2=834233&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/BaseDirContext.java Mon Nov 9 21:06:37 2009
@@ -91,7 +91,7 @@
/**
* The string manager for this package.
*/
- protected StringManager sm = StringManager.getManager(Constants.Package);
+ protected static final StringManager sm = StringManager.getManager(Constants.Package);

/**

Modified: tomcat/trunk/java/org/apache/naming/resources/ProxyDirContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/ProxyDirContext.java?rev=834233&r1=834232&r2=834233&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/resources/ProxyDirContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/ProxyDirContext.java Mon Nov 9 21:06:37 2009
@@ -134,7 +134,7 @@
/**
* The string manager for this package.
*/
- protected StringManager sm = StringManager.getManager(Constants.Package);
+ protected static final StringManager sm = StringManager.getManager(Constants.Package);

/**

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=834233&r1=834232&r2=834233&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Mon Nov 9 21:06:37 2009
@@ -39,7 +39,7 @@
protected static final Log log = LogFactory.getLog(AbstractEndpoint.class);

// -------------------------------------------------------------- Constants
- protected StringManager sm = StringManager.getManager("org.apache.tomcat.util.net.res");
+ protected static final StringManager sm = StringManager.getManager("org.apache.tomcat.util.net.res");

/**
* The Request attribute key for the cipher suite.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

svn commit: r834229 - in /tomcat/trunk: java/org/apache/catalina/authenticator/ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/catalina/ha/session/ java/org/apache/catalina/ha/tcp/ java/org/apache/catalina/manager/ j...

2009-11-09T13:00:26Z

Author: markt
Date: Mon Nov 9 21:00:22 2009
New Revision: 834229

URL: http://svn.apache.org/viewvc?rev=834229&view=rev
Log:
StringManagers should be final

Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java
tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java
tomcat/trunk/java/org/apache/catalina/connector/Response.java
tomcat/trunk/java/org/apache/catalina/connector/ResponseFacade.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationRequest.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationResponse.java
tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaRequest.java
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
tomcat/trunk/java/org/apache/catalina/ha/session/SerializablePrincipal.java
tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java
tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java
tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java
tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java
tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
tomcat/trunk/java/org/apache/catalina/startup/Embedded.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java
tomcat/trunk/java/org/apache/catalina/tribes/util/StringManager.java
tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java
tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java
tomcat/trunk/java/org/apache/catalina/util/HexUtils.java
tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
tomcat/trunk/java/org/apache/catalina/valves/RequestFilterValve.java
tomcat/trunk/java/org/apache/catalina/valves/ValveBase.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpMessage.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
tomcat/trunk/java/org/apache/naming/ContextBindings.java
tomcat/trunk/java/org/apache/naming/StringManager.java
tomcat/trunk/java/org/apache/tomcat/util/http/HttpMessages.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java
tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/HexDump.java

Modified: tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java (original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java Mon Nov 9 21:00:22 2009
@@ -111,7 +111,7 @@
/**
* The string manager for this package.
*/
- protected final static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

Modified: tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CometEventImpl.java Mon Nov 9 21:00:22 2009
@@ -33,7 +33,7 @@
/**
* The string manager for this package.
*/
- protected static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

Modified: tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java Mon Nov 9 21:00:22 2009
@@ -48,7 +48,7 @@
/**
* The string manager for this package.
*/
- protected static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Mon Nov 9 21:00:22 2009
@@ -145,7 +145,7 @@
/**
* The string manager for this package.
*/
- protected static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

Modified: tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java Mon Nov 9 21:00:22 2009
@@ -235,7 +235,7 @@
/**
* The string manager for this package.
*/
- protected static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

Modified: tomcat/trunk/java/org/apache/catalina/connector/Response.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Response.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Response.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Response.java Mon Nov 9 21:00:22 2009
@@ -93,7 +93,7 @@
/**
* The string manager for this package.
*/
- protected static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

Modified: tomcat/trunk/java/org/apache/catalina/connector/ResponseFacade.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/ResponseFacade.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/ResponseFacade.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/ResponseFacade.java Mon Nov 9 21:00:22 2009
@@ -108,7 +108,7 @@
/**
* The string manager for this package.
*/
- protected static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java Mon Nov 9 21:00:22 2009
@@ -58,7 +58,7 @@
public final class ApplicationFilterConfig implements FilterConfig, Serializable {

- protected static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

private static org.apache.juli.logging.Log log =

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java Mon Nov 9 21:00:22 2009
@@ -79,7 +79,7 @@
/**
* The string manager for this package.
*/
- protected static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java Mon Nov 9 21:00:22 2009
@@ -99,7 +99,7 @@
/**
* The string manager for this package.
*/
- protected static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationRequest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationRequest.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationRequest.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationRequest.java Mon Nov 9 21:00:22 2009
@@ -93,7 +93,7 @@
/**
* The string manager for this package.
*/
- protected static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationResponse.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationResponse.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationResponse.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationResponse.java Mon Nov 9 21:00:22 2009
@@ -89,7 +89,7 @@
/**
* The string manager for this package.
*/
- protected static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

Modified: tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java Mon Nov 9 21:00:22 2009
@@ -49,7 +49,7 @@
/**
* The string manager for this package.
*/
- protected static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

Modified: tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java Mon Nov 9 21:00:22 2009
@@ -247,7 +247,7 @@
/**
* The string manager for this package.
*/
- protected static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

Modified: tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java Mon Nov 9 21:00:22 2009
@@ -142,7 +142,7 @@
/**
* The string manager for this package.
*/
- protected static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java Mon Nov 9 21:00:22 2009
@@ -114,7 +114,7 @@
/**
* The string manager for this package.
*/
- protected static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Mon Nov 9 21:00:22 2009
@@ -73,7 +73,7 @@
/**
* The string manager for this package.
*/
- protected static StringManager sm = StringManager.getManager(Constants.Package);
+ protected static final StringManager sm = StringManager.getManager(Constants.Package);

// ----------------------------------------------------- Instance Variables

Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaRequest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaRequest.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaRequest.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaRequest.java Mon Nov 9 21:00:22 2009
@@ -46,7 +46,7 @@
/**
* The string manager for this package.
*/
- protected static StringManager sm = StringManager
+ protected static final StringManager sm = StringManager
.getManager(Constants.Package);

public static final int TYPE_ATTRIBUTE = 0;

Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java Mon Nov 9 21:00:22 2009
@@ -67,7 +67,7 @@
/**
* The string manager for this package.
*/
- protected static StringManager sm = StringManager.getManager(Constants.Package);
+ protected static final StringManager sm = StringManager.getManager(Constants.Package);

// ----------------------------------------------------- Instance Variables

Modified: tomcat/trunk/java/org/apache/catalina/ha/session/SerializablePrincipal.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/SerializablePrincipal.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/SerializablePrincipal.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/SerializablePrincipal.java Mon Nov 9 21:00:22 2009
@@ -50,7 +50,7 @@
/**
* The string manager for this package.
*/
- protected static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

// ----------------------------------------------------------- Constructors

Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java Mon Nov 9 21:00:22 2009
@@ -78,7 +78,7 @@
/**
* The StringManager for this package.
*/
- protected static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

private CatalinaCluster cluster = null ;

Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Mon Nov 9 21:00:22 2009
@@ -233,7 +233,7 @@
/**
* The string manager for this package.
*/
- protected static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

Modified: tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java Mon Nov 9 21:00:22 2009
@@ -88,7 +88,7 @@
/**
* The string manager for this package.
*/
- protected static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

Modified: tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java Mon Nov 9 21:00:22 2009
@@ -138,7 +138,7 @@
/**
* The string manager for this package.
*/
- protected static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

Modified: tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java Mon Nov 9 21:00:22 2009
@@ -46,7 +46,7 @@
/**
* The string manager for this package.
*/
- protected static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

/**

Modified: tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java Mon Nov 9 21:00:22 2009
@@ -118,7 +118,7 @@
/**
* The string manager for this package.
*/
- protected static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

/**

Modified: tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java Mon Nov 9 21:00:22 2009
@@ -89,7 +89,7 @@
/**
* The string manager for this package.
*/
- private static StringManager sm =
+ private static final StringManager sm =
StringManager.getManager(Constants.Package);

Modified: tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java Mon Nov 9 21:00:22 2009
@@ -137,7 +137,7 @@
/**
* The string manager for this package.
*/
- protected static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

Modified: tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java Mon Nov 9 21:00:22 2009
@@ -84,7 +84,7 @@
/**
* The string manager for this package.
*/
- private static StringManager sm =
+ private static final StringManager sm =
StringManager.getManager(Constants.Package);

Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Mon Nov 9 21:00:22 2009
@@ -197,7 +197,7 @@
/**
* The string manager for this package.
*/
- protected static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

Modified: tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java Mon Nov 9 21:00:22 2009
@@ -209,7 +209,7 @@
/**
* The string manager for this package.
*/
- protected static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

/**

Modified: tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardSession.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/StandardSession.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardSession.java Mon Nov 9 21:00:22 2009
@@ -242,7 +242,7 @@
/**
* The string manager for this package.
*/
- protected static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

Modified: tomcat/trunk/java/org/apache/catalina/startup/Embedded.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Embedded.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Embedded.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Embedded.java Mon Nov 9 21:00:22 2009
@@ -183,7 +183,7 @@
/**
* The string manager for this package.
*/
- protected static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java Mon Nov 9 21:00:22 2009
@@ -48,7 +48,7 @@
/**
* The string manager for this package.
*/
- protected static StringManager sm = StringManager.getManager(Constants.Package);
+ protected static final StringManager sm = StringManager.getManager(Constants.Package);

// ----------------------------------------------------- Instance Variables

Modified: tomcat/trunk/java/org/apache/catalina/tribes/util/StringManager.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/util/StringManager.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/util/StringManager.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/util/StringManager.java Mon Nov 9 21:00:22 2009
@@ -242,7 +242,7 @@
* @param packageName The package name
*/

- public synchronized static StringManager getManager(String packageName) {
+ public synchronized static final StringManager getManager(String packageName) {
StringManager mgr = managers.get(packageName);

if (mgr == null) {

Modified: tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java Mon Nov 9 21:00:22 2009
@@ -132,7 +132,7 @@
/**
* The string manager for this package.
*/
- private static StringManager sm =
+ private static final StringManager sm =
StringManager.getManager(Constants.Package);

Modified: tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java Mon Nov 9 21:00:22 2009
@@ -59,7 +59,7 @@
/**
* The string resources for this package.
*/
- private static StringManager sm =
+ private static final StringManager sm =
StringManager.getManager("org.apache.catalina.util");

private static ArrayList<Extension> containerAvailableExtensions = null;

Modified: tomcat/trunk/java/org/apache/catalina/util/HexUtils.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/HexUtils.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/HexUtils.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/HexUtils.java Mon Nov 9 21:00:22 2009
@@ -57,7 +57,7 @@
/**
* The string manager for this package.
*/
- private static StringManager sm =
+ private static final StringManager sm =
StringManager.getManager("org.apache.catalina.util");

Modified: tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java Mon Nov 9 21:00:22 2009
@@ -69,7 +69,7 @@
/**
* The StringManager for this package.
*/
- protected static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

Modified: tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java Mon Nov 9 21:00:22 2009
@@ -352,7 +352,7 @@
/**
* The StringManager for this package.
*/
- protected static StringManager sm = StringManager.getManager(Constants.Package);
+ protected static final StringManager sm = StringManager.getManager(Constants.Package);

/**
* Convert a given comma delimited list of regular expressions into an array of compiled {@link Pattern}

Modified: tomcat/trunk/java/org/apache/catalina/valves/RequestFilterValve.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/RequestFilterValve.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/RequestFilterValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/RequestFilterValve.java Mon Nov 9 21:00:22 2009
@@ -86,7 +86,7 @@
/**
* The StringManager for this package.
*/
- protected static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

Modified: tomcat/trunk/java/org/apache/catalina/valves/ValveBase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/ValveBase.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/ValveBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/ValveBase.java Mon Nov 9 21:00:22 2009
@@ -104,7 +104,7 @@
/**
* The string manager for this package.
*/
- protected final static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Mon Nov 9 21:00:22 2009
@@ -67,7 +67,7 @@
/**
* The string manager for this package.
*/
- protected static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Mon Nov 9 21:00:22 2009
@@ -60,7 +60,7 @@
/**
* The string manager for this package.
*/
- protected static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpMessage.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpMessage.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpMessage.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpMessage.java Mon Nov 9 21:00:22 2009
@@ -44,7 +44,7 @@
/**
* The string manager for this package.
*/
- protected static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Mon Nov 9 21:00:22 2009
@@ -67,7 +67,7 @@
/**
* The string manager for this package.
*/
- protected static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java Mon Nov 9 21:00:22 2009
@@ -61,7 +61,7 @@
/**
* The string manager for this package.
*/
- protected static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Mon Nov 9 21:00:22 2009
@@ -39,7 +39,7 @@
/**
* The string manager for this package.
*/
- protected static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

protected static boolean isSecurityEnabled =

Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractInputBuffer.java Mon Nov 9 21:00:22 2009
@@ -47,7 +47,7 @@
/**
* The string manager for this package.
*/
- protected static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java Mon Nov 9 21:00:22 2009
@@ -101,7 +101,7 @@
/**
* The string manager for this package.
*/
- protected static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

// ------------------------------------------------------------- Properties

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Mon Nov 9 21:00:22 2009
@@ -75,7 +75,7 @@
/**
* The string manager for this package.
*/
- protected static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Mon Nov 9 21:00:22 2009
@@ -59,7 +59,7 @@
/**
* The string manager for this package.
*/
- protected static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

public Http11AprProtocol() {

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Mon Nov 9 21:00:22 2009
@@ -69,7 +69,7 @@
/**
* The string manager for this package.
*/
- protected static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

/** Pass config info

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java Mon Nov 9 21:00:22 2009
@@ -63,7 +63,7 @@
/**
* The string manager for this package.
*/
- protected static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java Mon Nov 9 21:00:22 2009
@@ -81,7 +81,7 @@
/**
* The string manager for this package.
*/
- protected static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java Mon Nov 9 21:00:22 2009
@@ -91,7 +91,7 @@
/**
* The string manager for this package.
*/
- protected static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

Modified: tomcat/trunk/java/org/apache/naming/ContextBindings.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/ContextBindings.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/ContextBindings.java (original)
+++ tomcat/trunk/java/org/apache/naming/ContextBindings.java Mon Nov 9 21:00:22 2009
@@ -77,7 +77,7 @@
/**
* The string manager for this package.
*/
- protected static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager(Constants.Package);

Modified: tomcat/trunk/java/org/apache/naming/StringManager.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/StringManager.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/StringManager.java (original)
+++ tomcat/trunk/java/org/apache/naming/StringManager.java Mon Nov 9 21:00:22 2009
@@ -208,7 +208,7 @@
* @param packageName
*/

- public synchronized static StringManager getManager(String packageName) {
+ public synchronized static final StringManager getManager(String packageName) {
StringManager mgr = managers.get(packageName);
if (mgr == null) {
mgr = new StringManager(packageName);

Modified: tomcat/trunk/java/org/apache/tomcat/util/http/HttpMessages.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/HttpMessages.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/HttpMessages.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/HttpMessages.java Mon Nov 9 21:00:22 2009
@@ -30,7 +30,7 @@
*/
public class HttpMessages {
// XXX move message resources in this package
- protected static StringManager sm =
+ protected static final StringManager sm =
StringManager.getManager("org.apache.tomcat.util.http.res");

static String st_200=null;

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java Mon Nov 9 21:00:22 2009
@@ -80,7 +80,7 @@
public class JSSESocketFactory
extends org.apache.tomcat.util.net.ServerSocketFactory {

- private static StringManager sm =
+ private static final StringManager sm =
StringManager.getManager("org.apache.tomcat.util.net.jsse.res");

// defaults

Modified: tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java Mon Nov 9 21:00:22 2009
@@ -158,7 +158,7 @@
*
* @param packageName The package name
*/
- public synchronized static StringManager getManager(String packageName) {
+ public synchronized static final StringManager getManager(String packageName) {
StringManager mgr = managers.get(packageName);
if (mgr == null) {
mgr = new StringManager(packageName);

Modified: tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/HexDump.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/HexDump.java?rev=834229&r1=834228&r2=834229&view=diff
==============================================================================
--- tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/HexDump.java (original)
+++ tomcat/trunk/modules/tomcat-lite/test/org/apache/tomcat/lite/HexDump.java Mon Nov 9 21:00:22 2009
@@ -33,7 +33,7 @@

// -------------------------------------------------------------- Constants
- static StringManager sm;
+ static final StringManager sm;

/**
* Table for HEX to DEC byte translation.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

svn commit: r834227 - /tomcat/trunk/java/org/apache/catalina/util/Base64.java

2009-11-09T12:52:49Z

Author: markt
Date: Mon Nov 9 20:52:49 2009
New Revision: 834227

URL: http://svn.apache.org/viewvc?rev=834227&view=rev
Log:
Unused code

Modified:
tomcat/trunk/java/org/apache/catalina/util/Base64.java

Modified: tomcat/trunk/java/org/apache/catalina/util/Base64.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/Base64.java?rev=834227&r1=834226&r2=834227&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/Base64.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/Base64.java Mon Nov 9 20:52:49 2009
@@ -42,7 +42,6 @@
static private final byte PAD = (byte) '=';
static private byte [] base64Alphabet = new byte[BASELENGTH];
static private byte [] lookUpBase64Alphabet = new byte[LOOKUPLENGTH];
- //static private final Log log = LogSource.getInstance("org.apache.commons.util.Base64");

static
{

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

svn commit: r834226 - in /tomcat/trunk: java/org/apache/catalina/authenticator/ java/org/apache/catalina/connector/ java/org/apache/catalina/core/ java/org/apache/catalina/filters/ java/org/apache/catalina/ha/backend/ java/org/apache/catalina/ha/jmx/ j...

2009-11-09T12:51:21Z

Author: markt
Date: Mon Nov 9 20:51:17 2009
New Revision: 834226

URL: http://svn.apache.org/viewvc?rev=834226&view=rev
Log:
Loggers should be final

Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java
tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
tomcat/trunk/java/org/apache/catalina/core/JasperListener.java
tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java
tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java
tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java
tomcat/trunk/java/org/apache/catalina/core/StandardServer.java
tomcat/trunk/java/org/apache/catalina/core/StandardService.java
tomcat/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java
tomcat/trunk/java/org/apache/catalina/filters/RemoteHostFilter.java
tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java
tomcat/trunk/java/org/apache/catalina/ha/backend/HeartbeatListener.java
tomcat/trunk/java/org/apache/catalina/ha/backend/MultiCastSender.java
tomcat/trunk/java/org/apache/catalina/ha/backend/TcpSender.java
tomcat/trunk/java/org/apache/catalina/ha/jmx/ClusterJmxHelper.java
tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
tomcat/trunk/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
tomcat/trunk/java/org/apache/catalina/mbeans/ServerLifecycleListener.java
tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java
tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java
tomcat/trunk/java/org/apache/catalina/realm/LockOutRealm.java
tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java
tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java
tomcat/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java
tomcat/trunk/java/org/apache/catalina/startup/ClusterRuleSetFactory.java
tomcat/trunk/java/org/apache/catalina/startup/ConnectorCreateRule.java
tomcat/trunk/java/org/apache/catalina/startup/Embedded.java
tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java
tomcat/trunk/java/org/apache/catalina/startup/Tool.java
tomcat/trunk/java/org/apache/catalina/tribes/io/BufferPool.java
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/trunk/java/org/apache/catalina/tribes/util/Arrays.java
tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java
tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
tomcat/trunk/java/org/apache/catalina/valves/ValveBase.java
tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
tomcat/trunk/java/org/apache/jasper/JspC.java
tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java
tomcat/trunk/java/org/apache/jasper/compiler/JspReader.java
tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
tomcat/trunk/java/org/apache/jasper/runtime/JspFactoryImpl.java
tomcat/trunk/java/org/apache/jasper/runtime/TagHandlerPool.java
tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java
tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
tomcat/trunk/java/org/apache/tomcat/util/digester/GenericParser.java
tomcat/trunk/java/org/apache/tomcat/util/digester/XercesParser.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDOMSource.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsSerSource.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/BayeuxServlet.java
tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/ChannelImpl.java
tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/ClientImpl.java
tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/RequestBase.java
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
tomcat/trunk/test/org/apache/catalina/tribes/demos/LoadTest.java
tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async0.java
tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async1.java
tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async2.java
tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async3.java

Modified: tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java Mon Nov 9 20:51:17 2009
@@ -77,7 +77,7 @@
public abstract class AuthenticatorBase
extends ValveBase
implements Authenticator, Lifecycle {
- private static Log log = LogFactory.getLog(AuthenticatorBase.class);
+ private static final Log log = LogFactory.getLog(AuthenticatorBase.class);

//------------------------------------------------------ Constructor

Modified: tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java (original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java Mon Nov 9 20:51:17 2009
@@ -47,7 +47,7 @@

public class BasicAuthenticator
extends AuthenticatorBase {
- private static Log log = LogFactory.getLog(BasicAuthenticator.class);
+ private static final Log log = LogFactory.getLog(BasicAuthenticator.class);

Modified: tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java (original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java Mon Nov 9 20:51:17 2009
@@ -49,7 +49,7 @@

public class DigestAuthenticator
extends AuthenticatorBase {
- private static Log log = LogFactory.getLog(DigestAuthenticator.class);
+ private static final Log log = LogFactory.getLog(DigestAuthenticator.class);

// -------------------------------------------------------------- Constants

Modified: tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java (original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java Mon Nov 9 20:51:17 2009
@@ -56,7 +56,7 @@
public class FormAuthenticator
extends AuthenticatorBase {

- private static Log log = LogFactory.getLog(FormAuthenticator.class);
+ private static final Log log = LogFactory.getLog(FormAuthenticator.class);

// ----------------------------------------------------- Instance Variables

Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Mon Nov 9 20:51:17 2009
@@ -56,7 +56,7 @@
public class Connector
implements Lifecycle, MBeanRegistration
{
- private static Log log = LogFactory.getLog(Connector.class);
+ private static final Log log = LogFactory.getLog(Connector.class);

/**

Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Mon Nov 9 20:51:17 2009
@@ -57,7 +57,7 @@
public class CoyoteAdapter
implements Adapter
{
- private static Log log = LogFactory.getLog(CoyoteAdapter.class);
+ private static final Log log = LogFactory.getLog(CoyoteAdapter.class);

// -------------------------------------------------------------- Constants

Modified: tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java Mon Nov 9 20:51:17 2009
@@ -53,7 +53,7 @@
{

- private static Log log = LogFactory.getLog(MapperListener.class);
+ private static final Log log = LogFactory.getLog(MapperListener.class);

// ----------------------------------------------------- Instance Variables

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java Mon Nov 9 20:51:17 2009
@@ -68,7 +68,7 @@
final class ApplicationDispatcher
implements RequestDispatcher {

- protected static Log log = LogFactory.getLog(ApplicationDispatcher.class);
+ protected static final Log log = LogFactory.getLog(ApplicationDispatcher.class);

protected class PrivilegedForward
implements PrivilegedExceptionAction<Void> {

Modified: tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java Mon Nov 9 20:51:17 2009
@@ -44,7 +44,7 @@
public class AprLifecycleListener
implements LifecycleListener {

- private static Log log = LogFactory.getLog(AprLifecycleListener.class);
+ private static final Log log = LogFactory.getLog(AprLifecycleListener.class);

/**
* The string manager for this package.

Modified: tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java Mon Nov 9 20:51:17 2009
@@ -51,7 +51,7 @@
NOT_STARTED, STARTED, DISPATCHING, DISPATCHED, COMPLETING, TIMING_OUT, ERROR_DISPATCHING
}

- protected static Log log = LogFactory.getLog(AsyncContextImpl.class);
+ protected static final Log log = LogFactory.getLog(AsyncContextImpl.class);

private ServletRequest servletRequest = null;
private ServletResponse servletResponse = null;

Modified: tomcat/trunk/java/org/apache/catalina/core/JasperListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/JasperListener.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/JasperListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/JasperListener.java Mon Nov 9 20:51:17 2009
@@ -38,7 +38,7 @@
public class JasperListener
implements LifecycleListener {

- private static Log log = LogFactory.getLog(JasperListener.class);
+ private static final Log log = LogFactory.getLog(JasperListener.class);

/**
* The string manager for this package.

Modified: tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java Mon Nov 9 20:51:17 2009
@@ -81,7 +81,7 @@
public class NamingContextListener
implements LifecycleListener, ContainerListener, PropertyChangeListener {

- private static Log log = LogFactory.getLog(NamingContextListener.class);
+ private static final Log log = LogFactory.getLog(NamingContextListener.class);

// ----------------------------------------------------- Instance Variables

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Mon Nov 9 20:51:17 2009
@@ -117,7 +117,7 @@
extends ContainerBase
implements Context, NotificationEmitter
{
- private static Log log = LogFactory.getLog(StandardContext.class);
+ private static final Log log = LogFactory.getLog(StandardContext.class);

// ----------------------------------------------------------- Constructors

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java Mon Nov 9 20:51:17 2009
@@ -53,7 +53,7 @@
extends ContainerBase
implements Engine {

- private static Log log = LogFactory.getLog(StandardEngine.class);
+ private static final Log log = LogFactory.getLog(StandardEngine.class);

// ----------------------------------------------------------- Constructors

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java Mon Nov 9 20:51:17 2009
@@ -57,7 +57,7 @@
extends ValveBase {

- private static Log log = LogFactory.getLog(StandardHostValve.class);
+ private static final Log log = LogFactory.getLog(StandardHostValve.class);

//------------------------------------------------------ Constructor
public StandardHostValve() {

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java Mon Nov 9 20:51:17 2009
@@ -55,7 +55,7 @@
implements Pipeline, Contained, Lifecycle
{

- private static Log log = LogFactory.getLog(StandardPipeline.class);
+ private static final Log log = LogFactory.getLog(StandardPipeline.class);

// ----------------------------------------------------------- Constructors

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardServer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardServer.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardServer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardServer.java Mon Nov 9 20:51:17 2009
@@ -60,7 +60,7 @@
public final class StandardServer
implements Lifecycle, Server, MBeanRegistration
{
- private static Log log = LogFactory.getLog(StandardServer.class);
+ private static final Log log = LogFactory.getLog(StandardServer.class);

// ------------------------------------------------------------ Constructor

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardService.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardService.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardService.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardService.java Mon Nov 9 20:51:17 2009
@@ -52,7 +52,7 @@
public class StandardService
implements Lifecycle, Service, MBeanRegistration
{
- private static Log log = LogFactory.getLog(StandardService.class);
+ private static final Log log = LogFactory.getLog(StandardService.class);

// ----------------------------------------------------- Instance Variables

Modified: tomcat/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RemoteAddrFilter.java Mon Nov 9 20:51:17 2009
@@ -44,7 +44,7 @@
extends RequestFilter {

// ----------------------------------------------------- Instance Variables
- private static Log log = LogFactory.getLog(RemoteAddrFilter.class);
+ private static final Log log = LogFactory.getLog(RemoteAddrFilter.class);

// ------------------------------------------------------------- Properties

Modified: tomcat/trunk/java/org/apache/catalina/filters/RemoteHostFilter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RemoteHostFilter.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/RemoteHostFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RemoteHostFilter.java Mon Nov 9 20:51:17 2009
@@ -45,7 +45,7 @@

// ----------------------------------------------------- Instance Variables
- private static Log log = LogFactory.getLog(RemoteHostFilter.class);
+ private static final Log log = LogFactory.getLog(RemoteHostFilter.class);

// ------------------------------------------------------------- Properties

Modified: tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java Mon Nov 9 20:51:17 2009
@@ -581,7 +581,7 @@
/**
* Logger
*/
- private static Log log = LogFactory.getLog(RemoteIpFilter.class);
+ private static final Log log = LogFactory.getLog(RemoteIpFilter.class);

protected static final String PROTOCOL_HEADER_PARAMETER = "protocolHeader";

Modified: tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java Mon Nov 9 20:51:17 2009
@@ -68,7 +68,7 @@
/**
* The logger for this class.
*/
- private static Log log = LogFactory.getLog(RequestDumperFilter.class);
+ private static final Log log = LogFactory.getLog(RequestDumperFilter.class);

/**

Modified: tomcat/trunk/java/org/apache/catalina/ha/backend/HeartbeatListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/backend/HeartbeatListener.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/backend/HeartbeatListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/backend/HeartbeatListener.java Mon Nov 9 20:51:17 2009
@@ -36,7 +36,7 @@
public class HeartbeatListener
implements LifecycleListener, ContainerListener {

- private static Log log = LogFactory.getLog(HeartbeatListener.class);
+ private static final Log log = LogFactory.getLog(HeartbeatListener.class);

/* To allow to select the connector */
int port = 0;

Modified: tomcat/trunk/java/org/apache/catalina/ha/backend/MultiCastSender.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/backend/MultiCastSender.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/backend/MultiCastSender.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/backend/MultiCastSender.java Mon Nov 9 20:51:17 2009
@@ -33,7 +33,7 @@
public class MultiCastSender
implements Sender {

- private static Log log = LogFactory.getLog(HeartbeatListener.class);
+ private static final Log log = LogFactory.getLog(HeartbeatListener.class);

HeartbeatListener config = null;

Modified: tomcat/trunk/java/org/apache/catalina/ha/backend/TcpSender.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/backend/TcpSender.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/backend/TcpSender.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/backend/TcpSender.java Mon Nov 9 20:51:17 2009
@@ -37,7 +37,7 @@
public class TcpSender
implements Sender {

- private static Log log = LogFactory.getLog(HeartbeatListener.class);
+ private static final Log log = LogFactory.getLog(HeartbeatListener.class);

HeartbeatListener config = null;

Modified: tomcat/trunk/java/org/apache/catalina/ha/jmx/ClusterJmxHelper.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/jmx/ClusterJmxHelper.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/jmx/ClusterJmxHelper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/jmx/ClusterJmxHelper.java Mon Nov 9 20:51:17 2009
@@ -39,7 +39,7 @@

protected static Registry registry = Registry.getRegistry(null,null);

- protected static Log log = LogFactory.getLog(ClusterJmxHelper.class);
+ protected static final Log log = LogFactory.getLog(ClusterJmxHelper.class);

protected static boolean jmxEnabled = true;

Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java Mon Nov 9 20:51:17 2009
@@ -76,7 +76,7 @@
implements CatalinaCluster, Lifecycle, LifecycleListener, IDynamicProperty,
MembershipListener, ChannelListener{

- public static Log log = LogFactory.getLog(SimpleTcpCluster.class);
+ public static final Log log = LogFactory.getLog(SimpleTcpCluster.class);

// ----------------------------------------------------- Instance Variables

Modified: tomcat/trunk/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java Mon Nov 9 20:51:17 2009
@@ -49,7 +49,7 @@

public class GlobalResourcesLifecycleListener
implements LifecycleListener {
- private static Log log = LogFactory.getLog(GlobalResourcesLifecycleListener.class);
+ private static final Log log = LogFactory.getLog(GlobalResourcesLifecycleListener.class);

// ----------------------------------------------------- Instance Variables

Modified: tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java Mon Nov 9 20:51:17 2009
@@ -52,7 +52,7 @@
*/
public class JmxRemoteLifecycleListener implements LifecycleListener {

- private static Log log =
+ private static final Log log =
LogFactory.getLog(JmxRemoteLifecycleListener.class);

/**

Modified: tomcat/trunk/java/org/apache/catalina/mbeans/ServerLifecycleListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/ServerLifecycleListener.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/ServerLifecycleListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/ServerLifecycleListener.java Mon Nov 9 20:51:17 2009
@@ -64,7 +64,7 @@
public class ServerLifecycleListener
implements ContainerListener, LifecycleListener, PropertyChangeListener {

- private static Log log = LogFactory.getLog(ServerLifecycleListener.class);
+ private static final Log log = LogFactory.getLog(ServerLifecycleListener.class);

// ------------------------------------------------------------- Properties

Modified: tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java Mon Nov 9 20:51:17 2009
@@ -41,7 +41,7 @@
*/
public class CombinedRealm extends RealmBase {

- private static Log log = LogFactory.getLog(CombinedRealm.class);
+ private static final Log log = LogFactory.getLog(CombinedRealm.class);

/**
* The string manager for this package.

Modified: tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java Mon Nov 9 20:51:17 2009
@@ -79,7 +79,7 @@
public class JAASMemoryLoginModule extends MemoryRealm implements LoginModule {
// We need to extend MemoryRealm to avoid class cast

- private static Log log = LogFactory.getLog(JAASMemoryLoginModule.class);
+ private static final Log log = LogFactory.getLog(JAASMemoryLoginModule.class);

// ----------------------------------------------------- Instance Variables

Modified: tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java Mon Nov 9 20:51:17 2009
@@ -128,7 +128,7 @@
public class JAASRealm
extends RealmBase
{
- private static Log log = LogFactory.getLog(JAASRealm.class);
+ private static final Log log = LogFactory.getLog(JAASRealm.class);

// ----------------------------------------------------- Instance Variables

Modified: tomcat/trunk/java/org/apache/catalina/realm/LockOutRealm.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/LockOutRealm.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/LockOutRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/LockOutRealm.java Mon Nov 9 20:51:17 2009
@@ -41,7 +41,7 @@
*/
public class LockOutRealm extends CombinedRealm {

- private static Log log = LogFactory.getLog(LockOutRealm.class);
+ private static final Log log = LogFactory.getLog(LockOutRealm.class);

/**
* The number of times in a row a user has to fail authentication to be

Modified: tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java Mon Nov 9 20:51:17 2009
@@ -47,7 +47,7 @@

public class MemoryRealm extends RealmBase {

- private static Log log = LogFactory.getLog(MemoryRealm.class);
+ private static final Log log = LogFactory.getLog(MemoryRealm.class);

// ----------------------------------------------------- Instance Variables

Modified: tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java Mon Nov 9 20:51:17 2009
@@ -72,7 +72,7 @@
public abstract class RealmBase
implements Lifecycle, Realm, MBeanRegistration {

- private static Log log = LogFactory.getLog(RealmBase.class);
+ private static final Log log = LogFactory.getLog(RealmBase.class);

// ----------------------------------------------------- Instance Variables

Modified: tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java Mon Nov 9 20:51:17 2009
@@ -54,7 +54,7 @@
extends ManagerBase
implements Lifecycle, PropertyChangeListener {

- private static Log log = LogFactory.getLog(PersistentManagerBase.class);
+ private static final Log log = LogFactory.getLog(PersistentManagerBase.class);

// ---------------------------------------------------- Security Classes

Modified: tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java Mon Nov 9 20:51:17 2009
@@ -52,7 +52,7 @@

public final class Bootstrap {

- private static Log log = LogFactory.getLog(Bootstrap.class);
+ private static final Log log = LogFactory.getLog(Bootstrap.class);

// -------------------------------------------------------------- Constants

Modified: tomcat/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java Mon Nov 9 20:51:17 2009
@@ -51,7 +51,7 @@
public final class ClassLoaderFactory {

- private static Log log = LogFactory.getLog(ClassLoaderFactory.class);
+ private static final Log log = LogFactory.getLog(ClassLoaderFactory.class);

protected static final Integer IS_DIR = new Integer(0);
protected static final Integer IS_JAR = new Integer(1);

Modified: tomcat/trunk/java/org/apache/catalina/startup/ClusterRuleSetFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ClusterRuleSetFactory.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ClusterRuleSetFactory.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ClusterRuleSetFactory.java Mon Nov 9 20:51:17 2009
@@ -29,7 +29,7 @@
import java.lang.reflect.InvocationTargetException;
public class ClusterRuleSetFactory {

- public static Log log = LogFactory.getLog(ClusterRuleSetFactory.class);
+ public static final Log log = LogFactory.getLog(ClusterRuleSetFactory.class);

public static RuleSetBase getClusterRuleSet(String prefix) {

Modified: tomcat/trunk/java/org/apache/catalina/startup/ConnectorCreateRule.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ConnectorCreateRule.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ConnectorCreateRule.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ConnectorCreateRule.java Mon Nov 9 20:51:17 2009
@@ -37,7 +37,7 @@

public class ConnectorCreateRule extends Rule {

- protected static Log log = LogFactory.getLog(ConnectorCreateRule.class);
+ protected static final Log log = LogFactory.getLog(ConnectorCreateRule.class);
// --------------------------------------------------------- Public Methods

Modified: tomcat/trunk/java/org/apache/catalina/startup/Embedded.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Embedded.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Embedded.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Embedded.java Mon Nov 9 20:51:17 2009
@@ -102,7 +102,7 @@
*/

public class Embedded extends StandardService {
- private static Log log = LogFactory.getLog(Embedded.class);
+ private static final Log log = LogFactory.getLog(Embedded.class);

// ----------------------------------------------------------- Constructors

Modified: tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java Mon Nov 9 20:51:17 2009
@@ -47,7 +47,7 @@

public class ExpandWar {

- private static Log log = LogFactory.getLog(ExpandWar.class);
+ private static final Log log = LogFactory.getLog(ExpandWar.class);

/**
* The string resources for this package.

Modified: tomcat/trunk/java/org/apache/catalina/startup/Tool.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tool.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Tool.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tool.java Mon Nov 9 20:51:17 2009
@@ -73,7 +73,7 @@
public final class Tool {

- private static Log log = LogFactory.getLog(Tool.class);
+ private static final Log log = LogFactory.getLog(Tool.class);

// ------------------------------------------------------- Static Variables

Modified: tomcat/trunk/java/org/apache/catalina/tribes/io/BufferPool.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/io/BufferPool.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/io/BufferPool.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/io/BufferPool.java Mon Nov 9 20:51:17 2009
@@ -27,7 +27,7 @@
* @version 1.0
*/
public class BufferPool {
- protected static Log log = LogFactory.getLog(BufferPool.class);
+ protected static final Log log = LogFactory.getLog(BufferPool.class);

public static int DEFAULT_POOL_SIZE = 100*1024*1024; //100MB

Modified: tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java Mon Nov 9 20:51:17 2009
@@ -53,7 +53,7 @@
* @version 1.0
*/
public abstract class AbstractReplicatedMap extends ConcurrentHashMap implements RpcCallback, ChannelListener, MembershipListener, Heartbeat {
- protected static Log log = LogFactory.getLog(AbstractReplicatedMap.class);
+ protected static final Log log = LogFactory.getLog(AbstractReplicatedMap.class);

/**
* The default initial capacity - MUST be a power of two.

Modified: tomcat/trunk/java/org/apache/catalina/tribes/util/Arrays.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/util/Arrays.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/util/Arrays.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/util/Arrays.java Mon Nov 9 20:51:17 2009
@@ -35,7 +35,7 @@
* @version 1.0
*/
public class Arrays {
- protected static Log log = LogFactory.getLog(Arrays.class);
+ protected static final Log log = LogFactory.getLog(Arrays.class);

public static boolean contains(byte[] source, int srcoffset, byte[] key, int keyoffset, int length) {
if ( srcoffset < 0 || srcoffset >= source.length) throw new ArrayIndexOutOfBoundsException("srcoffset is out of bounds.");

Modified: tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java Mon Nov 9 20:51:17 2009
@@ -52,7 +52,7 @@
public class MemoryUserDatabase implements UserDatabase {

- private static Log log = LogFactory.getLog(MemoryUserDatabase.class);
+ private static final Log log = LogFactory.getLog(MemoryUserDatabase.class);

// ----------------------------------------------------------- Constructors

Modified: tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java Mon Nov 9 20:51:17 2009
@@ -123,7 +123,7 @@
extends ValveBase
implements Lifecycle {

- private static Log log = LogFactory.getLog(AccessLogValve.class);
+ private static final Log log = LogFactory.getLog(AccessLogValve.class);

//------------------------------------------------------ Constructor
public AccessLogValve() {

Modified: tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java Mon Nov 9 20:51:17 2009
@@ -133,7 +133,7 @@
extends AccessLogValve
implements Lifecycle {

- private static Log log = LogFactory.getLog(ExtendedAccessLogValve.class);
+ private static final Log log = LogFactory.getLog(ExtendedAccessLogValve.class);

// ----------------------------------------------------- Instance Variables

Modified: tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java Mon Nov 9 20:51:17 2009
@@ -347,7 +347,7 @@
/**
* Logger
*/
- private static Log log = LogFactory.getLog(RemoteIpValve.class);
+ private static final Log log = LogFactory.getLog(RemoteIpValve.class);

/**
* The StringManager for this package.

Modified: tomcat/trunk/java/org/apache/catalina/valves/ValveBase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/ValveBase.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/ValveBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/ValveBase.java Mon Nov 9 20:51:17 2009
@@ -57,7 +57,7 @@

public abstract class ValveBase
implements Contained, Valve, MBeanRegistration {
- private static Log log = LogFactory.getLog(ValveBase.class);
+ private static final Log log = LogFactory.getLog(ValveBase.class);

//------------------------------------------------------ Constructor

Modified: tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java (original)
+++ tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java Mon Nov 9 20:51:17 2009
@@ -42,7 +42,7 @@
public final class EmbeddedServletOptions implements Options {

// Logger
- private Log log = LogFactory.getLog(EmbeddedServletOptions.class);
+ private final Log log = LogFactory.getLog(EmbeddedServletOptions.class);

private Properties settings = new Properties();

Modified: tomcat/trunk/java/org/apache/jasper/JspC.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspC.java Mon Nov 9 20:51:17 2009
@@ -97,7 +97,7 @@
"clsid:8AD9C840-044E-11D1-B3E9-00805F499D93";

// Logger
- protected static Log log = LogFactory.getLog(JspC.class);
+ protected static final Log log = LogFactory.getLog(JspC.class);

protected static final String SWITCH_VERBOSE = "-v";
protected static final String SWITCH_HELP = "-help";

Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java Mon Nov 9 20:51:17 2009
@@ -44,7 +44,7 @@
private static final String WEB_XML = "/WEB-INF/web.xml";

// Logger
- private Log log = LogFactory.getLog(JspConfig.class);
+ private final Log log = LogFactory.getLog(JspConfig.class);

private Vector<JspPropertyGroup> jspProperties = null;
private ServletContext ctxt;

Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspReader.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspReader.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/JspReader.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspReader.java Mon Nov 9 20:51:17 2009
@@ -51,7 +51,7 @@
/**
* Logger.
*/
- private Log log = LogFactory.getLog(JspReader.class);
+ private final Log log = LogFactory.getLog(JspReader.class);

/**
* The current spot in the file.

Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java Mon Nov 9 20:51:17 2009
@@ -58,7 +58,7 @@
public final class JspRuntimeContext {

// Logger
- private Log log = LogFactory.getLog(JspRuntimeContext.class);
+ private final Log log = LogFactory.getLog(JspRuntimeContext.class);

/*
* Counts how many times the webapp's JSPs have been reloaded.

Modified: tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java Mon Nov 9 20:51:17 2009
@@ -65,7 +65,7 @@
class TagLibraryInfoImpl extends TagLibraryInfo implements TagConstants {

// Logger
- private Log log = LogFactory.getLog(TagLibraryInfoImpl.class);
+ private final Log log = LogFactory.getLog(TagLibraryInfoImpl.class);

private JspCompilationContext ctxt;

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=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java Mon Nov 9 20:51:17 2009
@@ -81,7 +81,7 @@
public class TldLocationsCache {

// Logger
- private Log log = LogFactory.getLog(TldLocationsCache.class);
+ private final Log log = LogFactory.getLog(TldLocationsCache.class);

/**
* The types of URI one may specify for a tag library

Modified: tomcat/trunk/java/org/apache/jasper/runtime/JspFactoryImpl.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/JspFactoryImpl.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/runtime/JspFactoryImpl.java (original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/JspFactoryImpl.java Mon Nov 9 20:51:17 2009
@@ -40,7 +40,7 @@
public class JspFactoryImpl extends JspFactory {

// Logger
- private Log log = LogFactory.getLog(JspFactoryImpl.class);
+ private final Log log = LogFactory.getLog(JspFactoryImpl.class);

private static final String SPEC_VERSION = "2.1";
private static final boolean USE_POOL =

Modified: tomcat/trunk/java/org/apache/jasper/runtime/TagHandlerPool.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/TagHandlerPool.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/runtime/TagHandlerPool.java (original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/TagHandlerPool.java Mon Nov 9 20:51:17 2009
@@ -38,7 +38,7 @@
public static final String OPTION_TAGPOOL="tagpoolClassName";
public static final String OPTION_MAXSIZE="tagpoolMaxSize";

- private Log log = LogFactory.getLog(TagHandlerPool.class);
+ private final Log log = LogFactory.getLog(TagHandlerPool.class);

// index of next available tag handler
private int current;

Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java (original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java Mon Nov 9 20:51:17 2009
@@ -58,7 +58,7 @@
public class JspServlet extends HttpServlet implements PeriodicEventListener {

// Logger
- private Log log = LogFactory.getLog(JspServlet.class);
+ private final Log log = LogFactory.getLog(JspServlet.class);

private ServletContext context;
private ServletConfig config;

Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java (original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java Mon Nov 9 20:51:17 2009
@@ -65,7 +65,7 @@
public class JspServletWrapper {

// Logger
- private Log log = LogFactory.getLog(JspServletWrapper.class);
+ private final Log log = LogFactory.getLog(JspServletWrapper.class);

private Servlet theServlet;
private String jspUri;

Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/GenericParser.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/GenericParser.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/GenericParser.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/GenericParser.java Mon Nov 9 20:51:17 2009
@@ -41,7 +41,7 @@
/**
* The Log to which all SAX event related logging calls will be made.
*/
- protected static Log log =
+ protected static final Log log =
LogFactory.getLog("org.apache.commons.digester.Digester.sax");

/**

Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/XercesParser.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/XercesParser.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/XercesParser.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/XercesParser.java Mon Nov 9 20:51:17 2009
@@ -46,7 +46,7 @@
/**
* The Log to which all SAX event related logging calls will be made.
*/
- protected static Log log =
+ protected static final Log log =
LogFactory.getLog("org.apache.commons.digester.Digester.sax");

Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java Mon Nov 9 20:51:17 2009
@@ -101,7 +101,7 @@
* @author Costin Manolache
*/
public class BaseModelMBean implements DynamicMBean, MBeanRegistration, ModelMBeanNotificationBroadcaster {
- private static Log log = LogFactory.getLog(BaseModelMBean.class);
+ private static final Log log = LogFactory.getLog(BaseModelMBean.class);

// ----------------------------------------------------------- Constructors

Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java Mon Nov 9 20:51:17 2009
@@ -76,7 +76,7 @@
/**
* The Log instance to which we will write our log messages.
*/
- private static Log log = LogFactory.getLog(Registry.class);
+ private static final Log log = LogFactory.getLog(Registry.class);

// Support for the factory methods

Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDOMSource.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDOMSource.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDOMSource.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDOMSource.java Mon Nov 9 20:51:17 2009
@@ -39,7 +39,7 @@

public class MbeansDescriptorsDOMSource extends ModelerSource
{
- private static Log log = LogFactory.getLog(MbeansDescriptorsDOMSource.class);
+ private static final Log log = LogFactory.getLog(MbeansDescriptorsDOMSource.class);

Registry registry;
String location;

Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java Mon Nov 9 20:51:17 2009
@@ -34,7 +34,7 @@

public class MbeansDescriptorsDigesterSource extends ModelerSource
{
- private static Log log =
+ private static final Log log =
LogFactory.getLog(MbeansDescriptorsDigesterSource.class);

Registry registry;

Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java Mon Nov 9 20:51:17 2009
@@ -38,7 +38,7 @@

public class MbeansDescriptorsIntrospectionSource extends ModelerSource
{
- private static Log log = LogFactory.getLog(MbeansDescriptorsIntrospectionSource.class);
+ private static final Log log = LogFactory.getLog(MbeansDescriptorsIntrospectionSource.class);

Registry registry;
String location;

Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsSerSource.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsSerSource.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsSerSource.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsSerSource.java Mon Nov 9 20:51:17 2009
@@ -32,7 +32,7 @@

public class MbeansDescriptorsSerSource extends ModelerSource
{
- private static Log log = LogFactory.getLog(MbeansDescriptorsSerSource.class);
+ private static final Log log = LogFactory.getLog(MbeansDescriptorsSerSource.class);
Registry registry;
String location;
String type;

Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java Mon Nov 9 20:51:17 2009
@@ -53,7 +53,7 @@
*/
public class MbeansSource extends ModelerSource implements MbeansSourceMBean
{
- private static Log log = LogFactory.getLog(MbeansSource.class);
+ private static final Log log = LogFactory.getLog(MbeansSource.class);
Registry registry;
String type;

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Mon Nov 9 20:51:17 2009
@@ -36,7 +36,7 @@
* @author Remy Maucherat
*/
public abstract class AbstractEndpoint {
- protected static Log log = LogFactory.getLog(AbstractEndpoint.class);
+ protected static final Log log = LogFactory.getLog(AbstractEndpoint.class);

// -------------------------------------------------------------- Constants
protected StringManager sm = StringManager.getManager("org.apache.tomcat.util.net.res");

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Mon Nov 9 20:51:17 2009
@@ -57,7 +57,7 @@
// -------------------------------------------------------------- Constants

- protected static Log log = LogFactory.getLog(AprEndpoint.class);
+ protected static final Log log = LogFactory.getLog(AprEndpoint.class);

// ----------------------------------------------------------------- Fields

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java Mon Nov 9 20:51:17 2009
@@ -49,7 +49,7 @@

// -------------------------------------------------------------- Constants

- protected static Log log = LogFactory.getLog(JIoEndpoint.class);
+ protected static final Log log = LogFactory.getLog(JIoEndpoint.class);

// ----------------------------------------------------------------- Fields

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java Mon Nov 9 20:51:17 2009
@@ -38,7 +38,7 @@

public class NioBlockingSelector {

- protected static Log log = LogFactory.getLog(NioBlockingSelector.class);
+ protected static final Log log = LogFactory.getLog(NioBlockingSelector.class);

private static int threadCounter = 0;

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Mon Nov 9 20:51:17 2009
@@ -77,7 +77,7 @@
// -------------------------------------------------------------- Constants

- protected static Log log = LogFactory.getLog(NioEndpoint.class);
+ protected static final Log log = LogFactory.getLog(NioEndpoint.class);

public static final int OP_REGISTER = 0x100; //register interest op

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java Mon Nov 9 20:51:17 2009
@@ -45,7 +45,7 @@

protected static int threadCount = 0;

- protected static Log log = LogFactory.getLog(NioSelectorPool.class);
+ protected static final Log log = LogFactory.getLog(NioSelectorPool.class);

protected final static boolean SHARED =
Boolean.valueOf(System.getProperty("org.apache.tomcat.util.net.NioSelectorShared", "true")).booleanValue();

Modified: tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/BayeuxServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/BayeuxServlet.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/BayeuxServlet.java (original)
+++ tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/BayeuxServlet.java Mon Nov 9 20:51:17 2009
@@ -49,7 +49,7 @@
/**
* Logger object
*/
- protected static Log log = LogFactory.getLog(BayeuxServlet.class);
+ protected static final Log log = LogFactory.getLog(BayeuxServlet.class);

/**
* Servlet config - for future use

Modified: tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/ChannelImpl.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/ChannelImpl.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/ChannelImpl.java (original)
+++ tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/ChannelImpl.java Mon Nov 9 20:51:17 2009
@@ -34,7 +34,7 @@
*/
public class ChannelImpl implements Channel {

- protected static Log log = LogFactory.getLog(ChannelImpl.class);
+ protected static final Log log = LogFactory.getLog(ChannelImpl.class);

/**
* The unique id of this channel

Modified: tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/ClientImpl.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/ClientImpl.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/ClientImpl.java (original)
+++ tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/ClientImpl.java Mon Nov 9 20:51:17 2009
@@ -41,7 +41,7 @@

public static final String COMET_EVENT_ATTR = "org.apache.cometd.bayeux.client";

- protected static Log log = LogFactory.getLog(ClientImpl.class);
+ protected static final Log log = LogFactory.getLog(ClientImpl.class);

protected static LinkedList<Message> EMPTY_LIST = new LinkedList<Message>();
/**

Modified: tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/RequestBase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/RequestBase.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/RequestBase.java (original)
+++ tomcat/trunk/modules/bayeux/java/org/apache/tomcat/bayeux/RequestBase.java Mon Nov 9 20:51:17 2009
@@ -74,7 +74,7 @@

protected HashMap<String, Object> response = null;

- protected static Log log = LogFactory.getLog(RequestBase.class);
+ protected static final Log log = LogFactory.getLog(RequestBase.class);

protected int reconnectInterval = 1000;

Modified: tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java (original)
+++ tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java Mon Nov 9 20:51:17 2009
@@ -58,7 +58,7 @@
/**
* Logger
*/
- protected static Log log = LogFactory.getLog(ConnectionPool.class);
+ protected static final Log log = LogFactory.getLog(ConnectionPool.class);

//===============================================================================
// INSTANCE/QUICK ACCESS VARIABLE

Modified: tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java (original)
+++ tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java Mon Nov 9 20:51:17 2009
@@ -55,7 +55,7 @@
* @author Filip Hanik
*/
public class DataSourceFactory implements ObjectFactory {
- protected static Log log = LogFactory.getLog(DataSourceFactory.class);
+ protected static final Log log = LogFactory.getLog(DataSourceFactory.class);

protected final static String PROP_DEFAULTAUTOCOMMIT = "defaultAutoCommit";
protected final static String PROP_DEFAULTREADONLY = "defaultReadOnly";

Modified: tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java (original)
+++ tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java Mon Nov 9 20:51:17 2009
@@ -43,7 +43,7 @@
*/

public class DataSourceProxy implements PoolConfiguration {
- protected static Log log = LogFactory.getLog(DataSourceProxy.class);
+ protected static final Log log = LogFactory.getLog(DataSourceProxy.class);

protected volatile ConnectionPool pool = null;

Modified: tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java (original)
+++ tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java Mon Nov 9 20:51:17 2009
@@ -33,7 +33,7 @@
*
*/
public class PoolProperties implements PoolConfiguration {
- protected static Log log = LogFactory.getLog(PoolProperties.class);
+ protected static final Log log = LogFactory.getLog(PoolProperties.class);

protected static AtomicInteger poolCounter = new AtomicInteger(0);
protected Properties dbProperties = new Properties();

Modified: tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java (original)
+++ tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java Mon Nov 9 20:51:17 2009
@@ -38,7 +38,7 @@
/**
* Logger
*/
- protected static Log log = LogFactory.getLog(PooledConnection.class);
+ protected static final Log log = LogFactory.getLog(PooledConnection.class);
/**
* Instance counter
*/

Modified: tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java (original)
+++ tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/AbstractQueryReport.java Mon Nov 9 20:51:17 2009
@@ -37,7 +37,7 @@
*/
public abstract class AbstractQueryReport extends AbstractCreateStatementInterceptor {
//logger
- protected static Log log = LogFactory.getLog(AbstractQueryReport.class);
+ protected static final Log log = LogFactory.getLog(AbstractQueryReport.class);

/**
* The threshold in milliseconds. If the query is faster than this, we don't measure it

Modified: tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java (original)
+++ tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java Mon Nov 9 20:51:17 2009
@@ -41,7 +41,7 @@
*/

public class ConnectionState extends JdbcInterceptor {
- protected static Log log = LogFactory.getLog(ConnectionState.class);
+ protected static final Log log = LogFactory.getLog(ConnectionState.class);

protected final String[] readState = {"getAutoCommit","getTransactionIsolation","isReadOnly","getCatalog"};
protected final String[] writeState = {"setAutoCommit","setTransactionIsolation","setReadOnly","setCatalog"};

Modified: tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java (original)
+++ tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java Mon Nov 9 20:51:17 2009
@@ -39,7 +39,7 @@
*/
public class SlowQueryReport extends AbstractQueryReport {
//logger
- protected static Log log = LogFactory.getLog(SlowQueryReport.class);
+ protected static final Log log = LogFactory.getLog(SlowQueryReport.class);

/**
* we will be keeping track of query stats on a per pool basis

Modified: tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java (original)
+++ tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java Mon Nov 9 20:51:17 2009
@@ -60,7 +60,7 @@

protected static CompositeType SLOW_QUERY_TYPE;

- protected static Log log = LogFactory.getLog(SlowQueryReportJmx.class);
+ protected static final Log log = LogFactory.getLog(SlowQueryReportJmx.class);

protected static ConcurrentHashMap<String,SlowQueryReportJmxMBean> mbeans =

Modified: tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java (original)
+++ tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java Mon Nov 9 20:51:17 2009
@@ -32,7 +32,7 @@
*
*/
public class StatementFinalizer extends AbstractCreateStatementInterceptor {
- protected static Log log = LogFactory.getLog(StatementFinalizer.class);
+ protected static final Log log = LogFactory.getLog(StatementFinalizer.class);

protected ArrayList<WeakReference<Statement>> statements = new ArrayList<WeakReference<Statement>>();

Modified: tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java (original)
+++ tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java Mon Nov 9 20:51:17 2009
@@ -35,7 +35,7 @@
/**
* logger
*/
- protected static Log log = LogFactory.getLog(ConnectionPool.class);
+ protected static final Log log = LogFactory.getLog(ConnectionPool.class);

/**
* the connection pool

Modified: tomcat/trunk/test/org/apache/catalina/tribes/demos/LoadTest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/demos/LoadTest.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/tribes/demos/LoadTest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/tribes/demos/LoadTest.java Mon Nov 9 20:51:17 2009
@@ -41,7 +41,7 @@
* @version 1.0
*/
public class LoadTest implements MembershipListener,ChannelListener, Runnable {
- protected static Log log = LogFactory.getLog(LoadTest.class);
+ protected static final Log log = LogFactory.getLog(LoadTest.class);
public static int size = 24000;
public static Object mutex = new Object();
public boolean doRun = true;

Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async0.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async0.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async0.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async0.java Mon Nov 9 20:51:17 2009
@@ -28,7 +28,7 @@
import org.apache.juli.logging.LogFactory;

public class Async0 extends HttpServlet {
- protected static Log log = LogFactory.getLog(Async0.class);
+ protected static final Log log = LogFactory.getLog(Async0.class);
public Async0() {
}

Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async1.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async1.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async1.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async1.java Mon Nov 9 20:51:17 2009
@@ -28,7 +28,7 @@
import org.apache.juli.logging.LogFactory;

public class Async1 extends HttpServlet {
- protected static Log log = LogFactory.getLog(Async1.class);
+ protected static final Log log = LogFactory.getLog(Async1.class);
public Async1() {
}

Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async2.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async2.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async2.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async2.java Mon Nov 9 20:51:17 2009
@@ -28,7 +28,7 @@
import org.apache.juli.logging.LogFactory;

public class Async2 extends HttpServlet {
- protected static Log log = LogFactory.getLog(Async2.class);
+ protected static final Log log = LogFactory.getLog(Async2.class);
public Async2() {
}

Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async3.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async3.java?rev=834226&r1=834225&r2=834226&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async3.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async3.java Mon Nov 9 20:51:17 2009
@@ -28,7 +28,7 @@
import org.apache.juli.logging.LogFactory;

public class Async3 extends HttpServlet {
- protected static Log log = LogFactory.getLog(Async3.class);
+ protected static final Log log = LogFactory.getLog(Async3.class);
public Async3() {
}

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

svn commit: r834220 - in /tomcat/trunk/java/org/apache/catalina: core/ApplicationContext.java core/StandardContext.java ha/context/ReplicatedContext.java startup/DefaultJarScanner.java

2009-11-09T12:43:49Z

Author: markt
Date: Mon Nov 9 20:43:47 2009
New Revision: 834220

URL: http://svn.apache.org/viewvc?rev=834220&view=rev
Log:
The assumption that contexts will always be file system based or that resources will always be extracted to the work does not hold true, particularly for custom DirContext implementations. Don't make the assumption and clean-up up the redundant field that is no longer required.

Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java
tomcat/trunk/java/org/apache/catalina/startup/DefaultJarScanner.java

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=834220&r1=834219&r2=834220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Mon Nov 9 20:43:47 2009
@@ -19,7 +19,6 @@
package org.apache.catalina.core;

-import java.io.File;
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
@@ -90,10 +89,9 @@
*
* @param context The associated Context instance
*/
- public ApplicationContext(String basePath, StandardContext context) {
+ public ApplicationContext(StandardContext context) {
super();
this.context = context;
- this.basePath = basePath;

// Populate session tracking modes
populateSessionTrackingModes();
@@ -158,12 +156,6 @@

/**
- * Base path.
- */
- private String basePath = null;
-
-
- /**
* Thread local data used during request dispatch.
*/
private ThreadLocal<DispatchData> dispatchData =
@@ -492,37 +484,21 @@
throw new MalformedURLException(sm.getString("applicationContext.requestDispatcher.iae", path));

- path = RequestUtil.normalize(path);
- if (path == null)
+ String normPath = RequestUtil.normalize(path);
+ if (normPath == null)
return (null);

- String libPath = "/WEB-INF/lib/";
- if ((path.startsWith(libPath)) && (path.endsWith(".jar"))) {
- File jarFile = null;
- if (context.isFilesystemBased()) {
- jarFile = new File(basePath, path);
- } else {
- jarFile = new File(context.getWorkPath(), path);
- }
- if (jarFile.exists()) {
- return jarFile.toURI().toURL();
- } else {
- return null;
- }
- } else {
-
- DirContext resources = context.getResources();
- if (resources != null) {
- String fullPath = context.getName() + path;
- String hostName = context.getParent().getName();
- try {
- resources.lookup(path);
- return new URL
- ("jndi", "", 0, getJNDIUri(hostName, fullPath),
- new DirContextURLStreamHandler(resources));
- } catch (Exception e) {
- // Ignore
- }
+ DirContext resources = context.getResources();
+ if (resources != null) {
+ String fullPath = context.getName() + normPath;
+ String hostName = context.getParent().getName();
+ try {
+ resources.lookup(path);
+ return new URL
+ ("jndi", "", 0, getJNDIUri(hostName, fullPath),
+ new DirContextURLStreamHandler(resources));
+ } catch (Exception e) {
+ // Ignore
}
}

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=834220&r1=834219&r2=834220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Mon Nov 9 20:43:47 2009
@@ -1758,7 +1758,7 @@
public ServletContext getServletContext() {

if (context == null) {
- context = new ApplicationContext(getBasePath(), this);
+ context = new ApplicationContext(this);
if (altDDName != null)
context.setAttribute(Globals.ALT_DD_ATTR,altDDName);
}

Modified: tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java?rev=834220&r1=834219&r2=834220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java Mon Nov 9 20:43:47 2009
@@ -54,7 +54,7 @@
super.addLifecycleListener(this);
try {
CatalinaCluster catclust = (CatalinaCluster)this.getCluster();
- if (this.context == null) this.context = new ReplApplContext(this.getBasePath(), this);
+ if (this.context == null) this.context = new ReplApplContext(this);
if ( catclust != null ) {
ReplicatedMap map = new ReplicatedMap(this,catclust.getChannel(),DEFAULT_REPL_TIMEOUT,
getName(),getClassLoaders());
@@ -116,7 +116,7 @@
@Override
public ServletContext getServletContext() {
if (context == null) {
- context = new ReplApplContext(getBasePath(), this);
+ context = new ReplApplContext(this);
if (getAltDDName() != null)
context.setAttribute(Globals.ALT_DD_ATTR,getAltDDName());
}
@@ -130,8 +130,8 @@
protected ConcurrentHashMap<String, Object> tomcatAttributes =
new ConcurrentHashMap<String, Object>();

- public ReplApplContext(String basePath, ReplicatedContext context) {
- super(basePath,context);
+ public ReplApplContext(ReplicatedContext context) {
+ super(context);
}

protected ReplicatedContext getParent() {

Modified: tomcat/trunk/java/org/apache/catalina/startup/DefaultJarScanner.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/DefaultJarScanner.java?rev=834220&r1=834219&r2=834220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/DefaultJarScanner.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/DefaultJarScanner.java Mon Nov 9 20:43:47 2009
@@ -163,7 +163,7 @@
callback.scan((JarURLConnection) conn);
} else {
String urlStr = url.toString();
- if (urlStr.startsWith("file:")) {
+ if (urlStr.startsWith("file:") || urlStr.startsWith("jndi:")) {
if (urlStr.endsWith(JAR_EXT)) {
URL jarURL = new URL("jar:" + urlStr + "!/");
callback.scan((JarURLConnection) jarURL.openConnection());

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

[Tomcat Wiki] Trivial Update of "PoweredBy" by IsaacAdams

2009-11-09T11:22:03Z

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification.

The "PoweredBy" page has been changed by IsaacAdams.
http://wiki.apache.org/tomcat/PoweredBy?action=diff&rev1=206&rev2=207

--------------------------------------------------

===== InnoShare =====
{{http://webmail.innoshare.com/images/innoshare_logo_small.jpg}}
- [[http://www.innoshare.com/|InnoShare]] - a [[http://www.innoshare.com/services/atlanta-business-web-hosting|web hosting]] and [[http://www.innoshare.com/services/atlanta-email-newsletters|email marketing]] system for small businesses *formerly EdSyndicate*
+ [[http://www.innoshare.com/|InnoShare]] - a [[http://www.innoshare.com/services/atlanta-business-web-hosting|web hosting]] and [[http://www.innoshare.com/services/atlanta-email-newsletters|email marketing]] system for small businesses

===== EMC / Documentum =====
EMC / Documentum's web-based frontend for content management ([[http://software.emc.com/products/software_az/webtop.htm|Webtop]]) runs in Apache Tomcat [[http://software.emc.com/products/software_az/tech_specs/general.htm|WebtopTechnicalSpecifications]]. Also, a primary Documentum developer website cites Tomcat as well [[http://www.dmdeveloper.com/articles/administration/methodServer.html|dm_developer]]

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

[Tomcat Wiki] Trivial Update of "PoweredBy" by IsaacAdams

2009-11-09T11:19:01Z

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification.

The "PoweredBy" page has been changed by IsaacAdams.
http://wiki.apache.org/tomcat/PoweredBy?action=diff&rev1=205&rev2=206

--------------------------------------------------

===== InnoShare =====
{{http://webmail.innoshare.com/images/innoshare_logo_small.jpg}}
- [[http://www.innoshare.com/|InnoShare]] - a hosted content management and email marketing system for small businesses *formerly EdSyndicate*
+ [[http://www.innoshare.com/|InnoShare]] - a [[http://www.innoshare.com/services/atlanta-business-web-hosting|web hosting]] and [[http://www.innoshare.com/services/atlanta-email-newsletters|email marketing]] system for small businesses *formerly EdSyndicate*

===== EMC / Documentum =====
EMC / Documentum's web-based frontend for content management ([[http://software.emc.com/products/software_az/webtop.htm|Webtop]]) runs in Apache Tomcat [[http://software.emc.com/products/software_az/tech_specs/general.htm|WebtopTechnicalSpecifications]]. Also, a primary Documentum developer website cites Tomcat as well [[http://www.dmdeveloper.com/articles/administration/methodServer.html|dm_developer]]

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

Re: SSL & Tomcat

2009-11-09T10:47:38Z

On Mon, Nov 9, 2009 at 8:04 AM, Konstantin Kolinko
<knst.kolinko@...>wrote:

> 2009/11/9 Mark Thomas <markt@...>:
> > Summarising the information gathered so far from various channels
> > (thanks to Bill B., Bill W. & Rainer who have done most of the actual
> > work to find the info below).
> >
> > BIO/NIO connectors using JSSE.
> > Vulnerable when renegotiation is triggered by the client or server.
> > We could prevent server initiated renegotiation (and probably break the
> > majority of configurations using CLIENT-CERT).
> > We can't do anything to prevent client initiated renegotiation.
> >
> > APR/native connector using OpenSSL
> > It is vulnerable when renegotiation is triggered by the client or by the
> > server.
> > Client triggered negotiation is supported.
> > Server triggered negotiation will be supported from 1.1.17 onwards.
> >
> > OpenSSL 0.9.8l disables negotiation by default
> >
> >
> > In terms of what this means for users:
> >
> > BIO/NIO
> > - There isn't anything we can do in Tomcat to stop client
> > initiated renegotiation so it is a case of waiting for the JVM
> > vendors to respond.
> >
> > APR/native
> > - Re-building their current version with 0.9.8l will protect
> > users at the risk of breaking any configurations that
> > require renegotiation.
> > - We can release 1.1.17 with the binaries built with 0.9.8l. This
> > will also protect users at the risk of breaking any
> > configurations that require renegotiation. Mladen is doing this
> > now.
> > - Supporting renegotiation whilst avoiding the vulnerability will
> > require a protocol fix. In the meantime, we could port port
> > r833582 from httpd which would disable client triggered
> > renegotiation for OpenSSL < 0.9.8l (which may help some users
> > who can't easily change their OpenSSl version and release 1.1.18
> > with this fix
> > - Once the protocol is fixed, release 1.1.next bundled with the
> > appropriate version of OpenSSL
> >
> >
> > Have I got my facts right above? If so, any objections to posting the
> > above to the users@ and announce@ lists along with adding something to
> > the security pages?
> >
> > Mark
> >
>
> +1
>
> s/negotiation/renegotiation/
> s/port port/port/
>
> A question:
> My understanding of renegotiation is that it changes SSL session. Is
> it possible to observe changes in the value of SSL sessionId? I doubt
> so, but may be?
>

AFAIK you can reuse the session ID across negotiations ( it's a nice
optimization BTW, too
bad we're not using, it can speed up SSL connections a lot ), I'm not sure
if it changes
within a renegotation, but AFAIK when you start any negotiation you can
specify you want
to reuse the old session id. But if I understand the exploit correctly -
they would want a different
cypher, and if you reuse the session you reuse the old one.

Maybe we can modify JSSESupport.Listener to break the connection if
handshakeCompleted is
called > once in a connection ? That is besides disabling server-initiated
handshakes.

Costin

> We read that value once and provide it to our users as
> "javax.servlet.request.ssl_session" request attribute.
>
> Regarding valves (as mentioned in issue 48157):
> I understand, that that is not sufficient, but if anyone wants to
> check against malformed headers, they can do so.
>
> Best regards,
> Konstantin Kolinko
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@...
> For additional commands, e-mail: dev-help@...
>
>

Re: SSL & Tomcat

2009-11-09T09:32:26Z

On 09.11.2009 17:16, Mark Thomas wrote:

> Konstantin Kolinko wrote:
>> 2009/11/9 Mark Thomas <markt@...>:
>>> Summarising the information gathered so far from various channels
>>> (thanks to Bill B., Bill W. & Rainer who have done most of the actual
>>> work to find the info below).
>>>
>>> BIO/NIO connectors using JSSE.
>>> Vulnerable when renegotiation is triggered by the client or server.
>>> We could prevent server initiated renegotiation (and probably break the
>>> majority of configurations using CLIENT-CERT).
>>> We can't do anything to prevent client initiated renegotiation.
>>>
>>> APR/native connector using OpenSSL
>>> It is vulnerable when renegotiation is triggered by the client or by the
>>> server.
>>> Client triggered negotiation is supported.
>>> Server triggered negotiation will be supported from 1.1.17 onwards.
>>>
>>> OpenSSL 0.9.8l disables negotiation by default
>>>
>>>
>>> In terms of what this means for users:
>>>
>>> BIO/NIO
>>> - There isn't anything we can do in Tomcat to stop client
>>> initiated renegotiation so it is a case of waiting for the JVM
>>> vendors to respond.
>>>
>>> APR/native
>>> - Re-building their current version with 0.9.8l will protect
>>> users at the risk of breaking any configurations that
>>> require renegotiation.
>>> - We can release 1.1.17 with the binaries built with 0.9.8l. This
>>> will also protect users at the risk of breaking any
>>> configurations that require renegotiation. Mladen is doing this
>>> now.
>>> - Supporting renegotiation whilst avoiding the vulnerability will
>>> require a protocol fix. In the meantime, we could port port
>>> r833582 from httpd which would disable client triggered
>>> renegotiation for OpenSSL < 0.9.8l (which may help some users
>>> who can't easily change their OpenSSl version and release 1.1.18
>>> with this fix
>>> - Once the protocol is fixed, release 1.1.next bundled with the
>>> appropriate version of OpenSSL
>>>
>>>
>>> Have I got my facts right above? If so, any objections to posting the
>>> above to the users@ and announce@ lists along with adding something to
>>> the security pages?
>>>
>>> Mark
>>>
>>
>> +1
>>
>> s/negotiation/renegotiation/
>> s/port port/port/
>
> Noted. I'll get the notice out.
>
>> A question:
>> My understanding of renegotiation is that it changes SSL session. Is
>> it possible to observe changes in the value of SSL sessionId? I doubt
>> so, but may be?
>> We read that value once and provide it to our users as
>> "javax.servlet.request.ssl_session" request attribute.
>
> Hmm. Interesting. I need to do some testing :)

Yes, using the naive openssl test with s_client and the "R" command, the
session id changes.

In order to find out, whether this is optional behaviour or will always
happen, I guess we would need to ask on the openssl dev list, which I
will do in a minute :)

> I'll add something along the lines of "We are currently evaluating a
> number of possible work-arounds prior to a protocol fix becoming
> available. Discussion is happening on the dev list and any significant
> developments will be posted to the users@ and announce@ mailing lists.

+1

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

[SECURITY] CVE-2009-3555 SSL Man-In-The-Middle attack

2009-11-09T08:43:39Z

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

A vulnerability in the TLS protocol has recently been made public [1]
that allows an attacker to inject arbitrary requests into an TLS stream.

The current understanding of the Tomcat developers is as follows:

BIO & NIO connectors using JSSE
These connectors are vulnerable when renegotiation is triggered by the
client or the server.
Server initiated re-negotiation can be limited by configuration
Server initiated re-negotiation could be prevented by a code change
Client initiated re-negotiation can not currently be prevented

APR/Native connector using OpenSSL
Vulnerable when renegotiation is triggered by the client or the server.
Server initiated re-negotiation is not supported prior to 1.1.17
Client initiated re-negotiation is supported but can not be prevented

OpenSSL 0.9.8l disables all negotiation by default

In terms of what this means for users:

BIO/NIO
- - We haven't yet (we are still looking) found a way to stop client
initiated renegotiation. It may be necessary to wait for the JVM
vendors to respond.

APR/native
- - Re-building any version of the APR/native connector with OpenSSL
0.9.8l will protect against this vulnerability but any configurations
that require renegotiation will break.
- - Version 1.1.17 of the APR/native connector will be released shortly.
The binary versions will be built with OpenSSL 0.9.8l which will
protect against this vulnerability but configurations that require
renegotiation will break.

Supporting renegotiation whilst avoiding the vulnerability requires a
protocol fix. The Tomcat development team is examining possible
work-arounds that may provide an interim solution. These options include
porting r833582 from httpd to the APR/native connector which would
disable client triggered renegotiation for OpenSSL < 0.9.8l which may
help some users who can't easily change their OpenSSL version.

If you'd would like to join/follow the work-around discussions, please
join the Tomcat dev mailing list. Any significant developments in this
area will be posted to the Tomcat announce@ and users@ mailing lists.

Mark

[1] http://extendedsubset.com/?p=8
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.12 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBCgAGBQJK+Ea6AAoJEBDAHFovYFnnjggP/RU6UpOmXDCzOG/neVmMI0RX
XMKMZdpph8TCdjOzOd1UdCGPK5q3U1CDvB7P96eYZ5R745YTT6Ct1hXETC++SAh2
Q6jRD2qNPXX7hA9JFallC6+PUjq+IaHknJQYGAFaHCEdvwocp8NYWxUSqg5yTc6U
toUclHntjEwXc6jpEeNwuU3An8WNf2rX5OV9IX17lS7mxtElfVVIM5o4PrkMV0Tn
5i3YpLXTzHIHZ3Wv6VOlsQy+X+JhM4GMWF+4wWgHzdUfQ3wCpUrmC/tOgsXp23j8
ITPqIcf5dsDsOEd9RAZRWoRPpgcJH3bypnmG65VpITRkjnvKq6GC1TcKXTdUBxER
0OwpAY2A/e6OzHpw68q0wn5deYKBEo+6DJ/rFmHCs4KYiw7WXpOQFsL5LXxuDfEr
7W79w1nEPAaXz6KGSGiEuPxyLtJafAP16ZtaITqzoI9Pn1bpl9iP/OK+2OTc/e+/
BF0vI0gh2ZD2AbktNZJLY8+i5FmF/jcJP6/SQLnFQl5AZQ6YhRNQl87bc4lEkZkm
IHIdJW28EbD/4V0Yex8MnAFIFEq/jyWe2LgUep0/j9LEkMKlFGpoNNgEQsA9E8ml
RR9adgTCESBN6cCCsn5CrYTlsTKyfxk/Db2inI7L/OM3zfQoCTQDFnxY1l13I+Dt
FiHrC9dgiTCEZL0fR69F
=xrMK
-----END PGP SIGNATURE-----

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

Re: SSL & Tomcat

2009-11-09T08:16:05Z

Konstantin Kolinko wrote:

> 2009/11/9 Mark Thomas <markt@...>:
>> Summarising the information gathered so far from various channels
>> (thanks to Bill B., Bill W. & Rainer who have done most of the actual
>> work to find the info below).
>>
>> BIO/NIO connectors using JSSE.
>> Vulnerable when renegotiation is triggered by the client or server.
>> We could prevent server initiated renegotiation (and probably break the
>> majority of configurations using CLIENT-CERT).
>> We can't do anything to prevent client initiated renegotiation.
>>
>> APR/native connector using OpenSSL
>> It is vulnerable when renegotiation is triggered by the client or by the
>> server.
>> Client triggered negotiation is supported.
>> Server triggered negotiation will be supported from 1.1.17 onwards.
>>
>> OpenSSL 0.9.8l disables negotiation by default
>>
>>
>> In terms of what this means for users:
>>
>> BIO/NIO
>> - There isn't anything we can do in Tomcat to stop client
>> initiated renegotiation so it is a case of waiting for the JVM
>> vendors to respond.
>>
>> APR/native
>> - Re-building their current version with 0.9.8l will protect
>> users at the risk of breaking any configurations that
>> require renegotiation.
>> - We can release 1.1.17 with the binaries built with 0.9.8l. This
>> will also protect users at the risk of breaking any
>> configurations that require renegotiation. Mladen is doing this
>> now.
>> - Supporting renegotiation whilst avoiding the vulnerability will
>> require a protocol fix. In the meantime, we could port port
>> r833582 from httpd which would disable client triggered
>> renegotiation for OpenSSL < 0.9.8l (which may help some users
>> who can't easily change their OpenSSl version and release 1.1.18
>> with this fix
>> - Once the protocol is fixed, release 1.1.next bundled with the
>> appropriate version of OpenSSL
>>
>>
>> Have I got my facts right above? If so, any objections to posting the
>> above to the users@ and announce@ lists along with adding something to
>> the security pages?
>>
>> Mark
>>
>
> +1
>
> s/negotiation/renegotiation/
> s/port port/port/

Noted. I'll get the notice out.

> A question:
> My understanding of renegotiation is that it changes SSL session. Is
> it possible to observe changes in the value of SSL sessionId? I doubt
> so, but may be?
> We read that value once and provide it to our users as
> "javax.servlet.request.ssl_session" request attribute.

Hmm. Interesting. I need to do some testing :)

I'll add something along the lines of "We are currently evaluating a
number of possible work-arounds prior to a protocol fix becoming
available. Discussion is happening on the dev list and any significant
developments will be posted to the users@ and announce@ mailing lists.

Mark

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

Re: SSL & Tomcat

2009-11-09T08:04:55Z

2009/11/9 Mark Thomas <markt@...>:

> Summarising the information gathered so far from various channels
> (thanks to Bill B., Bill W. & Rainer who have done most of the actual
> work to find the info below).
>
> BIO/NIO connectors using JSSE.
> Vulnerable when renegotiation is triggered by the client or server.
> We could prevent server initiated renegotiation (and probably break the
> majority of configurations using CLIENT-CERT).
> We can't do anything to prevent client initiated renegotiation.
>
> APR/native connector using OpenSSL
> It is vulnerable when renegotiation is triggered by the client or by the
> server.
> Client triggered negotiation is supported.
> Server triggered negotiation will be supported from 1.1.17 onwards.
>
> OpenSSL 0.9.8l disables negotiation by default
>
>
> In terms of what this means for users:
>
> BIO/NIO
> - There isn't anything we can do in Tomcat to stop client
> initiated renegotiation so it is a case of waiting for the JVM
> vendors to respond.
>
> APR/native
> - Re-building their current version with 0.9.8l will protect
> users at the risk of breaking any configurations that
> require renegotiation.
> - We can release 1.1.17 with the binaries built with 0.9.8l. This
> will also protect users at the risk of breaking any
> configurations that require renegotiation. Mladen is doing this
> now.
> - Supporting renegotiation whilst avoiding the vulnerability will
> require a protocol fix. In the meantime, we could port port
> r833582 from httpd which would disable client triggered
> renegotiation for OpenSSL < 0.9.8l (which may help some users
> who can't easily change their OpenSSl version and release 1.1.18
> with this fix
> - Once the protocol is fixed, release 1.1.next bundled with the
> appropriate version of OpenSSL
>
>
> Have I got my facts right above? If so, any objections to posting the
> above to the users@ and announce@ lists along with adding something to
> the security pages?
>
> Mark
>

+1

s/negotiation/renegotiation/
s/port port/port/

A question:
My understanding of renegotiation is that it changes SSL session. Is
it possible to observe changes in the value of SSL sessionId? I doubt
so, but may be?
We read that value once and provide it to our users as
"javax.servlet.request.ssl_session" request attribute.

Regarding valves (as mentioned in issue 48157):
I understand, that that is not sufficient, but if anyone wants to
check against malformed headers, they can do so.

Best regards,
Konstantin Kolinko

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

DO NOT REPLY [Bug 48157] describe how to disable X-Header trick to attack client cert auth

2009-11-09T07:44:36Z

https://issues.apache.org/bugzilla/show_bug.cgi?id=48157

Luciana Moreira <moreira@...> changed:

What |Removed |Added
----------------------------------------------------------------------------
CC| |moreira@...

--
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

DO NOT REPLY [Bug 48158] warn that "per directory client certificate authentication" is harmful

2009-11-09T07:43:45Z

https://issues.apache.org/bugzilla/show_bug.cgi?id=48158

Luciana Moreira <moreira@...> changed:

What |Removed |Added
----------------------------------------------------------------------------
CC| |moreira@...

--
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

Re: SSL & Tomcat

2009-11-09T07:24:26Z

On 09.11.2009 11:56, Mark Thomas wrote:

+1, everything seems right to me and ready for notice to the users.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

svn commit: r834099 - in /tomcat/trunk/java/org/apache/catalina: loader/WebappClassLoader.java security/SecurityClassLoad.java

2009-11-09T07:08:50Z

Author: kkolinko
Date: Mon Nov 9 15:08:50 2009
New Revision: 834099

URL: http://svn.apache.org/viewvc?rev=834099&view=rev
Log:
Remove unused inner class

Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java

Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=834099&r1=834098&r2=834099&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java (original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Mon Nov 9 15:08:50 2009
@@ -114,23 +114,6 @@
public static final boolean ENABLE_CLEAR_REFERENCES =
Boolean.valueOf(System.getProperty("org.apache.catalina.loader.WebappClassLoader.ENABLE_CLEAR_REFERENCES", "true")).booleanValue();

- protected class PrivilegedFindResource
- implements PrivilegedAction<ResourceEntry> {
-
- protected File file;
- protected String path;
-
- PrivilegedFindResource(File file, String path) {
- this.file = file;
- this.path = path;
- }
-
- public ResourceEntry run() {
- return findResourceInternal(file, path);
- }
-
- }
-
protected class PrivilegedFindResourceByName
implements PrivilegedAction<ResourceEntry> {

Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=834099&r1=834098&r2=834099&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java (original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java Mon Nov 9 15:08:50 2009
@@ -88,7 +88,7 @@
String basePackage = "org.apache.catalina.";
loader.loadClass
(basePackage +
- "loader.WebappClassLoader$PrivilegedFindResource");
+ "loader.WebappClassLoader$PrivilegedFindResourceByName");
}

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

svn commit: r834096 - /tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java

2009-11-09T07:04:08Z

Author: kkolinko
Date: Mon Nov 9 15:04:07 2009
New Revision: 834096

URL: http://svn.apache.org/viewvc?rev=834096&view=rev
Log:
With rev.834080 WebappClassLoader#findResourceInternal(String,String) is always called with AccessController.doPrivileged(), thus there is no need to wrap #findResourceInternal(File,String) call that is inside it.

Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java

Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=834096&r1=834095&r2=834096&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java (original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Mon Nov 9 15:04:07 2009
@@ -1989,8 +1989,7 @@
}

/**
- * Find specified resource in local repositories. This block
- * will execute under an AccessControl.doPrivilege block.
+ * Find specified resource in local repositories.
*
* @return the loaded resource, or null if the resource isn't found
*/
@@ -2049,13 +2048,7 @@

// Note : Not getting an exception here means the resource was
// found
- if (securityManager != null) {
- PrivilegedAction<ResourceEntry> dp =
- new PrivilegedFindResource(files[i], path);
- entry = AccessController.doPrivileged(dp);
- } else {
- entry = findResourceInternal(files[i], path);
- }
+ entry = findResourceInternal(files[i], path);

ResourceAttributes attributes =
(ResourceAttributes) resources.getAttributes(fullPath);

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...