November 2009 - logback-dev

[JIRA] Created: (LBCORE-98) TimeBasedRollingPolicy: name of file in zip archive is <FileNamePattern>.nanos.tmp
by Anders Wallgren (JIRA) 13 Nov '09

13 Nov '09

TimeBasedRollingPolicy: name of file in zip archive is <FileNamePattern>.nanos.tmp ---------------------------------------------------------------------------------- Key: LBCORE-98 URL: http://jira.qos.ch/browse/LBCORE-98 Project: logback-core Issue Type: Bug Components: Rolling Affects Versions: 0.9.15 Environment: Windows Reporter: Anders Wallgren Assignee: Logback dev list Priority: Minor The name of the filename in the zip archive is a temp filename, based on the FileNamePattern, no the FileNamePattern itself. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

2 4

branch, master, updated. feba37d06ec4fc8398641b3056f32e1afdcb0bb4
by git-noreply＠pixie.qos.ch 13 Nov '09

13 Nov '09

The branch, master has been updated via feba37d06ec4fc8398641b3056f32e1afdcb0bb4 (commit) from 0334b5b0597eeb09a5319a00c69c1867a17b5b2f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=feba37d06ec4fc8398641b30… http://github.com/ceki/logback/commit/feba37d06ec4fc8398641b3056f32e1afdcb0… commit feba37d06ec4fc8398641b3056f32e1afdcb0bb4 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Fri Nov 13 10:35:51 2009 +0100 Fixed http://jira.qos.ch/browse/LBCORE-98 The name of the log file nested within .zip archives was incorrectly set to be that of the tmp file logback creates during compression. Anders Wallgren reported and posted an appropriate patch for this problem LBCORE-98. The nested file is now named after the zip archive file. Analysis showed that this was an appropriate strategy in all the cases we considered. diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingFileAppender.java b/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingFileAppender.java index 92a610e..cddef70 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingFileAppender.java +++ b/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingFileAppender.java @@ -49,13 +49,13 @@ public class RollingFileAppender<E> extends FileAppender<E> { addWarn("For more information, please visit http://logback.qos.ch/codes.html#rfa_no_tp"); return; } - + // we don't want to void existing log files - if(!append) { - addWarn("Append mode is mandatory for RollingFileAppender"); + if (!append) { + addWarn("Append mode is mandatory for RollingFileAppender"); append = true; } - + if (rollingPolicy == null) { addError("No RollingPolicy was set for the RollingFileAppender named " + getName()); @@ -96,23 +96,11 @@ public class RollingFileAppender<E> extends FileAppender<E> { } /** - * Implements the usual roll over behaviour. - * - * If <code>MaxBackupIndex</code> is positive, then files {<code>File.1</code>, - * ..., <code>File.MaxBackupIndex -1</code>} are renamed to {<code>File.2</code>, - * ..., <code>File.MaxBackupIndex</code>}. Moreover, <code>File</code> is - * renamed <code>File.1</code> and closed. A new <code>File</code> is - * created to receive further log output. - * - * If <code>MaxBackupIndex</code> is equal to zero, then the - * <code>File</code> is truncated with no backup files created. - * + * Implemented by delegating most of the rollover work to a rolling policy. */ public synchronized void rollover() { // Note: This method needs to be synchronized because it needs exclusive - // acces while - // it closes and then re-opens the target file. - + // access while it closes and then re-opens the target file. // // make sure to close the hereto active log file! Renaming under windows // does not work for open files. @@ -130,7 +118,7 @@ public class RollingFileAppender<E> extends FileAppender<E> { // update the currentlyActiveFile // http://jira.qos.ch/browse/LBCORE-90 currentlyActiveFile = new File(rollingPolicy.getActiveFileName()); - + // This will also close the file. This is OK since multiple // close operations are safe. this.openFile(rollingPolicy.getActiveFileName()); diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedRollingPolicy.java b/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedRollingPolicy.java index 259d3a0..b987069 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedRollingPolicy.java +++ b/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedRollingPolicy.java @@ -101,7 +101,7 @@ public class TimeBasedRollingPolicy<E> extends RollingPolicyBase implements return timeBasedTriggering; } - static String computeFileNameStr_WCS(String fileNamePatternStr, + static public String computeFileNameStr_WCS(String fileNamePatternStr, CompressionMode compressionMode) { int len = fileNamePatternStr.length(); switch (compressionMode) { diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/Compressor.java b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/Compressor.java index 2205091..4a620e2 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/Compressor.java +++ b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/Compressor.java @@ -20,11 +20,11 @@ import java.util.zip.GZIPOutputStream; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; +import ch.qos.logback.core.rolling.TimeBasedRollingPolicy; import ch.qos.logback.core.spi.ContextAwareBase; import ch.qos.logback.core.status.ErrorStatus; import ch.qos.logback.core.status.WarnStatus; - /** * The <code>Compression</code> class implements ZIP and GZ file * compression/decompression methods. @@ -34,24 +34,24 @@ import ch.qos.logback.core.status.WarnStatus; public class Compressor extends ContextAwareBase { final CompressionMode compressionMode; - //final String nameOfFile2Compress; - //final String nameOfCompressedFile; + // final String nameOfFile2Compress; + // final String nameOfCompressedFile; public Compressor(CompressionMode compressionMode) { this.compressionMode = compressionMode; } - - -// public Compressor(CompressionMode compressionMode, String nameOfFile2Compress, String nameOfCompressedFile) { -// this.compressionMode = compressionMode; -// //this.nameOfFile2Compress = nameOfFile2Compress; -// //this.nameOfCompressedFile = nameOfCompressedFile; -// } - - public void compress( String nameOfFile2Compress, String nameOfCompressedFile) { - switch(compressionMode) { - case GZ: + + // public Compressor(CompressionMode compressionMode, String + // nameOfFile2Compress, String nameOfCompressedFile) { + // this.compressionMode = compressionMode; + // //this.nameOfFile2Compress = nameOfFile2Compress; + // //this.nameOfCompressedFile = nameOfCompressedFile; + // } + + public void compress(String nameOfFile2Compress, String nameOfCompressedFile) { + switch (compressionMode) { + case GZ: addInfo("GZ compressing [" + nameOfFile2Compress + "]."); gzCompress(nameOfFile2Compress, nameOfCompressedFile); break; @@ -60,7 +60,8 @@ public class Compressor extends ContextAwareBase { zipCompress(nameOfFile2Compress, nameOfCompressedFile); break; case NONE: - throw new UnsupportedOperationException("compress method called in NONE compression mode"); + throw new UnsupportedOperationException( + "compress method called in NONE compression mode"); } } @@ -68,9 +69,8 @@ public class Compressor extends ContextAwareBase { File file2zip = new File(nameOfFile2zip); if (!file2zip.exists()) { - addStatus(new WarnStatus( - "The file to compress named [" + nameOfFile2zip - + "] does not exist.", this)); + addStatus(new WarnStatus("The file to compress named [" + nameOfFile2zip + + "] does not exist.", this)); return; } @@ -82,9 +82,8 @@ public class Compressor extends ContextAwareBase { File zippedFile = new File(nameOfZippedFile); if (zippedFile.exists()) { - addStatus(new WarnStatus( - "The target compressed file named [" + nameOfZippedFile - + "] exist already.", this)); + addStatus(new WarnStatus("The target compressed file named [" + + nameOfZippedFile + "] exist already.", this)); return; } @@ -94,7 +93,7 @@ public class Compressor extends ContextAwareBase { ZipOutputStream zos = new ZipOutputStream(fos); FileInputStream fis = new FileInputStream(nameOfFile2zip); - ZipEntry zipEntry = new ZipEntry(file2zip.getName()); + ZipEntry zipEntry = computeZipEntry(zippedFile); zos.putNextEntry(zipEntry); byte[] inbuf = new byte[8102]; @@ -117,6 +116,27 @@ public class Compressor extends ContextAwareBase { } } + // http://jira.qos.ch/browse/LBCORE-98 + // The name of the compressed file as nested within the zip archive + // + // Case 1: RawFile = null, Patern = foo-%d.zip + // nestedFilename = foo-${current-date} + // + // Case 2: RawFile = hello.txtm, Pattern = = foo-%d.zip + // nestedFilename = foo-${current-date} + // + // in both cases, the strategy consisting of removing the compression + // suffix of zip file works reasonably well. The alternative strategy + // whereby the nested file name was based on the value of the raw file name + // (applicable to case 2 only) has the disadvantage of the nested files + // all having the same name, which could make it harder for the user + // to unzip the file without collisions + ZipEntry computeZipEntry(File zippedFile) { + String nameOfFileNestedWithinArchive = TimeBasedRollingPolicy + .computeFileNameStr_WCS(zippedFile.getName(), compressionMode); + return new ZipEntry(nameOfFileNestedWithinArchive); + } + private void gzCompress(String nameOfFile2gz, String nameOfgzedFile) { File file2gz = new File(nameOfFile2gz); @@ -163,7 +183,7 @@ public class Compressor extends ContextAwareBase { + nameOfFile2gz + "] into [" + nameOfgzedFile + "].", this, e)); } } - + @Override public String toString() { return "c.q.l.core.rolling.helper.Compress"; diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index 0254ae2..953aabe 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -42,6 +42,10 @@ by applying the relavant patch supplied by Hugues Malphettes. + Made the OSGi import declerations for Janino and javax optional + as proposed by David Varnes in <a + href="http://jira.qos.ch/browse/LBCORE-101">LBCORE-101</a>. + JaninoEventEvaluator now passes the throwable associated with an event as a <code>java.lang.Throwable</code> instead of an <code>IThrowableProxy</code>. This fixes <a @@ -50,6 +54,15 @@ href="manual/filters.html#evalutatorFilter">EvaluatorFilter documentation</a> for more details. + The name of the log file nested within .zip archives was + incorrectly set to be that of the tmp file logback creates during + compression. Anders Wallgren reported and posted an appropriate + patch for this problem in <a + href="http://jira.qos.ch/browse/LBCORE-98">LBCORE-98</a>. The + nested file is now named after the zip archive file. Analysis + showed that this was an appropriate strategy in all the cases we + considered. + <hr width="80%" align="center" /> <h3>9th of August 2009 - Release of version 0.9.17</h3> ----------------------------------------------------------------------- Summary of changes: .../logback/core/rolling/RollingFileAppender.java | 26 ++------ .../core/rolling/TimeBasedRollingPolicy.java | 2 +- .../logback/core/rolling/helper/Compressor.java | 66 +++++++++++++------- logback-site/src/site/pages/news.html | 13 ++++ 4 files changed, 64 insertions(+), 43 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBCORE-101) OSGi manifest headers too restrictive
by david varnes (JIRA) 12 Nov '09

