- logback-dev - mailman3.qos.ch

svn commit: r455 - logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net
by noreply.ceki＠qos.ch 10 Aug '06

10 Aug '06

Author: ceki Date: Thu Aug 10 20:08:27 2006 New Revision: 455 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SyslogAppenderBase.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SyslogConstants.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SyslogWriter.java Log: ongoing work Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SyslogAppenderBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SyslogAppenderBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SyslogAppenderBase.java Thu Aug 10 20:08:27 2006 @@ -1,6 +1,8 @@ package ch.qos.logback.core.net; import java.io.IOException; +import java.net.SocketException; +import java.net.UnknownHostException; import ch.qos.logback.core.AppenderBase; import ch.qos.logback.core.Layout; @@ -11,8 +13,9 @@ int facility; String facilityStr; String syslogHost; + protected String suffixPattern; SyslogWriter sw; - //private String localHostname; + int port = SyslogConstants.SYSLOG_PORT; public void start() { int errorCount = 0; @@ -23,14 +26,26 @@ facility = facilityStringToint(facilityStr); - layout = getLayout(); + try { + sw = new SyslogWriter(syslogHost, port); + } catch (UnknownHostException e) { + addError("Could not create SyslogWriter", e); + errorCount++; + } catch (SocketException e) { + errorCount++; + addError("Failed to bind to a random datagram socket ", e); + } + + if(layout == null) { + layout = buildLayout(facilityStr); + } if(errorCount == 0) { super.start(); } } - abstract public Layout buildLayout(int facility); + abstract public Layout buildLayout(String facilityStr); abstract public int getSeverityForEvent(Object eventObject); @@ -39,14 +54,15 @@ if(!isStarted()) { return; } + try { String msg = layout.doLayout(eventObject); sw.write(msg); sw.flush(); + } catch(IOException ioe) { addError("Failed to send diagram to "+syslogHost, ioe); stop(); - } } @@ -143,4 +159,56 @@ } this.facilityStr = facilityStr; } + + /** + * + * @return + */ + public int getPort() { + return port; + } + + /** + * The port number on the syslog server to connect to. Nornally, wou would not + * want to change the default value, that is 514. + */ + public void setPort(int port) { + this.port = port; + } + + /** + * You can override + */ + public Layout getLayout() { + return layout; + } + + public void setLayout(Layout layout) { + this.layout = layout; + } + + @Override + public void stop() { + sw.close(); + super.stop(); + } + + /** + * See {@link #setSuffixPattern(String). + * + * @return + */ + public String getSuffixPattern() { + return suffixPattern; + } + + /** + * The <b>suffixPattern</b> option specifies the fortmat of the + * non-standardized part the message sent to the syslog server. + * + * @param pattern + */ + public void setSuffixPattern(String suffixPattern) { + this.suffixPattern = suffixPattern; + } } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SyslogConstants.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SyslogConstants.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SyslogConstants.java Thu Aug 10 20:08:27 2006 @@ -7,6 +7,9 @@ **/ public class SyslogConstants { + static public final int SYSLOG_PORT = 514; + + // Following constants extracted from RFC 3164, we multiply them by 8 // in order to precompute the facility part of PRI. // See RFC 3164, Section 4.1.1 for exact details. Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SyslogWriter.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SyslogWriter.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/net/SyslogWriter.java Thu Aug 10 20:08:27 2006 @@ -9,24 +9,26 @@ import java.net.UnknownHostException; /** - * SyslogWriter is a wrapper around the {@link DatagramSocket} class - * so that it behaves like a {@link Writer}. + * SyslogWriter is a wrapper around the {@link DatagramSocket} class so that it + * behaves like a {@link Writer}. */ class SyslogWriter extends Writer { + /** - * The maximum length after which we discard the existing string buffer and + * The maximum length after which we discard the existing string buffer and * start anew. */ - static final int MAX_LEN = 1024; - - static final int SYSLOG_PORT = 514; - + private static final int MAX_LEN = 1024; + private InetAddress address; private DatagramSocket ds; private StringBuffer buf = new StringBuffer(); - - public SyslogWriter(String syslogHost) throws UnknownHostException, SocketException { + final private int port; + + public SyslogWriter(String syslogHost, int port) throws UnknownHostException, + SocketException { this.address = InetAddress.getByName(syslogHost); + this.port = port; this.ds = new DatagramSocket(); } @@ -36,19 +38,19 @@ public void write(String str) throws IOException { buf.append(str); - + } public void flush() throws IOException { byte[] bytes = buf.toString().getBytes(); - DatagramPacket packet = - new DatagramPacket(bytes, bytes.length, address, SYSLOG_PORT); + DatagramPacket packet = new DatagramPacket(bytes, bytes.length, address, + port); if (this.ds != null) { ds.send(packet); } // clean up for next round - if(buf.length() > MAX_LEN) { + if (buf.length() > MAX_LEN) { buf = new StringBuffer(); } else { buf.setLength(0); @@ -59,5 +61,9 @@ address = null; ds = null; } -} + public int getPort() { + return port; + } + +}

