- logback-dev - mailman3.qos.ch

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

10 Oct '06

Author: seb Date: Tue Oct 10 21:33:53 2006 New Revision: 659 Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/PatternLayout.java Log: added clf/common/combined keywords 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 Tue Oct 10 21:33:53 2006 @@ -215,6 +215,10 @@ public static final Map<String, String> defaultConverterMap = new HashMap<String, String>(); public static String CLF_PATTERN = "%h %l %u %t \"%r\" %s %b"; + public static String CLF_PATTERN_NAME = "common"; + public static String CLF_PATTERN_NAME_2 = "clf"; + public static String COMBINED_PATTERN = "%h %l %u %t \"%r\" %>s %b \"%i{Referer}\" \"%i{User-Agent}"; + public static String COMBINED_PATTERN_NAME = "combined"; static { @@ -316,4 +320,15 @@ return doLayout((AccessEvent) o); } + @Override + public void start() { + if (getPattern().equalsIgnoreCase(CLF_PATTERN_NAME) + || getPattern().equalsIgnoreCase(CLF_PATTERN_NAME_2)) { + setPattern(CLF_PATTERN); + } else if (getPattern().equalsIgnoreCase(COMBINED_PATTERN_NAME)) { + setPattern(COMBINED_PATTERN); + } + super.start(); + } + }

1 0

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

10 Oct '06

Author: seb Date: Tue Oct 10 20:26:28 2006 New Revision: 658 Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java Log: modified config file name Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java Tue Oct 10 20:26:28 2006 @@ -35,15 +35,15 @@ * </pre> * * By default, RequestLogImpl looks for a logback configuration file called - * logback.xml, in the same folder where jetty.xml is located, that is - * etc/logback.xml. The logback.xml file is slightly different than the usual + * logback-access.xml, in the same folder where jetty.xml is located, that is + * etc/logback-access.xml. The logback-access.xml file is slightly different than the usual * logback classic configuration file. Most of it is the same: Appenders and * Layouts are declared the exact same way. However, loggers elements are not * allowed. * * It is possible to put the logback configuration file anywhere, as long as * it's path is specified. Here is another example, with a path to the - * logback.xml file. + * logback-access.xml file. * * <pre> * <Ref id="requestLog"> @@ -55,7 +55,7 @@ * </pre> * * - * Here is a sample logback.xml file that can be used right away: + * Here is a sample logback-access.xml file that can be used right away: * * <pre> * <configuration> @@ -103,7 +103,7 @@ AppenderAttachable { public final static String DEFAULT_CONFIG_FILE = "etc" + File.separatorChar - + "logback.xml"; + + "logback-access.xml"; AppenderAttachableImpl aai = new AppenderAttachableImpl(); String filename;

1 0

svn commit: r657 - logback/trunk/logback-site/src/site/xdocTemplates
by noreply.seb＠qos.ch 10 Oct '06

10 Oct '06