12 Nov '09

OSGi manifest headers too restrictive ------------------------------------- Key: LBCORE-101 URL: http://jira.qos.ch/browse/LBCORE-101 Project: logback-core Issue Type: Bug Affects Versions: 0.9.15 Reporter: david varnes Assignee: Logback dev list This issue is very similar and could be addressed at the same time as LBCLASSIC-119, LBCLASSIC-121 & LBCLASSIC-131. The Import-Package definition for logback-core requires that the javax.* packages be available at runtime. The pom.xml file and my usage seem to indicate that they should be optional. Attached patch adds javax.* as 'optional' in addition to the exiting janino declaration. thanks ! -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

2 2

branch, master, updated. 0334b5b0597eeb09a5319a00c69c1867a17b5b2f
by git-noreply＠pixie.qos.ch 12 Nov '09

12 Nov '09

The branch, master has been updated via 0334b5b0597eeb09a5319a00c69c1867a17b5b2f (commit) from 043fe3b6471a4025911da4a78d28fc41cd775038 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=0334b5b0597eeb09a5319a00… http://github.com/ceki/logback/commit/0334b5b0597eeb09a5319a00c69c1867a17b5… commit 0334b5b0597eeb09a5319a00c69c1867a17b5b2f Author: Ceki Gulcu <ceki(a)qos.ch> Date: Fri Nov 13 00:06:19 2009 +0100 - made the import declerations for janino and javax options as suggested by DAvid Varnes in LBCORE-101 diff --git a/logback-core/pom.xml b/logback-core/pom.xml index cddf12f..873db19 100644 --- a/logback-core/pom.xml +++ b/logback-core/pom.xml @@ -135,7 +135,11 @@ <configuration> <instructions> <Export-Package>ch.qos.logback.core.*</Export-Package> - <Import-Package>org.codehaus.janino;resolution:=optional,*</Import-Package> + <Import-Package> + javax.*;resolution:=optional, + org.codehaus.janino;resolution:=optional, + * + </Import-Package> <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment> </instructions> </configuration> ----------------------------------------------------------------------- Summary of changes: logback-core/pom.xml | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

