[Red5devs] [red5 commit] r3071 - java/example/trunk/oflaDemo java/example/trunk/oflaDemo/src java/example/trunk/oflaDemo/s...
codesite-noreply at google.com
codesite-noreply at google.com
Thu Sep 18 22:59:45 PDT 2008
Author: mondain
Date: Thu Sep 18 22:59:03 2008
New Revision: 3071
Added:
java/example/trunk/oflaDemo/src/logback-oflaDemo.xml
repository/tomcat-juli-slf4j-1.5.0.jar (contents, props changed)
Removed:
java/example/trunk/oflaDemo/src/logback.xml
Modified:
java/example/trunk/oflaDemo/.classpath
java/example/trunk/oflaDemo/src/org/red5/demos/oflaDemo/Application.java
java/example/trunk/oflaDemo/src/org/red5/demos/oflaDemo/DemoService.java
java/example/trunk/oflaDemo/www/WEB-INF/web.xml
java/server/trunk/ivy.xml
java/server/trunk/ivysettings.xml
java/server/trunk/src/org/red5/logging/LoggerContextFilter.java
Log:
Removed dep on tomcat juli stuff, replaced with slf4j version. Updated
oflaDemo to use the fixed loggers. Updated ivy and cleaned up out.prints.
Modified: java/example/trunk/oflaDemo/.classpath
==============================================================================
--- java/example/trunk/oflaDemo/.classpath (original)
+++ java/example/trunk/oflaDemo/.classpath Thu Sep 18 22:59:03 2008
@@ -5,13 +5,16 @@
<classpathentry kind="con"
path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="con"
path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="var" path="Red5/red5.jar"/>
- <classpathentry kind="var" path="Red5/lib/logback-core-0.9.9.jar"/>
- <classpathentry kind="var" path="Red5/lib/slf4j-api-1.5.2.jar"/>
<classpathentry kind="var" path="Red5/lib/spring-beans-2.5.5.jar"/>
<classpathentry kind="var" path="Red5/lib/spring-context-2.5.5.jar"/>
<classpathentry kind="var" path="Red5/lib/spring-core-2.5.5.jar"/>
<classpathentry kind="var" path="Red5/lib/jsp-api-2.1.jar"/>
<classpathentry kind="var" path="Red5/lib/servlet-api-2.5.jar"/>
- <classpathentry kind="var" path="Red5/lib/logback-classic-0.9.9.jar"/>
+ <classpathentry kind="var" path="Red5/lib/jcl-over-slf4j-1.5.3.jar"/>
+ <classpathentry kind="var" path="Red5/lib/jul-to-slf4j-1.5.3.jar"/>
+ <classpathentry kind="var" path="Red5/lib/log4j-over-slf4j-1.5.3.jar"/>
+ <classpathentry kind="var"
path="Red5/lib/logback-classic-0.9.10-SNAPSHOT.jar"/>
+ <classpathentry kind="var"
path="Red5/lib/logback-core-0.9.10-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="Red5/lib/slf4j-api-1.5.3.jar"/>
<classpathentry kind="output" path="www/WEB-INF/classes"/>
</classpath>
Added: java/example/trunk/oflaDemo/src/logback-oflaDemo.xml
==============================================================================
--- (empty file)
+++ java/example/trunk/oflaDemo/src/logback-oflaDemo.xml Thu Sep 18
22:59:03 2008
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+ <appender name="OFLA" class="ch.qos.logback.core.FileAppender">
+ <File>log/oflademo.log</File>
+ <Append>false</Append>
+ <Encoding>UTF-8</Encoding>
+ <BufferedIO>false</BufferedIO>
+ <ImmediateFlush>true</ImmediateFlush>
+ <layout class="ch.qos.logback.classic.PatternLayout">
+ <Pattern>
+ %date [%thread] %-5level %logger{35} - %msg%n
+ </Pattern>
+ </layout>
+ </appender>
+ <root>
+ <appender-ref ref="OFLA" />
+ </root>
+ <logger name="org.red5.demos.oflaDemo">
+ <level value="DEBUG" />
+ </logger>
+</configuration>
Modified:
java/example/trunk/oflaDemo/src/org/red5/demos/oflaDemo/Application.java
==============================================================================
---
java/example/trunk/oflaDemo/src/org/red5/demos/oflaDemo/Application.java
(original)
+++
java/example/trunk/oflaDemo/src/org/red5/demos/oflaDemo/Application.java
Thu Sep 18 22:59:03 2008
@@ -8,16 +8,25 @@
import org.red5.server.api.stream.IStreamCapableConnection;
import org.red5.server.api.stream.support.SimpleConnectionBWConfig;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.slf4j.impl.StaticLoggerBinder;
+
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.selector.ContextSelector;
public class Application extends ApplicationAdapter {
- protected Logger log = LoggerFactory.getLogger(Application.class);
+ private static Logger log;
private IScope appScope;
private IServerStream serverStream;
+ static {
+ ContextSelector selector =
StaticLoggerBinder.SINGLETON.getContextSelector();
+ LoggerContext ctx = selector.getLoggerContext("oflaDemo");
+ log = ctx.getLogger(Application.class);
+ }
+
{
log.info("oflaDemo created");
System.out.println("oflaDemo created");
@@ -36,7 +45,6 @@
@Override
public boolean appConnect(IConnection conn, Object[] params) {
log.info("oflaDemo appConnect");
- System.out.println("oflaDemo appConnect");
// Trigger calling of "onBWDone", required for some FLV players
measureBandwidth(conn);
if (conn instanceof IStreamCapableConnection) {
@@ -74,6 +82,7 @@
/** {@inheritDoc} */
@Override
public void appDisconnect(IConnection conn) {
+ log.info("oflaDemo appDisconnect");
if (appScope == conn.getScope() && serverStream != null) {
serverStream.close();
}
Modified:
java/example/trunk/oflaDemo/src/org/red5/demos/oflaDemo/DemoService.java
==============================================================================
---
java/example/trunk/oflaDemo/src/org/red5/demos/oflaDemo/DemoService.java
(original)
+++
java/example/trunk/oflaDemo/src/org/red5/demos/oflaDemo/DemoService.java
Thu Sep 18 22:59:03 2008
@@ -8,20 +8,27 @@
import java.util.Locale;
import java.util.Map;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import org.red5.server.api.IScope;
import org.red5.server.api.Red5;
+import org.slf4j.Logger;
+import org.slf4j.impl.StaticLoggerBinder;
import org.springframework.core.io.Resource;
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.selector.ContextSelector;
+
public class DemoService {
- protected Logger log = LoggerFactory.getLogger(DemoService.class);
+ private static Logger log;
+ static {
+ ContextSelector selector =
StaticLoggerBinder.SINGLETON.getContextSelector();
+ LoggerContext ctx = selector.getLoggerContext("oflaDemo");
+ log = ctx.getLogger(DemoService.class);
+ }
+
{
log.info("oflaDemo DemoService created");
- System.out.println("oflaDemo DemoService created");
}
private String formatDate(Date date) {
Modified: java/example/trunk/oflaDemo/www/WEB-INF/web.xml
==============================================================================
--- java/example/trunk/oflaDemo/www/WEB-INF/web.xml (original)
+++ java/example/trunk/oflaDemo/www/WEB-INF/web.xml Thu Sep 18 22:59:03 2008
@@ -5,13 +5,27 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
- <display-name>Red5 oflaDemo Test App</display-name>
+ <display-name>oflaDemo</display-name>
<context-param>
<param-name>webAppRootKey</param-name>
<param-value>/oflaDemo</param-value>
</context-param>
+ <listener>
+
<listener-class>org.red5.logging.ContextLoggingListener</listener-class>
+ </listener>
+
+ <filter>
+ <filter-name>LoggerContextFilter</filter-name>
+ <filter-class>org.red5.logging.LoggerContextFilter</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>LoggerContextFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
<security-constraint>
<web-resource-collection>
<web-resource-name>Forbidden</web-resource-name>
Modified: java/server/trunk/ivy.xml
==============================================================================
--- java/server/trunk/ivy.xml (original)
+++ java/server/trunk/ivy.xml Thu Sep 18 22:59:03 2008
@@ -15,8 +15,6 @@
<dependency org="tomcat" name="jasper" rev="6.0.16" />
<dependency org="tomcat" name="jasper-jdt" rev="6.0.16" />
<dependency org="tomcat" name="jasper-el" rev="6.0.16" />
- <dependency org="tomcat" name="tomcat-juli" rev="6.0.16" />
- <dependency org="tomcat" name="tomcat-juli-adapters" rev="6.0.16"
/>
<dependency org="tomcat" name="el-api" rev="" />
<dependency org="javax" name="jsp-api" rev="2.1" />
<dependency org="javax" name="servlet-api" rev="2.5" />
@@ -45,6 +43,7 @@
<dependency name="jcl-over-slf4j" rev="1.5.3" />
<dependency name="log4j-over-slf4j" rev="1.5.3" />
<dependency name="jul-to-slf4j" rev="1.5.3" />
+ <dependency name="tomcat-juli-slf4j" rev="1.5.0" />
<dependency name="logback-core" rev="0.9.10-SNAPSHOT" />
<dependency name="logback-classic" rev="0.9.10-SNAPSHOT" />
<!-- General -->
Modified: java/server/trunk/ivysettings.xml
==============================================================================
--- java/server/trunk/ivysettings.xml (original)
+++ java/server/trunk/ivysettings.xml Thu Sep 18 22:59:03 2008
@@ -20,10 +20,12 @@
<artifact
pattern="http://red5.googlecode.com/svn/repository/[artifact](-[revision]).[ext]"
/>
<artifact
pattern="http://red5.googlecode.com/svn/repository/[organisation]/[artifact](-[revision]).[ext]"
/>
</url>
+ <!--
<url name="cvsdude">
<artifact
pattern="http://svn1.cvsdude.com/osflash/red5/repository/[artifact](-[revision]).[ext]"
/>
<artifact
pattern="http://svn1.cvsdude.com/osflash/red5/repository/[organisation]/[artifact](-[revision]).[ext]"
/>
</url>
+ -->
</chain>
</resolvers>
</ivysettings>
Modified: java/server/trunk/src/org/red5/logging/LoggerContextFilter.java
==============================================================================
--- java/server/trunk/src/org/red5/logging/LoggerContextFilter.java
(original)
+++ java/server/trunk/src/org/red5/logging/LoggerContextFilter.java Thu Sep
18 22:59:03 2008
@@ -43,7 +43,7 @@
public void doFilter(ServletRequest request, ServletResponse response,
FilterChain chain) throws IOException, ServletException {
- System.out.println("Context name: " + contextName);
+ System.out.printf("Context name: %s\n", contextName);
LoggingContextSelector selector = (LoggingContextSelector)
StaticLoggerBinder.SINGLETON.getContextSelector();
System.out.println("Context select type: " +
selector.getClass().getName());
@@ -58,11 +58,11 @@
//evaluate context name against logger context name
if (!contextName.equals(ctx.getName())) {
- System.err.println("Logger context name and context name dont match ("
+ contextName + " != " + ctx.getName() + ")");
+ System.err.printf("Logger context name and context name dont match
(%s != %s)\n", contextName, ctx.getName());
}
if (ctx != null) {
- System.out.println("Logger context name: " + ctx.getName());
+ System.out.printf("Logger context name: %s\n", ctx.getName());
selector.setLocalContext(ctx);
}
Added: repository/tomcat-juli-slf4j-1.5.0.jar
==============================================================================
Binary file. No diff available.
More information about the Red5devs
mailing list