1 0

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

10 Aug '06

Author: seb Date: Thu Aug 10 19:08:35 2006 New Revision: 454 Modified: logback/trunk/logback-site/src/site/xdocTemplates/shortIntro.xml Log: - replaced Lroot and Lx level values in example with real levels - updated last source code snippet - other minor fixes Modified: logback/trunk/logback-site/src/site/xdocTemplates/shortIntro.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/shortIntro.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/shortIntro.xml Thu Aug 10 19:08:35 2006 @@ -92,9 +92,7 @@ <p> After you have added the jar files - <em>logback-core.jar</em> - and - <em>logback-classic.jar</em> + <em>logback-core.jar</em>, <em>logback-classic.jar</em> and their dependencies to your classpath, you can begin experimenting with logback. </p> @@ -145,8 +143,7 @@ <p> - <b>ceki: compile?</b> - You can compile and run this class with the command: + Once you're in the examples/classes directory of the logback distribution, you can run this class with the command: </p> <div class="source">java chapter1.HelloWorld1</div> @@ -243,7 +240,7 @@ will barely change. Only the configuration process will be different, since you don't need (nor should) configure the logging context in each and every class that will require - logging. As well, the LoggerStatusPrinter will certainly not be + logging. As well, the <code>LoggerStatusPrinter</code> will certainly not be used after all the logging statements. </p> @@ -316,7 +313,7 @@ It is exceptional in a way that is always exists. Like every logger, it can be retrieved by its name, like this: </p> - <div class="source">Logger rootLogger = LoggerFactory.getLogger("root");</div> + <div class="source">Logger rootLogger = LoggerFactory.getLogger(LoggerContext.<em>ROOT_NAME</em>);</div> <p> All other loggers are retrieved with the class static @@ -360,7 +357,7 @@ </div> <p> To ensure that all loggers can eventually inherit a level, - the root logger always has an assigned level. + the root logger always has an assigned level. By default, its level is DEBUG. </p> <p> Below are four examples with various assigned level values @@ -389,31 +386,31 @@ </tr> <tr> <td>root</td> - <td>L<sub>root</sub></td> - <td>L<sub>root</sub></td> + <td>DEBUG</td> + <td>DEBUG</td> </tr> <tr> <td>X</td> <td>none</td> - <td>L<sub>root</sub></td> + <td>DEBUG</td> </tr> <tr> <td>X.Y</td> <td>none</td> - <td>L<sub>root</sub></td> + <td>DEBUG</td> </tr> <tr> <td>X.Y.Z</td> <td>none</td> - <td>L<sub>root</sub></td> + <td>DEBUG</td> </tr> </table> <p> In example 1 above, only the root logger is assigned a level. </p> - This level value, <code>L<sub>root</sub></code>, is inherited by the other loggers + This level value, <code>DEBUG</code>, is inherited by the other loggers <code>X</code>, <code>X.Y</code> and <code>X.Y.Z</code> <table> <tr> @@ -436,24 +433,24 @@ </tr> <tr align="left"> <td>root</td> - <td>L<sub>root</sub></td> - <td>L<sub>root</sub></td> + <td>ERROR</td> + <td>ERROR</td> </tr> <tr align="left"> <td>X</td> - <td>L<sub>x</sub></td> - <td>L<sub>x</sub></td> + <td>INFO</td> + <td>INFO</td> </tr> <tr align="left"> <td>X.Y</td> - <td>L<sub>xy</sub></td> - <td>L<sub>xy</sub></td> + <td>DEBUG</td> + <td>DEBUG</td> </tr> <tr align="left"> <td>X.Y.Z</td> - <td>L<sub>xyz</sub></td> - <td>L<sub>xyz</sub></td> + <td>WARN</td> + <td>WARN</td> </tr> </table> @@ -482,30 +479,30 @@ </tr> <tr align="left"> <td>root</td> - <td>L<sub>root</sub></td> - <td>L<sub>root</sub></td> + <td>DEBUG</td> + <td>DEBUG</td> </tr> <tr align="left"> <td>X</td> - <td>L<sub>x</sub></td> - <td>L<sub>x</sub></td> + <td>INFO</td> + <td>INFO</td> </tr> <tr align="left"> <td>X.Y</td> <td>none</td> - <td>L<sub>x</sub></td> + <td>INFO</td> </tr> <tr align="left"> <td>X.Y.Z</td> - <td>L<sub>xyz</sub></td> - <td>L<sub>xyz</sub></td> + <td>ERROR</td> + <td>ERROR</td> </tr> </table> <p> In example 3, the loggers <code>root</code>, <code>X</code> - and <code>X.Y.Z</code> are assigned the levels <code>L<sub>root</sub></code>, - <code>L<sub>x</sub></code> and <code>L<sub>xyz</sub></code> + and <code>X.Y.Z</code> are assigned the levels <code>DEBUG</code>, + <code>INFO</code> and <code>ERROR</code> respectively. The logger <code>X.Y</code> inherits its level value from its parent <code>X</code>. </p> @@ -530,31 +527,31 @@ </tr> <tr align="left"> <td>root</td> - <td>L<sub>root</sub></td> - <td>L<sub>root</sub></td> + <td>DEBUG</td> + <td>DEBUG</td> </tr> <tr align="left"> <td>X</td> - <td>L<sub>x</sub></td> - <td>L<sub>x</sub></td> + <td>INFO</td> + <td>INFO</td> </tr> <tr align="left"> <td>X.Y</td> <td>none</td> - <td>L<sub>x</sub></td> + <td>INFO</td> </tr> <tr align="left"> <td>X.Y.Z</td> <td>none</td> - <td>L<sub>x</sub></td> + <td>INFO</td> </tr> </table> <p> In example 4, the loggers <code>root</code> and <code>X</code> - and are assigned the levels <code>L<sub>root</sub></code> and - <code>L<sub>x</sub></code> respectively. The loggers <code>X.Y</code> and + and are assigned the levels <code>DEBUG</code> and + <code>INFO</code> respectively. The loggers <code>X.Y</code> and <code>X.Y.Z</code> inherits their level value from their nearest parent <code>X</code> having an assigned level. </p> @@ -848,10 +845,10 @@ <p> For example, the PatternLayout with the conversion pattern - "%r [%t] %-5p %c - %m%n" will output something akin to: + "%-4relative [%thread] %-5level %class - %msg%n" will output something akin to: </p> - <div class="source">176 [main] INFO org.foo.Bar - Located nearest gas station.</div> + <div class="source">176 [main] DEBUG chapter1.HelloWorld3 - Hello world.</div> <p> The first field is the number of milliseconds elapsed since @@ -915,7 +912,8 @@ </p> - <div class="source">Object entry = new SomeObject(); logger.debug("The entry is {}.", entry);</div> + <div class="source">Object entry = new SomeObject(); +logger.debug("The entry is {}.", entry);</div> <p> After evaluting whether to log or not, and only if the @@ -1064,24 +1062,29 @@ package chapter1; //Import SLF4J classes. +import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import ch.qos.logback.classic.Logger; -<b>import ch.qos.logback.classic.joran.JoranConfigurator;</b> +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.joran.JoranConfigurator; +import ch.qos.logback.core.util.StatusPrinter; public class MyAppWithConfigFile { - - public static void main(String[] args) throws Exception { - Logger logger = (Logger) LoggerFactory.getLogger(MyAppWithConfigFile.class); - + + public static void main(String[] args) { + Logger logger = LoggerFactory.getLogger(MyAppWithConfigFile.class); + LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); + JoranConfigurator configurator = new JoranConfigurator(); - configurator.setContext(logger.getLoggerContext()); + configurator.setContext(lc); configurator.doConfigure(args[0]); logger.info("Entering application."); Bar bar = new Bar(); bar.doIt(); logger.info("Exiting application."); + + StatusPrinter.print(lc.getStatusManager()); } }</div> <p> @@ -1089,6 +1092,8 @@ Joran is a XML interpreter, similar to the commons-digester API, but offering several small advantages over commons-digester. Here, it parses the xml file and runs actions depending on the tags it finds. + To setup the JoranConfigurator properly, we passed the <code>LoggerContext</code>. A <code>LoggerContext</code> + is the class that creates and manages Loggers in logback. It is also the class that implements the org.slf4j.ILoggerFactory. </p> <p>Logging to the console is a rather simple example. Let's now configure logback

