October 2006 - logback-dev - mailman3.qos.ch

svn commit: r621 - in logback/trunk: logback-classic/src/main/java/ch/qos/logback/classic/db logback-classic/src/main/java/ch/qos/logback/classic/pattern logback-core/src/main/java/ch/qos/logback/core/db
by noreply.seb＠qos.ch 04 Oct '06

04 Oct '06

Author: seb Date: Wed Oct 4 18:25:24 2006 New Revision: 621 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/db/package.html logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/package.html logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/package.html Log: fixes Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/db/package.html ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/db/package.html (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/db/package.html Wed Oct 4 18:25:24 2006 @@ -6,8 +6,18 @@ </head> <body> - - Contains the classes used to log to a database. +The ch.qos.logback.classic.db package provides means to append logging events +into various databases. + + +Most popular database systems, such as PostgreSQL, MySQL, Oracle, DB2 and MsSQL +are supported. + + +Just as importantly, the way for obtaining JDBC connections is pluggable. Connections can +be obtained through the tradinal way of DriverManager, or alternatively as a DataSource. +A DataSource can be instantiated directly or it can obtained through JNDI. + </body> </html> \ No newline at end of file Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/package.html ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/package.html (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/package.html Wed Oct 4 18:25:24 2006 @@ -7,7 +7,7 @@ <body> - Contains classes used by PatternLayout to format the logging event. + Provides classes implementing format specifiers in conversion patterns. </body> </html> \ No newline at end of file Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/package.html ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/package.html (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/package.html Wed Oct 4 18:25:24 2006 @@ -6,13 +6,17 @@ </head> <body> - - Contains the base classes that are used by logback to append LoggingEvent objects - to a database. +The ch.qos.logback.core.db package provides bases classes to append objects +into various databases. + - It also contains helper classes and dialect classes, to allow logback - to log to different database types. - +Most popular database systems, such as PostgreSQL, MySQL, Oracle, DB2 and MsSQL +are supported. + +Just as importantly, the way for obtaining JDBC connections is pluggable. Connections can +be obtained through the tradinal way of DriverManager, or alternatively as a DataSource. +A DataSource can be instantiated directly or it can obtained through JNDI. + </body> </html> \ No newline at end of file

1 0

svn commit: r620 - logback/trunk/logback-access/src/main/java/ch/qos/logback/access
by noreply.seb＠qos.ch 04 Oct '06

04 Oct '06

Author: seb Date: Wed Oct 4 18:17:18 2006 New Revision: 620 Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/PatternLayout.java Log: removed reference to PostContentConverter Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/PatternLayout.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/PatternLayout.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/PatternLayout.java Wed Oct 4 18:17:18 2006 @@ -88,9 +88,6 @@ defaultConverterMap.put("v", ServerNameConverter.class.getName()); defaultConverterMap.put("server", ServerNameConverter.class.getName()); - defaultConverterMap.put("p", PostContentConverter.class.getName()); - defaultConverterMap.put("postContent", PostContentConverter.class.getName()); - defaultConverterMap.put("localPort", LocalPortConverter.class.getName()); defaultConverterMap.put("reqAttribute", RequestAttributeConverter.class.getName()); defaultConverterMap.put("reqCookie", RequestCookieConverter.class.getName());

1 0

svn commit: r619 - in logback/trunk/logback-classic/src/main/java: ch/qos/logback/classic ch/qos/logback/classic/db ch/qos/logback/classic/helpers ch/qos/logback/classic/html ch/qos/logback/classic/joran ch/qos/logback/classic/net ch/qos/logback/classic/pattern ch/qos/logback/classic/spi ch/qos/logback/classic/util org/slf4j
by noreply.seb＠qos.ch 04 Oct '06

04 Oct '06

Author: seb Date: Wed Oct 4 17:50:14 2006 New Revision: 619 Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/db/package.html logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/helpers/package.html logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/html/package.html logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/package.html logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/package.html logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/package.html logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/package.html logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/package.html logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/package.html logback/trunk/logback-classic/src/main/java/org/slf4j/package.html Log: added package.html files Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/db/package.html ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/db/package.html Wed Oct 4 17:50:14 2006 @@ -0,0 +1,13 @@ +<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> + +<html> + <head> + <title></title> + </head> + + <body> + + Contains the classes used to log to a database. + + </body> +</html> \ No newline at end of file Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/helpers/package.html ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/helpers/package.html Wed Oct 4 17:50:14 2006 @@ -0,0 +1,13 @@ +<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> + +<html> + <head> + <title></title> + </head> + + <body> + + Contains helpers. + + </body> +</html> \ No newline at end of file Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/html/package.html ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/html/package.html Wed Oct 4 17:50:14 2006 @@ -0,0 +1,13 @@ +<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> + +<html> + <head> + <title></title> + </head> + + <body> + + Contains classes to format log output in HTML. + + </body> +</html> \ No newline at end of file Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/package.html ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/package.html Wed Oct 4 17:50:14 2006 @@ -0,0 +1,13 @@ +<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> + +<html> + <head> + <title></title> + </head> + + <body> + + Contains Joran configuration classes. + + </body> +</html> \ No newline at end of file Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/package.html ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/package.html Wed Oct 4 17:50:14 2006 @@ -0,0 +1,12 @@ +<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> + +<html> + <head> + <title></title> + </head> + + <body> + + Contains classes used to log through a network + </body> +</html> \ No newline at end of file Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/package.html ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/package.html Wed Oct 4 17:50:14 2006 @@ -0,0 +1,13 @@ +<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> + +<html> + <head> + <title></title> + </head> + + <body> + + Contains logback classic main classes. + + </body> +</html> \ No newline at end of file Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/package.html ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/package.html Wed Oct 4 17:50:14 2006 @@ -0,0 +1,13 @@ +<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> + +<html> + <head> + <title></title> + </head> + + <body> + + Contains classes used by PatternLayout to format the logging event. + + </body> +</html> \ No newline at end of file Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/package.html ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/package.html Wed Oct 4 17:50:14 2006 @@ -0,0 +1,13 @@ +<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> + +<html> + <head> + <title></title> + </head> + + <body> + + Contains core classes of logback classic. + + </body> +</html> \ No newline at end of file Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/package.html ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/package.html Wed Oct 4 17:50:14 2006 @@ -0,0 +1,13 @@ +<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> + +<html> + <head> + <title></title> + </head> + + <body> + + Contains utility classes. + + </body> +</html> \ No newline at end of file Added: logback/trunk/logback-classic/src/main/java/org/slf4j/package.html ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/main/java/org/slf4j/package.html Wed Oct 4 17:50:14 2006 @@ -0,0 +1,13 @@ +<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> + +<html> + <head> + <title></title> + </head> + + <body> + + Contains SLF4J implementations binding logback classes to the SLF4J framework. + + </body> +</html> \ No newline at end of file

1 0

svn commit: r618 - in logback/trunk/logback-core/src/main/java/ch/qos/logback/core: . boolex db db/dialect filter helpers html joran net pattern spi status util
by noreply.seb＠qos.ch 04 Oct '06

04 Oct '06

Author: seb Date: Wed Oct 4 17:18:12 2006 New Revision: 618 Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/boolex/package.html logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/dialect/package.html logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/package.html logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/package.html logback/trunk/logback-core/src/main/java/ch/qos/logback/core/helpers/package.html logback/trunk/logback-core/src/main/java/ch/qos/logback/core/html/package.html logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/package.html logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/package.html logback/trunk/logback-core/src/main/java/ch/qos/logback/core/package.html logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/package.html logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/package.html logback/trunk/logback-core/src/main/java/ch/qos/logback/core/status/package.html logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/package.html Log: added package.html files Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/boolex/package.html ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/boolex/package.html Wed Oct 4 17:18:12 2006 @@ -0,0 +1,17 @@ +<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> + +<html> + <head> + <title></title> + </head> + + <body> + + Contains the EventEvaluator interface and subclasses. + + EventEvaluator is subclassed by JaninoEventEvaluatorBase. + Specific subclasses can be found in logback modules. + + + </body> +</html> \ No newline at end of file Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/dialect/package.html ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/dialect/package.html Wed Oct 4 17:18:12 2006 @@ -0,0 +1,14 @@ +<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> + +<html> + <head> + <title></title> + </head> + + <body> + + Contains the dialect classes used by logback to log to different databases, and the + SQL scripts to created the necessary tables. + + </body> +</html> \ No newline at end of file Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/package.html ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/package.html Wed Oct 4 17:18:12 2006 @@ -0,0 +1,18 @@ +<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> + +<html> + <head> + <title></title> + </head> + + <body> + + Contains the base classes that are used by logback to append LoggingEvent objects + to a database. + + It also contains helper classes and dialect classes, to allow logback + to log to different database types. + + + </body> +</html> \ No newline at end of file Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/package.html ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/filter/package.html Wed Oct 4 17:18:12 2006 @@ -0,0 +1,13 @@ +<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> + +<html> + <head> + <title></title> + </head> + + <body> + + Contains base classes to the event filtering functionnalities of logback. + + </body> +</html> \ No newline at end of file Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/helpers/package.html ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/helpers/package.html Wed Oct 4 17:18:12 2006 @@ -0,0 +1,14 @@ +<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> + +<html> + <head> + <title></title> + </head> + + <body> + + Helpers package. + + + </body> +</html> \ No newline at end of file Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/html/package.html ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/html/package.html Wed Oct 4 17:18:12 2006 @@ -0,0 +1,13 @@ +<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> + +<html> + <head> + <title></title> + </head> + + <body> + + Contains the base classes needed to format logging events to HTML. + + </body> +</html> \ No newline at end of file Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/package.html ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/package.html Wed Oct 4 17:18:12 2006 @@ -0,0 +1,13 @@ +<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> + +<html> + <head> + <title></title> + </head> + + <body> + + Contains Joran configuration classes. + + </body> +</html> \ No newline at end of file Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/package.html ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/package.html Wed Oct 4 17:18:12 2006 @@ -0,0 +1,17 @@ +<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> + +<html> +<head> +<title></title> +</head> + +<body> + +Contains the base classes used by logback to log to remote +destinations. + +SMTPAppender logs events and sends an email when appropriate. +SyslogAppender logs to a Syslog deamon. + +</body> +</html> Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/package.html ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/package.html Wed Oct 4 17:18:12 2006 @@ -0,0 +1,13 @@ +<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> + +<html> + <head> + <title></title> + </head> + + <body> + + Contains the main classes of logback core. + + </body> +</html> \ No newline at end of file Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/package.html ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/pattern/package.html Wed Oct 4 17:18:12 2006 @@ -0,0 +1,17 @@ +<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> + +<html> + <head> + <title></title> + </head> + + <body> + + Contains the base classes used by PatternLayout. + + These classes lay the groundwork so that subclasses of PatternLayoutBase + can use module-specific patterns. + + + </body> +</html> \ No newline at end of file Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/package.html ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/package.html Wed Oct 4 17:18:12 2006 @@ -0,0 +1,15 @@ +<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> + +<html> +<head> +<title></title> +</head> + +<body> + +Contains core functionnalities of logback, such as +(a)link{ch.qos.logback.core.spi.AppenderAttachable} and +(a)link{ch.qos.logback.core.spi.LifeCycle}. + +</body> +</html> Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/status/package.html ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/status/package.html Wed Oct 4 17:18:12 2006 @@ -0,0 +1,13 @@ +<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> + +<html> +<head> +<title></title> +</head> + +<body> + +Contains logback's internal error reporting system. + +</body> +</html> Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/package.html ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/package.html Wed Oct 4 17:18:12 2006 @@ -0,0 +1,13 @@ +<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> + +<html> +<head> +<title></title> +</head> + +<body> + +Contains various utility classes. + +</body> +</html>

1 0

svn commit: r617 - logback/trunk
by noreply.seb＠qos.ch 04 Oct '06

04 Oct '06

Author: seb Date: Wed Oct 4 16:26:27 2006 New Revision: 617 Modified: logback/trunk/pom.xml Log: modified javadoc configuration Modified: logback/trunk/pom.xml ============================================================================== --- logback/trunk/pom.xml (original) +++ logback/trunk/pom.xml Wed Oct 4 16:26:27 2006 @@ -148,6 +148,24 @@ http://java.sun.com/j2se/1.5.0/docs/api </link> </links> + <groups> + <group> + <title>Logback Core</title> + <packages>ch.qos.logback.core:ch.qos.logback.core.*</packages> + </group> + <group> + <title>Logback Classic</title> + <packages>ch.qos.logback:ch.qos.logback.classic:ch.qos.logback.classic.*</packages> + </group> + <group> + <title>Logback Access</title> + <packages>ch.qos.logback.access:ch.qos.logback.access.*</packages> + </group> + <group> + <title>SLF4J</title> + <packages>org.slf4j:org.slf4j.*</packages> + </group> + </groups> </configuration> </plugin>

1 0

svn commit: r616 - logback/trunk/logback-access/src/main/java/ch/qos/logback/access/tomcat
by noreply.seb＠qos.ch 03 Oct '06

03 Oct '06

Author: seb Date: Tue Oct 3 11:28:44 2006 New Revision: 616 Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java Log: LogbackValve now extends ValveBase, instead of ContextBase. Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java Tue Oct 3 11:28:44 2006 @@ -2,36 +2,31 @@ import java.io.File; import java.io.IOException; +import java.util.HashMap; import java.util.Iterator; +import java.util.Map; -import javax.management.MBeanRegistration; -import javax.management.MBeanServer; -import javax.management.MalformedObjectNameException; -import javax.management.ObjectName; import javax.servlet.ServletException; -import org.apache.catalina.Contained; -import org.apache.catalina.Container; -import org.apache.catalina.Context; -import org.apache.catalina.Engine; -import org.apache.catalina.Host; -import org.apache.catalina.Pipeline; -import org.apache.catalina.Valve; -import org.apache.catalina.Wrapper; import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; -import org.apache.catalina.core.ContainerBase; +import org.apache.catalina.valves.ValveBase; import ch.qos.logback.access.joran.JoranConfigurator; import ch.qos.logback.access.spi.AccessEvent; import ch.qos.logback.core.Appender; -import ch.qos.logback.core.ContextBase; +import ch.qos.logback.core.BasicStatusManager; +import ch.qos.logback.core.Context; +import ch.qos.logback.core.filter.Filter; import ch.qos.logback.core.spi.AppenderAttachable; import ch.qos.logback.core.spi.AppenderAttachableImpl; +import ch.qos.logback.core.spi.FilterAttachableImpl; import ch.qos.logback.core.status.ErrorStatus; +import ch.qos.logback.core.status.StatusManager; /** - * This class is an implementation of tomcat's Valve interface. + * This class is an implementation of tomcat's Valve interface, by extending + * ValveBase. * * It can be seen as logback classic's LoggerContext. Appenders can be attached * directly to LogbackValve and LogbackValve uses the same StatusManager as @@ -52,15 +47,15 @@ * Here is a sample logback.xml file that can be used right away: * * <pre> - * <configuration> - * <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> - * <layout class="ch.qos.logback.access.PatternLayout"> - * <param name="Pattern" value="%date %server %remoteIP %clientHost %user %requestURL " /> - * </layout> - * </appender> - * - * <appender-ref ref="STDOUT" /> - * </configuration> + * <configuration> + * <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> + * <layout class="ch.qos.logback.access.PatternLayout"> + * <param name="Pattern" value="%date %server %remoteIP %clientHost %user %requestURL " /> + * </layout> + * </appender> + * + * <appender-ref ref="STDOUT" /> + * </configuration> * </pre> * * A special, module-specific implementation of PatternLayout was implemented to @@ -73,27 +68,30 @@ * it's javadoc. * * - * - * MBean registration parts of this class come from tomcat's ValveBase - * implementation. - * - * * @author Ceki Gülcü * @author Sébastien Pennec */ -public class LogbackValve extends ContextBase implements Valve, Contained, - AppenderAttachable, MBeanRegistration { +public class LogbackValve extends ValveBase implements Context, + AppenderAttachable { public final static String DEFAULT_CONFIG_FILE = "conf" + File.separatorChar + "logback.xml"; + // Attributes from ContextBase: + private String name; + StatusManager sm = new BasicStatusManager(); + // TODO propertyMap should be observable so that we can be notified + // when it changes so that a new instance of propertyMap can be + // serialized. For the time being, we ignore this shortcoming. + Map<String, String> propertyMap = new HashMap<String, String>(); + Map<String, Object> objectMap = new HashMap<String, Object>(); + Map<String, String> converterMap = new HashMap<String, String>(); + private FilterAttachableImpl fai = new FilterAttachableImpl(); + AppenderAttachableImpl aai = new AppenderAttachableImpl(); String filename; boolean started; - Container container; - Valve nextValve; - public LogbackValve() { // System.out.println("LogbackValve constructor called"); start(); @@ -125,7 +123,7 @@ public void invoke(Request request, Response response) throws IOException, ServletException { - nextValve.invoke(request, response); + getNext().invoke(request, response); // System.out.println("**** LogbackValve invoke called"); TomcatServerAdapter adapter = new TomcatServerAdapter(request, response); @@ -167,155 +165,64 @@ return aai.detachAppender(name); } - public void backgroundProcess() { - } - public String getInfo() { - return "logback's valve"; + return "Logback's implementation of ValveBase"; } - public Valve getNext() { - return nextValve; + // Methods from ContextBase: + public StatusManager getStatusManager() { + return sm; } - public void setNext(Valve next) { - this.nextValve = next; + public Map<String, String> getPropertyMap() { + return propertyMap; } - public void setFileName(String fileName) { - this.filename = fileName; + public void setProperty(String key, String val) { + this.propertyMap.put(key, val); } - public Container getContainer() { - return container; + public String getProperty(String key) { + return (String) this.propertyMap.get(key); } - public void setContainer(Container container) { - this.container = container; + public Object getObject(String key) { + return objectMap.get(key); } - // -------------------- JMX and Registration -------------------- - // MBean descriptions for custom components needed - // in order to avoid a "ManagedBean is not found" exception. - - protected String domain; - protected ObjectName oname; - protected MBeanServer mserver; - protected ObjectName controller; - - public ObjectName getObjectName() { - return oname; + public void putObject(String key, Object value) { + objectMap.put(key, value); } - public void setObjectName(ObjectName oname) { - this.oname = oname; + public Map<String, String> getConverterMap() { + return converterMap; } - public String getDomain() { - return domain; + public void addFilter(Filter newFilter) { + fai.addFilter(newFilter); } - public ObjectName preRegister(MBeanServer server, ObjectName name) - throws Exception { - oname = name; - mserver = server; - domain = name.getDomain(); - - return name; + public Filter getFirstFilter() { + return fai.getFirstFilter(); } - public void postRegister(Boolean registrationDone) { + public void clearAllFilters() { + fai.clearAllFilters(); } - public void preDeregister() throws Exception { + public int getFilterChainDecision(Object event) { + return fai.getFilterChainDecision(event); } - public void postDeregister() { + public String getName() { + return name; } - public ObjectName getController() { - return controller; - } - - public void setController(ObjectName controller) { - this.controller = controller; - } - - /** - * From the name, extract the parent object name - * - * @param valveName - * The valve name - * @return ObjectName The parent name - */ - public ObjectName getParentName(ObjectName valveName) { - - return null; - } - - public ObjectName createObjectName(String domain, ObjectName parent) - throws MalformedObjectNameException { - Container container = this.getContainer(); - if (container == null || !(container instanceof ContainerBase)) - return null; - ContainerBase containerBase = (ContainerBase) container; - Pipeline pipe = containerBase.getPipeline(); - Valve valves[] = pipe.getValves(); - - /* Compute the "parent name" part */ - String parentName = ""; - if (container instanceof Engine) { - } else if (container instanceof Host) { - parentName = ",host=" + container.getName(); - } else if (container instanceof Context) { - String path = ((Context) container).getPath(); - if (path.length() < 1) { - path = "/"; - } - Host host = (Host) container.getParent(); - parentName = ",path=" + path + ",host=" + host.getName(); - } else if (container instanceof Wrapper) { - Context ctx = (Context) container.getParent(); - String path = ctx.getPath(); - if (path.length() < 1) { - path = "/"; - } - Host host = (Host) ctx.getParent(); - parentName = ",servlet=" + container.getName() + ",path=" + path - + ",host=" + host.getName(); - } - - String className = this.getClass().getName(); - int period = className.lastIndexOf('.'); - if (period >= 0) - className = className.substring(period + 1); - - int seq = 0; - for (int i = 0; i < valves.length; i++) { - // Find other valves with the same name - if (valves[i] == this) { - break; - } - if (valves[i] != null && valves[i].getClass() == this.getClass()) { - - seq++; - } + public void setName(String name) { + if (this.name != null) { + throw new IllegalStateException( + "LogbackValve has been already given a name"); } - String ext = ""; - if (seq > 0) { - ext = ",seq=" + seq; - } - - ObjectName objectName = new ObjectName(domain + ":type=Valve,name=" - + className + ext + parentName); - return objectName; - } - - // -------------------- JMX data -------------------- - - public ObjectName getContainerName() { - if (container == null) - return null; - return ((ContainerBase) container).getJmxName(); + this.name = name; } }

1 0

svn commit: r615 - logback/trunk/logback-access/src/main/java/ch/qos/logback/access/tomcat
by noreply.seb＠qos.ch 03 Oct '06

03 Oct '06

Author: seb Date: Tue Oct 3 10:53:47 2006 New Revision: 615 Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java Log: - added registration and jmx. Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java Tue Oct 3 10:53:47 2006 @@ -4,13 +4,23 @@ import java.io.IOException; import java.util.Iterator; +import javax.management.MBeanRegistration; +import javax.management.MBeanServer; +import javax.management.MalformedObjectNameException; +import javax.management.ObjectName; import javax.servlet.ServletException; import org.apache.catalina.Contained; import org.apache.catalina.Container; +import org.apache.catalina.Context; +import org.apache.catalina.Engine; +import org.apache.catalina.Host; +import org.apache.catalina.Pipeline; import org.apache.catalina.Valve; +import org.apache.catalina.Wrapper; import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; +import org.apache.catalina.core.ContainerBase; import ch.qos.logback.access.joran.JoranConfigurator; import ch.qos.logback.access.spi.AccessEvent; @@ -28,10 +38,10 @@ * LoggerContext does. It also provides containers for properties. * * To configure tomcat in order to use LogbackValve, the following lines must be - * added to the tomcat's server.xml: - * + * added to the tomcat's server.xml, nested in an <code>Engine</code> element: + * * <Valve className="ch.qos.logback.access.tomcat.LogbackValve"/> - * + * * By default, LogbackValve looks for a logback configuration file called * logback.xml, in the same folder where the tomcat configuration is located, * that is /conf/logback.xml. The logback.xml file is slightly different than @@ -42,15 +52,15 @@ * Here is a sample logback.xml file that can be used right away: * * <pre> - * <configuration> - * <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> - * <layout class="ch.qos.logback.access.PatternLayout"> - * <param name="Pattern" value="%date %server %remoteIP %clientHost %user %requestURL " /> - * </layout> - * </appender> - * - * <appender-ref ref="STDOUT" /> - * </configuration> + * <configuration> + * <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> + * <layout class="ch.qos.logback.access.PatternLayout"> + * <param name="Pattern" value="%date %server %remoteIP %clientHost %user %requestURL " /> + * </layout> + * </appender> + * + * <appender-ref ref="STDOUT" /> + * </configuration> * </pre> * * A special, module-specific implementation of PatternLayout was implemented to @@ -63,11 +73,16 @@ * it's javadoc. * * + * + * MBean registration parts of this class come from tomcat's ValveBase + * implementation. + * + * * @author Ceki Gülcü * @author Sébastien Pennec */ public class LogbackValve extends ContextBase implements Valve, Contained, - AppenderAttachable { + AppenderAttachable, MBeanRegistration { public final static String DEFAULT_CONFIG_FILE = "conf" + File.separatorChar + "logback.xml"; @@ -178,4 +193,129 @@ public void setContainer(Container container) { this.container = container; } + + // -------------------- JMX and Registration -------------------- + // MBean descriptions for custom components needed + // in order to avoid a "ManagedBean is not found" exception. + + protected String domain; + protected ObjectName oname; + protected MBeanServer mserver; + protected ObjectName controller; + + public ObjectName getObjectName() { + return oname; + } + + public void setObjectName(ObjectName oname) { + this.oname = oname; + } + + public String getDomain() { + return domain; + } + + public ObjectName preRegister(MBeanServer server, ObjectName name) + throws Exception { + oname = name; + mserver = server; + domain = name.getDomain(); + + return name; + } + + public void postRegister(Boolean registrationDone) { + } + + public void preDeregister() throws Exception { + } + + public void postDeregister() { + } + + public ObjectName getController() { + return controller; + } + + public void setController(ObjectName controller) { + this.controller = controller; + } + + /** + * From the name, extract the parent object name + * + * @param valveName + * The valve name + * @return ObjectName The parent name + */ + public ObjectName getParentName(ObjectName valveName) { + + return null; + } + + public ObjectName createObjectName(String domain, ObjectName parent) + throws MalformedObjectNameException { + Container container = this.getContainer(); + if (container == null || !(container instanceof ContainerBase)) + return null; + ContainerBase containerBase = (ContainerBase) container; + Pipeline pipe = containerBase.getPipeline(); + Valve valves[] = pipe.getValves(); + + /* Compute the "parent name" part */ + String parentName = ""; + if (container instanceof Engine) { + } else if (container instanceof Host) { + parentName = ",host=" + container.getName(); + } else if (container instanceof Context) { + String path = ((Context) container).getPath(); + if (path.length() < 1) { + path = "/"; + } + Host host = (Host) container.getParent(); + parentName = ",path=" + path + ",host=" + host.getName(); + } else if (container instanceof Wrapper) { + Context ctx = (Context) container.getParent(); + String path = ctx.getPath(); + if (path.length() < 1) { + path = "/"; + } + Host host = (Host) ctx.getParent(); + parentName = ",servlet=" + container.getName() + ",path=" + path + + ",host=" + host.getName(); + } + + String className = this.getClass().getName(); + int period = className.lastIndexOf('.'); + if (period >= 0) + className = className.substring(period + 1); + + int seq = 0; + for (int i = 0; i < valves.length; i++) { + // Find other valves with the same name + if (valves[i] == this) { + break; + } + if (valves[i] != null && valves[i].getClass() == this.getClass()) { + + seq++; + } + } + String ext = ""; + if (seq > 0) { + ext = ",seq=" + seq; + } + + ObjectName objectName = new ObjectName(domain + ":type=Valve,name=" + + className + ext + parentName); + return objectName; + } + + // -------------------- JMX data -------------------- + + public ObjectName getContainerName() { + if (container == null) + return null; + return ((ContainerBase) container).getJmxName(); + } }

1 0

svn commit: r614 - in logback/trunk: logback-access/src/main/java/ch/qos/logback/access logback-access/src/main/java/ch/qos/logback/access/spi logback-core/src/main/java/ch/qos/logback/core/db
by noreply.seb＠qos.ch 02 Oct '06

02 Oct '06

Author: seb Date: Mon Oct 2 17:19:24 2006 New Revision: 614 Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/PatternLayout.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/AccessEvent.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/DBAppenderBase.java Log: - minor fixes Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/PatternLayout.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/PatternLayout.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/PatternLayout.java Mon Oct 2 17:19:24 2006 @@ -89,7 +89,7 @@ defaultConverterMap.put("server", ServerNameConverter.class.getName()); defaultConverterMap.put("p", PostContentConverter.class.getName()); - defaultConverterMap.put("post", PostContentConverter.class.getName()); + defaultConverterMap.put("postContent", PostContentConverter.class.getName()); defaultConverterMap.put("localPort", LocalPortConverter.class.getName()); defaultConverterMap.put("reqAttribute", RequestAttributeConverter.class.getName()); Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/AccessEvent.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/AccessEvent.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/AccessEvent.java Mon Oct 2 17:19:24 2006 @@ -311,7 +311,6 @@ try { InputStream in = httpRequest.getInputStream(); - System.out.println("********InputStream: " + in.toString()); postContent = Util.readToString(in); } catch (Exception ex) { // do nothing Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/DBAppenderBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/DBAppenderBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/DBAppenderBase.java Mon Oct 2 17:19:24 2006 @@ -70,9 +70,6 @@ protected boolean cnxSupportsBatchUpdates = false; protected SQLDialect sqlDialect; - public DBAppenderBase() { - } - @Override public void start() {

1 0