branch, master, updated. 043fe3b6471a4025911da4a78d28fc41cd775038
by git-noreply＠pixie.qos.ch 12 Nov '09

12 Nov '09

The branch, master has been updated via 043fe3b6471a4025911da4a78d28fc41cd775038 (commit) from 4cdca9f671ff8251e7775fee498a7331328ffa5b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=043fe3b6471a4025911da4a7… http://github.com/ceki/logback/commit/043fe3b6471a4025911da4a78d28fc41cd775… commit 043fe3b6471a4025911da4a78d28fc41cd775038 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Thu Nov 12 01:22:45 2009 +0100 - minor refactoring in DefaultArchiver and SizeAndTimeBasedArchiveRemover - Adapted TimeBasedRollingWithArchiveRemovalTest so that dailySizeBasedRollover() no longer fails under certain circumstances, e.g. when in the last period no size-based rollover occuers. Also increased the number of ticks per period (more logging calls) and increased the triggering size (less size-based rollovers for faster test execution time) diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/DefaultArchiveRemover.java b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/DefaultArchiveRemover.java index 6640853..c18b53c 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/DefaultArchiveRemover.java +++ b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/DefaultArchiveRemover.java @@ -23,7 +23,7 @@ public class DefaultArchiveRemover implements ArchiveRemover { final FileNamePattern fileNamePattern; final RollingCalendar rc; - int periodOffset; + int periodOffsetForDeletionTarget; final boolean parentClean; public DefaultArchiveRemover(FileNamePattern fileNamePattern, @@ -67,7 +67,7 @@ public class DefaultArchiveRemover implements ArchiveRemover { } public void clean(Date now) { - Date date2delete = rc.getRelativeDate(now, periodOffset); + Date date2delete = rc.getRelativeDate(now, periodOffsetForDeletionTarget); String filename = fileNamePattern.convert(date2delete); File file2Delete = new File(filename); if (file2Delete.exists() && file2Delete.isFile()) { @@ -98,7 +98,7 @@ public class DefaultArchiveRemover implements ArchiveRemover { } public void setMaxHistory(int maxHistory) { - this.periodOffset = -maxHistory - 1; + this.periodOffsetForDeletionTarget = -maxHistory - 1; } } diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/FileNamePattern.java b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/FileNamePattern.java index a9cdfdc..c5efefd 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/FileNamePattern.java +++ b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/FileNamePattern.java @@ -145,9 +145,7 @@ public class FileNamePattern extends ContextAwareBase { } /** - * Given date, convert this instance to a regular expression. A - * slashified regex, is a regex with naturally occurring forward slash - * characters replaced by back slashes. + * Given date, convert this instance to a regular expression. */ public String toRegex(Date date) { StringBuilder buf = new StringBuilder(); diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/SizeAndTimeBasedArchiveRemover.java b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/SizeAndTimeBasedArchiveRemover.java index 66d7513..397ad9a 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/SizeAndTimeBasedArchiveRemover.java +++ b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/SizeAndTimeBasedArchiveRemover.java @@ -25,7 +25,7 @@ public class SizeAndTimeBasedArchiveRemover extends DefaultArchiveRemover { @Override public void clean(Date now) { - Date dateOfPeriodToClean = rc.getRelativeDate(now, periodOffset); + Date dateOfPeriodToClean = rc.getRelativeDate(now, periodOffsetForDeletionTarget); String regex = fileNamePattern.toRegex(dateOfPeriodToClean); String stemRegex = FileFilterUtil.afterLastSlash(regex); diff --git a/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java b/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java index af4a068..2e2e27a 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java @@ -104,7 +104,7 @@ public class TimeBasedRollingWithArchiveRemovalTest { slashCount = computeSlashCount(MONTHLY_CROLOLOG_DATE_PATTERN); int numPeriods = 40; int maxHistory = 2; - + doRollover(randomOutputDir + "/%d{" + MONTHLY_CROLOLOG_DATE_PATTERN + "}/clean.txt.zip", MILLIS_IN_MONTH, maxHistory, numPeriods); int beginPeriod = Calendar.getInstance().get(Calendar.MONTH); @@ -136,21 +136,25 @@ public class TimeBasedRollingWithArchiveRemovalTest { @Test public void dailySizeBasedRollover() throws Exception { SizeAndTimeBasedFNATP<Object> sizeAndTimeBasedFNATP = new SizeAndTimeBasedFNATP<Object>(); - sizeAndTimeBasedFNATP.setMaxFileSize("10"); + sizeAndTimeBasedFNATP.setMaxFileSize("10000"); tbfnatp = sizeAndTimeBasedFNATP; slashCount = computeSlashCount(DAILY_DATE_PATTERN); doRollover( randomOutputDir + "/%d{" + DAILY_DATE_PATTERN + "}-clean.%i.zip", MILLIS_IN_DAY, 5, 5 * 4); + + // make .zip optional so that if for one reason or another, no size-based + // rollover occurs on the last period, that the last period is still accounted + // for checkPatternCompliance(5 + 1 + slashCount, - "\\d{4}-\\d{2}-\\d{2}-clean.(\\d).zip"); + "\\d{4}-\\d{2}-\\d{2}-clean.(\\d)(.zip)?"); } @Test public void dailyChronologSizeBasedRollover() throws Exception { SizeAndTimeBasedFNATP<Object> sizeAndTimeBasedFNATP = new SizeAndTimeBasedFNATP<Object>(); - sizeAndTimeBasedFNATP.setMaxFileSize("10"); + sizeAndTimeBasedFNATP.setMaxFileSize("10000"); tbfnatp = sizeAndTimeBasedFNATP; slashCount = 1; @@ -180,19 +184,22 @@ public class TimeBasedRollingWithArchiveRemovalTest { rfa.setRollingPolicy(tbrp); rfa.start(); - int ticksPerPeriod = 64; + // lots of ticks per period + int ticksPerPeriod = 512; long runLength = simulatedNumberOfPeriods * ticksPerPeriod; - for (long i = 0; i < runLength; i++) { + long i = 0; + for (; i < runLength; i++) { rfa .doAppend("Hello ----------------------------------------------------------" + i); tbrp.timeBasedTriggering.setCurrentTime(addTime(tbrp.timeBasedTriggering .getCurrentTime(), periodDurationInMillis / ticksPerPeriod)); - if (tbrp.future != null) { - tbrp.future.get(200, TimeUnit.MILLISECONDS); - } + } + + if (tbrp.future != null && !tbrp.future.isDone()) { + tbrp.future.get(200, TimeUnit.MILLISECONDS); } rfa.stop(); } @@ -324,6 +331,9 @@ public class TimeBasedRollingWithArchiveRemovalTest { assertEquals(expectedClassCount, fileList.size()); } + // reduce file names differing by index number into the same group + // for example, 2009-11-01-clean-0.zip, 2009-11-01-clean-1.zip and + // 2009-11-01-clean-2 are reduced into the same string (group) Set<String> groupByClass(List<File> fileList, String regex) { Pattern p = Pattern.compile(regex); Set<String> set = new HashSet<String>(); @@ -333,7 +343,8 @@ public class TimeBasedRollingWithArchiveRemovalTest { m.matches(); int begin = m.start(1); int end = m.end(1); - set.add(n.substring(0, begin) + n.substring(end)); + String reduced = n.substring(0, begin) + n.substring(end); + set.add(reduced); } return set; } ----------------------------------------------------------------------- Summary of changes: .../core/rolling/helper/DefaultArchiveRemover.java | 6 ++-- .../core/rolling/helper/FileNamePattern.java | 4 +-- .../helper/SizeAndTimeBasedArchiveRemover.java | 2 +- .../TimeBasedRollingWithArchiveRemovalTest.java | 31 +++++++++++++------ 4 files changed, 26 insertions(+), 17 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