1 0

svn commit: r453 - logback/trunk/src/main/assembly
by noreply.seb＠qos.ch 10 Aug '06

10 Aug '06

Author: seb Date: Thu Aug 10 18:49:47 2006 New Revision: 453 Modified: logback/trunk/src/main/assembly/source.xml Log: excluded output directory from the core tests. Modified: logback/trunk/src/main/assembly/source.xml ============================================================================== --- logback/trunk/src/main/assembly/source.xml (original) +++ logback/trunk/src/main/assembly/source.xml Thu Aug 10 18:49:47 2006 @@ -38,6 +38,11 @@ <fileSet> <directory>logback-core/src/</directory> <outputDirectory>logback-core/src/</outputDirectory> + <excludes> + <exclude> + test/output/ + </exclude> + </excludes> </fileSet> <fileSet> <directory>logback-classic/src/</directory>

1 0

svn commit: r452 - logback/trunk
by noreply.seb＠qos.ch 10 Aug '06

10 Aug '06

Author: seb Date: Thu Aug 10 11:21:38 2006 New Revision: 452 Modified: logback/trunk/ (props changed) Log: updated svn ignore

1 0

svn commit: r451 - logback/trunk/src/main/assembly
by noreply.seb＠qos.ch 10 Aug '06

10 Aug '06

