[Red5commits] [2397] Standardized logging to slf4j from a mix of log4j and jcl
pgregoire
luke at codegent.com
Mon Oct 15 16:20:26 PDT 2007
Standardized logging to slf4j from a mix of log4j and jcl
Timestamp: 10/15/07 18:15:59 EST (less than one hour ago)
Change: 2397
Author: pgregoire
Files (see diff or trac for details):
java/server/trunk/ivy.xml
java/server/trunk/src/org/red5/io/FileKeyFrameMetaCache.java
java/server/trunk/src/org/red5/io/StreamableFileFactory.java
java/server/trunk/src/org/red5/io/amf/Input.java
java/server/trunk/src/org/red5/io/amf/Output.java
java/server/trunk/src/org/red5/io/amf3/Input.java
java/server/trunk/src/org/red5/io/amf3/Output.java
java/server/trunk/src/org/red5/io/filter/ExecutorFilter.java
java/server/trunk/src/org/red5/io/flv/impl/FLV.java
java/server/trunk/src/org/red5/io/flv/impl/FLVReader.java
java/server/trunk/src/org/red5/io/flv/impl/FLVWriter.java
java/server/trunk/src/org/red5/io/flv/meta/MetaData.java
java/server/trunk/src/org/red5/io/mock/Input.java
java/server/trunk/src/org/red5/io/mock/Output.java
java/server/trunk/src/org/red5/io/mp3/impl/MP3Reader.java
java/server/trunk/src/org/red5/io/object/Deserializer.java
java/server/trunk/src/org/red5/io/object/Serializer.java
java/server/trunk/src/org/red5/io/utils/DOM2Writer.java
java/server/trunk/src/org/red5/io/utils/HexDump.java
java/server/trunk/src/org/red5/io/utils/IOUtils.java
java/server/trunk/src/org/red5/io/utils/RandomGUID.java
java/server/trunk/src/org/red5/io/utils/XMLUtils.java
java/server/trunk/src/org/red5/samples/services/EchoService.java
java/server/trunk/src/org/red5/server/BaseConnection.java
java/server/trunk/src/org/red5/server/Client.java
java/server/trunk/src/org/red5/server/Context.java
java/server/trunk/src/org/red5/server/ContextLoader.java
java/server/trunk/src/org/red5/server/CoreHandler.java
java/server/trunk/src/org/red5/server/DebugPooledByteBufferAllocator.java
java/server/trunk/src/org/red5/server/Scope.java
java/server/trunk/src/org/red5/server/Server.java
java/server/trunk/src/org/red5/server/Standalone.java
java/server/trunk/src/org/red5/server/WebScope.java
java/server/trunk/src/org/red5/server/adapter/ApplicationAdapter.java
java/server/trunk/src/org/red5/server/api/IClient.java
java/server/trunk/src/org/red5/server/api/ScopeUtils.java
java/server/trunk/src/org/red5/server/api/stream/IStreamCapableConnection.java
java/server/trunk/src/org/red5/server/api/stream/support/StreamUtils.java
java/server/trunk/src/org/red5/server/cache/CacheImpl.java
java/server/trunk/src/org/red5/server/cache/CacheableImpl.java
java/server/trunk/src/org/red5/server/cache/EhCacheImpl.java
java/server/trunk/src/org/red5/server/cache/NoCacheImpl.java
java/server/trunk/src/org/red5/server/cache/WhirlyCacheImpl.java
java/server/trunk/src/org/red5/server/jboss/JbossLoader.java
java/server/trunk/src/org/red5/server/jetty/JettyApplicationContext.java
java/server/trunk/src/org/red5/server/jetty/JettyApplicationLoader.java
java/server/trunk/src/org/red5/server/jetty/JettyLoader.java
java/server/trunk/src/org/red5/server/jetty/Red5WebPropertiesConfiguration.java
java/server/trunk/src/org/red5/server/jmx/JMXAgent.java
java/server/trunk/src/org/red5/server/jmx/JMXFactory.java
java/server/trunk/src/org/red5/server/jmx/JMXUtil.java
java/server/trunk/src/org/red5/server/messaging/AbstractPipe.java
java/server/trunk/src/org/red5/server/messaging/InMemoryPullPullPipe.java
java/server/trunk/src/org/red5/server/messaging/InMemoryPushPushPipe.java
java/server/trunk/src/org/red5/server/midi/SharedMidiObject.java
java/server/trunk/src/org/red5/server/midi/Test.java
java/server/trunk/src/org/red5/server/net/proxy/DebugProxyHandler.java
java/server/trunk/src/org/red5/server/net/proxy/NetworkDumpFilter.java
java/server/trunk/src/org/red5/server/net/proxy/ProxyFilter.java
java/server/trunk/src/org/red5/server/net/remoting/FlexMessagingService.java
java/server/trunk/src/org/red5/server/net/remoting/RemotingClient.java
java/server/trunk/src/org/red5/server/net/remoting/RemotingConnection.java
java/server/trunk/src/org/red5/server/net/remoting/codec/RemotingProtocolDecoder.java
java/server/trunk/src/org/red5/server/net/remoting/codec/RemotingProtocolEncoder.java
java/server/trunk/src/org/red5/server/net/rtmp/BaseRTMPHandler.java
java/server/trunk/src/org/red5/server/net/rtmp/Channel.java
java/server/trunk/src/org/red5/server/net/rtmp/DeferredResult.java
java/server/trunk/src/org/red5/server/net/rtmp/RTMPClient.java
java/server/trunk/src/org/red5/server/net/rtmp/RTMPConnection.java
java/server/trunk/src/org/red5/server/net/rtmp/RTMPHandler.java
java/server/trunk/src/org/red5/server/net/rtmp/RTMPMinaConnection.java
java/server/trunk/src/org/red5/server/net/rtmp/RTMPMinaIoHandler.java
java/server/trunk/src/org/red5/server/net/rtmp/RTMPMinaTransport.java
java/server/trunk/src/org/red5/server/net/rtmp/codec/RTMPMinaCodecFactory.java
java/server/trunk/src/org/red5/server/net/rtmp/codec/RTMPMinaProtocolEncoder.java
java/server/trunk/src/org/red5/server/net/rtmp/codec/RTMPProtocolDecoder.java
java/server/trunk/src/org/red5/server/net/rtmp/codec/RTMPProtocolEncoder.java
java/server/trunk/src/org/red5/server/net/rtmp/event/AllocationDebugger.java
java/server/trunk/src/org/red5/server/net/rtmp/message/SharedObjectTypeMapping.java
java/server/trunk/src/org/red5/server/net/rtmp/status/Status.java
java/server/trunk/src/org/red5/server/net/rtmp/status/StatusObjectService.java
java/server/trunk/src/org/red5/server/net/rtmpt/RTMPTConnection.java
java/server/trunk/src/org/red5/server/net/rtmpt/RTMPTHandler.java
java/server/trunk/src/org/red5/server/net/rtmpt/RTMPTLoader.java
java/server/trunk/src/org/red5/server/net/rtmpt/RTMPTServlet.java
java/server/trunk/src/org/red5/server/net/rtmpt/TomcatRTMPTLoader.java
java/server/trunk/src/org/red5/server/net/servlet/AMFGatewayServlet.java
java/server/trunk/src/org/red5/server/net/servlet/AMFTunnelServlet.java
java/server/trunk/src/org/red5/server/net/servlet/CaptureViewerServlet.java
java/server/trunk/src/org/red5/server/net/servlet/RequestDumpServlet.java
java/server/trunk/src/org/red5/server/net/servlet/ZAMFGatewayServlet.java
java/server/trunk/src/org/red5/server/net/udp/BasicHandler.java
java/server/trunk/src/org/red5/server/persistence/FilePersistence.java
java/server/trunk/src/org/red5/server/persistence/FilePersistenceThread.java
java/server/trunk/src/org/red5/server/pooling/ThreadObjectFactory.java
java/server/trunk/src/org/red5/server/pooling/ThreadPool.java
java/server/trunk/src/org/red5/server/pooling/WorkerThread.java
java/server/trunk/src/org/red5/server/scheduling/QuartzSchedulingServiceJob.java
java/server/trunk/src/org/red5/server/script/jython/JythonScriptFactory.java
java/server/trunk/src/org/red5/server/script/rhino/RhinoScriptFactory.java
java/server/trunk/src/org/red5/server/script/rhino/RhinoScriptUtils.java
java/server/trunk/src/org/red5/server/service/ConversionUtils.java
java/server/trunk/src/org/red5/server/service/ServiceInvoker.java
java/server/trunk/src/org/red5/server/service/ServiceUtils.java
java/server/trunk/src/org/red5/server/so/ClientSharedObject.java
java/server/trunk/src/org/red5/server/so/SharedObject.java
java/server/trunk/src/org/red5/server/so/SharedObjectScope.java
java/server/trunk/src/org/red5/server/so/SharedObjectService.java
java/server/trunk/src/org/red5/server/stream/AbstractClientStream.java
java/server/trunk/src/org/red5/server/stream/ClientBroadcastStream.java
java/server/trunk/src/org/red5/server/stream/FileStreamSource.java
java/server/trunk/src/org/red5/server/stream/OutputStream.java
java/server/trunk/src/org/red5/server/stream/PlaylistSubscriberStream.java
java/server/trunk/src/org/red5/server/stream/ProviderService.java
java/server/trunk/src/org/red5/server/stream/ServerStream.java
java/server/trunk/src/org/red5/server/stream/SimpleBWControlService.java
java/server/trunk/src/org/red5/server/stream/StreamService.java
java/server/trunk/src/org/red5/server/stream/VideoCodecFactory.java
java/server/trunk/src/org/red5/server/stream/VideoFrameDropper.java
java/server/trunk/src/org/red5/server/stream/codec/ScreenVideo.java
java/server/trunk/src/org/red5/server/stream/consumer/ConnectionConsumer.java
java/server/trunk/src/org/red5/server/stream/consumer/FileConsumer.java
java/server/trunk/src/org/red5/server/stream/filter/StreamBandwidthController.java
java/server/trunk/src/org/red5/server/stream/provider/FileProvider.java
java/server/trunk/src/org/red5/server/tomcat/TomcatApplicationContext.java
java/server/trunk/src/org/red5/server/tomcat/TomcatLoader.java
java/server/trunk/src/org/red5/server/war/MainServlet.java
java/server/trunk/src/org/red5/server/war/RootContextLoaderServlet.java
java/server/trunk/src/org/red5/server/war/SubContextLoaderServlet.java
java/server/trunk/src/org/red5/server/war/WarLoaderServlet.java
java/server/trunk/webapps/adminPanel/WEB-INF/src/org/red5/adminPanel/client/AuthClientRegistry.java
java/server/trunk/webapps/adminPanel/WEB-INF/src/org/red5/adminPanel/panel/ScopeStatistics.java
java/server/trunk/webapps/adminPanel/WEB-INF/src/org/red5/adminPanel/panel/UserStatistics.java
java/server/trunk/webapps/adminPanel/WEB-INF/src/org/red5/adminPanel/panel/adminPanel.java
Trac: http://mirror1.cvsdude.com/trac/osflash/red5/changeset/2397
Index: /java/server/trunk/src/org/red5/samples/services/EchoService.java
===================================================================
--- /java/server/trunk/src/org/red5/samples/services/EchoService.java (revision 1698)
+++ /java/server/trunk/src/org/red5/samples/services/EchoService.java (revision 2397)
@@ -25,8 +25,8 @@
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.red5.server.api.IConnection;
import org.red5.server.api.Red5;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
@@ -40,5 +40,5 @@
public class EchoService implements IEchoService {
- private Log log = LogFactory.getLog(EchoService.class.getName());
+ private Logger log = LoggerFactory.getLogger(EchoService.class);
/** {@inheritDoc} */
Index: /java/server/trunk/src/org/red5/server/jboss/JbossLoader.java
===================================================================
--- /java/server/trunk/src/org/red5/server/jboss/JbossLoader.java (revision 2241)
+++ /java/server/trunk/src/org/red5/server/jboss/JbossLoader.java (revision 2397)
@@ -23,7 +23,7 @@
import java.io.File;
-import org.apache.commons.logging.LogFactory;
-import org.apache.log4j.Logger;
import org.red5.server.jmx.JMXAgent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -48,5 +48,5 @@
// Initialize Logging
- protected static Logger logger = Logger.getLogger(JbossLoader.class
+ protected static Logger logger = LoggerFactory.getLogger(JbossLoader.class
.getName());
@@ -140,5 +140,5 @@
}
appContext.close();
- LogFactory.release(Thread.currentThread().getContextClassLoader());
+ //LogFactory.release(Thread.currentThread().getContextClassLoader());
} catch (Exception e) {
logger.warn("Jboss could not be stopped", e);
Index: /java/server/trunk/src/org/red5/server/adapter/ApplicationAdapter.java
===================================================================
--- /java/server/trunk/src/org/red5/server/adapter/ApplicationAdapter.java (revision 2233)
+++ /java/server/trunk/src/org/red5/server/adapter/ApplicationAdapter.java (revision 2397)
@@ -33,6 +33,4 @@
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.red5.io.IStreamableFile;
import org.red5.io.IStreamableFileFactory;
@@ -73,4 +71,6 @@
import org.red5.server.stream.ProviderService;
import org.red5.server.stream.StreamService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -122,5 +122,5 @@
* Logger object
*/
- protected static Log log = LogFactory.getLog(ApplicationAdapter.class
+ protected static Logger log = LoggerFactory.getLogger(ApplicationAdapter.class
.getName());
@@ -291,5 +291,5 @@
* try { Thread.currentThread().sleep(3000); } catch
* (InterruptedException e) { // TODO Auto-generated catch block
- * log.error(e); }
+ * log.error("", e); }
*/
if (!super.connect(conn, scope, params)) {
Index: /java/server/trunk/src/org/red5/server/so/SharedObjectScope.java
===================================================================
--- /java/server/trunk/src/org/red5/server/so/SharedObjectScope.java (revision 2007)
+++ /java/server/trunk/src/org/red5/server/so/SharedObjectScope.java (revision 2397)
@@ -29,6 +29,4 @@
import java.util.concurrent.locks.ReentrantLock;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.red5.server.BaseConnection;
import org.red5.server.BasicScope;
@@ -47,4 +45,6 @@
import org.red5.server.net.rtmp.status.StatusCodes;
import org.red5.server.service.ServiceUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -55,5 +55,5 @@
* Logger
*/
- private Log log = LogFactory.getLog(SharedObjectScope.class.getName());
+ private Logger log = LoggerFactory.getLogger(SharedObjectScope.class);
/**
* Lock to synchronize shared object updates from multiple threads
Index: /java/server/trunk/src/org/red5/server/so/ClientSharedObject.java
===================================================================
--- /java/server/trunk/src/org/red5/server/so/ClientSharedObject.java (revision 2220)
+++ /java/server/trunk/src/org/red5/server/so/ClientSharedObject.java (revision 2397)
@@ -28,6 +28,4 @@
import java.util.concurrent.locks.ReentrantLock;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.red5.server.api.IAttributeStore;
import org.red5.server.api.IConnection;
@@ -40,4 +38,6 @@
import org.red5.server.net.rtmp.RTMPConnection;
import org.red5.server.so.ISharedObjectEvent.Type;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -50,5 +50,5 @@
* Logger
*/
- protected static Log log = LogFactory.getLog(ClientSharedObject.class.getName());
+ protected static Logger log = LoggerFactory.getLogger(ClientSharedObject.class);
/**
* Initial synchronization flag
Index: /java/server/trunk/src/org/red5/server/so/SharedObject.java
===================================================================
--- /java/server/trunk/src/org/red5/server/so/SharedObject.java (revision 2221)
+++ /java/server/trunk/src/org/red5/server/so/SharedObject.java (revision 2397)
@@ -33,6 +33,4 @@
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.red5.io.object.Deserializer;
import org.red5.io.object.Input;
@@ -49,4 +47,6 @@
import org.red5.server.net.rtmp.message.Constants;
import org.red5.server.so.ISharedObjectEvent.Type;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -73,5 +73,5 @@
* Logger
*/
- protected static Log log = LogFactory.getLog(SharedObject.class.getName());
+ protected static Logger log = LoggerFactory.getLogger(SharedObject.class);
/**
Index: /java/server/trunk/src/org/red5/server/so/SharedObjectService.java
===================================================================
--- /java/server/trunk/src/org/red5/server/so/SharedObjectService.java (revision 1698)
+++ /java/server/trunk/src/org/red5/server/so/SharedObjectService.java (revision 2397)
@@ -26,6 +26,4 @@
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.red5.server.api.IBasicScope;
import org.red5.server.api.IScope;
@@ -36,4 +34,6 @@
import org.red5.server.api.so.ISharedObjectService;
import org.red5.server.persistence.RamPersistence;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -44,5 +44,5 @@
* Logger
*/
- private Log log = LogFactory.getLog(SharedObjectService.class.getName());
+ private Logger log = LoggerFactory.getLogger(SharedObjectService.class);
/**
* Persistence store prefix
Index: /java/server/trunk/src/org/red5/server/midi/Test.java
===================================================================
--- /java/server/trunk/src/org/red5/server/midi/Test.java (revision 1683)
+++ /java/server/trunk/src/org/red5/server/midi/Test.java (revision 2397)
@@ -8,11 +8,11 @@
import javax.sound.midi.MidiDevice.Info;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class Test {
// Initialize Logging
- protected static Log log = LogFactory.getLog(Test.class.getName());
+ protected static Logger log = LoggerFactory.getLogger(Test.class);
public static void main(String[] args) throws Exception {
@@ -29,5 +29,5 @@
return MidiSystem.getMidiDevice(element);
} catch (MidiUnavailableException e) {
- log.error(e);
+ log.error("", e);
}
}
Index: /java/server/trunk/src/org/red5/server/midi/SharedMidiObject.java
===================================================================
--- /java/server/trunk/src/org/red5/server/midi/SharedMidiObject.java (revision 1597)
+++ /java/server/trunk/src/org/red5/server/midi/SharedMidiObject.java (revision 2397)
@@ -11,11 +11,11 @@
import javax.sound.midi.MidiDevice.Info;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.red5.server.api.so.ISharedObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class SharedMidiObject {
- private static final Log log = LogFactory.getLog(SharedMidiObject.class);
+ private static final Logger log = LoggerFactory.getLogger(SharedMidiObject.class);
protected String deviceName;
@@ -63,5 +63,5 @@
return MidiSystem.getMidiDevice(element);
} catch (MidiUnavailableException e) {
- log.error(e);
+ log.error("", e);
}
}
Index: /java/server/trunk/src/org/red5/server/persistence/FilePersistence.java
===================================================================
--- /java/server/trunk/src/org/red5/server/persistence/FilePersistence.java (revision 2370)
+++ /java/server/trunk/src/org/red5/server/persistence/FilePersistence.java (revision 2397)
@@ -28,6 +28,4 @@
import java.lang.reflect.InvocationTargetException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.mina.common.ByteBuffer;
import org.red5.io.amf.Input;
@@ -37,4 +35,6 @@
import org.red5.server.api.persistence.IPersistable;
import org.red5.server.net.servlet.ServletUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.core.io.Resource;
import org.springframework.core.io.support.ResourcePatternResolver;
@@ -52,5 +52,5 @@
* Logger
*/
- private Log log = LogFactory.getLog(FilePersistence.class.getName());
+ private Logger log = LoggerFactory.getLogger(FilePersistence.class);
/**
* Files path
Index: /java/server/trunk/src/org/red5/server/persistence/FilePersistenceThread.java
===================================================================
--- /java/server/trunk/src/org/red5/server/persistence/FilePersistenceThread.java (revision 2138)
+++ /java/server/trunk/src/org/red5/server/persistence/FilePersistenceThread.java (revision 2397)
@@ -25,7 +25,7 @@
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.red5.server.api.persistence.IPersistable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -40,5 +40,5 @@
* Logger
*/
- private Log log = LogFactory.getLog(FilePersistenceThread.class.getName());
+ private Logger log = LoggerFactory.getLogger(FilePersistenceThread.class);
/**
Index: /java/server/trunk/src/org/red5/server/scheduling/QuartzSchedulingServiceJob.java
===================================================================
--- /java/server/trunk/src/org/red5/server/scheduling/QuartzSchedulingServiceJob.java (revision 1698)
+++ /java/server/trunk/src/org/red5/server/scheduling/QuartzSchedulingServiceJob.java (revision 2397)
@@ -20,6 +20,4 @@
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.quartz.Job;
import org.quartz.JobExecutionContext;
@@ -27,4 +25,6 @@
import org.red5.server.api.scheduling.IScheduledJob;
import org.red5.server.api.scheduling.ISchedulingService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -48,5 +48,5 @@
* Logger
*/
- private Log log = LogFactory.getLog( QuartzSchedulingService.class );
+ private Logger log = LoggerFactory.getLogger( QuartzSchedulingService.class );
/** {@inheritDoc} */
Index: /java/server/trunk/src/org/red5/server/tomcat/TomcatApplicationContext.java
===================================================================
--- /java/server/trunk/src/org/red5/server/tomcat/TomcatApplicationContext.java (revision 2187)
+++ /java/server/trunk/src/org/red5/server/tomcat/TomcatApplicationContext.java (revision 2397)
@@ -22,7 +22,7 @@
import org.apache.catalina.Context;
import org.apache.catalina.core.StandardContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.red5.server.api.IApplicationContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -37,6 +37,5 @@
* Logger
*/
- protected static Log log = LogFactory
- .getLog(TomcatApplicationContext.class.getName());
+ protected static Logger log = LoggerFactory.getLogger(TomcatApplicationContext.class);
/** Store a reference to the Tomcat webapp context. */
Index: /java/server/trunk/src/org/red5/server/tomcat/TomcatLoader.java
===================================================================
--- /java/server/trunk/src/org/red5/server/tomcat/TomcatLoader.java (revision 2186)
+++ /java/server/trunk/src/org/red5/server/tomcat/TomcatLoader.java (revision 2397)
@@ -33,9 +33,9 @@
import org.apache.catalina.core.StandardHost;
import org.apache.catalina.startup.Embedded;
-import org.apache.log4j.Logger;
import org.red5.server.LoaderBase;
import org.red5.server.LoaderMBean;
import org.red5.server.jmx.JMXAgent;
-import org.red5.server.tomcat.TomcatApplicationContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
@@ -45,5 +45,6 @@
* Red5 loader for Tomcat
*/
-public class TomcatLoader extends LoaderBase implements ApplicationContextAware, LoaderMBean {
+public class TomcatLoader extends LoaderBase implements
+ ApplicationContextAware, LoaderMBean {
/**
* Filters directory content
@@ -52,8 +53,10 @@
/**
* Check whether file matches filter rules
- *
- * @param dir Dir
- * @param name File name
- * @return true if file does match filter rules, false otherwise
+ *
+ * @param dir
+ * Dir
+ * @param name
+ * File name
+ * @return true if file does match filter rules, false otherwise
*/
public boolean accept(File dir, String name) {
@@ -63,5 +66,6 @@
log.debug("Constructed dir: " + f.getAbsolutePath());
}
- //filter out all non-directories that are hidden and/or not readable
+ // filter out all non-directories that are hidden and/or not
+ // readable
return f.isDirectory() && f.canRead() && !f.isHidden();
}
@@ -75,6 +79,5 @@
// Initialize Logging
- protected static Logger log = Logger
- .getLogger(TomcatLoader.class.getName());
+ protected static Logger log = LoggerFactory.getLogger(TomcatLoader.class);
static {
log.info("Init tomcat");
@@ -122,12 +125,16 @@
/**
* Add context from path and docbase
- * @param path Path
- * @param docBase Docbase
- * @return Catalina context (that is, web application)
+ *
+ * @param path
+ * Path
+ * @param docBase
+ * Docbase
+ * @return Catalina context (that is, web application)
*/
public org.apache.catalina.Context addContext(String path, String docBase) {
org.apache.catalina.Context c = embedded.createContext(path, docBase);
baseHost.addChild(c);
- LoaderBase.setRed5ApplicationContext(path, new TomcatApplicationContext(c));
+ LoaderBase.setRed5ApplicationContext(path,
+ new TomcatApplicationContext(c));
return c;
}
@@ -135,5 +142,6 @@
/**
* Get base host
- * @return Base host
+ *
+ * @return Base host
*/
public Host getBaseHost() {
@@ -143,5 +151,6 @@
/**
* Return connector
- * @return Connector
+ *
+ * @return Connector
*/
public Connector getConnector() {
@@ -151,6 +160,6 @@
/**
* Getter for embedded object
- *
- * @return Embedded object
+ *
+ * @return Embedded object
*/
public Embedded getEmbedded() {
@@ -160,5 +169,6 @@
/**
* Return Tomcat engine
- * @return Tomcat engine
+ *
+ * @return Tomcat engine
*/
public Engine getEngine() {
@@ -168,5 +178,6 @@
/**
* Getter for realm
- * @return Realm
+ *
+ * @return Realm
*/
public Realm getRealm() {
@@ -193,5 +204,5 @@
log.info("Application root: " + webappFolder);
- //scan for additional webapp contexts
+ // scan for additional webapp contexts
if (log.isDebugEnabled()) {
log.debug("Approot: " + webappFolder);
@@ -205,5 +216,5 @@
for (File dir : dirs) {
String dirName = '/' + dir.getName();
- //check to see if the directory is already mapped
+ // check to see if the directory is already mapped
if (null == baseHost.findChild(dirName)) {
if (log.isDebugEnabled()) {
@@ -214,5 +225,5 @@
}
- //dump context list
+ // dump context list
if (log.isDebugEnabled()) {
for (Container cont : baseHost.findChildren()) {
@@ -220,8 +231,8 @@
}
}
- //set a realm
+ // set a realm
embedded.setRealm(realm);
- //dont start tomcats jndi
+ // dont start tomcats jndi
embedded.setUseNaming(false);
@@ -237,5 +248,5 @@
setApplicationLoader(new TomcatApplicationLoader(embedded, baseHost));
-
+
// start server
try {
@@ -249,6 +260,10 @@
/**
* Setter for application context
- * @param context Application context
- * @throws BeansException Abstract superclass for all exceptions thrown in the beans package and subpackages
+ *
+ * @param context
+ * Application context
+ * @throws BeansException
+ * Abstract superclass for all exceptions thrown in the beans
+ * package and subpackages
*/
public void setApplicationContext(ApplicationContext context)
@@ -259,5 +274,7 @@
/**
* Set base host
- * @param baseHost Base host
+ *
+ * @param baseHost
+ * Base host
*/
public void setBaseHost(Host baseHost) {
@@ -268,5 +285,7 @@
/**
* Set connector
- * @param connector Connector
+ *
+ * @param connector
+ * Connector
*/
public void setConnector(Connector connector) {
@@ -277,6 +296,7 @@
/**
* Set additional connectors
- *
- * @param connectors Additional connectors
+ *
+ * @param connectors
+ * Additional connectors
*/
public void setConnectors(List<Connector> connectors) {
@@ -291,6 +311,7 @@
/**
* Set additional contexts
- *
- * @param contexts Map of contexts
+ *
+ * @param contexts
+ * Map of contexts
*/
public void setContexts(Map<String, String> contexts) {
@@ -306,5 +327,7 @@
/**
* Setter for embedded object
- * @param embedded Embedded object
+ *
+ * @param embedded
+ * Embedded object
*/
public void setEmbedded(Embedded embedded) {
@@ -315,5 +338,7 @@
/**
* Set Tomcat engine implementation
- * @param engine Tomcat engine
+ *
+ * @param engine
+ * Tomcat engine
*/
public void setEngine(Engine engine) {
@@ -324,6 +349,7 @@
/**
* Set additional hosts
- *
- * @param hosts List of hosts added to engine
+ *
+ * @param hosts
+ * List of hosts added to engine
*/
public void setHosts(List<Host> hosts) {
@@ -338,5 +364,7 @@
/**
* Setter for realm
- * @param realm Realm
+ *
+ * @param realm
+ * Realm
*/
public void setRealm(Realm realm) {
@@ -347,6 +375,7 @@
/**
* Set additional valves
- *
- * @param valves List of valves
+ *
+ * @param valves
+ * List of valves
*/
public void setValves(List<Valve> valves) {
Index: /java/server/trunk/src/org/red5/server/DebugPooledByteBufferAllocator.java
===================================================================
--- /java/server/trunk/src/org/red5/server/DebugPooledByteBufferAllocator.java (revision 1781)
+++ /java/server/trunk/src/org/red5/server/DebugPooledByteBufferAllocator.java (revision 2397)
@@ -30,9 +30,9 @@
import java.util.Map.Entry;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.ByteBufferAllocator;
import org.apache.mina.util.ExpiringStack;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -58,6 +58,5 @@
* Logger
*/
- protected static Log log = LogFactory
- .getLog(DebugPooledByteBufferAllocator.class.getName());
+ protected static Logger log = LoggerFactory.getLogger(DebugPooledByteBufferAllocator.class);
/**
*
Index: /java/server/trunk/src/org/red5/server/stream/SimpleBWControlService.java
===================================================================
--- /java/server/trunk/src/org/red5/server/stream/SimpleBWControlService.java (revision 2005)
+++ /java/server/trunk/src/org/red5/server/stream/SimpleBWControlService.java (revision 2397)
@@ -30,8 +30,8 @@
import java.util.concurrent.CopyOnWriteArrayList;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.red5.server.api.IBWControllable;
import org.red5.server.api.IBandwidthConfigure;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -57,5 +57,5 @@
public class SimpleBWControlService extends TimerTask
implements IBWControlService {
- private static final Log log = LogFactory.getLog(SimpleBWControlService.class);
+ private static final Logger log = LoggerFactory.getLogger(SimpleBWControlService.class);
protected Map<IBWControllable, BWContext> contextMap =
Index: /java/server/trunk/src/org/red5/server/stream/provider/FileProvider.java
===================================================================
--- /java/server/trunk/src/org/red5/server/stream/provider/FileProvider.java (revision 1888)
+++ /java/server/trunk/src/org/red5/server/stream/provider/FileProvider.java (revision 2397)
@@ -23,6 +23,4 @@
import java.io.IOException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.red5.io.IStreamableFile;
import org.red5.io.IStreamableFileFactory;
@@ -53,4 +51,6 @@
import org.red5.server.stream.IStreamTypeAwareProvider;
import org.red5.server.stream.message.RTMPMessage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -62,5 +62,5 @@
* Logger
*/
- private static final Log log = LogFactory.getLog(FileProvider.class);
+ private static final Logger log = LoggerFactory.getLogger(FileProvider.class);
/**
* Class name
Index: /java/server/trunk/src/org/red5/server/stream/consumer/ConnectionConsumer.java
===================================================================
--- /java/server/trunk/src/org/red5/server/stream/consumer/ConnectionConsumer.java (revision 2275)
+++ /java/server/trunk/src/org/red5/server/stream/consumer/ConnectionConsumer.java (revision 2397)
@@ -20,6 +20,4 @@
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.red5.server.api.IBWControllable;
import org.red5.server.api.IBandwidthConfigure;
@@ -49,4 +47,6 @@
import org.red5.server.stream.message.ResetMessage;
import org.red5.server.stream.message.StatusMessage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -58,5 +58,5 @@
* Logger
*/
- private static final Log log = LogFactory.getLog(ConnectionConsumer.class);
+ private static final Logger log = LoggerFactory.getLogger(ConnectionConsumer.class);
/**
* Connection consumer class name
Index: /java/server/trunk/src/org/red5/server/stream/consumer/FileConsumer.java
===================================================================
--- /java/server/trunk/src/org/red5/server/stream/consumer/FileConsumer.java (revision 1947)
+++ /java/server/trunk/src/org/red5/server/stream/consumer/FileConsumer.java (revision 2397)
@@ -24,6 +24,4 @@
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.mina.common.ByteBuffer;
import org.red5.io.IStreamableFile;
@@ -50,4 +48,6 @@
import org.red5.server.stream.message.ResetMessage;
import org.red5.server.stream.message.StatusMessage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -59,5 +59,5 @@
* Logger
*/
- private static final Log
Note:
Diffs are chopped if more than 25k.
This is to get past the limit on the mailing list.
More information about the Red5commits
mailing list