branch, master, updated. 4cdca9f671ff8251e7775fee498a7331328ffa5b
by git-noreply＠pixie.qos.ch 11 Nov '09

11 Nov '09

The branch, master has been updated via 4cdca9f671ff8251e7775fee498a7331328ffa5b (commit) from b3f2333b924d4c811059863e92c5b7742580fe47 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=4cdca9f671ff8251e7775fee… http://github.com/ceki/logback/commit/4cdca9f671ff8251e7775fee498a7331328ff… commit 4cdca9f671ff8251e7775fee498a7331328ffa5b Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Nov 11 09:02:45 2009 +0100 - instead of hardcoding, have logback-classic's MANIFEST reference/export slf4j by variable. diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml index f7e1bd7..b460fb3 100644 --- a/logback-classic/pom.xml +++ b/logback-classic/pom.xml @@ -208,7 +208,7 @@ </executions> <configuration> <instructions> - <Export-Package>ch.qos.logback.classic*, org.slf4j.impl;version=1.5.6</Export-Package> + <Export-Package>ch.qos.logback.classic*, org.slf4j.impl;version=${slf4j.version}</Export-Package>  - <slf4j.version>1.5.8</slf4j.version> +  + <slf4j.version>1.5.9.RC1</slf4j.version> <consolePlugin.version>1.1.0</consolePlugin.version> </properties> ----------------------------------------------------------------------- Summary of changes: logback-classic/pom.xml | 2 +- pom.xml | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBCLASSIC-165) Wrong MANIFEST.MF Private-Package and Export-Package sections
by Bulat Nigmatullin (JIRA) 10 Nov '09

10 Nov '09