Author: seb Date: Thu Aug 10 11:20:56 2006 New Revision: 451 Modified: logback/trunk/src/main/assembly/source.xml Log: - added parent src file to the assembly - added some comments Modified: logback/trunk/src/main/assembly/source.xml ============================================================================== --- logback/trunk/src/main/assembly/source.xml (original) +++ logback/trunk/src/main/assembly/source.xml Thu Aug 10 11:20:56 2006 @@ -5,6 +5,7 @@ <format>tar.gz</format> </formats> <fileSets> +  <fileSet> <directory>logback-core/</directory> <outputDirectory>logback-core/</outputDirectory> @@ -32,6 +33,8 @@ </include> </includes> </fileSet> + +  <fileSet> <directory>logback-core/src/</directory> <outputDirectory>logback-core/src/</outputDirectory> @@ -44,6 +47,8 @@ <directory>logback-access/src/</directory> <outputDirectory>logback-access/src/</outputDirectory> </fileSet> + +  <fileSet> <directory>logback-core/target/</directory> <outputDirectory>/</outputDirectory> @@ -67,22 +72,30 @@ <include>logback-access-${project.version}.jar</include> </includes> </fileSet> + +  <fileSet> <directory>logback-classic/examples/</directory> <outputDirectory>/examples/</outputDirectory> </fileSet> + +  <fileSet> <directory>target/site</directory> <outputDirectory>/site</outputDirectory> </fileSet> + +  <fileSet> <includes> + <include>src/</include> <include>README*</include> <include>LICENSE*</include> <include>pom.xml</include> </includes> </fileSet> </fileSets> + <dependencySets> <dependencySet> <outputDirectory>/lib</outputDirectory> @@ -96,9 +109,10 @@ or we can use the short form (hard coded into assembly) of <groupId>:<artifactId> This is a String equality match not a pattern match. + --> <exclude>ch.qos.logback:logback-core</exclude> - --> + </excludes> </dependencySet> </dependencySets>

1 0

svn commit: r450 - logback/trunk/logback-classic/src/main/assembly
by noreply.seb＠qos.ch 10 Aug '06

10 Aug '06

Author: seb Date: Thu Aug 10 11:20:19 2006 New Revision: 450 Removed: logback/trunk/logback-classic/src/main/assembly/ Log: deleted unused child assembly files

1 0

svn commit: r449 - in logback/trunk/logback-core: . src/main/assembly
by noreply.seb＠qos.ch 10 Aug '06

10 Aug '06

