Author: markt
Date: Tue Dec 23 21:35:06 2014
New Revision: 1647681
URL: http://svn.apache.org/r1647681
Log:
Use imports rather than full package names for loggers.
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
tomcat/trunk/java/org/apache/catalina/ha/ClusterListener.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/JvmRouteBinderValve.java
tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java
tomcat/trunk/java/org/apache/catalina/loader/ParallelWebappClassLoader.java
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java
tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
tomcat/trunk/java/org/apache/catalina/security/SecurityConfig.java
tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java
tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java
tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java
tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java
tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java
tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java
tomcat/trunk/java/org/apache/jasper/security/SecurityClassLoad.java
tomcat/trunk/java/org/apache/jasper/xmlparser/UCSReader.java
tomcat/trunk/java/org/apache/jasper/xmlparser/UTF8Reader.java
tomcat/trunk/java/org/apache/naming/NamingContext.java
tomcat/trunk/java/org/apache/naming/SelectorContext.java
tomcat/trunk/java/org/apache/tomcat/util/Diagnostics.java
tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
tomcat/trunk/java/org/apache/tomcat/util/buf/StringCache.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
tomcat/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java
tomcat/trunk/res/checkstyle/org-import-control.xml
tomcat/trunk/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java
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=1647681&r1=1647680&r2=1647681&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java Tue
Dec 23 21:35:06 2014
@@ -37,6 +37,7 @@ import javax.servlet.ServletException;
import org.apache.catalina.Context;
import org.apache.catalina.Globals;
import org.apache.catalina.security.SecurityUtil;
+import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.InstanceManager;
import org.apache.tomcat.util.ExceptionUtils;
@@ -61,8 +62,7 @@ public final class ApplicationFilterConf
protected static final StringManager sm =
StringManager.getManager(Constants.Package);
- private static final org.apache.juli.logging.Log log =
- LogFactory.getLog(ApplicationFilterConfig.class);
+ private static final Log log =
LogFactory.getLog(ApplicationFilterConfig.class);
/**
* Empty String collection to serve as the basis for empty enumerations.
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=1647681&r1=1647680&r2=1647681&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java Tue Dec 23
21:35:06 2014
@@ -131,8 +131,7 @@ import org.apache.tomcat.util.res.String
public abstract class ContainerBase extends LifecycleMBeanBase
implements Container {
- private static final org.apache.juli.logging.Log log=
- org.apache.juli.logging.LogFactory.getLog( ContainerBase.class );
+ private static final Log log = LogFactory.getLog(ContainerBase.class);
/**
* Perform addChild with the permissions of this class.
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardHost.java?rev=1647681&r1=1647680&r2=1647681&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardHost.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardHost.java Tue Dec 23
21:35:06 2014
@@ -40,6 +40,8 @@ import org.apache.catalina.LifecycleExce
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.Valve;
import org.apache.catalina.loader.WebappClassLoaderBase;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.ExceptionUtils;
/**
@@ -52,8 +54,7 @@ import org.apache.tomcat.util.ExceptionU
*/
public class StandardHost extends ContainerBase implements Host {
- private static final org.apache.juli.logging.Log log=
- org.apache.juli.logging.LogFactory.getLog( StandardHost.class );
+ private static final Log log = LogFactory.getLog(StandardHost.class);
// ----------------------------------------------------------- Constructors
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=1647681&r1=1647680&r2=1647681&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/ClusterListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/ClusterListener.java Tue Dec 23
21:35:06 2014
@@ -21,6 +21,8 @@ import java.io.Serializable;
import org.apache.catalina.tribes.ChannelListener;
import org.apache.catalina.tribes.Member;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
/**
@@ -31,8 +33,7 @@ import org.apache.catalina.tribes.Member
*/
public abstract class ClusterListener implements ChannelListener {
- private static final org.apache.juli.logging.Log log =
- org.apache.juli.logging.LogFactory.getLog(ClusterListener.class);
+ private static final Log log = LogFactory.getLog(ClusterListener.class);
//--Instance Variables--------------------------------------
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=1647681&r1=1647680&r2=1647681&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Tue Dec
23 21:35:06 2014
@@ -36,6 +36,8 @@ import org.apache.catalina.ha.ClusterMes
import org.apache.catalina.session.ManagerBase;
import org.apache.catalina.tribes.Member;
import org.apache.catalina.tribes.io.ReplicationStream;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.res.StringManager;
@@ -57,8 +59,7 @@ import org.apache.tomcat.util.res.String
public class DeltaManager extends ClusterManagerBase{
// ---------------------------------------------------- Security Classes
- public final org.apache.juli.logging.Log log =
- org.apache.juli.logging.LogFactory.getLog(DeltaManager.class);
+ public final Log log = LogFactory.getLog(DeltaManager.class);
/**
* The string manager for this package.
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=1647681&r1=1647680&r2=1647681&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaRequest.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaRequest.java Tue Dec
23 21:35:06 2014
@@ -33,13 +33,14 @@ import java.util.LinkedList;
import org.apache.catalina.SessionListener;
import org.apache.catalina.realm.GenericPrincipal;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.res.StringManager;
public class DeltaRequest implements Externalizable {
- public static final org.apache.juli.logging.Log log =
- org.apache.juli.logging.LogFactory.getLog( DeltaRequest.class );
+ public static final Log log = LogFactory.getLog(DeltaRequest.class);
/**
* The string manager for this package.
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=1647681&r1=1647680&r2=1647681&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java Tue Dec
23 21:35:06 2014
@@ -42,6 +42,8 @@ import org.apache.catalina.session.Manag
import org.apache.catalina.session.StandardSession;
import org.apache.catalina.tribes.io.ReplicationStream;
import org.apache.catalina.tribes.tipis.ReplicatedMapEntry;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.res.StringManager;
/**
@@ -51,7 +53,7 @@ import org.apache.tomcat.util.res.String
*/
public class DeltaSession extends StandardSession implements
Externalizable,ClusterSession,ReplicatedMapEntry {
- public static final org.apache.juli.logging.Log log =
org.apache.juli.logging.LogFactory.getLog(DeltaSession.class);
+ public static final Log log = LogFactory.getLog(DeltaSession.class);
/**
* The string manager for this package.
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=1647681&r1=1647680&r2=1647681&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
Tue Dec 23 21:35:06 2014
@@ -34,6 +34,8 @@ import org.apache.catalina.ha.ClusterVal
import org.apache.catalina.session.ManagerBase;
import org.apache.catalina.session.PersistentManager;
import org.apache.catalina.valves.ValveBase;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.res.StringManager;
/**
@@ -81,8 +83,7 @@ import org.apache.tomcat.util.res.String
public class JvmRouteBinderValve extends ValveBase implements ClusterValve {
/*--Static Variables----------------------------------------*/
- public static final org.apache.juli.logging.Log log =
org.apache.juli.logging.LogFactory
- .getLog(JvmRouteBinderValve.class);
+ public static final Log log = LogFactory.getLog(JvmRouteBinderValve.class);
//------------------------------------------------------ Constructor
public JvmRouteBinderValve() {
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=1647681&r1=1647680&r2=1647681&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/ReplicationValve.java Tue Dec
23 21:35:06 2014
@@ -42,6 +42,8 @@ import org.apache.catalina.ha.ClusterVal
import org.apache.catalina.ha.session.DeltaManager;
import org.apache.catalina.ha.session.DeltaSession;
import org.apache.catalina.valves.ValveBase;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.res.StringManager;
/**
@@ -63,8 +65,7 @@ import org.apache.tomcat.util.res.String
public class ReplicationValve
extends ValveBase implements ClusterValve {
- private static final org.apache.juli.logging.Log log =
- org.apache.juli.logging.LogFactory.getLog( ReplicationValve.class );
+ private static final Log log = LogFactory.getLog(ReplicationValve.class);
// ----------------------------------------------------- Instance Variables
Modified:
tomcat/trunk/java/org/apache/catalina/loader/ParallelWebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/ParallelWebappClassLoader.java?rev=1647681&r1=1647680&r2=1647681&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/ParallelWebappClassLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/ParallelWebappClassLoader.java
Tue Dec 23 21:35:06 2014
@@ -17,11 +17,12 @@
package org.apache.catalina.loader;
import org.apache.catalina.LifecycleException;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
public class ParallelWebappClassLoader extends WebappClassLoaderBase {
- private static final org.apache.juli.logging.Log log =
-
org.apache.juli.logging.LogFactory.getLog(ParallelWebappClassLoader.class);
+ private static final Log log =
LogFactory.getLog(ParallelWebappClassLoader.class);
static {
boolean result = ClassLoader.registerAsParallelCapable();
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?rev=1647681&r1=1647680&r2=1647681&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java Tue
Dec 23 21:35:06 2014
@@ -75,6 +75,8 @@ import org.apache.catalina.WebResource;
import org.apache.catalina.WebResourceRoot;
import org.apache.catalina.webresources.TomcatURLStreamHandlerFactory;
import org.apache.juli.WebappProperties;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.InstrumentableClassLoader;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.IntrospectionUtils;
@@ -127,8 +129,7 @@ import org.apache.tomcat.util.res.String
public abstract class WebappClassLoaderBase extends URLClassLoader
implements Lifecycle, InstrumentableClassLoader, WebappProperties {
- private static final org.apache.juli.logging.Log log =
- org.apache.juli.logging.LogFactory.getLog(WebappClassLoaderBase.class);
+ private static final Log log =
LogFactory.getLog(WebappClassLoaderBase.class);
/**
* List of ThreadGroup names to ignore when scanning for web application
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java?rev=1647681&r1=1647680&r2=1647681&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java (original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java Tue Dec 23
21:35:06 2014
@@ -39,6 +39,8 @@ import org.apache.catalina.LifecycleExce
import org.apache.catalina.LifecycleState;
import org.apache.catalina.Loader;
import org.apache.catalina.util.LifecycleMBeanBase;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.modeler.Registry;
import org.apache.tomcat.util.res.StringManager;
@@ -665,8 +667,7 @@ public class WebappLoader extends Lifecy
}
- private static final org.apache.juli.logging.Log log=
- org.apache.juli.logging.LogFactory.getLog( WebappLoader.class );
+ private static final Log log = LogFactory.getLog(WebappLoader.class);
@Override
Modified: tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java?rev=1647681&r1=1647680&r2=1647681&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java Tue Dec 23
21:35:06 2014
@@ -30,6 +30,8 @@ import org.apache.catalina.Host;
import org.apache.catalina.WebResource;
import org.apache.catalina.WebResourceRoot;
import org.apache.catalina.Wrapper;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.buf.Ascii;
import org.apache.tomcat.util.buf.CharChunk;
import org.apache.tomcat.util.buf.MessageBytes;
@@ -44,11 +46,9 @@ import org.apache.tomcat.util.res.String
public final class Mapper {
- private static final org.apache.juli.logging.Log log =
- org.apache.juli.logging.LogFactory.getLog(Mapper.class);
+ private static final Log log = LogFactory.getLog(Mapper.class);
- protected static final StringManager sm =
- StringManager.getManager(Mapper.class.getPackage().getName());
+ protected static final StringManager sm =
StringManager.getManager(Mapper.class);
// ----------------------------------------------------- Instance Variables
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java?rev=1647681&r1=1647680&r2=1647681&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java Tue Dec 23
21:35:06 2014
@@ -44,6 +44,8 @@ import org.apache.catalina.realm.UserDat
import org.apache.catalina.session.StandardManager;
import org.apache.catalina.startup.ContextConfig;
import org.apache.catalina.startup.HostConfig;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.res.StringManager;
@@ -52,8 +54,7 @@ import org.apache.tomcat.util.res.String
*/
public class MBeanFactory {
- private static final org.apache.juli.logging.Log log =
- org.apache.juli.logging.LogFactory.getLog(MBeanFactory.class);
+ private static final Log log = LogFactory.getLog(MBeanFactory.class);
protected static final StringManager sm =
StringManager.getManager(Constants.Package);
Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityConfig.java?rev=1647681&r1=1647680&r2=1647681&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/security/SecurityConfig.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityConfig.java Tue Dec
23 21:35:06 2014
@@ -19,6 +19,8 @@ package org.apache.catalina.security;
import java.security.Security;
import org.apache.catalina.startup.CatalinaProperties;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
/**
* Util class to protect Catalina against package access and insertion.
@@ -28,8 +30,7 @@ import org.apache.catalina.startup.Catal
public final class SecurityConfig{
private static SecurityConfig singleton = null;
- private static final org.apache.juli.logging.Log log=
- org.apache.juli.logging.LogFactory.getLog( SecurityConfig.class );
+ private static final Log log = LogFactory.getLog(SecurityConfig.class);
private static final String PACKAGE_ACCESS = "sun.,"
Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java?rev=1647681&r1=1647680&r2=1647681&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java (original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java Tue Dec 23
21:35:06 2014
@@ -35,6 +35,8 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpSession;
import org.apache.catalina.Globals;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.res.StringManager;
/**
@@ -71,8 +73,7 @@ public final class SecurityUtil{
*/
private static final Map<Class<?>,Method[]> classCache = new
ConcurrentHashMap<>();
- private static final org.apache.juli.logging.Log log=
- org.apache.juli.logging.LogFactory.getLog( SecurityUtil.class );
+ private static final Log log = LogFactory.getLog(SecurityUtil.class);
private static final boolean packageDefinitionEnabled =
(System.getProperty("package.definition") == null &&
Modified: tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Catalina.java?rev=1647681&r1=1647680&r2=1647681&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Tue Dec 23
21:35:06 2014
@@ -36,6 +36,8 @@ import org.apache.catalina.LifecycleStat
import org.apache.catalina.Server;
import org.apache.catalina.security.SecurityConfig;
import org.apache.juli.ClassLoaderLogManager;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.digester.Digester;
import org.apache.tomcat.util.digester.Rule;
@@ -813,8 +815,7 @@ public class Catalina {
}
- private static final org.apache.juli.logging.Log log=
- org.apache.juli.logging.LogFactory.getLog( Catalina.class );
+ private static final Log log = LogFactory.getLog(Catalina.class);
}
Modified: tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java?rev=1647681&r1=1647680&r2=1647681&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/CatalinaProperties.java Tue
Dec 23 21:35:06 2014
@@ -24,6 +24,9 @@ import java.net.URL;
import java.util.Enumeration;
import java.util.Properties;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+
/**
* Utility class to read the bootstrap Catalina configuration.
@@ -32,8 +35,7 @@ import java.util.Properties;
*/
public class CatalinaProperties {
- private static final org.apache.juli.logging.Log log=
- org.apache.juli.logging.LogFactory.getLog( CatalinaProperties.class );
+ private static final Log log = LogFactory.getLog(CatalinaProperties.class);
private static Properties properties = null;
Modified: tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java?rev=1647681&r1=1647680&r2=1647681&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java Tue Dec 23
21:35:06 2014
@@ -32,6 +32,8 @@ import org.apache.catalina.Host;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleListener;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.res.StringManager;
@@ -48,8 +50,7 @@ public final class UserConfig
implements LifecycleListener {
- private static final org.apache.juli.logging.Log log=
- org.apache.juli.logging.LogFactory.getLog( UserConfig.class );
+ private static final Log log = LogFactory.getLog(UserConfig.class);
// ----------------------------------------------------- Instance Variables
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java?rev=1647681&r1=1647680&r2=1647681&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
Tue Dec 23 21:35:06 2014
@@ -27,6 +27,8 @@ import org.apache.catalina.tribes.Member
import org.apache.catalina.tribes.group.ChannelInterceptorBase;
import org.apache.catalina.tribes.group.InterceptorPayload;
import org.apache.catalina.tribes.io.XByteBuffer;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
/**
*
@@ -41,7 +43,7 @@ import org.apache.catalina.tribes.io.XBy
* @version 1.0
*/
public class FragmentationInterceptor extends ChannelInterceptorBase {
- private static final org.apache.juli.logging.Log log =
org.apache.juli.logging.LogFactory.getLog( FragmentationInterceptor.class );
+ private static final Log log =
LogFactory.getLog(FragmentationInterceptor.class);
protected final HashMap<FragKey, FragCollection> fragpieces = new
HashMap<>();
private int maxSize = 1024*100;
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java?rev=1647681&r1=1647680&r2=1647681&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
Tue Dec 23 21:35:06 2014
@@ -36,6 +36,8 @@ import org.apache.catalina.tribes.io.Cha
import org.apache.catalina.tribes.io.XByteBuffer;
import org.apache.catalina.tribes.membership.Membership;
import org.apache.catalina.tribes.membership.StaticMember;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
/**
* <p>Title: A perfect failure detector </p>
@@ -58,7 +60,7 @@ import org.apache.catalina.tribes.member
*/
public class TcpFailureDetector extends ChannelInterceptorBase {
- private static final org.apache.juli.logging.Log log =
org.apache.juli.logging.LogFactory.getLog( TcpFailureDetector.class );
+ private static final Log log = LogFactory.getLog(TcpFailureDetector.class);
protected static final byte[] TCP_FAIL_DETECT = new byte[] {
79, -89, 115, 72, 121, -126, 67, -55, -97, 111, -119, -128, -95, 91,
7, 20,
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java?rev=1647681&r1=1647680&r2=1647681&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java
Tue Dec 23 21:35:06 2014
@@ -27,12 +27,14 @@ import org.apache.catalina.tribes.group.
import org.apache.catalina.tribes.group.InterceptorPayload;
import org.apache.catalina.tribes.util.Arrays;
import org.apache.catalina.tribes.util.UUIDGenerator;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
public class TwoPhaseCommitInterceptor extends ChannelInterceptorBase {
private static final byte[] START_DATA = new byte[] {113, 1, -58, 2, -34,
-60, 75, -78, -101, -12, 32, -29, 32, 111, -40, 4};
private static final byte[] END_DATA = new byte[] {54, -13, 90, 110, 47,
-31, 75, -24, -81, -29, 36, 52, -58, 77, -110, 56};
- private static final org.apache.juli.logging.Log log =
org.apache.juli.logging.LogFactory.getLog(TwoPhaseCommitInterceptor.class);
+ private static final Log log =
LogFactory.getLog(TwoPhaseCommitInterceptor.class);
protected final HashMap<UniqueId, MapEntry> messages = new HashMap<>();
protected long expire = 1000 * 60; //one minute expiration
Modified: tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java?rev=1647681&r1=1647680&r2=1647681&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java Tue Dec 23
21:35:06 2014
@@ -27,6 +27,9 @@ import java.io.Serializable;
import java.nio.ByteBuffer;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+
/**
* The XByteBuffer provides a dual functionality.
* One, it stores message bytes and automatically extends the byte buffer if
needed.<BR>
@@ -43,11 +46,9 @@ import java.util.concurrent.atomic.Atomi
* <li><b>END_DATA</b> - 7 bytes - <i>TLF2003</i></li>
* </ul>
*/
-public class XByteBuffer
-{
+public class XByteBuffer {
- private static final org.apache.juli.logging.Log log =
- org.apache.juli.logging.LogFactory.getLog( XByteBuffer.class );
+ private static final Log log = LogFactory.getLog(XByteBuffer.class);
/**
* This is a package header, 7 bytes (FLT2002)
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=1647681&r1=1647680&r2=1647681&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java
Tue Dec 23 21:35:06 2014
@@ -33,6 +33,8 @@ import org.apache.catalina.tribes.io.XBy
import org.apache.catalina.tribes.util.Arrays;
import org.apache.catalina.tribes.util.StringManager;
import org.apache.catalina.tribes.util.UUIDGenerator;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
/**
* A <b>membership</b> implementation using simple multicast.
@@ -42,8 +44,7 @@ import org.apache.catalina.tribes.util.U
*/
public class McastService implements
MembershipService,MembershipListener,MessageListener {
- private static final org.apache.juli.logging.Log log =
- org.apache.juli.logging.LogFactory.getLog( McastService.class );
+ private static final Log log = LogFactory.getLog(McastService.class);
/**
* The string manager for this package.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java?rev=1647681&r1=1647680&r2=1647681&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
Tue Dec 23 21:35:06 2014
@@ -37,6 +37,8 @@ import org.apache.catalina.tribes.Messag
import org.apache.catalina.tribes.io.ChannelData;
import org.apache.catalina.tribes.io.XByteBuffer;
import org.apache.catalina.tribes.util.ExecutorFactory;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
/**
* A <b>membership</b> implementation using simple multicast.
@@ -47,10 +49,9 @@ import org.apache.catalina.tribes.util.E
* Need to fix this, could use java.nio and only need one thread to send and
receive, or
* just use a timeout on the receive
*/
-public class McastServiceImpl
-{
- private static final org.apache.juli.logging.Log log =
- org.apache.juli.logging.LogFactory.getLog( McastService.class );
+public class McastServiceImpl {
+
+ private static final Log log = LogFactory.getLog(McastService.class);
protected static final int MAX_PACKET_SIZE = 65535;
/**
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=1647681&r1=1647680&r2=1647681&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
Tue Dec 23 21:35:06 2014
@@ -30,6 +30,8 @@ import org.apache.catalina.tribes.transp
import org.apache.catalina.tribes.transport.Constants;
import org.apache.catalina.tribes.transport.SenderState;
import org.apache.catalina.tribes.util.StringManager;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
/**
* Send cluster messages with only one socket. Ack and keep Alive Handling is
@@ -40,7 +42,7 @@ import org.apache.catalina.tribes.util.S
*/
public class BioSender extends AbstractSender {
- private static final org.apache.juli.logging.Log log =
org.apache.juli.logging.LogFactory.getLog(BioSender.class);
+ private static final Log log = LogFactory.getLog(BioSender.class);
/**
* The string manager for this package.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java?rev=1647681&r1=1647680&r2=1647681&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java
Tue Dec 23 21:35:06 2014
@@ -22,6 +22,8 @@ import java.util.concurrent.atomic.Atomi
import org.apache.catalina.tribes.ChannelMessage;
import org.apache.catalina.tribes.Member;
import org.apache.catalina.tribes.group.InterceptorPayload;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
@@ -34,7 +36,7 @@ import org.apache.catalina.tribes.group.
*/
public class FastQueue {
- private static final org.apache.juli.logging.Log log =
org.apache.juli.logging.LogFactory.getLog(FastQueue.class);
+ private static final Log log = LogFactory.getLog(FastQueue.class);
/**
* This is the actual queue
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java?rev=1647681&r1=1647680&r2=1647681&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java
Tue Dec 23 21:35:06 2014
@@ -37,6 +37,8 @@ import org.apache.catalina.tribes.io.Obj
import org.apache.catalina.tribes.transport.AbstractRxTask;
import org.apache.catalina.tribes.transport.Constants;
import org.apache.catalina.tribes.util.Logs;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
/**
* A worker thread class which can drain channels and echo-back the input. Each
@@ -50,7 +52,7 @@ import org.apache.catalina.tribes.util.L
*/
public class NioReplicationTask extends AbstractRxTask {
- private static final org.apache.juli.logging.Log log =
org.apache.juli.logging.LogFactory.getLog( NioReplicationTask.class );
+ private static final Log log = LogFactory.getLog(NioReplicationTask.class);
private ByteBuffer buffer = null;
private SelectionKey key;
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=1647681&r1=1647680&r2=1647681&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java Tue Dec
23 21:35:06 2014
@@ -30,6 +30,8 @@ import java.util.jar.Manifest;
import org.apache.catalina.Context;
import org.apache.catalina.WebResource;
import org.apache.catalina.WebResourceRoot;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.res.StringManager;
@@ -46,8 +48,7 @@ import org.apache.tomcat.util.res.String
*/
public final class ExtensionValidator {
- private static final org.apache.juli.logging.Log log=
- org.apache.juli.logging.LogFactory.getLog(ExtensionValidator.class);
+ private static final Log log = LogFactory.getLog(ExtensionValidator.class);
/**
* The string resources for this 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=1647681&r1=1647680&r2=1647681&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java Tue
Dec 23 21:35:06 2014
@@ -27,6 +27,8 @@ import org.apache.coyote.ByteBufferHolde
import org.apache.coyote.OutputBuffer;
import org.apache.coyote.Response;
import org.apache.coyote.http11.filters.GzipOutputFilter;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.buf.MessageBytes;
import org.apache.tomcat.util.http.HttpMessages;
@@ -146,8 +148,7 @@ public abstract class AbstractOutputBuff
/**
* Logger.
*/
- private static final org.apache.juli.logging.Log log
- =
org.apache.juli.logging.LogFactory.getLog(AbstractOutputBuffer.class);
+ private static final Log log =
LogFactory.getLog(AbstractOutputBuffer.class);
// ------------------------------------------------------------- Properties
Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java?rev=1647681&r1=1647680&r2=1647681&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java
Tue Dec 23 21:35:06 2014
@@ -24,6 +24,8 @@ import java.util.zip.GZIPOutputStream;
import org.apache.coyote.OutputBuffer;
import org.apache.coyote.Response;
import org.apache.coyote.http11.OutputFilter;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.buf.ByteChunk;
/**
@@ -34,11 +36,7 @@ import org.apache.tomcat.util.buf.ByteCh
public class GzipOutputFilter implements OutputFilter {
- /**
- * Logger.
- */
- protected static final org.apache.juli.logging.Log log =
- org.apache.juli.logging.LogFactory.getLog(GzipOutputFilter.class);
+ protected static final Log log = LogFactory.getLog(GzipOutputFilter.class);
// ----------------------------------------------------- Instance Variables
Modified: tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java?rev=1647681&r1=1647680&r2=1647681&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/SmapUtil.java Tue Dec 23
21:35:06 2014
@@ -32,6 +32,8 @@ import java.util.Map;
import org.apache.jasper.JasperException;
import org.apache.jasper.JspCompilationContext;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
/**
* Contains static utilities for generating SMAP data based on the
@@ -180,8 +182,7 @@ public class SmapUtil {
// Installation logic (from Robert Field, JSR-045 spec lead)
private static class SDEInstaller {
- private final org.apache.juli.logging.Log log=
- org.apache.juli.logging.LogFactory.getLog( SDEInstaller.class );
+ private final Log log = LogFactory.getLog(SDEInstaller.class);
static final String nameSDE = "SourceDebugExtension";
Modified: tomcat/trunk/java/org/apache/jasper/security/SecurityClassLoad.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/security/SecurityClassLoad.java?rev=1647681&r1=1647680&r2=1647681&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/security/SecurityClassLoad.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/security/SecurityClassLoad.java Tue Dec
23 21:35:06 2014
@@ -18,6 +18,9 @@
package org.apache.jasper.security;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+
/**
* Static class used to preload java classes when using the
* Java SecurityManager so that the defineClassInPackage
@@ -26,8 +29,7 @@ package org.apache.jasper.security;
public final class SecurityClassLoad {
- private static final org.apache.juli.logging.Log log=
- org.apache.juli.logging.LogFactory.getLog( SecurityClassLoad.class );
+ private static final Log log = LogFactory.getLog(SecurityClassLoad.class);
public static void securityClassLoad(ClassLoader loader){
Modified: tomcat/trunk/java/org/apache/jasper/xmlparser/UCSReader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/xmlparser/UCSReader.java?rev=1647681&r1=1647680&r2=1647681&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/xmlparser/UCSReader.java (original)
+++ tomcat/trunk/java/org/apache/jasper/xmlparser/UCSReader.java Tue Dec 23
21:35:06 2014
@@ -21,6 +21,9 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+
/**
* Reader for UCS-2 and UCS-4 encodings.
* (i.e., encodings from ISO-10646-UCS-(2|4)).
@@ -29,8 +32,7 @@ import java.io.Reader;
*/
public class UCSReader extends Reader {
- private final org.apache.juli.logging.Log log=
- org.apache.juli.logging.LogFactory.getLog( UCSReader.class );
+ private final Log log = LogFactory.getLog(UCSReader.class);
//
// Constants
Modified: tomcat/trunk/java/org/apache/jasper/xmlparser/UTF8Reader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/xmlparser/UTF8Reader.java?rev=1647681&r1=1647680&r2=1647681&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/xmlparser/UTF8Reader.java (original)
+++ tomcat/trunk/java/org/apache/jasper/xmlparser/UTF8Reader.java Tue Dec 23
21:35:06 2014
@@ -23,6 +23,8 @@ import java.io.Reader;
import java.io.UTFDataFormatException;
import org.apache.jasper.compiler.Localizer;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
/**
* @author Andy Clark, IBM
@@ -30,8 +32,7 @@ import org.apache.jasper.compiler.Locali
public class UTF8Reader
extends Reader {
- private final org.apache.juli.logging.Log log=
- org.apache.juli.logging.LogFactory.getLog( UTF8Reader.class );
+ private final Log log = LogFactory.getLog(UTF8Reader.class);
// debugging
Modified: tomcat/trunk/java/org/apache/naming/NamingContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/NamingContext.java?rev=1647681&r1=1647680&r2=1647681&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/NamingContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/NamingContext.java Tue Dec 23 21:35:06
2014
@@ -40,6 +40,9 @@ import javax.naming.Reference;
import javax.naming.Referenceable;
import javax.naming.spi.NamingManager;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+
/**
* Catalina JNDI Context implementation.
*
@@ -57,8 +60,7 @@ public class NamingContext implements Co
protected static final NameParser nameParser = new NameParserImpl();
- private static final org.apache.juli.logging.Log log =
- org.apache.juli.logging.LogFactory.getLog(NamingContext.class);
+ private static final Log log = LogFactory.getLog(NamingContext.class);
// ----------------------------------------------------------- Constructors
Modified: tomcat/trunk/java/org/apache/naming/SelectorContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/SelectorContext.java?rev=1647681&r1=1647680&r2=1647681&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/SelectorContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/SelectorContext.java Tue Dec 23
21:35:06 2014
@@ -28,6 +28,9 @@ import javax.naming.NameParser;
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+
/**
* Catalina JNDI Context implementation.
*
@@ -57,8 +60,7 @@ public class SelectorContext implements
public static final String IC_PREFIX = "IC_";
- private static final org.apache.juli.logging.Log log =
- org.apache.juli.logging.LogFactory.getLog(SelectorContext.class);
+ private static final Log log = LogFactory.getLog(SelectorContext.class);
// ----------------------------------------------------------- Constructors
Modified: tomcat/trunk/java/org/apache/tomcat/util/Diagnostics.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/Diagnostics.java?rev=1647681&r1=1647680&r2=1647681&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/Diagnostics.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/Diagnostics.java Tue Dec 23
21:35:06 2014
@@ -60,6 +60,8 @@ import java.util.Map;
import java.util.logging.LogManager;
import java.util.logging.LoggingMXBean;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.res.StringManager;
public class Diagnostics {
@@ -73,8 +75,7 @@ public class Diagnostics {
private static final String CRLF = "\r\n";
private static final String vminfoSystemProperty = "java.vm.info";
- private static final org.apache.juli.logging.Log log=
- org.apache.juli.logging.LogFactory.getLog(Diagnostics.class);
+ private static final Log log = LogFactory.getLog(Diagnostics.class);
private static final SimpleDateFormat timeformat =
new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
Modified: tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java?rev=1647681&r1=1647680&r2=1647681&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java Tue Dec 23
21:35:06 2014
@@ -23,14 +23,16 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.Hashtable;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+
/**
* Utils for introspection and reflection
*/
public final class IntrospectionUtils {
- private static final org.apache.juli.logging.Log log=
- org.apache.juli.logging.LogFactory.getLog( IntrospectionUtils.class );
+ private static final Log log = LogFactory.getLog(IntrospectionUtils.class);
/**
* Find a method with the right name If found, call the method ( if param
is
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/StringCache.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/StringCache.java?rev=1647681&r1=1647680&r2=1647681&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/buf/StringCache.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/StringCache.java Tue Dec 23
21:35:06 2014
@@ -22,6 +22,9 @@ import java.util.HashMap;
import java.util.Map.Entry;
import java.util.TreeMap;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+
/**
* This class implements a String cache for ByteChunk and CharChunk.
*
@@ -30,8 +33,7 @@ import java.util.TreeMap;
public class StringCache {
- private static final org.apache.juli.logging.Log log=
- org.apache.juli.logging.LogFactory.getLog( StringCache.class );
+ private static final Log log = LogFactory.getLog(StringCache.class);
// ------------------------------------------------------- Static Variables
Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java?rev=1647681&r1=1647680&r2=1647681&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXml.java Tue Dec
23 21:35:06 2014
@@ -37,6 +37,8 @@ import javax.servlet.descriptor.JspConfi
import javax.servlet.descriptor.JspPropertyGroupDescriptor;
import javax.servlet.descriptor.TaglibDescriptor;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.descriptor.XmlIdentifiers;
import org.apache.tomcat.util.res.StringManager;
@@ -56,8 +58,7 @@ public class WebXml {
private static final StringManager sm =
StringManager.getManager(Constants.PACKAGE_NAME);
- private static final org.apache.juli.logging.Log log=
- org.apache.juli.logging.LogFactory.getLog(WebXml.class);
+ private static final Log log = LogFactory.getLog(WebXml.class);
// Global defaults are overridable but Servlets and Servlet mappings need
to
// be unique. Duplicates normally trigger an error. This flag indicates if
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java?rev=1647681&r1=1647680&r2=1647681&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/Parameters.java Tue Dec 23
21:35:06 2014
@@ -26,6 +26,8 @@ import java.util.Enumeration;
import java.util.LinkedHashMap;
import java.util.Map;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.buf.B2CConverter;
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.buf.MessageBytes;
@@ -39,8 +41,7 @@ import org.apache.tomcat.util.res.String
*/
public final class Parameters {
- private static final org.apache.juli.logging.Log log =
- org.apache.juli.logging.LogFactory.getLog(Parameters.class );
+ private static final Log log = LogFactory.getLog(Parameters.class);
private static final UserDataHelper userDataLog = new UserDataHelper(log);
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java?rev=1647681&r1=1647680&r2=1647681&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java Tue Dec
23 21:35:06 2014
@@ -19,6 +19,9 @@ package org.apache.tomcat.util.net;
import javax.net.ssl.SSLSession;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+
/* SSLImplementation:
Abstract factory and base class for all SSL implementations.
@@ -26,8 +29,7 @@ import javax.net.ssl.SSLSession;
@author EKR
*/
public abstract class SSLImplementation {
- private static final org.apache.juli.logging.Log logger =
org.apache.juli.logging.LogFactory
- .getLog(SSLImplementation.class);
+ private static final Log logger =
LogFactory.getLog(SSLImplementation.class);
// The default implementations in our search path
private static final String JSSEImplementationClass =
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=1647681&r1=1647680&r2=1647681&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 Dec 23 21:35:06 2014
@@ -56,6 +56,8 @@ import javax.net.ssl.TrustManager;
import javax.net.ssl.TrustManagerFactory;
import javax.net.ssl.X509KeyManager;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.net.AbstractEndpoint;
import org.apache.tomcat.util.net.Constants;
import org.apache.tomcat.util.net.SSLUtil;
@@ -76,8 +78,7 @@ import org.apache.tomcat.util.res.String
*/
public class JSSESocketFactory implements SSLUtil {
- private static final org.apache.juli.logging.Log log =
- org.apache.juli.logging.LogFactory.getLog(JSSESocketFactory.class);
+ private static final Log log = LogFactory.getLog(JSSESocketFactory.class);
private static final StringManager sm =
StringManager.getManager("org.apache.tomcat.util.net.jsse.res");
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java?rev=1647681&r1=1647680&r2=1647681&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java Tue Dec
23 21:35:06 2014
@@ -33,6 +33,8 @@ import javax.net.ssl.SSLSession;
import javax.net.ssl.SSLSocket;
import javax.security.cert.X509Certificate;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.net.SSLSessionManager;
import org.apache.tomcat.util.net.SSLSupport;
import org.apache.tomcat.util.res.StringManager;
@@ -53,8 +55,7 @@ import org.apache.tomcat.util.res.String
class JSSESupport implements SSLSupport, SSLSessionManager {
- private static final org.apache.juli.logging.Log log =
- org.apache.juli.logging.LogFactory.getLog(JSSESupport.class);
+ private static final Log log = LogFactory.getLog(JSSESupport.class);
private static final StringManager sm =
StringManager.getManager("org.apache.tomcat.util.net.jsse.res");
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java?rev=1647681&r1=1647680&r2=1647681&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java
Tue Dec 23 21:35:06 2014
@@ -28,6 +28,8 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.res.StringManager;
/**
@@ -35,8 +37,7 @@ import org.apache.tomcat.util.res.String
*/
public class OpenSSLCipherConfigurationParser {
- private static final org.apache.juli.logging.Log log =
-
org.apache.juli.logging.LogFactory.getLog(OpenSSLCipherConfigurationParser.class);
+ private static final Log log =
LogFactory.getLog(OpenSSLCipherConfigurationParser.class);
private static final StringManager sm =
StringManager.getManager("org.apache.tomcat.util.net.jsse.res");
Modified: tomcat/trunk/res/checkstyle/org-import-control.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/checkstyle/org-import-control.xml?rev=1647681&r1=1647680&r2=1647681&view=diff
==============================================================================
--- tomcat/trunk/res/checkstyle/org-import-control.xml (original)
+++ tomcat/trunk/res/checkstyle/org-import-control.xml Tue Dec 23 21:35:06 2014
@@ -113,6 +113,7 @@
<subpackage name="naming">
<allow pkg="javax.mail"/>
<allow pkg="javax.wsdl"/>
+ <allow pkg="org.apache.juli"/>
<allow pkg="org.apache.naming"/>
<allow class="org.apache.tomcat.util.buf.UDecoder"/>
<allow class="org.apache.tomcat.util.buf.UEncoder"/>
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java?rev=1647681&r1=1647680&r2=1647681&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/tribes/demos/IntrospectionUtils.java
Tue Dec 23 21:35:06 2014
@@ -23,14 +23,16 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.Hashtable;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+
/**
* Utils for introspection and reflection
*/
public final class IntrospectionUtils {
- private static final org.apache.juli.logging.Log log=
- org.apache.juli.logging.LogFactory.getLog( IntrospectionUtils.class );
+ private static final Log log = LogFactory.getLog(IntrospectionUtils.class);
/*
* Find a method with the right name If found, call the method ( if param
is
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