Wrong MANIFEST.MF Private-Package and Export-Package sections ------------------------------------------------------------- Key: LBCLASSIC-165 URL: http://jira.qos.ch/browse/LBCLASSIC-165 Project: logback-classic Issue Type: Bug Components: joran Affects Versions: 0.917 Reporter: Bulat Nigmatullin Assignee: Logback dev list I'm trying to setup logback configuration loading in accordance with http://logback.qos.ch/xref/chapter3/MyApp3.html . When running in OSGi Framework i have the following error: Error while starting bundle: file:/home/bulat/Desktop/xmppserver/lib/log-0.2.jar: org.osgi.framework.BundleException: Unresolved constraint in bundle ru.rambler.xmpp.server.util.log [13]: package; (package=ch.qos.logback.classic) Package ch.qos.logback.classic and ch.qos.logback.classic.joran and may be many others should be in Export-Package section of MANIFEST.MF -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

4 10

branch, master, updated. b3f2333b924d4c811059863e92c5b7742580fe47
by git-noreply＠pixie.qos.ch 10 Nov '09

10 Nov '09

The branch, master has been updated via b3f2333b924d4c811059863e92c5b7742580fe47 (commit) from baba96b8e2a916ecee6d3fda41c7040535f5b175 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=b3f2333b924d4c811059863e… http://github.com/ceki/logback/commit/b3f2333b924d4c811059863e92c5b7742580f… commit b3f2333b924d4c811059863e92c5b7742580fe47 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Nov 10 22:20:58 2009 +0100 - minor adjustments in the comments - editing of filters.html diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/boolex/JaninoEventEvaluator.java b/logback-classic/src/main/java/ch/qos/logback/classic/boolex/JaninoEventEvaluator.java index 232c689..0bfd020 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/boolex/JaninoEventEvaluator.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/boolex/JaninoEventEvaluator.java @@ -28,22 +28,20 @@ import ch.qos.logback.core.CoreConstants; import ch.qos.logback.core.boolex.JaninoEventEvaluatorBase; import ch.qos.logback.core.boolex.Matcher; +public class JaninoEventEvaluator extends + JaninoEventEvaluatorBase<ILoggingEvent> { - -public class JaninoEventEvaluator extends JaninoEventEvaluatorBase<ILoggingEvent> { - - public final static String IMPORT_LEVEL = "import ch.qos.logback.classic.Level;\r\n"; - + public final static List<String> DEFAULT_PARAM_NAME_LIST = new ArrayList<String>(); public final static List<Class> DEFAULT_PARAM_TYPE_LIST = new ArrayList<Class>(); - + static { DEFAULT_PARAM_NAME_LIST.add("DEBUG"); DEFAULT_PARAM_NAME_LIST.add("INFO"); DEFAULT_PARAM_NAME_LIST.add("WARN"); DEFAULT_PARAM_NAME_LIST.add("ERROR"); - + DEFAULT_PARAM_NAME_LIST.add("event"); DEFAULT_PARAM_NAME_LIST.add("message"); @@ -56,12 +54,12 @@ public class JaninoEventEvaluator extends JaninoEventEvaluatorBase<ILoggingEvent DEFAULT_PARAM_NAME_LIST.add("mdc"); DEFAULT_PARAM_NAME_LIST.add("throwableProxy"); DEFAULT_PARAM_NAME_LIST.add("throwable"); - + DEFAULT_PARAM_TYPE_LIST.add(int.class); DEFAULT_PARAM_TYPE_LIST.add(int.class); DEFAULT_PARAM_TYPE_LIST.add(int.class); DEFAULT_PARAM_TYPE_LIST.add(int.class); - + DEFAULT_PARAM_TYPE_LIST.add(ILoggingEvent.class); DEFAULT_PARAM_TYPE_LIST.add(String.class); DEFAULT_PARAM_TYPE_LIST.add(String.class); @@ -74,11 +72,11 @@ public class JaninoEventEvaluator extends JaninoEventEvaluatorBase<ILoggingEvent DEFAULT_PARAM_TYPE_LIST.add(IThrowableProxy.class); DEFAULT_PARAM_TYPE_LIST.add(Throwable.class); } - - + public JaninoEventEvaluator() { - + } + protected String getDecoratedExpression() { return IMPORT_LEVEL + getExpression(); } @@ -87,18 +85,18 @@ public class JaninoEventEvaluator extends JaninoEventEvaluatorBase<ILoggingEvent List<String> fullNameList = new ArrayList<String>(); fullNameList.addAll(DEFAULT_PARAM_NAME_LIST); - for(int i = 0; i < matcherList.size(); i++) { + for (int i = 0; i < matcherList.size(); i++) { Matcher m = (Matcher) matcherList.get(i); fullNameList.add(m.getName()); } - + return (String[]) fullNameList.toArray(CoreConstants.EMPTY_STRING_ARRAY); } protected Class[] getParameterTypes() { List<Class> fullTypeList = new ArrayList<Class>(); fullTypeList.addAll(DEFAULT_PARAM_TYPE_LIST); - for(int i = 0; i < matcherList.size(); i++) { + for (int i = 0; i < matcherList.size(); i++) { fullTypeList.add(Matcher.class); } return (Class[]) fullTypeList.toArray(CoreConstants.EMPTY_CLASS_ARRAY); @@ -106,30 +104,34 @@ public class JaninoEventEvaluator extends JaninoEventEvaluatorBase<ILoggingEvent protected Object[] getParameterValues(ILoggingEvent loggingEvent) { final int matcherListSize = matcherList.size(); - + int i = 0; - Object[] values = new Object[DEFAULT_PARAM_NAME_LIST.size()+matcherListSize]; + Object[] values = new Object[DEFAULT_PARAM_NAME_LIST.size() + + matcherListSize]; values[i++] = Level.DEBUG_INTEGER; values[i++] = Level.INFO_INTEGER; values[i++] = Level.WARN_INTEGER; values[i++] = Level.ERROR_INTEGER; - + values[i++] = loggingEvent; - values[i++] = loggingEvent.getMessage(); - values[i++] = loggingEvent.getFormattedMessage(); + values[i++] = loggingEvent.getMessage(); + values[i++] = loggingEvent.getFormattedMessage(); values[i++] = loggingEvent.getLoggerName(); values[i++] = loggingEvent.getLoggerContextVO(); values[i++] = loggingEvent.getLevel().toInteger(); values[i++] = new Long(loggingEvent.getTimeStamp()); + // In order to avoid NullPointerException, we could push a dummy marker if + // the event's marker is null. However, this would surprise user who + // expect to see a null marker instead of a dummy one. values[i++] = loggingEvent.getMarker(); values[i++] = loggingEvent.getMDCPropertyMap(); - + IThrowableProxy iThrowableProxy = loggingEvent.getThrowableProxy(); - + if (iThrowableProxy != null) { values[i++] = iThrowableProxy; - if(iThrowableProxy instanceof ThrowableProxy) { + if (iThrowableProxy instanceof ThrowableProxy) { values[i++] = ((ThrowableProxy) iThrowableProxy).getThrowable(); } else { values[i++] = null; @@ -138,12 +140,11 @@ public class JaninoEventEvaluator extends JaninoEventEvaluatorBase<ILoggingEvent values[i++] = null; values[i++] = null; } - - - for(int j = 0; j < matcherListSize; j++) { + + for (int j = 0; j < matcherListSize; j++) { values[i++] = (Matcher) matcherList.get(j); } - + return values; } diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/boolex/JaninoEventEvaluatorTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/boolex/JaninoEventEvaluatorTest.java index 8be5a62..17eabe8 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/boolex/JaninoEventEvaluatorTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/boolex/JaninoEventEvaluatorTest.java @@ -13,6 +13,7 @@ */ package ch.qos.logback.classic.boolex; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -31,15 +32,22 @@ import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.core.boolex.EvaluationException; import ch.qos.logback.core.boolex.JaninoEventEvaluatorBase; import ch.qos.logback.core.boolex.Matcher; +import ch.qos.logback.core.filter.EvaluatorFilter; +import ch.qos.logback.core.spi.FilterReply; +import ch.qos.logback.core.util.StatusPrinter; -public class JaninoEventEvaluatorTest { +public class JaninoEventEvaluatorTest { LoggerContext loggerContext = new LoggerContext(); Logger logger = loggerContext.getLogger(ConverterTest.class); Matcher matcherX = new Matcher(); + JaninoEventEvaluator jee = new JaninoEventEvaluator(); + public JaninoEventEvaluatorTest() { + jee.setContext(loggerContext); + matcherX.setName("x"); matcherX.setRegex("^Some\\s.*"); matcherX.start(); @@ -55,33 +63,27 @@ public class JaninoEventEvaluatorTest { @Test public void testBasic() throws Exception { - JaninoEventEvaluator jee = new JaninoEventEvaluator(); jee.setExpression("message.equals(\"Some message\")"); - jee.setContext(loggerContext); jee.start(); ILoggingEvent event = makeLoggingEvent(null); - //System.out.println(event); + // System.out.println(event); assertTrue(jee.evaluate(event)); } @Test public void testLevel() throws Exception { - JaninoEventEvaluator jee = new JaninoEventEvaluator(); jee.setExpression("level > DEBUG"); - jee.setContext(loggerContext); jee.start(); ILoggingEvent event = makeLoggingEvent(null); - //System.out.println(event); + // System.out.println(event); assertTrue(jee.evaluate(event)); } @Test public void testtimeStamp() throws Exception { - JaninoEventEvaluator jee = new JaninoEventEvaluator(); jee.setExpression("timeStamp > 10"); - jee.setContext(loggerContext); jee.start(); ILoggingEvent event = makeLoggingEvent(null); @@ -90,10 +92,7 @@ public class JaninoEventEvaluatorTest { @Test public void testWithMatcher() throws Exception { - - JaninoEventEvaluator jee = new JaninoEventEvaluator(); jee.setExpression("x.matches(message)"); - jee.setContext(loggerContext); jee.addMatcher(matcherX); jee.start(); @@ -102,11 +101,8 @@ public class JaninoEventEvaluatorTest { } @Test - public void testMarker() throws Exception { - JaninoEventEvaluator jee = new JaninoEventEvaluator(); + public void marker() throws Exception { jee.setExpression("marker.contains(\"BLUE\")"); - jee.setContext(loggerContext); - jee.addMatcher(matcherX); jee.start(); LoggingEvent event = makeLoggingEvent(null); @@ -115,11 +111,8 @@ public class JaninoEventEvaluatorTest { } @Test - public void testWithNullMarker_LBCORE_118() throws Exception { - JaninoEventEvaluator jee = new JaninoEventEvaluator(); + public void withNullMarker_LBCORE_118() throws Exception { jee.setExpression("marker.contains(\"BLUE\")"); - jee.setContext(loggerContext); - jee.addMatcher(matcherX); jee.start(); ILoggingEvent event = makeLoggingEvent(null); @@ -127,36 +120,32 @@ public class JaninoEventEvaluatorTest { jee.evaluate(event); fail("We should not reach this point"); } catch (EvaluationException ee) { - + // received an exception as expected } } @Test - public void testWithNullMarker() throws Exception { - JaninoEventEvaluator jee = new JaninoEventEvaluator(); + public void evaluatorFilterWithNullMarker_LBCORE_118() throws Exception { + EvaluatorFilter<ILoggingEvent> ef = new EvaluatorFilter<ILoggingEvent>(); + ef.setContext(loggerContext); + + ef.setOnMatch(FilterReply.ACCEPT); + ef.setOnMismatch(FilterReply.DENY); + jee.setExpression("marker.contains(\"BLUE\")"); - jee.setContext(loggerContext); - jee.addMatcher(matcherX); jee.start(); + ef.setEvaluator(jee); + ef.start(); ILoggingEvent event = makeLoggingEvent(null); - try { - jee.evaluate(event); - fail("We should not reach this point"); - } catch (EvaluationException ee) { - - } + assertEquals(FilterReply.NEUTRAL, ef.decide(event)); + } - - @Test public void testComplex() throws Exception { - - JaninoEventEvaluator jee = new JaninoEventEvaluator(); jee .setExpression("level >= INFO && x.matches(message) && marker.contains(\"BLUE\")"); - jee.setContext(loggerContext); jee.addMatcher(matcherX); jee.start(); @@ -166,35 +155,23 @@ public class JaninoEventEvaluatorTest { } /** - * check that evaluator with bogis exp does not start + * check that evaluator with bogus exp does not start * * @throws Exception */ @Test public void testBogusExp1() { - - JaninoEventEvaluator jee = new JaninoEventEvaluator(); jee.setExpression("mzzzz.get(\"key\").equals(null)"); - jee.setContext(loggerContext); jee.setName("bogus"); jee.start(); assertFalse(jee.isStarted()); - - // StatusPrinter.print(loggerContext); - // LoggingEvent event = makeLoggingEvent(null); - // event.setMarker(MarkerFactory.getMarker("BLUE")); - // - // jee.evaluate(event); } // check that eval stops after errors @Test public void testBogusExp2() { - - JaninoEventEvaluator jee = new JaninoEventEvaluator(); jee.setExpression("mdc.get(\"keyXN89\").equals(null)"); - jee.setContext(loggerContext); jee.setName("bogus"); jee.start(); @@ -222,19 +199,17 @@ public class JaninoEventEvaluatorTest { // with 10 parameters 510 nanos (all levels + fields) void loop(JaninoEventEvaluator jee, String msg) throws Exception { ILoggingEvent event = makeLoggingEvent(null); - //final long start = System.nanoTime(); + // final long start = System.nanoTime(); for (int i = 0; i < LEN; i++) { jee.evaluate(event); } - //final long end = System.nanoTime(); - //System.out.println(msg + (end - start) / LEN + " nanos"); + // final long end = System.nanoTime(); + // System.out.println(msg + (end - start) / LEN + " nanos"); } @Test public void testLoop1() throws Exception { - JaninoEventEvaluator jee = new JaninoEventEvaluator(); jee.setExpression("timeStamp > 10"); - jee.setContext(loggerContext); jee.start(); loop(jee, "timestamp > 10]: "); @@ -242,32 +217,25 @@ public class JaninoEventEvaluatorTest { @Test public void testLoop2() throws Exception { - JaninoEventEvaluator jee = new JaninoEventEvaluator(); jee.setExpression("x.matches(message)"); - jee.setContext(loggerContext); jee.addMatcher(matcherX); jee.start(); loop(jee, "x.matches(message): "); } - @Test + @Test public void throwable_LBCLASSIC_155_I() throws EvaluationException { - JaninoEventEvaluator jee = new JaninoEventEvaluator(); jee.setExpression("throwable instanceof java.io.IOException"); - jee.setContext(loggerContext); jee.start(); LoggingEvent event = makeLoggingEvent(new IOException("")); assertTrue(jee.evaluate(event)); } - - @Test + @Test public void throwable_LBCLASSIC_155_II() throws EvaluationException { - JaninoEventEvaluator jee = new JaninoEventEvaluator(); jee.setExpression("throwableProxy.getClassName().contains(\"IO\")"); - jee.setContext(loggerContext); jee.start(); LoggingEvent event = makeLoggingEvent(new IOException("")); diff --git a/logback-examples/src/main/java/chapter6/evaluatorWithMatcher.xml b/logback-examples/src/main/java/chapter6/evaluatorWithMatcher.xml index 64d0efb..f2aab92 100644 --- a/logback-examples/src/main/java/chapter6/evaluatorWithMatcher.xml +++ b/logback-examples/src/main/java/chapter6/evaluatorWithMatcher.xml @@ -9,7 +9,7 @@ <regex>statement [13579]</regex> </matcher> - <expression>message.contains("billing") || odd.matches(formattedMessage)</expression> + <expression>odd.matches(formattedMessage)</expression> </evaluator> <OnMismatch>NEUTRAL</OnMismatch> <OnMatch>DENY</OnMatch> diff --git a/logback-site/src/site/pages/manual/filters.html b/logback-site/src/site/pages/manual/filters.html index 3b61138..b2aa23c 100644 --- a/logback-site/src/site/pages/manual/filters.html +++ b/logback-site/src/site/pages/manual/filters.html @@ -348,7 +348,9 @@ public class SampleFilter extends Filter>ILoggingEvent> { <td>marker</td> <td><code>Marker</code></td> <td>The <code>Marker</code> object associated with the logging - request. + request. Note that marker can be null and it is your + responsibility to check for this condition in order to avoid + <code>NullPointerException</code>. </td> </tr> <tr> @@ -502,7 +504,7 @@ java chapter6.FilterEvents src/main/java/chapter6/basicConfiguration.xml Example 6.: Defining matchers in an event evaluator (logback-examples/src/main/java/chapter6/evaluatorWithMatcher.xml) - <pre class="prettyprint source longline"><configuration debug="true"> + <pre class="prettyprint source"><configuration debug="true"> <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> <filter class="ch.qos.logback.core.filter.EvaluatorFilter"> @@ -513,7 +515,7 @@ java chapter6.FilterEvents src/main/java/chapter6/basicConfiguration.xml <regex>statement [13579]</regex> </matcher> - <expression>message.contains("billing") || odd.matches(formattedMessage)</expression> + <expression>odd.matches(formattedMessage)</expression> </evaluator> <OnMismatch>NEUTRAL</OnMismatch> <OnMatch>DENY</OnMatch> @@ -533,13 +535,14 @@ java chapter6.FilterEvents src/main/java/chapter6/basicConfiguration.xml we obtain: - 220 [main] INFO chapter6.FilterEvents - logging statement 0 -223 [main] INFO chapter6.FilterEvents - logging statement 2 -223 [main] INFO chapter6.FilterEvents - logging statement 4 -225 [main] INFO chapter6.FilterEvents - logging statement 8 + 260 [main] INFO chapter6.FilterEvents - logging statement 0 +264 [main] INFO chapter6.FilterEvents - logging statement 2 +264 [main] INFO chapter6.FilterEvents - logging statement 4 +266 [main] ERROR chapter6.FilterEvents - billing statement 6 +266 [main] INFO chapter6.FilterEvents - logging statement 8 In case you need to define additional matchers, you can do so by - adding further <code><matcher></code> elements. + adding further <code><matcher></code> elements.   ----------------------------------------------------------------------- Summary of changes: .../classic/boolex/JaninoEventEvaluator.java | 55 ++++++------ .../classic/boolex/JaninoEventEvaluatorTest.java | 94 +++++++------------- .../main/java/chapter6/evaluatorWithMatcher.xml | 2 +- logback-site/src/site/pages/manual/filters.html | 19 +++-- 4 files changed, 71 insertions(+), 99 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBCORE-118) EvaluatorFilter returns OnMatch when marker is null
by Manuel Kueblboeck (JIRA) 10 Nov '09