Author: seb Date: Thu Aug 10 11:20:18 2006 New Revision: 449 Removed: logback/trunk/logback-core/src/main/assembly/ Modified: logback/trunk/logback-core/ (props changed) Log: deleted unused child assembly files

1 0

svn commit: r448 - in logback/trunk/logback-access: . src/main/assembly
by noreply.seb＠qos.ch 10 Aug '06

10 Aug '06

Author: seb Date: Thu Aug 10 11:20:16 2006 New Revision: 448 Removed: logback/trunk/logback-access/src/main/assembly/ Modified: logback/trunk/logback-access/ (props changed) Log: deleted unused child assembly files

1 0

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

10 Aug '06

Author: seb Date: Thu Aug 10 11:14:33 2006 New Revision: 447 Modified: logback/trunk/logback-site/src/site/xdocTemplates/bugreport.xml logback/trunk/logback-site/src/site/xdocTemplates/license.xml logback/trunk/logback-site/src/site/xdocTemplates/news.xml logback/trunk/logback-site/src/site/xdocTemplates/repos.xml Log: - added bugzilla link on bugreport.xml - modified links in repos.xml - minor other changes Modified: logback/trunk/logback-site/src/site/xdocTemplates/bugreport.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/bugreport.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/bugreport.xml Thu Aug 10 11:14:33 2006 @@ -2,11 +2,10 @@ <document> <body> -<h2>Bug reporting -</h2> +<h2>Bug reporting</h2> - -<p>No bug tracking system is defined yet. Please check back at a later date.</p> +<p>The logback project uses a bugzilla based management system to track bugs.</p> +<p>You can report and follow logback bugs by following <a href="http://bugzilla.qos.ch/">this link</a>.</p> Modified: logback/trunk/logback-site/src/site/xdocTemplates/license.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/license.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/license.xml Thu Aug 10 11:14:33 2006 @@ -8,32 +8,29 @@ <body> - <div class="section"> - <h2>Logback License</h2> - </div> + <div class="section"> + <h2>Logback License</h2> + </div> + + <p> + Logback source code and binaries are distributed under the + <a href="http://www.gnu.org/licenses/lgpl.html"> + GNU Lesser General Public License + </a> + as published by the Free Software Foundation. + </p> + <div class="source"> <p> - Logback source code and binaries are distributed - under the - <a href="http://www.gnu.org/licenses/lgpl.html"> - GNU Lesser General Public License - </a> - as published by the Free Software Foundation. +Logback: the reliable, generic, fast and flexible logging library for Java. + <br /> +Copyright (C) 2000-2006, QOS.ch + <br /> +This library is free software, you can redistribute it and/or modify it +under the terms of the GNU Lesser General Public License as +published by the Free Software Foundation. </p> - - <div class="source"> - <p> -Logback: the reliable, generic, fast and flexible -logging library for Java.<br/> - -Copyright (C) 2000-2006, QOS.ch <br/> - -This library is free software, you can redistribute it -and/or modify it under the terms of the GNU Lesser -General Public License as published by the Free Software -Foundation. - </p> - </div> + </div> </body> Modified: logback/trunk/logback-site/src/site/xdocTemplates/news.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/news.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/news.xml Thu Aug 10 11:14:33 2006 @@ -18,7 +18,7 @@ </p> <p> The archives containing source code and binaries of all - modules are downloadable from the corresponding download + modules are downloadable from the download pages. </p> Modified: logback/trunk/logback-site/src/site/xdocTemplates/repos.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/repos.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/repos.xml Thu Aug 10 11:14:33 2006 @@ -40,18 +40,8 @@ Subversion or go straight to the public repositories at: </p> <p> - <a href="http://svn.qos.ch/viewcvs/logback/core/trunk"> - Logback core SVN Repository - </a> - </p> - <p> - <a href="http://svn.qos.ch/viewcvs/logback/classic/trunk"> - Logback classic SVN Repository - </a> - </p> - <p> - <a href="http://svn.qos.ch/viewcvs/logback/access/trunk"> - Logback access SVN Repository + <a href="http://svn.qos.ch/viewcvs/logback/trunk/"> + Logback SVN Repository </a> </p> @@ -61,15 +51,20 @@ <p> To access the Subversion repositories anonymously, you will need a Subversion client. - - To check out one of the logback project modules, issue one of the following commands: </p> + + <p>You can check out the entire logback project by using this command:</p> + + <div class="source">svn co http://svn.qos.ch/repos/logback/trunk/</div> + + <p>If you prefer to check out only one of the logback project modules, make your choice:</p> - <div class="source">svn co http://svn.qos.ch/repos/logback/core/trunk</div> + <div class="source">svn co http://svn.qos.ch/repos/logback/trunk/logback-core</div> - <div class="source">svn co http://svn.qos.ch/repos/logback/classic/trunk</div> + <div class="source">svn co http://svn.qos.ch/repos/logback/trunk/logback-classic</div> - <div class="source">svn co http://svn.qos.ch/repos/logback/access/trunk</div> + <div class="source">svn co http://svn.qos.ch/repos/logback/trunk/logback-access</div> + <div class="section"> <p>

