Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 67966 invoked from network); 19 Nov 2009 00:47:18 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 19 Nov 2009 00:47:18 -0000 Received: (qmail 31349 invoked by uid 500); 19 Nov 2009 00:47:17 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 31291 invoked by uid 500); 19 Nov 2009 00:47:17 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 31280 invoked by uid 99); 19 Nov 2009 00:47:17 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Nov 2009 00:47:17 +0000 X-ASF-Spam-Status: No, hits=-2.7 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Nov 2009 00:47:14 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 670C8238888F; Thu, 19 Nov 2009 00:46:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r882017 - in /tomcat/trunk: java/org/apache/catalina/core/ java/org/apache/catalina/ha/context/ java/org/apache/catalina/ha/deploy/ java/org/apache/catalina/ha/session/ java/org/apache/catalina/tribes/tipis/ java/org/apache/catalina/tribes/... Date: Thu, 19 Nov 2009 00:46:54 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091119004654.670C8238888F@eris.apache.org> Author: markt Date: Thu Nov 19 00:46:52 2009 New Revision: 882017 URL: http://svn.apache.org/viewvc?rev=882017&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48233 More loggers to private static final Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java tomcat/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java tomcat/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.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/SlowQueryReport.java tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReportJmx.java Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=882017&r1=882016&r2=882017&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Thu Nov 19 00:46:52 2009 @@ -60,6 +60,9 @@ import org.apache.tomcat.util.log.SystemLogHandler; import org.apache.tomcat.util.modeler.Registry; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; + /** * Standard implementation of the Wrapper interface that represents * an individual servlet definition. No child Containers are allowed, and @@ -73,8 +76,7 @@ extends ContainerBase implements ServletConfig, Wrapper, NotificationEmitter { - protected static final org.apache.juli.logging.Log log= - org.apache.juli.logging.LogFactory.getLog( StandardWrapper.class ); + private static final Log log = LogFactory.getLog( StandardWrapper.class ); protected static final String[] DEFAULT_SERVLET_METHODS = new String[] { "GET", "HEAD", "POST" }; 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=882017&r1=882016&r2=882017&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java (original) +++ tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java Thu Nov 19 00:46:52 2009 @@ -33,13 +33,16 @@ import org.apache.catalina.util.Enumerator; import org.apache.catalina.tribes.tipis.AbstractReplicatedMap.MapOwner; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; + /** * @author Filip Hanik * @version 1.0 */ public class ReplicatedContext extends StandardContext implements LifecycleListener,MapOwner { private int mapSendOptions = Channel.SEND_OPTIONS_DEFAULT; - public static final org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog( ReplicatedContext.class ); + private static final Log log = LogFactory.getLog( ReplicatedContext.class ); protected boolean startComplete = false; protected static long DEFAULT_REPL_TIMEOUT = 15000;//15 seconds Modified: tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java?rev=882017&r1=882016&r2=882017&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java (original) +++ tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java Thu Nov 19 00:46:52 2009 @@ -37,6 +37,9 @@ import org.apache.catalina.tribes.Member; import org.apache.tomcat.util.modeler.Registry; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; + /** *