10 Nov '09

EvaluatorFilter returns OnMatch when marker is null --------------------------------------------------- Key: LBCORE-118 URL: http://jira.qos.ch/browse/LBCORE-118 Project: logback-core Issue Type: Bug Components: Other Affects Versions: 0.9.17 Environment: Windows XP Reporter: Manuel Kueblboeck Assignee: Logback dev list Priority: Minor <appender name="Alert" class="ch.qos.logback.core.ConsoleAppender"> <filter class="ch.qos.logback.core.filter.EvaluatorFilter"> <evaluator name="isAlert"> <expression>marker.getName().equals("Alert")</expression> </evaluator> <OnMatch>ACCEPT</OnMatch> <OnMismatch>DENY</OnMismatch> </filter> <layout class="ch.qos.logback.classic.PatternLayout"> <Pattern>ALERT: %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</Pattern> </layout> </appender> In the above example, when an event is logged without an attached marker, the filter returns OnMatch. I would expect that it returns OnMismatch. A work around for this issue is to change the expression to this: <expression>marker != null && marker.getName().equals("Alert")</expression> -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

2 3

branch, master, updated. baba96b8e2a916ecee6d3fda41c7040535f5b175
by git-noreply＠pixie.qos.ch 10 Nov '09

10 Nov '09

