You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2006/10/08 17:27:22 UTC
svn commit: r454158 [3/3] - in /tomcat/tc6.0.x/trunk/java/org/apache:
catalina/ catalina/authenticator/ catalina/connector/ catalina/core/
catalina/deploy/ catalina/ha/ catalina/ha/context/ catalina/ha/deploy/
catalina/ha/session/ catalina/ha/tcp/ cata...
Added: tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/LogFactory.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/LogFactory.java?view=auto&rev=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/LogFactory.java (added)
+++ tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/LogFactory.java Sun Oct 8 08:27:16 2006
@@ -0,0 +1,361 @@
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed 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.juli.logging;
+
+
+import java.util.Properties;
+
+
+
+/**
+ * Modified LogFactory: removed all discovery, hardcode a specific implementation
+ * If you like a different logging implementation - use either the discovery-based
+ * commons-logging, or better - another implementation hardcoded to your favourite
+ * logging impl.
+ *
+ * Why ? Each application and deployment can choose a logging implementation -
+ * that involves configuration, installing the logger jar and optional plugins, etc.
+ * As part of this process - they can as well install the commons-logging implementation
+ * that corresponds to their logger of choice. This completely avoids any discovery
+ * problem, while still allowing the user to switch.
+ *
+ * Note that this implementation is not just a wrapper arround JDK logging ( like
+ * the original commons-logging impl ). It adds 2 features - a simpler configuration
+ * ( which is in fact a subset of log4j.properties ) and a formatter that is
+ * less ugly.
+ *
+ * The removal of 'abstract' preserves binary backward compatibility. It is possible
+ * to preserve the abstract - and introduce another ( hardcoded ) factory - but I
+ * see no benefit.
+ *
+ * Since this class is not intended to be extended - and provides
+ * no plugin for other LogFactory implementation - all protected methods are removed.
+ * This can be changed - but again, there is little value in keeping dead code.
+ * Just take a quick look at the removed code ( and it's complexity)
+ *
+ * --------------
+ *
+ * Original comment:
+ * <p>Factory for creating {@link Log} instances, with discovery and
+ * configuration features similar to that employed by standard Java APIs
+ * such as JAXP.</p>
+ *
+ * <p><strong>IMPLEMENTATION NOTE</strong> - This implementation is heavily
+ * based on the SAXParserFactory and DocumentBuilderFactory implementations
+ * (corresponding to the JAXP pluggability APIs) found in Apache Xerces.</p>
+ *
+ *
+ * @author Craig R. McClanahan
+ * @author Costin Manolache
+ * @author Richard A. Sitze
+ * @version $Revision: 209449 $ $Date: 2005-07-06 05:06:32 -0700 (Wed, 06 Jul 2005) $
+ */
+public /* abstract */ class LogFactory {
+
+ // ----------------------------------------------------- Manifest Constants
+
+ /**
+ * The name of the property used to identify the LogFactory implementation
+ * class name.
+ */
+ public static final String FACTORY_PROPERTY =
+ "org.apache.commons.logging.LogFactory";
+
+ /**
+ * The fully qualified class name of the fallback <code>LogFactory</code>
+ * implementation class to use, if no other can be found.
+ */
+ public static final String FACTORY_DEFAULT =
+ "org.apache.commons.logging.impl.LogFactoryImpl";
+
+ /**
+ * The name of the properties file to search for.
+ */
+ public static final String FACTORY_PROPERTIES =
+ "commons-logging.properties";
+
+ /**
+ * <p>Setting this system property value allows the <code>Hashtable</code> used to store
+ * classloaders to be substituted by an alternative implementation.
+ * </p>
+ * <p>
+ * <strong>Note:</strong> <code>LogFactory</code> will print:
+ * <code><pre>
+ * [ERROR] LogFactory: Load of custom hashtable failed</em>
+ * </code></pre>
+ * to system error and then continue using a standard Hashtable.
+ * </p>
+ * <p>
+ * <strong>Usage:</strong> Set this property when Java is invoked
+ * and <code>LogFactory</code> will attempt to load a new instance
+ * of the given implementation class.
+ * For example, running the following ant scriplet:
+ * <code><pre>
+ * <java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
+ * ...
+ * <sysproperty
+ * key="org.apache.commons.logging.LogFactory.HashtableImpl"
+ * value="org.apache.commons.logging.AltHashtable"/>
+ * </java>
+ * </pre></code>
+ * will mean that <code>LogFactory</code> will load an instance of
+ * <code>org.apache.commons.logging.AltHashtable</code>.
+ * </p>
+ * <p>
+ * A typical use case is to allow a custom
+ * Hashtable implementation using weak references to be substituted.
+ * This will allow classloaders to be garbage collected without
+ * the need to release them (on 1.3+ JVMs only, of course ;)
+ * </p>
+ */
+ public static final String HASHTABLE_IMPLEMENTATION_PROPERTY =
+ "org.apache.commons.logging.LogFactory.HashtableImpl";
+
+ private static LogFactory singleton=new LogFactory();
+
+ Properties logConfig;
+
+ // ----------------------------------------------------------- Constructors
+
+
+ /**
+ * Protected constructor that is not available for public use.
+ */
+ private LogFactory() {
+ logConfig=new Properties();
+ }
+
+ // hook for syserr logger - class level
+ void setLogConfig( Properties p ) {
+ this.logConfig=p;
+ }
+ // --------------------------------------------------------- Public Methods
+
+ // only those 2 methods need to change to use a different direct logger.
+
+ /**
+ * <p>Construct (if necessary) and return a <code>Log</code> instance,
+ * using the factory's current set of configuration attributes.</p>
+ *
+ * <p><strong>NOTE</strong> - Depending upon the implementation of
+ * the <code>LogFactory</code> you are using, the <code>Log</code>
+ * instance you are returned may or may not be local to the current
+ * application, and may or may not be returned again on a subsequent
+ * call with the same name argument.</p>
+ *
+ * @param name Logical name of the <code>Log</code> instance to be
+ * returned (the meaning of this name is only known to the underlying
+ * logging implementation that is being wrapped)
+ *
+ * @exception LogConfigurationException if a suitable <code>Log</code>
+ * instance cannot be returned
+ */
+ public Log getInstance(String name)
+ throws LogConfigurationException {
+ return DirectJDKLog.getInstance(name);
+ }
+
+
+ /**
+ * Release any internal references to previously created {@link Log}
+ * instances returned by this factory. This is useful in environments
+ * like servlet containers, which implement application reloading by
+ * throwing away a ClassLoader. Dangling references to objects in that
+ * class loader would prevent garbage collection.
+ */
+ public void release() {
+ DirectJDKLog.release();
+ }
+
+ /**
+ * Return the configuration attribute with the specified name (if any),
+ * or <code>null</code> if there is no such attribute.
+ *
+ * @param name Name of the attribute to return
+ */
+ public Object getAttribute(String name) {
+ return logConfig.get(name);
+ }
+
+
+ /**
+ * Return an array containing the names of all currently defined
+ * configuration attributes. If there are no such attributes, a zero
+ * length array is returned.
+ */
+ public String[] getAttributeNames() {
+ return (String[])logConfig.keySet().toArray();
+ }
+
+ /**
+ * Remove any configuration attribute associated with the specified name.
+ * If there is no such attribute, no action is taken.
+ *
+ * @param name Name of the attribute to remove
+ */
+ public void removeAttribute(String name) {
+ logConfig.remove(name);
+ }
+
+
+ /**
+ * Set the configuration attribute with the specified name. Calling
+ * this with a <code>null</code> value is equivalent to calling
+ * <code>removeAttribute(name)</code>.
+ *
+ * @param name Name of the attribute to set
+ * @param value Value of the attribute to set, or <code>null</code>
+ * to remove any setting for this attribute
+ */
+ public void setAttribute(String name, Object value) {
+ logConfig.put(name, value);
+ }
+
+
+ /**
+ * Convenience method to derive a name from the specified class and
+ * call <code>getInstance(String)</code> with it.
+ *
+ * @param clazz Class for which a suitable Log name will be derived
+ *
+ * @exception LogConfigurationException if a suitable <code>Log</code>
+ * instance cannot be returned
+ */
+ public Log getInstance(Class clazz)
+ throws LogConfigurationException {
+ return getInstance( clazz.getName());
+ }
+
+
+
+
+
+ // ------------------------------------------------------- Static Variables
+
+
+
+ // --------------------------------------------------------- Static Methods
+
+
+ /**
+ * <p>Construct (if necessary) and return a <code>LogFactory</code>
+ * instance, using the following ordered lookup procedure to determine
+ * the name of the implementation class to be loaded.</p>
+ * <ul>
+ * <li>The <code>org.apache.commons.logging.LogFactory</code> system
+ * property.</li>
+ * <li>The JDK 1.3 Service Discovery mechanism</li>
+ * <li>Use the properties file <code>commons-logging.properties</code>
+ * file, if found in the class path of this class. The configuration
+ * file is in standard <code>java.util.Properties</code> format and
+ * contains the fully qualified name of the implementation class
+ * with the key being the system property defined above.</li>
+ * <li>Fall back to a default implementation class
+ * (<code>org.apache.commons.logging.impl.LogFactoryImpl</code>).</li>
+ * </ul>
+ *
+ * <p><em>NOTE</em> - If the properties file method of identifying the
+ * <code>LogFactory</code> implementation class is utilized, all of the
+ * properties defined in this file will be set as configuration attributes
+ * on the corresponding <code>LogFactory</code> instance.</p>
+ *
+ * @exception LogConfigurationException if the implementation class is not
+ * available or cannot be instantiated.
+ */
+ public static LogFactory getFactory() throws LogConfigurationException {
+ return singleton;
+ }
+
+
+ /**
+ * Convenience method to return a named logger, without the application
+ * having to care about factories.
+ *
+ * @param clazz Class from which a log name will be derived
+ *
+ * @exception LogConfigurationException if a suitable <code>Log</code>
+ * instance cannot be returned
+ */
+ public static Log getLog(Class clazz)
+ throws LogConfigurationException {
+ return (getFactory().getInstance(clazz));
+
+ }
+
+
+ /**
+ * Convenience method to return a named logger, without the application
+ * having to care about factories.
+ *
+ * @param name Logical name of the <code>Log</code> instance to be
+ * returned (the meaning of this name is only known to the underlying
+ * logging implementation that is being wrapped)
+ *
+ * @exception LogConfigurationException if a suitable <code>Log</code>
+ * instance cannot be returned
+ */
+ public static Log getLog(String name)
+ throws LogConfigurationException {
+ return (getFactory().getInstance(name));
+
+ }
+
+
+ /**
+ * Release any internal references to previously created {@link LogFactory}
+ * instances that have been associated with the specified class loader
+ * (if any), after calling the instance method <code>release()</code> on
+ * each of them.
+ *
+ * @param classLoader ClassLoader for which to release the LogFactory
+ */
+ public static void release(ClassLoader classLoader) {
+ // nothing - we don't use any class loaders
+ }
+
+
+ /**
+ * Release any internal references to previously created {@link LogFactory}
+ * instances, after calling the instance method <code>release()</code> on
+ * each of them. This is useful in environments like servlet containers,
+ * which implement application reloading by throwing away a ClassLoader.
+ * Dangling references to objects in that class loader would prevent
+ * garbage collection.
+ */
+ public static void releaseAll() {
+ singleton.release();
+ }
+
+ /**
+ * Returns a string that uniquely identifies the specified object, including
+ * its class.
+ * <p>
+ * The returned string is of form "classname@hashcode", ie is the same as
+ * the return value of the Object.toString() method, but works even when
+ * the specified object's class has overidden the toString method.
+ *
+ * @param o may be null.
+ * @return a string of form classname@hashcode, or "null" if param o is null.
+ */
+ public static String objectId(Object o) {
+ if (o == null) {
+ return "null";
+ } else {
+ return o.getClass().getName() + "@" + System.identityHashCode(o);
+ }
+ }
+}
Propchange: tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/LogFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/package.html
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/package.html?view=auto&rev=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/package.html (added)
+++ tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/package.html Sun Oct 8 08:27:16 2006
@@ -0,0 +1,21 @@
+<body>
+
+<h3>Overview</h3>
+
+
+<p>This implementation of commons-logging uses a commons-logging.jar
+ specific to a particular logging framework, instead of discovery. This takes
+out the guessing, is simpler, faster and more robust. Just like you chose a
+logging implementation, you should also use a matching commons-logging - for
+example you download log4j.jar and commons-logging-log4j.jar, or use jdk
+logging and use commons-logging-jdk.jar.</p>
+
+<p>A similar packaging is used by Eclipse SWT - they provide a common widget API,
+ but each platform uses a different implementation jar - instead of using a complex
+ discovery/plugin mechanism.
+</p>
+
+<p>This package generates commons-logging-jdk14.jar - i.e. the java.util implementation
+of commons-logging api.<p>
+
+</body>
Propchange: tomcat/tc6.0.x/trunk/java/org/apache/juli/logging/package.html
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tomcat/tc6.0.x/trunk/java/org/apache/naming/NamingContext.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/naming/NamingContext.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/naming/NamingContext.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/naming/NamingContext.java Sun Oct 8 08:27:16 2006
@@ -54,8 +54,8 @@
protected static final NameParser nameParser = new NameParserImpl();
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(NamingContext.class);
+ private static org.apache.juli.logging.Log log =
+ org.apache.juli.logging.LogFactory.getLog(NamingContext.class);
// ----------------------------------------------------------- Constructors
Modified: tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java Sun Oct 8 08:27:16 2006
@@ -49,8 +49,8 @@
public class FileDirContext extends BaseDirContext {
- private static org.apache.commons.logging.Log log=
- org.apache.commons.logging.LogFactory.getLog( FileDirContext.class );
+ private static org.apache.juli.logging.Log log=
+ org.apache.juli.logging.LogFactory.getLog( FileDirContext.class );
// -------------------------------------------------------------- Constants
Modified: tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/WARDirContext.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/WARDirContext.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/WARDirContext.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/WARDirContext.java Sun Oct 8 08:27:16 2006
@@ -52,8 +52,8 @@
public class WARDirContext extends BaseDirContext {
- private static org.apache.commons.logging.Log log=
- org.apache.commons.logging.LogFactory.getLog( WARDirContext.class );
+ private static org.apache.juli.logging.Log log=
+ org.apache.juli.logging.LogFactory.getLog( WARDirContext.class );
// ----------------------------------------------------------- Constructors
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/DomUtil.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/DomUtil.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/DomUtil.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/DomUtil.java Sun Oct 8 08:27:16 2006
@@ -44,8 +44,8 @@
* @author Costin Manolache
*/
public class DomUtil {
- private static org.apache.commons.logging.Log log=
- org.apache.commons.logging.LogFactory.getLog( DomUtil.class );
+ private static org.apache.juli.logging.Log log=
+ org.apache.juli.logging.LogFactory.getLog( DomUtil.class );
// -------------------- DOM utils --------------------
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java Sun Oct 8 08:27:16 2006
@@ -37,8 +37,8 @@
public final class IntrospectionUtils {
- private static org.apache.commons.logging.Log log=
- org.apache.commons.logging.LogFactory.getLog( IntrospectionUtils.class );
+ private static org.apache.juli.logging.Log log=
+ org.apache.juli.logging.LogFactory.getLog( IntrospectionUtils.class );
/**
* Call execute() - any ant-like task should work
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java Sun Oct 8 08:27:16 2006
@@ -36,8 +36,8 @@
public class B2CConverter {
- private static org.apache.commons.logging.Log log=
- org.apache.commons.logging.LogFactory.getLog( B2CConverter.class );
+ private static org.apache.juli.logging.Log log=
+ org.apache.juli.logging.LogFactory.getLog( B2CConverter.class );
private IntermediateInputStream iis;
private ReadConvertor conv;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/Base64.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/Base64.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/Base64.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/Base64.java Sun Oct 8 08:27:16 2006
@@ -33,8 +33,8 @@
public final class Base64 {
- private static org.apache.commons.logging.Log log=
- org.apache.commons.logging.LogFactory.getLog( Base64.class );
+ private static org.apache.juli.logging.Log log=
+ org.apache.juli.logging.LogFactory.getLog( Base64.class );
static private final int BASELENGTH = 255;
static private final int LOOKUPLENGTH = 63;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java Sun Oct 8 08:27:16 2006
@@ -30,8 +30,8 @@
*/
public final class C2BConverter {
- private static org.apache.commons.logging.Log log=
- org.apache.commons.logging.LogFactory.getLog(C2BConverter.class );
+ private static org.apache.juli.logging.Log log=
+ org.apache.juli.logging.LogFactory.getLog(C2BConverter.class );
private IntermediateOutputStream ios;
private WriteConvertor conv;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/StringCache.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/StringCache.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/StringCache.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/StringCache.java Sun Oct 8 08:27:16 2006
@@ -29,8 +29,8 @@
public class StringCache {
- private static org.apache.commons.logging.Log log=
- org.apache.commons.logging.LogFactory.getLog( StringCache.class );
+ private static org.apache.juli.logging.Log log=
+ org.apache.juli.logging.LogFactory.getLog( StringCache.class );
// ------------------------------------------------------- Static Variables
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/UDecoder.java Sun Oct 8 08:27:16 2006
@@ -29,8 +29,8 @@
*/
public final class UDecoder {
- private static org.apache.commons.logging.Log log=
- org.apache.commons.logging.LogFactory.getLog(UDecoder.class );
+ private static org.apache.juli.logging.Log log=
+ org.apache.juli.logging.LogFactory.getLog(UDecoder.class );
public UDecoder()
{
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/UEncoder.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/UEncoder.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/UEncoder.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/UEncoder.java Sun Oct 8 08:27:16 2006
@@ -33,8 +33,8 @@
*/
public final class UEncoder {
- private static org.apache.commons.logging.Log log=
- org.apache.commons.logging.LogFactory.getLog(UEncoder.class );
+ private static org.apache.juli.logging.Log log=
+ org.apache.juli.logging.LogFactory.getLog(UEncoder.class );
// Not static - the set may differ ( it's better than adding
// an extra check for "/", "+", etc
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/UTF8Decoder.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/UTF8Decoder.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/UTF8Decoder.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/UTF8Decoder.java Sun Oct 8 08:27:16 2006
@@ -33,8 +33,8 @@
public final class UTF8Decoder extends B2CConverter {
- private static org.apache.commons.logging.Log log=
- org.apache.commons.logging.LogFactory.getLog(UTF8Decoder.class );
+ private static org.apache.juli.logging.Log log=
+ org.apache.juli.logging.LogFactory.getLog(UTF8Decoder.class );
// may have state !!
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/collections/SimpleHashtable.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/collections/SimpleHashtable.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/collections/SimpleHashtable.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/collections/SimpleHashtable.java Sun Oct 8 08:27:16 2006
@@ -58,8 +58,8 @@
public final class SimpleHashtable implements Enumeration
{
- private static org.apache.commons.logging.Log log=
- org.apache.commons.logging.LogFactory.getLog( SimpleHashtable.class );
+ private static org.apache.juli.logging.Log log=
+ org.apache.juli.logging.LogFactory.getLog( SimpleHashtable.class );
// entries ...
private Entry table[];
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/collections/SimplePool.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/collections/SimplePool.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/collections/SimplePool.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/collections/SimplePool.java Sun Oct 8 08:27:16 2006
@@ -27,8 +27,8 @@
public final class SimplePool {
- private static org.apache.commons.logging.Log log=
- org.apache.commons.logging.LogFactory.getLog(SimplePool.class );
+ private static org.apache.juli.logging.Log log=
+ org.apache.juli.logging.LogFactory.getLog(SimplePool.class );
/*
* Where the threads are held.
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/Digester.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/Digester.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/Digester.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/Digester.java Sun Oct 8 08:27:16 2006
@@ -35,8 +35,8 @@
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.IntrospectionUtils;
import org.xml.sax.Attributes;
import org.xml.sax.EntityResolver;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/GenericParser.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/GenericParser.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/GenericParser.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/GenericParser.java Sun Oct 8 08:27:16 2006
@@ -24,8 +24,8 @@
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.xml.sax.SAXException;
import org.xml.sax.SAXNotRecognizedException;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/XercesParser.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/XercesParser.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/XercesParser.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/digester/XercesParser.java Sun Oct 8 08:27:16 2006
@@ -25,8 +25,8 @@
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.xml.sax.SAXException;
import org.xml.sax.SAXNotRecognizedException;
import org.xml.sax.SAXNotSupportedException;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/Cookies.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/Cookies.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/Cookies.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/Cookies.java Sun Oct 8 08:27:16 2006
@@ -34,8 +34,8 @@
*/
public final class Cookies { // extends MultiMap {
- private static org.apache.commons.logging.Log log=
- org.apache.commons.logging.LogFactory.getLog(Cookies.class );
+ private static org.apache.juli.logging.Log log=
+ org.apache.juli.logging.LogFactory.getLog(Cookies.class );
// expected average number of cookies per request
public static final int INITIAL_SIZE=4;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/Parameters.java Sun Oct 8 08:27:16 2006
@@ -33,8 +33,8 @@
public final class Parameters extends MultiMap {
- private static org.apache.commons.logging.Log log=
- org.apache.commons.logging.LogFactory.getLog(Parameters.class );
+ private static org.apache.juli.logging.Log log=
+ org.apache.juli.logging.LogFactory.getLog(Parameters.class );
// Transition: we'll use the same Hashtable( String->String[] )
// for the beginning. When we are sure all accesses happen through
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/ServerCookie.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/ServerCookie.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/ServerCookie.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/ServerCookie.java Sun Oct 8 08:27:16 2006
@@ -36,8 +36,8 @@
public class ServerCookie implements Serializable {
- private static org.apache.commons.logging.Log log=
- org.apache.commons.logging.LogFactory.getLog(ServerCookie.class );
+ private static org.apache.juli.logging.Log log=
+ org.apache.juli.logging.LogFactory.getLog(ServerCookie.class );
private MessageBytes name=MessageBytes.newInstance();
private MessageBytes value=MessageBytes.newInstance();
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java Sun Oct 8 08:27:16 2006
@@ -34,8 +34,8 @@
public final class Mapper {
- private static org.apache.commons.logging.Log logger =
- org.apache.commons.logging.LogFactory.getLog(Mapper.class);
+ private static org.apache.juli.logging.Log logger =
+ org.apache.juli.logging.LogFactory.getLog(Mapper.class);
// ----------------------------------------------------- Instance Variables
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java Sun Oct 8 08:27:16 2006
@@ -45,8 +45,8 @@
import javax.management.modelmbean.InvalidTargetObjectTypeException;
import javax.management.modelmbean.ModelMBeanNotificationBroadcaster;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
/*
* Changes from commons.modeler:
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/Registry.java Sun Oct 8 08:27:16 2006
@@ -38,8 +38,8 @@
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.modeler.modules.ModelerSource;
/*
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDOMSource.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDOMSource.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDOMSource.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDOMSource.java Sun Oct 8 08:27:16 2006
@@ -21,8 +21,8 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.DomUtil;
import org.apache.tomcat.util.modeler.AttributeInfo;
import org.apache.tomcat.util.modeler.ManagedBean;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java Sun Oct 8 08:27:16 2006
@@ -24,8 +24,8 @@
import org.apache.tomcat.util.digester.Digester;
import org.apache.tomcat.util.modeler.Registry;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
public class MbeansDescriptorsDigesterSource extends ModelerSource
{
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java Sun Oct 8 08:27:16 2006
@@ -27,8 +27,8 @@
import javax.management.ObjectName;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.modeler.AttributeInfo;
import org.apache.tomcat.util.modeler.ManagedBean;
import org.apache.tomcat.util.modeler.OperationInfo;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsSerSource.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsSerSource.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsSerSource.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsSerSource.java Sun Oct 8 08:27:16 2006
@@ -6,8 +6,8 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.modeler.ManagedBean;
import org.apache.tomcat.util.modeler.Registry;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java Sun Oct 8 08:27:16 2006
@@ -14,8 +14,8 @@
import javax.management.loading.MLet;
import javax.xml.transform.TransformerException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.DomUtil;
import org.apache.tomcat.util.modeler.AttributeInfo;
import org.apache.tomcat.util.modeler.BaseModelMBean;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Sun Oct 8 08:27:16 2006
@@ -21,8 +21,8 @@
import java.util.HashMap;
import java.util.concurrent.Executor;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.jni.Address;
import org.apache.tomcat.jni.Error;
import org.apache.tomcat.jni.File;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/BaseEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/BaseEndpoint.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/BaseEndpoint.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/BaseEndpoint.java Sun Oct 8 08:27:16 2006
@@ -19,8 +19,8 @@
import java.net.InetAddress;
import java.util.concurrent.Executor;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.res.StringManager;
/**
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java Sun Oct 8 08:27:16 2006
@@ -23,8 +23,8 @@
import java.net.Socket;
import java.util.concurrent.Executor;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.res.StringManager;
/**
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Sun Oct 8 08:27:16 2006
@@ -40,8 +40,8 @@
import javax.net.ssl.SSLEngine;
import javax.net.ssl.TrustManagerFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.net.SecureNioChannel.ApplicationBufferHandler;
import org.apache.tomcat.util.res.StringManager;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/PoolTcpEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/PoolTcpEndpoint.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/PoolTcpEndpoint.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/PoolTcpEndpoint.java Sun Oct 8 08:27:16 2006
@@ -27,8 +27,8 @@
import java.util.Stack;
import java.util.Vector;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.res.StringManager;
import org.apache.tomcat.util.threads.ThreadPool;
import org.apache.tomcat.util.threads.ThreadPoolRunnable;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java Sun Oct 8 08:27:16 2006
@@ -26,8 +26,8 @@
@author EKR
*/
abstract public class SSLImplementation {
- private static org.apache.commons.logging.Log logger =
- org.apache.commons.logging.LogFactory.getLog(SSLImplementation.class);
+ private static org.apache.juli.logging.Log logger =
+ org.apache.juli.logging.LogFactory.getLog(SSLImplementation.class);
// The default implementations in our search path
private static final String PureTLSImplementationClass=
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java Sun Oct 8 08:27:16 2006
@@ -34,8 +34,8 @@
{
static final String SSLSocketClass = "javax.net.ssl.SSLSocket";
- static org.apache.commons.logging.Log logger =
- org.apache.commons.logging.LogFactory.getLog(JSSEImplementation.class);
+ static org.apache.juli.logging.Log logger =
+ org.apache.juli.logging.LogFactory.getLog(JSSEImplementation.class);
private JSSEFactory factory = null;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java Sun Oct 8 08:27:16 2006
@@ -87,8 +87,8 @@
private static final String defaultKeystoreFile
= System.getProperty("user.home") + "/.keystore";
private static final String defaultKeyPass = "changeit";
- static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(JSSESocketFactory.class);
+ static org.apache.juli.logging.Log log =
+ org.apache.juli.logging.LogFactory.getLog(JSSESocketFactory.class);
protected boolean initialized;
protected String clientAuth = "false";
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java Sun Oct 8 08:27:16 2006
@@ -49,8 +49,8 @@
class JSSESupport implements SSLSupport {
- private static org.apache.commons.logging.Log log =
- org.apache.commons.logging.LogFactory.getLog(JSSESupport.class);
+ private static org.apache.juli.logging.Log log =
+ org.apache.juli.logging.LogFactory.getLog(JSSESupport.class);
protected SSLSocket ssl;
protected SSLSession session;
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/threads/ThreadPool.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/threads/ThreadPool.java?view=diff&rev=454158&r1=454157&r2=454158
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/threads/ThreadPool.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/threads/ThreadPool.java Sun Oct 8 08:27:16 2006
@@ -17,8 +17,9 @@
package org.apache.tomcat.util.threads;
import java.util.*;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.res.StringManager;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org