Author: seb Date: Tue Oct 10 19:32:04 2006 New Revision: 657 Modified: logback/trunk/logback-site/src/site/xdocTemplates/accessLogJetty.xml Log: updates Modified: logback/trunk/logback-site/src/site/xdocTemplates/accessLogJetty.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/accessLogJetty.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/accessLogJetty.xml Tue Oct 10 19:32:04 2006 @@ -54,18 +54,28 @@ HTTP-access log functionality. - Integrating logback into Jetty is very simple. Once done, one can benefit of many of - logback's flexibility and reliability. + Integrating logback into Jetty is very simple. Once done, one can benefit from the power + and flexibility found only in fully-fledged logging systems. + + + + To use logback access with Jetty, first download the files, then place the + logback-core-VERSION.jar and logback-access-VERSION.jar files + in the Jetty classpath. <h2>Logback's RequestLog implementation</h2> Logback's <code>ch.qos.logback.access.jetty.RequestLogImpl</code> is an - implementation of jetty's <code>RequestLog</code> interface. + implementation of jetty's <code>RequestLog</code> interface. This interface + is used by Jetty to allow external components to manage request logging. - It can be seen as logback classic's <code>LoggerContext</code>. + <code>RequestLogImpl</code> can be seen as logback classic's + <a href="http://logback.qos.ch/apidocs/ch/qos/logback/classic/LoggerContext.html"> + <code>LoggerContext</code></a>. It is the central component of the logging + environnement. In logback, logging destinations are called Appenders. These classes @@ -73,7 +83,7 @@ Logback's internal error reporting system is based on Status objects. <code>RequestLogImpl</code> uses the same <code>StatusManager</code> - as <code>LoggerContext</code> does. It also provides containers for properties. + as <code>LoggerContext</code> does. To configure jetty in order to use <code>RequestLogImpl</code>, the @@ -90,17 +100,28 @@ </Ref> </pre> + These lines reference the requestLog functionnality of Jetty, setting + the actual class that will be called at each logging request. + + By default, <code>RequestLogImpl</code> looks for a logback configuration - file called logback.xml, in the same folder where jetty.xml - is located, that is etc/logback.xml. The logback.xml file + file called logback.xml, in the same folder where jetty.xml + is located, that is etc/logback.xml. This configuration file + contains declarations of logback components. There, one can specify, + at runtime, the destinations where the logging requests will be sent, + and the format that logback will use to display the logging events. + + The logback.xml file is slightly different than the usual logback classic configuration file. Most of it is the same: Appenders and Layouts (which are logback components to format logging output) are declared the exact same way. However, loggers - elements are not allowed. It is possible to put the logback + elements are not allowed. + + It is possible to put the logback configuration file anywhere, as long as it's path is - specified. Here is another example, with a path to the - logback.xml file. + specified. Here is another example of declaration of the logback + component in the jetty configuration file, with a path to the logback.xml file. <pre> <Ref id="requestLog"> @@ -130,6 +151,12 @@ <appender-ref ref="STDOUT" /> </configuration> </pre> + + This file declares a logging destination (in the appender element). The + appender used is the ConsoleAppender which obviously logs events to the console. + A PatternLayout is also declared, to format the output. More informations about this + layout later on in this document. + Another configuration file, using logback access <code>SMTPAppender</code>, could be: <pre> <configuration> @@ -150,16 +177,31 @@ </configuration> </pre> + Here, there is no output to the console. Instead, logback access builds a buffer with + the logging events, and in case of an events that meets a certain condition, + an email is sent to the specified address, using the declared informations. + By default, an event that would cause an email to be sent is when a status + code of 500 or more occurs, which means that an error occured on the server. + + + These two configuration example should give you an idea of the + existing possibilities when having at hand the flexibility of a logging framework + like logback. Most of the things that you can do with the classic module of logback is + available for access logging. + + A special, module-specific implementation of <code>PatternLayout</code> was implemented to allow http-specific patterns to be used. - The <code>ch.qos.logback.access.PatternLayout</code> provides a way to + The <a href="http://logback.qos.ch/apidocs/ch/qos/logback/access/PatternLayout.html"> + <code>ch.qos.logback.access.PatternLayout</code></a> provides a way to format the logging output that is just as easy and flexible as the usual <code>PatternLayout</code>. For more information about the general use of a <code>PatternLayout</code>, please refer to logback - classic's <code>ch.qos.logback.classic.PatternLayout</code>. + classic's <a href="http://logback.qos.ch/apidocs/ch/qos/logback/classic/PatternLayout.html"> + <code>ch.qos.logback.classic.PatternLayout</code></a>. Logback access <code>PatternLayout</code> offers the following possibilities: @@ -207,13 +249,23 @@ Request protocol. </td> + </tr> + <tr> + <td align="center">reqParameter</td> + <td> + + Parameter of the response. This conversion word can be followed by a key + whose corresponding data will be extracted from the header information. + + Example: %reqParameter{userName} + </td> </tr> <tr> <td align="center">i / header</td> <td> - Request header. This conversion word can be followed by a key - whose corresponding data will be extracted from the header information. + Request header. Just like the reqParameter + conversion word, reqParameter can be followed by a key. </td> </tr> @@ -285,7 +337,7 @@ <td align="center">reqAttribute</td> <td> - Attribute of the request. Just like the request header + Attribute of the request. Just like the reqParameter conversion word, reqAttribute can be followed by a key. </td> @@ -294,7 +346,7 @@ <td align="center">reqCookie</td> <td> - Request cookie. Just like the request header + Request cookie. Just like the reqParameter conversion word, reqCookie can be followed by a key. </td> @@ -303,20 +355,11 @@ <td align="center">responseHeader</td> <td> - Header of the response. Just like the request header + Header of the response. Just like the reqParameter conversion word, responseHeader can be followed by a key. </td> </tr> - <tr> - <td align="center">reqParameter</td> - <td> - - Parameter of the response. Just like the request header - conversion word, reqParameter can be followed by a key. - - </td> - </tr> </table> </body> </document>

1 0

svn commit: r656 - in logback/trunk/logback-classic/src/main/java: ch/qos/logback/classic org/slf4j
by noreply.seb＠qos.ch 10 Oct '06

10 Oct '06