The branch, master has been updated via baba96b8e2a916ecee6d3fda41c7040535f5b175 (commit) via 0ddd19930833e8f5a2fb71c2b464d0c166783ab6 (commit) from 2f865c2f17e2444e562781b250950d29e3f429f8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=baba96b8e2a916ecee6d3fda… http://github.com/ceki/logback/commit/baba96b8e2a916ecee6d3fda41c7040535f5b… commit baba96b8e2a916ecee6d3fda41c7040535f5b175 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Nov 10 20:39:03 2009 +0100 - applied Hugues Malphettes' second patch as provided in http://jira.qos.ch/browse/LBCLASSIC-165 diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml index a69ccb9..f7e1bd7 100644 --- a/logback-classic/pom.xml +++ b/logback-classic/pom.xml @@ -209,8 +209,14 @@ <configuration> <instructions> <Export-Package>ch.qos.logback.classic*, org.slf4j.impl;version=1.5.6</Export-Package> +  + <Import-Package> sun.reflect;resolution:=optional, javax.jms;resolution:=optional, + ch.qos.logback.core.rolling, ch.qos.logback.core.rolling.helper, * </Import-Package> http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=0ddd19930833e8f5a2fb71c2… http://github.com/ceki/logback/commit/0ddd19930833e8f5a2fb71c2b464d0c166783… commit 0ddd19930833e8f5a2fb71c2b464d0c166783ab6 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Nov 10 19:44:52 2009 +0100 - short mention of licensing change diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index 5792c7e..0254ae2 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -30,6 +30,12 @@ <h3>13th of November 2009 - Release of version 0.9.18</h3> + After a very long investigation resulting in somewhat a better + understanding of licensing issues, logback is now <a + href="license.html">dual-licensed</a> under the EPL 1.0 and LGPL + 2.1. + + Fixed Private-Package and Export-Package sections in logback-classic.jar MANIFEST as reported in <a href="http://jira.qos.ch/browse/LBCLASSIC-165">LBCLASSIC-165</a> ----------------------------------------------------------------------- Summary of changes: logback-classic/pom.xml | 6 ++++++ logback-site/src/site/pages/news.html | 6 ++++++ 2 files changed, 12 insertions(+), 0 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0