1 0

svn commit: r446 - in logback/trunk: . logback-access logback-classic logback-core
by noreply.seb＠qos.ch 10 Aug '06

10 Aug '06

Author: seb Date: Thu Aug 10 11:13:27 2006 New Revision: 446 Modified: logback/trunk/logback-access/pom.xml logback/trunk/logback-classic/pom.xml logback/trunk/logback-core/pom.xml logback/trunk/pom.xml Log: added dependency management element in parent pom.xml and modified child pom.xml accordingly Modified: logback/trunk/logback-access/pom.xml ============================================================================== --- logback/trunk/logback-access/pom.xml (original) +++ logback/trunk/logback-access/pom.xml Thu Aug 10 11:13:27 2006 @@ -29,37 +29,31 @@ <dependencies> <dependency> <groupId>ch.qos.logback</groupId> - <artifactId>logback-core</artifactId> - <version>0.2-SNAPSHOT</version> + <artifactId>logback-core</artifactId> <scope>compile</scope> </dependency> <dependency> <groupId>tomcat</groupId> <artifactId>catalina</artifactId> - <version>5.5.12</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty</artifactId> - <version>6.0.0beta9</version> <scope>compile</scope> </dependency> <dependency> <groupId>com.caucho</groupId> <artifactId>resin</artifactId> - <version>3.0.9</version> <scope>compile</scope> </dependency> - <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>servlet-api-2.5</artifactId> - <version>6.0.0beta9</version> <scope>compile</scope> </dependency> </dependencies> Modified: logback/trunk/logback-classic/pom.xml ============================================================================== --- logback/trunk/logback-classic/pom.xml (original) +++ logback/trunk/logback-classic/pom.xml Thu Aug 10 11:13:27 2006 @@ -28,14 +28,12 @@ <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-core</artifactId> - <version>0.2-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-core</artifactId> - <version>0.2-SNAPSHOT</version> <classifier>tests</classifier> <scope>test</scope> </dependency> Modified: logback/trunk/logback-core/pom.xml ============================================================================== --- logback/trunk/logback-core/pom.xml (original) +++ logback/trunk/logback-core/pom.xml Thu Aug 10 11:13:27 2006 @@ -28,7 +28,6 @@ <dependency> <groupId>janino</groupId> <artifactId>janino</artifactId> - <version>2.4.3</version> </dependency> </dependencies> Modified: logback/trunk/pom.xml ============================================================================== --- logback/trunk/pom.xml (original) +++ logback/trunk/pom.xml Thu Aug 10 11:13:27 2006 @@ -33,20 +33,61 @@ <scope>test</scope> </dependency> </dependencies> + + <dependencyManagement> + <dependencies> +  + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-core</artifactId> + <version>${project.version}</version> + </dependency> - <build> + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-core</artifactId> + <version>${project.version}</version> + <classifier>tests</classifier> + </dependency> + +  + <dependency> + <groupId>janino</groupId> + <artifactId>janino</artifactId> + <version>2.4.3</version> + </dependency> -  +  + <dependency> + <groupId>tomcat</groupId> + <artifactId>catalina</artifactId> + <version>5.5.12</version> + </dependency> + + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + <version>6.0.0beta9</version> + </dependency> + + <dependency> + <groupId>com.caucho</groupId> + <artifactId>resin</artifactId> + <version>3.0.9</version> + </dependency> + + + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>servlet-api-2.5</artifactId> + <version>6.0.0beta9</version> + </dependency> + </dependencies> + + + </dependencyManagement> + + <build> <extensions> <extension> @@ -58,9 +99,6 @@ </build> <reporting> -  <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId>

1 0