Author: seb Date: Tue Oct 10 16:17:05 2006 New Revision: 656 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java logback/trunk/logback-classic/src/main/java/org/slf4j/LoggerFactory.java Log: Added a default initialization procedure to the LoggerFactory. Reformatted LoggerContext code. Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java Tue Oct 10 16:17:05 2006 @@ -10,35 +10,40 @@ package ch.qos.logback.classic; +import java.net.URL; import java.util.HashMap; import java.util.Hashtable; import org.slf4j.ILoggerFactory; +import ch.qos.logback.classic.joran.JoranConfigurator; import ch.qos.logback.classic.spi.LoggerContextRemoteView; import ch.qos.logback.core.ContextBase; import ch.qos.logback.core.CoreGlobal; import ch.qos.logback.core.status.ErrorStatus; - +import ch.qos.logback.core.util.Loader; +import ch.qos.logback.core.util.StatusPrinter; /** * @author ceki */ public class LoggerContext extends ContextBase implements ILoggerFactory { - public static final String ROOT_NAME = "root"; - + public static final String ROOT_NAME = "root"; + final Logger root; private int size; private int noAppenderWarning = 0; - - // We want loggerCache to be synchronized so Hashtable is a good choice. In practice, it - // performs a little faster than the map returned by Collections.synchronizedMap at the + + // We want loggerCache to be synchronized so Hashtable is a good choice. In + // practice, it + // performs a little faster than the map returned by + // Collections.synchronizedMap at the // cost of a very slightly higher memory footprint. private Hashtable<String, Logger> loggerCache; - LoggerContextRemoteView loggerContextRemoteView; - + LoggerContextRemoteView loggerContextRemoteView; + public LoggerContext() { super(); this.loggerCache = new Hashtable<String, Logger>(); @@ -49,38 +54,39 @@ putObject(CoreGlobal.EVALUATOR_MAP, new HashMap()); size = 1; } - + /** - * A new instance of LoggerContextRemoteView needs to be created each time - * the name or propertyMap (including keys or values) changes. + * A new instance of LoggerContextRemoteView needs to be created each time the + * name or propertyMap (including keys or values) changes. */ private void syncRemoteView() { - loggerContextRemoteView = new LoggerContextRemoteView(this); - for(Logger logger : loggerCache.values()) { - logger.buildRemoteView(); - } + loggerContextRemoteView = new LoggerContextRemoteView(this); + for (Logger logger : loggerCache.values()) { + logger.buildRemoteView(); + } } - + @Override public void setName(String name) { - super.setName(name); - syncRemoteView(); + super.setName(name); + syncRemoteView(); } public final Logger getLogger(final Class clazz) { return getLogger(clazz.getName()); } - + public final Logger getLogger(final String name) { - //if we are asking for the root logger, then let us return it without wasting time + // if we are asking for the root logger, then let us return it without + // wasting time if (ROOT_NAME.equalsIgnoreCase(name)) { - return root; + return root; } - + int i = 0; Logger logger = root; - + // check if the desired logger exists, if it does, return it // without further ado. Logger childLogger = (Logger) loggerCache.get(name); @@ -125,23 +131,25 @@ } /** - * Check if the named logger exists in the hierarchy. If so return - * its reference, otherwise returns <code>null</code>. - * - * @param name the name of the logger to search for. + * Check if the named logger exists in the hierarchy. If so return its + * reference, otherwise returns <code>null</code>. + * + * @param name + * the name of the logger to search for. */ Logger exists(String name) { return (Logger) loggerCache.get(name); } - + final void noAppenderDefinedWarning(final Logger logger) { - if (noAppenderWarning++ == 0) { - getStatusManager().add(new ErrorStatus( - "No appenders present in context ["+ getName() +"] for logger [" + logger.getName() + "].", logger)); - } + if (noAppenderWarning++ == 0) { + getStatusManager().add( + new ErrorStatus("No appenders present in context [" + getName() + + "] for logger [" + logger.getName() + "].", logger)); + } } - + public LoggerContextRemoteView getLoggerContextRemoteView() { - return loggerContextRemoteView; + return loggerContextRemoteView; } } Modified: logback/trunk/logback-classic/src/main/java/org/slf4j/LoggerFactory.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/org/slf4j/LoggerFactory.java (original) +++ logback/trunk/logback-classic/src/main/java/org/slf4j/LoggerFactory.java Tue Oct 10 16:17:05 2006 @@ -32,9 +32,16 @@ */ package org.slf4j; +import java.net.URL; + import org.slf4j.impl.StaticLoggerBinder; import org.slf4j.impl.Util; +import ch.qos.logback.classic.joran.JoranConfigurator; +import ch.qos.logback.core.Context; +import ch.qos.logback.core.util.Loader; +import ch.qos.logback.core.util.StatusPrinter; + /** * The <code>LoggerFactory</code> is a utility class producing Loggers for * various logging APIs, most notably for NLOG4J and JDK 1.4 logging. Other @@ -63,6 +70,16 @@ static { try { loggerFactory = StaticLoggerBinder.SINGLETON.getLoggerFactory(); + URL url = Loader.getResource("logback-classic.xml"); + System.out.println("URL = " + url); + if (url != null) { + JoranConfigurator configurator = new JoranConfigurator(); + configurator.setContext((Context)loggerFactory); + configurator.doConfigure(url); + StatusPrinter.print((Context)loggerFactory); + } else { + //TODO basic configuration?? + } } catch (Exception e) { // we should never get here Util.reportFailure("Failed to instantiate logger ["

1 0

svn commit: r655 - in logback/trunk: logback-access logback-classic logback-core logback-site logback-skin
by noreply.seb＠qos.ch 09 Oct '06

09 Oct '06

Author: seb Date: Mon Oct 9 20:46:42 2006 New Revision: 655 Modified: logback/trunk/logback-access/pom.xml logback/trunk/logback-classic/pom.xml logback/trunk/logback-core/pom.xml logback/trunk/logback-site/pom.xml logback/trunk/logback-skin/pom.xml Log: wrong variable name Modified: logback/trunk/logback-access/pom.xml ============================================================================== --- logback/trunk/logback-access/pom.xml (original) +++ logback/trunk/logback-access/pom.xml Mon Oct 9 20:46:42 2006 @@ -10,7 +10,7 @@ <groupId>ch.qos.logback</groupId> <artifactId>logback-access</artifactId> - <version>${project.version}</version> + <version>${parent.version}</version> <packaging>jar</packaging> <name>Logback Access Module</name> Modified: logback/trunk/logback-classic/pom.xml ============================================================================== --- logback/trunk/logback-classic/pom.xml (original) +++ logback/trunk/logback-classic/pom.xml Mon Oct 9 20:46:42 2006 @@ -10,7 +10,7 @@ <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> - <version>${project.version}</version> + <version>${parent.version}</version> <packaging>jar</packaging> <name>Logback Classic Module</name> Modified: logback/trunk/logback-core/pom.xml ============================================================================== --- logback/trunk/logback-core/pom.xml (original) +++ logback/trunk/logback-core/pom.xml Mon Oct 9 20:46:42 2006 @@ -10,7 +10,7 @@ <groupId>ch.qos.logback</groupId> <artifactId>logback-core</artifactId> - <version>${project.version}</version> + <version>${parent.version}</version> <packaging>jar</packaging> <name>Logback Core Module</name> Modified: logback/trunk/logback-site/pom.xml ============================================================================== --- logback/trunk/logback-site/pom.xml (original) +++ logback/trunk/logback-site/pom.xml Mon Oct 9 20:46:42 2006 @@ -11,7 +11,7 @@ <groupId>ch.qos.logback</groupId> <artifactId>logback-site</artifactId> <packaging>jar</packaging> - <version>${project.version}</version> + <version>${parent.version}</version> <name>Logback Site</name> <url>http://logback.qos.ch</url> Modified: logback/trunk/logback-skin/pom.xml ============================================================================== --- logback/trunk/logback-skin/pom.xml (original) +++ logback/trunk/logback-skin/pom.xml Mon Oct 9 20:46:42 2006 @@ -12,7 +12,7 @@ <groupId>ch.qos.logback</groupId> <artifactId>logback-skin</artifactId> <packaging>jar</packaging> - <version>${project.version}</version> + <version>${parent.version}</version> <name>Logback Skin</name> <url>http://logback.qos.ch</url>

1 0

svn commit: r654 - logback/tags/release-test
by noreply.seb＠qos.ch 09 Oct '06

09 Oct '06

Author: seb Date: Mon Oct 9 20:42:43 2006 New Revision: 654 Removed: logback/tags/release-test/ Log: deleting test tag

1 0

svn commit: r653 - in logback/trunk: . logback-access logback-classic logback-core logback-site logback-skin
by noreply.seb＠qos.ch 09 Oct '06

09 Oct '06

Author: seb Date: Mon Oct 9 20:42:30 2006 New Revision: 653 Modified: logback/trunk/logback-access/pom.xml logback/trunk/logback-classic/pom.xml logback/trunk/logback-core/pom.xml logback/trunk/logback-site/pom.xml logback/trunk/logback-skin/pom.xml logback/trunk/pom.xml Log: end of maven play, back to 0.5-snapshop version Modified: logback/trunk/logback-access/pom.xml ============================================================================== --- logback/trunk/logback-access/pom.xml (original) +++ logback/trunk/logback-access/pom.xml Mon Oct 9 20:42:30 2006 @@ -3,14 +3,14 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>ch.qos.logback</groupId> <artifactId>logback-access</artifactId> - <version>0.6-SNAPSHOT</version> + <version>${project.version}</version> <packaging>jar</packaging> <name>Logback Access Module</name> @@ -81,110 +81,8 @@ </configuration> </plugin> -  </plugins> -  - </build> - -  - -  - - <scm> - <connection>http://svn.qos.ch/repos/logback/access/trunk/</connection> - <developerConnection>https://svn.qos.ch/repos/logback/access/trunk/</developerConnection> - <url>http://svn.qos.ch/viewcvs/logback/access/trunk/</url> - </scm> - -  </project> \ No newline at end of file Modified: logback/trunk/logback-classic/pom.xml ============================================================================== --- logback/trunk/logback-classic/pom.xml (original) +++ logback/trunk/logback-classic/pom.xml Mon Oct 9 20:42:30 2006 @@ -3,14 +3,14 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> - <version>0.6-SNAPSHOT</version> + <version>${project.version}</version> <packaging>jar</packaging> <name>Logback Classic Module</name> @@ -107,25 +107,7 @@ </excludes> </configuration> </plugin> - -  + <plugin> <artifactId>maven-release-plugin</artifactId> <configuration> @@ -142,18 +124,6 @@ </plugin> </plugins> -  <testResources> <testResource> @@ -162,60 +132,5 @@ </testResource> </testResources> </build> -  - -  - <scm> - <connection>http://svn.qos.ch/repos/logback/classic/trunk/</connection> - <developerConnection>scm:svn:https://svn.qos.ch/repos/logback/classic/trunk/</developerConnection> - <url>http://svn.qos.ch/viewcvs/logback/classic/trunk/</url> - </scm> - -  </project> \ No newline at end of file Modified: logback/trunk/logback-core/pom.xml ============================================================================== --- logback/trunk/logback-core/pom.xml (original) +++ logback/trunk/logback-core/pom.xml Mon Oct 9 20:42:30 2006 @@ -3,14 +3,14 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>ch.qos.logback</groupId> <artifactId>logback-core</artifactId> - <version>0.6-SNAPSHOT</version> + <version>${project.version}</version> <packaging>jar</packaging> <name>Logback Core Module</name> Modified: logback/trunk/logback-site/pom.xml ============================================================================== --- logback/trunk/logback-site/pom.xml (original) +++ logback/trunk/logback-site/pom.xml Mon Oct 9 20:42:30 2006 @@ -3,7 +3,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -11,7 +11,7 @@ <groupId>ch.qos.logback</groupId> <artifactId>logback-site</artifactId> <packaging>jar</packaging> - <version>0.6-SNAPSHOT</version> + <version>${project.version}</version> <name>Logback Site</name> <url>http://logback.qos.ch</url> Modified: logback/trunk/logback-skin/pom.xml ============================================================================== --- logback/trunk/logback-skin/pom.xml (original) +++ logback/trunk/logback-skin/pom.xml Mon Oct 9 20:42:30 2006 @@ -3,7 +3,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.5-SNAPSHOT</version> </parent> @@ -12,7 +12,7 @@ <groupId>ch.qos.logback</groupId> <artifactId>logback-skin</artifactId> <packaging>jar</packaging> - <version>0.6-SNAPSHOT</version> + <version>${project.version}</version> <name>Logback Skin</name> <url>http://logback.qos.ch</url> Modified: logback/trunk/pom.xml ============================================================================== --- logback/trunk/pom.xml (original) +++ logback/trunk/pom.xml Mon Oct 9 20:42:30 2006 @@ -4,7 +4,7 @@ <groupId>ch.qos.logback</groupId> <artifactId>logback</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.5-SNAPSHOT</version> <packaging>pom</packaging> <name>Logback</name> @@ -193,12 +193,23 @@ <developerConnection>scm:svn:https://svn.qos.ch/repos/logback/</developerConnection> <url>http://svn.qos.ch/viewvc/logback/</url> </scm> - - <distributionManagement> - <site> - <id>pixie</id> - <url>scp://pixie/var/www/logback.qos.ch/htdocs/kidding/</url> - </site> - </distributionManagement> + <distributionManagement> + <site> + <id>pixie</id> + <url>scp://pixie/var/www/logback.qos.ch/htdocs/kidding/</url> + </site> + + </distributionManagement> </project> \ No newline at end of file

1 0

svn commit: r652 - in logback/trunk: . logback-access logback-classic logback-core logback-site logback-skin
by noreply.seb＠qos.ch 09 Oct '06

09 Oct '06

Author: seb Date: Mon Oct 9 20:17:25 2006 New Revision: 652 Modified: logback/trunk/logback-access/pom.xml logback/trunk/logback-classic/pom.xml logback/trunk/logback-core/pom.xml logback/trunk/logback-site/pom.xml logback/trunk/logback-skin/pom.xml logback/trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: logback/trunk/logback-access/pom.xml ============================================================================== --- logback/trunk/logback-access/pom.xml (original) +++ logback/trunk/logback-access/pom.xml Mon Oct 9 20:17:25 2006 @@ -3,14 +3,14 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback</artifactId> - <version>0.5</version> + <version>0.6-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>ch.qos.logback</groupId> <artifactId>logback-access</artifactId> - <version>0.5</version> + <version>0.6-SNAPSHOT</version> <packaging>jar</packaging> <name>Logback Access Module</name> @@ -174,9 +174,9 @@  <scm> - <connection>http://svn.qos.ch/repos/logback/access/tags/release-test</connection> - <developerConnection>https://svn.qos.ch/repos/logback/access/tags/release-test</developerConnection> - <url>http://svn.qos.ch/viewcvs/logback/access/tags/release-test</url> + <connection>http://svn.qos.ch/repos/logback/access/trunk/</connection> + <developerConnection>https://svn.qos.ch/repos/logback/access/trunk/</developerConnection> + <url>http://svn.qos.ch/viewcvs/logback/access/trunk/</url> </scm>  <scm> - <connection>http://svn.qos.ch/repos/logback/classic/tags/release-test</connection> - <developerConnection>scm:svn:https://svn.qos.ch/repos/logback/classic/tags/release-test</developerConnection> - <url>http://svn.qos.ch/viewcvs/logback/classic/tags/release-test</url> + <connection>http://svn.qos.ch/repos/logback/classic/trunk/</connection> + <developerConnection>scm:svn:https://svn.qos.ch/repos/logback/classic/trunk/</developerConnection> + <url>http://svn.qos.ch/viewcvs/logback/classic/trunk/</url> </scm> <!-- Modified: logback/trunk/logback-core/pom.xml ============================================================================== --- logback/trunk/logback-core/pom.xml (original) +++ logback/trunk/logback-core/pom.xml Mon Oct 9 20:17:25 2006 @@ -3,14 +3,14 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback</artifactId> - <version>0.5</version> + <version>0.6-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>ch.qos.logback</groupId> <artifactId>logback-core</artifactId> - <version>0.5</version> + <version>0.6-SNAPSHOT</version> <packaging>jar</packaging> <name>Logback Core Module</name> Modified: logback/trunk/logback-site/pom.xml ============================================================================== --- logback/trunk/logback-site/pom.xml (original) +++ logback/trunk/logback-site/pom.xml Mon Oct 9 20:17:25 2006 @@ -3,7 +3,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback</artifactId> - <version>0.5</version> + <version>0.6-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -11,7 +11,7 @@ <groupId>ch.qos.logback</groupId> <artifactId>logback-site</artifactId> <packaging>jar</packaging> - <version>0.5</version> + <version>0.6-SNAPSHOT</version> <name>Logback Site</name> <url>http://logback.qos.ch</url> Modified: logback/trunk/logback-skin/pom.xml ============================================================================== --- logback/trunk/logback-skin/pom.xml (original) +++ logback/trunk/logback-skin/pom.xml Mon Oct 9 20:17:25 2006 @@ -3,7 +3,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback</artifactId> - <version>0.5</version> + <version>0.6-SNAPSHOT</version> </parent> @@ -12,7 +12,7 @@ <groupId>ch.qos.logback</groupId> <artifactId>logback-skin</artifactId> <packaging>jar</packaging> - <version>0.5</version> + <version>0.6-SNAPSHOT</version> <name>Logback Skin</name> <url>http://logback.qos.ch</url> Modified: logback/trunk/pom.xml ============================================================================== --- logback/trunk/pom.xml (original) +++ logback/trunk/pom.xml Mon Oct 9 20:17:25 2006 @@ -4,7 +4,7 @@ <groupId>ch.qos.logback</groupId> <artifactId>logback</artifactId> - <version>0.5</version> + <version>0.6-SNAPSHOT</version> <packaging>pom</packaging> <name>Logback</name> @@ -189,9 +189,9 @@ </reporting> <scm> - <connection>http://svn.qos.ch/repos/logback/tags/release-test</connection> - <developerConnection>scm:svn:https://svn.qos.ch/repos/logback/tags/release-test</developerConnection> - <url>http://svn.qos.ch/viewvc/logback/tags/release-test</url> + <connection>http://svn.qos.ch/repos/logback/</connection> + <developerConnection>scm:svn:https://svn.qos.ch/repos/logback/</developerConnection> + <url>http://svn.qos.ch/viewvc/logback/</url> </scm> <distributionManagement>

1 0

svn commit: r651 - in logback/tags/release-test: . logback-access logback-access/src/main/java/ch/qos/logback/access/net logback-access/src/test/java/ch/qos/logback/access/jetty logback-classic logback-core logback-core/examples/classes logback-core/examples/src/joran/calculator logback-core/examples/src/joran/helloWorld logback-core/examples/src/joran/implicit logback-core/examples/src/joran/newRule logback-site logback-site/src/site/xdocTemplates logback-skin logback-skin/src src/main/assemb
by noreply.seb＠qos.ch 09 Oct '06

09 Oct '06

Author: seb Date: Mon Oct 9 20:17:22 2006 New Revision: 651 Added: logback/tags/release-test/ - copied from r639, /logback/trunk/ logback/tags/release-test/LICENSE.txt - copied unchanged from r646, /logback/trunk/LICENSE.txt logback/tags/release-test/logback-access/pom.xml - copied unchanged from r650, /logback/trunk/logback-access/pom.xml logback/tags/release-test/logback-access/src/main/java/ch/qos/logback/access/net/SMTPAppender.java - copied unchanged from r640, /logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/SMTPAppender.java logback/tags/release-test/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyBasicTest.java - copied unchanged from r642, /logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyBasicTest.java logback/tags/release-test/logback-classic/pom.xml - copied unchanged from r650, /logback/trunk/logback-classic/pom.xml logback/tags/release-test/logback-core/examples/classes/ - copied from r645, /logback/trunk/logback-core/examples/classes/ logback/tags/release-test/logback-core/examples/src/joran/calculator/readme.txt - copied unchanged from r640, /logback/trunk/logback-core/examples/src/joran/calculator/readme.txt logback/tags/release-test/logback-core/examples/src/joran/helloWorld/readme.txt - copied unchanged from r640, /logback/trunk/logback-core/examples/src/joran/helloWorld/readme.txt logback/tags/release-test/logback-core/examples/src/joran/implicit/readme.txt - copied unchanged from r640, /logback/trunk/logback-core/examples/src/joran/implicit/readme.txt logback/tags/release-test/logback-core/examples/src/joran/newRule/readme.txt - copied unchanged from r640, /logback/trunk/logback-core/examples/src/joran/newRule/readme.txt logback/tags/release-test/logback-core/pom.xml - copied unchanged from r650, /logback/trunk/logback-core/pom.xml logback/tags/release-test/logback-site/pom.xml - copied unchanged from r650, /logback/trunk/logback-site/pom.xml logback/tags/release-test/logback-site/src/site/xdocTemplates/documentation.xml - copied unchanged from r640, /logback/trunk/logback-site/src/site/xdocTemplates/documentation.xml logback/tags/release-test/logback-site/src/site/xdocTemplates/joran.xml - copied unchanged from r649, /logback/trunk/logback-site/src/site/xdocTemplates/joran.xml logback/tags/release-test/logback-site/src/site/xdocTemplates/mailinglist.xml - copied unchanged from r640, /logback/trunk/logback-site/src/site/xdocTemplates/mailinglist.xml logback/tags/release-test/logback-site/src/site/xdocTemplates/news.xml - copied unchanged from r646, /logback/trunk/logback-site/src/site/xdocTemplates/news.xml logback/tags/release-test/logback-skin/ - copied from r641, /logback/trunk/logback-skin/ logback/tags/release-test/logback-skin/pom.xml - copied unchanged from r650, /logback/trunk/logback-skin/pom.xml logback/tags/release-test/logback-skin/src/ - copied from r639, /logback/trunk/logback-skin/src/ logback/tags/release-test/pom.xml - copied unchanged from r650, /logback/trunk/pom.xml logback/tags/release-test/src/main/assembly/dist.xml - copied unchanged from r649, /logback/trunk/src/main/assembly/dist.xml Log: [maven-scm] copy for tag release-test

1 0

svn commit: r650 - in logback/trunk: . logback-access logback-classic logback-core logback-site logback-skin
by noreply.seb＠qos.ch 09 Oct '06

09 Oct '06

Author: seb Date: Mon Oct 9 20:17:19 2006 New Revision: 650 Modified: logback/trunk/logback-access/pom.xml logback/trunk/logback-classic/pom.xml logback/trunk/logback-core/pom.xml logback/trunk/logback-site/pom.xml logback/trunk/logback-skin/pom.xml logback/trunk/pom.xml Log: [maven-release-plugin] prepare release release-test Modified: logback/trunk/logback-access/pom.xml ============================================================================== --- logback/trunk/logback-access/pom.xml (original) +++ logback/trunk/logback-access/pom.xml Mon Oct 9 20:17:19 2006 @@ -1,21 +1,19 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.5</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>ch.qos.logback</groupId> <artifactId>logback-access</artifactId> - <version>${parent.version}</version> + <version>0.5</version> <packaging>jar</packaging> - <name>Logback Access Module</name> - + <name>Logback Access Module</name> + <url>http://logback.qos.ch/access</url> <description>  <scm> - <connection> - http://svn.qos.ch/repos/logback/access/trunk/ - </connection> - <developerConnection> - https://svn.qos.ch/repos/logback/access/trunk/ - </developerConnection> - <url>http://svn.qos.ch/viewcvs/logback/access/trunk/</url> + <connection>http://svn.qos.ch/repos/logback/access/tags/release-test</connection> + <developerConnection>https://svn.qos.ch/repos/logback/access/tags/release-test</developerConnection> + <url>http://svn.qos.ch/viewcvs/logback/access/tags/release-test</url> </scm>  - + </project> \ No newline at end of file Modified: logback/trunk/logback-classic/pom.xml ============================================================================== --- logback/trunk/logback-classic/pom.xml (original) +++ logback/trunk/logback-classic/pom.xml Mon Oct 9 20:17:19 2006 @@ -3,14 +3,14 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.5</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> - <version>${parent.version}</version> + <version>0.5</version> <packaging>jar</packaging> <name>Logback Classic Module</name> @@ -206,13 +206,9 @@  <scm> - <connection> - http://svn.qos.ch/repos/logback/classic/trunk/ - </connection> - <developerConnection> - scm:svn:https://svn.qos.ch/repos/logback/classic/trunk/ - </developerConnection> - <url>http://svn.qos.ch/viewcvs/logback/classic/trunk/</url> + <connection>http://svn.qos.ch/repos/logback/classic/tags/release-test</connection> + <developerConnection>scm:svn:https://svn.qos.ch/repos/logback/classic/tags/release-test</developerConnection> + <url>http://svn.qos.ch/viewcvs/logback/classic/tags/release-test</url> </scm>  </plugins> - -  <testResources> <testResource> @@ -139,73 +96,7 @@ <targetPath>witness</targetPath> </testResource> </testResources> - -  + </build> -  - - - -  - - <scm> - <connection>http://svn.qos.ch/repos/logback/core/trunk</connection> - <developerConnection>scm:svn:https://svn.qos.ch/repos/logback/core/trunk</developerConnection> - <url>http://svn.qos.ch/viewcvs/logback/core/trunk</url> - </scm> - -  - </project> \ No newline at end of file Modified: logback/trunk/logback-site/pom.xml ============================================================================== --- logback/trunk/logback-site/pom.xml (original) +++ logback/trunk/logback-site/pom.xml Mon Oct 9 20:17:19 2006 @@ -1,11 +1,9 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.5</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -13,7 +11,7 @@ <groupId>ch.qos.logback</groupId> <artifactId>logback-site</artifactId> <packaging>jar</packaging> - <version>${parent.version}</version> + <version>0.5</version> <name>Logback Site</name> <url>http://logback.qos.ch</url> Modified: logback/trunk/logback-skin/pom.xml ============================================================================== --- logback/trunk/logback-skin/pom.xml (original) +++ logback/trunk/logback-skin/pom.xml Mon Oct 9 20:17:19 2006 @@ -1,11 +1,9 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.5</version> </parent> @@ -14,7 +12,7 @@ <groupId>ch.qos.logback</groupId> <artifactId>logback-skin</artifactId> <packaging>jar</packaging> - <version>${parent.version}</version> + <version>0.5</version> <name>Logback Skin</name> <url>http://logback.qos.ch</url> Modified: logback/trunk/pom.xml ============================================================================== --- logback/trunk/pom.xml (original) +++ logback/trunk/pom.xml Mon Oct 9 20:17:19 2006 @@ -1,12 +1,10 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>ch.qos.logback</groupId> <artifactId>logback</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.5</version> <packaging>pom</packaging> <name>Logback</name> @@ -190,6 +188,12 @@ </reporting> + <scm> + <connection>http://svn.qos.ch/repos/logback/tags/release-test</connection> + <developerConnection>scm:svn:https://svn.qos.ch/repos/logback/tags/release-test</developerConnection> + <url>http://svn.qos.ch/viewvc/logback/tags/release-test</url> + </scm> + <distributionManagement> <site> <id>pixie</id>

1 0