@@ -59,8 +62,7 @@ */ public class FarmWarDeployer extends ClusterListener implements ClusterDeployer, FileChangeListener { /*--Static Variables----------------------------------------*/ - public static final org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory - .getLog(FarmWarDeployer.class); + private static final Log log = LogFactory.getLog(FarmWarDeployer.class); /** * The descriptive information about this implementation. */ Modified: tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java?rev=882017&r1=882016&r2=882017&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java (original) +++ tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java Thu Nov 19 00:46:52 2009 @@ -26,6 +26,9 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicLong; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; + /** * This factory is used to read files and write files by splitting them up into * smaller messages. So that entire files don't have to be read into memory. @@ -42,8 +45,7 @@ */ public class FileMessageFactory { /*--Static Variables----------------------------------------*/ - public static final org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory - .getLog(FileMessageFactory.class); + private static final Log log = LogFactory.getLog(FileMessageFactory.class); /** * The number of bytes that we read from file Modified: tomcat/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java?rev=882017&r1=882016&r2=882017&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java (original) +++ tomcat/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java Thu Nov 19 00:46:52 2009 @@ -22,6 +22,9 @@ import java.util.Map; import java.util.Iterator; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; + /** *

* The WarWatcher watches the deployDir for changes made to the @@ -37,8 +40,7 @@ public class WarWatcher { /*--Static Variables----------------------------------------*/ - public static final org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory - .getLog(WarWatcher.class); + private static final Log log = LogFactory.getLog(WarWatcher.class); /*--Instance Variables--------------------------------------*/ /** Modified: tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java?rev=882017&r1=882016&r2=882017&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java (original) +++ tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java Thu Nov 19 00:46:52 2009 @@ -31,13 +31,16 @@ import org.apache.catalina.tribes.tipis.LazyReplicatedMap; import org.apache.catalina.tribes.tipis.AbstractReplicatedMap.MapOwner; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; + /** *@author Filip Hanik *@version 1.0 */ public class BackupManager extends StandardManager implements ClusterManager, MapOwner { - public static final org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog( BackupManager.class ); + private static final Log log = LogFactory.getLog( BackupManager.class ); protected static long DEFAULT_REPL_TIMEOUT = 15000;//15 seconds 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=882017&r1=882016&r2=882017&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java Thu Nov 19 00:46:52 2009 @@ -53,7 +53,7 @@ * @version 1.0 */ public abstract class AbstractReplicatedMap extends ConcurrentHashMap implements RpcCallback, ChannelListener, MembershipListener, Heartbeat { - protected static final Log log = LogFactory.getLog(AbstractReplicatedMap.class); + private 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/tipis/LazyReplicatedMap.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java?rev=882017&r1=882016&r2=882017&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java Thu Nov 19 00:46:52 2009 @@ -27,6 +27,9 @@ import org.apache.catalina.tribes.util.Arrays; import org.apache.catalina.tribes.UniqueId; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; + /** * A smart implementation of a stateful replicated map. uses primary/secondary backup strategy. * One node is always the primary and one node is always the backup. @@ -66,7 +69,7 @@ */ public class LazyReplicatedMap extends AbstractReplicatedMap implements RpcCallback, ChannelListener, MembershipListener { - protected static final org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog(LazyReplicatedMap.class); + private static final Log log = LogFactory.getLog(LazyReplicatedMap.class); Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java?rev=882017&r1=882016&r2=882017&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java Thu Nov 19 00:46:52 2009 @@ -32,6 +32,7 @@ import org.apache.catalina.tribes.io.ListenCallback; import org.apache.catalina.tribes.util.ExecutorFactory; import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; /** *

Title:

@@ -47,7 +48,7 @@ public static final int OPTION_DIRECT_BUFFER = 0x0004; - protected static org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog(ReceiverBase.class); + private static final Log log = LogFactory.getLog(ReceiverBase.class); private MessageListener listener; private String host = "auto"; @@ -446,10 +447,6 @@ this.listener = listener; } - public void setLog(Log log) { - ReceiverBase.log = log; - } - public void setPool(RxTaskPool pool) { this.pool = pool; } Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java?rev=882017&r1=882016&r2=882017&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java Thu Nov 19 00:46:52 2009 @@ -27,6 +27,9 @@ import org.apache.catalina.tribes.transport.RxTaskPool; import org.apache.catalina.tribes.transport.AbstractRxTask; +import org.apache.juli.logging.Log; +import org.apache.juli.logging.LogFactory; + /** * * @author Filip Hanik @@ -34,7 +37,7 @@ */ public class BioReceiver extends ReceiverBase implements Runnable, ChannelReceiver, ListenCallback { - protected static final org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog(BioReceiver.class); + private static final Log log = LogFactory.getLog(BioReceiver.class); protected ServerSocket serverSocket; 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=882017&r1=882016&r2=882017&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java Thu Nov 19 00:46:52 2009 @@ -38,7 +38,7 @@ * @author Remy Maucherat */ public abstract class AbstractEndpoint { - protected static final Log log = LogFactory.getLog(AbstractEndpoint.class); + private static final Log log = LogFactory.getLog(AbstractEndpoint.class); // -------------------------------------------------------------- Constants protected static final StringManager sm = StringManager.getManager("org.apache.tomcat.util.net.res"); 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=882017&r1=882016&r2=882017&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Thu Nov 19 00:46:52 2009 @@ -76,7 +76,7 @@ // -------------------------------------------------------------- Constants - protected static final Log log = LogFactory.getLog(NioEndpoint.class); + private static final Log log = LogFactory.getLog(NioEndpoint.class); public static final int OP_REGISTER = 0x100; //register interest op 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=882017&r1=882016&r2=882017&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 Thu Nov 19 00:46:52 2009 @@ -37,7 +37,7 @@ */ public abstract class AbstractQueryReport extends AbstractCreateStatementInterceptor { //logger - protected static final Log log = LogFactory.getLog(AbstractQueryReport.class); + private 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/SlowQueryReport.java URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/SlowQueryReport.java?rev=882017&r1=882016&r2=882017&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 Thu Nov 19 00:46:52 2009 @@ -39,7 +39,7 @@ */ public class SlowQueryReport extends AbstractQueryReport { //logger - protected static final Log log = LogFactory.getLog(SlowQueryReport.class); + private 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=882017&r1=882016&r2=882017&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 Thu Nov 19 00:46:52 2009 @@ -60,7 +60,7 @@ protected static CompositeType SLOW_QUERY_TYPE; - protected static final Log log = LogFactory.getLog(SlowQueryReportJmx.class); + private static final Log log = LogFactory.getLog(SlowQueryReportJmx.class); protected static ConcurrentHashMap mbeans = --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org