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

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch master updated. v_0.9.30-63-g1b3439a
by git-noreply＠pixie.qos.ch 30 Oct '11

30 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via 1b3439a5868d50b8423f675e15dc8db9a35b7102 (commit) from ab6c1ddb8825e9e37a0250da5465bba5e34565b1 (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=1b3439a5868d50b8423f675e… http://github.com/ceki/logback/commit/1b3439a5868d50b8423f675e15dc8db9a35b7… commit 1b3439a5868d50b8423f675e15dc8db9a35b7102 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Sun Oct 30 19:25:44 2011 +0100 removing unused imports diff --git a/logback-access/src/main/java/ch/qos/logback/access/jetty/JettyServerAdapter.java b/logback-access/src/main/java/ch/qos/logback/access/jetty/JettyServerAdapter.java index bdb2fbe..877b84b 100644 --- a/logback-access/src/main/java/ch/qos/logback/access/jetty/JettyServerAdapter.java +++ b/logback-access/src/main/java/ch/qos/logback/access/jetty/JettyServerAdapter.java @@ -22,7 +22,6 @@ import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Response; import ch.qos.logback.access.spi.ServerAdapter; -import org.eclipse.jetty.server.Request; /** * A jetty specific implementation of the {@link ServerAdapter} interface. diff --git a/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeHttpServletRequest.java b/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeHttpServletRequest.java index f2601f2..86219fc 100644 --- a/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeHttpServletRequest.java +++ b/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeHttpServletRequest.java @@ -22,7 +22,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; import static ch.qos.logback.access.AccessConstants.LB_INPUT_BUFFER; -import static ch.qos.logback.access.AccessConstants.X_WWW_FORM_URLECODED; /** * As the "tee" program on Unix, duplicate the request's input stream. * diff --git a/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletInputStream.java b/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletInputStream.java index 68272cd..bc3f74f 100644 --- a/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletInputStream.java +++ b/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletInputStream.java @@ -17,8 +17,6 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; import javax.servlet.ServletInputStream; import javax.servlet.http.HttpServletRequest; diff --git a/logback-access/src/test/java/ch/qos/logback/access/joran/ConditionalTest.java b/logback-access/src/test/java/ch/qos/logback/access/joran/ConditionalTest.java index 16a2bea..9ab337a 100644 --- a/logback-access/src/test/java/ch/qos/logback/access/joran/ConditionalTest.java +++ b/logback-access/src/test/java/ch/qos/logback/access/joran/ConditionalTest.java @@ -3,13 +3,11 @@ package ch.qos.logback.access.joran; import ch.qos.logback.access.TeztConstants; import ch.qos.logback.access.spi.AccessContext; import ch.qos.logback.core.ConsoleAppender; -import ch.qos.logback.core.FileAppender; import ch.qos.logback.core.joran.spi.JoranException; import ch.qos.logback.core.read.ListAppender; import ch.qos.logback.core.status.StatusChecker; import ch.qos.logback.core.testUtil.RandomUtil; import ch.qos.logback.core.util.CoreTestConstants; -import ch.qos.logback.core.util.StatusPrinter; import org.junit.Before; import org.junit.Test; diff --git a/logback-access/src/test/java/ch/qos/logback/access/servlet/PackageTest.java b/logback-access/src/test/java/ch/qos/logback/access/servlet/PackageTest.java index 801197e..0bf8aa8 100644 --- a/logback-access/src/test/java/ch/qos/logback/access/servlet/PackageTest.java +++ b/logback-access/src/test/java/ch/qos/logback/access/servlet/PackageTest.java @@ -13,7 +13,6 @@ */ package ch.qos.logback.access.servlet; -import ch.qos.logback.access.filter.StatsByDayTest; import junit.framework.TestCase; import org.junit.runner.RunWith; import org.junit.runners.Suite; diff --git a/logback-access/src/test/java/ch/qos/logback/access/servlet/TeeFilterTest.java b/logback-access/src/test/java/ch/qos/logback/access/servlet/TeeFilterTest.java index 2d233b5..5e62088 100644 --- a/logback-access/src/test/java/ch/qos/logback/access/servlet/TeeFilterTest.java +++ b/logback-access/src/test/java/ch/qos/logback/access/servlet/TeeFilterTest.java @@ -15,9 +15,7 @@ package ch.qos.logback.access.servlet; import org.junit.Test; -import java.util.ArrayList; import java.util.Arrays; -import java.util.List; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/boolex/GEventEvaluator.java b/logback-classic/src/main/java/ch/qos/logback/classic/boolex/GEventEvaluator.java index d374886..3c6ac2b 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/boolex/GEventEvaluator.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/boolex/GEventEvaluator.java @@ -15,7 +15,6 @@ package ch.qos.logback.classic.boolex; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.boolex.EvaluationException; -import ch.qos.logback.core.boolex.EventEvaluator; import ch.qos.logback.core.boolex.EventEvaluatorBase; import ch.qos.logback.core.util.FileUtil; import groovy.lang.*; diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/gaffer/GafferUtil.java b/logback-classic/src/main/java/ch/qos/logback/classic/gaffer/GafferUtil.java index 387c79c..011699f 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/gaffer/GafferUtil.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/gaffer/GafferUtil.java @@ -16,7 +16,6 @@ package ch.qos.logback.classic.gaffer; import ch.qos.logback.classic.ClassicConstants; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.core.status.ErrorStatus; -import ch.qos.logback.core.status.InfoStatus; import ch.qos.logback.core.status.StatusManager; import java.io.File; diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/LoggerContextListenerAction.java b/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/LoggerContextListenerAction.java index 7539bcc..9a5d8e9 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/LoggerContextListenerAction.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/LoggerContextListenerAction.java @@ -13,20 +13,12 @@ */ package ch.qos.logback.classic.joran.action; -import java.lang.management.ManagementFactory; - -import javax.management.MBeanServer; -import javax.management.ObjectName; - import ch.qos.logback.classic.spi.LoggerContextListener; -import ch.qos.logback.core.boolex.EventEvaluator; import ch.qos.logback.core.spi.ContextAware; import ch.qos.logback.core.spi.LifeCycle; import org.xml.sax.Attributes; import ch.qos.logback.classic.LoggerContext; -import ch.qos.logback.classic.jmx.JMXConfigurator; -import ch.qos.logback.classic.jmx.MBeanUtil; import ch.qos.logback.core.joran.action.Action; import ch.qos.logback.core.joran.spi.ActionException; import ch.qos.logback.core.joran.spi.InterpretationContext; diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketNode.java b/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketNode.java index 390fc67..ac6b510 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketNode.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketNode.java @@ -20,7 +20,6 @@ import java.net.Socket; import java.net.SocketAddress; import ch.qos.logback.classic.Logger; -import org.slf4j.LoggerFactory; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.spi.ILoggingEvent; diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ClassicConverter.java b/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ClassicConverter.java index 9c0823c..ce7bb7e 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ClassicConverter.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ClassicConverter.java @@ -13,13 +13,8 @@ */ package ch.qos.logback.classic.pattern; -import ch.qos.logback.classic.LoggerContext; -import ch.qos.logback.classic.spi.LoggerContextAwareBase; import ch.qos.logback.classic.spi.ILoggingEvent; -import ch.qos.logback.core.Context; import ch.qos.logback.core.pattern.DynamicConverter; -import ch.qos.logback.core.status.Status; - /** * This class serves the super-class of all converters in logback. It extends diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/pattern/DateConverter.java b/logback-classic/src/main/java/ch/qos/logback/classic/pattern/DateConverter.java index 3532bf8..b29a422 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/pattern/DateConverter.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/pattern/DateConverter.java @@ -13,8 +13,6 @@ */ package ch.qos.logback.classic.pattern; -import java.text.SimpleDateFormat; -import java.util.Date; import java.util.List; import java.util.TimeZone; diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/sift/MDCBasedDiscriminator.java b/logback-classic/src/main/java/ch/qos/logback/classic/sift/MDCBasedDiscriminator.java index 2fa8a1f..38eb045 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/sift/MDCBasedDiscriminator.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/sift/MDCBasedDiscriminator.java @@ -13,8 +13,6 @@ */ package ch.qos.logback.classic.sift; -import org.slf4j.MDC; - import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.sift.Discriminator; import ch.qos.logback.core.spi.ContextAwareBase; diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/sift/SiftingAppender.java b/logback-classic/src/main/java/ch/qos/logback/classic/sift/SiftingAppender.java index e62b409..98fcd63 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/sift/SiftingAppender.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/sift/SiftingAppender.java @@ -15,7 +15,6 @@ package ch.qos.logback.classic.sift; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.joran.spi.DefaultClass; -import ch.qos.logback.core.sift.AppenderTracker; import ch.qos.logback.core.sift.Discriminator; import ch.qos.logback.core.sift.SiftingAppenderBase; diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/spi/PackagingDataCalculator.java b/logback-classic/src/main/java/ch/qos/logback/classic/spi/PackagingDataCalculator.java index f9c5ba8..c9b8232 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/spi/PackagingDataCalculator.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/spi/PackagingDataCalculator.java @@ -16,7 +16,6 @@ package ch.qos.logback.classic.spi; import java.net.URL; import java.util.HashMap; -import ch.qos.logback.core.util.Loader; import sun.reflect.Reflection; // import java.security.AccessControlException; import java.security.AccessController;import java.security.PrivilegedAction; /** diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/turbo/LRUMessageCache.java b/logback-classic/src/main/java/ch/qos/logback/classic/turbo/LRUMessageCache.java index ab12e8e..86219f4 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/turbo/LRUMessageCache.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/turbo/LRUMessageCache.java @@ -13,7 +13,6 @@ */ package ch.qos.logback.classic.turbo; -import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeFilter.java b/logback-classic/src/main/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeFilter.java index 3565e60..19f8aa1 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeFilter.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeFilter.java @@ -19,13 +19,10 @@ import java.util.List; import ch.qos.logback.classic.gaffer.GafferUtil; import ch.qos.logback.classic.util.EnvUtil; -import ch.qos.logback.core.CoreConstants; import ch.qos.logback.core.joran.event.SaxEvent; import ch.qos.logback.core.joran.spi.ConfigurationWatchList; import ch.qos.logback.core.joran.util.ConfigurationWatchListUtil; -import ch.qos.logback.core.status.Status; import ch.qos.logback.core.status.StatusChecker; -import ch.qos.logback.core.status.WarnStatus; import org.slf4j.Marker; import ch.qos.logback.classic.Level; @@ -34,7 +31,6 @@ import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.joran.JoranConfigurator; import ch.qos.logback.core.joran.spi.JoranException; import ch.qos.logback.core.spi.FilterReply; -import ch.qos.logback.core.status.InfoStatus; /** * Reconfigure a LoggerContext when the configuration file changes. diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java b/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java index eeb7898..fa2619c 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java @@ -21,10 +21,8 @@ import java.util.List; import ch.qos.logback.classic.BasicConfigurator; import ch.qos.logback.classic.LoggerContext; -import ch.qos.logback.classic.gaffer.GafferConfigurator; import ch.qos.logback.classic.gaffer.GafferUtil; import ch.qos.logback.classic.joran.JoranConfigurator; -import ch.qos.logback.core.CoreConstants; import ch.qos.logback.core.joran.spi.JoranException; import ch.qos.logback.core.status.ErrorStatus; import ch.qos.logback.core.status.InfoStatus; diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/PatternLayoutTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/PatternLayoutTest.java index 189a06c..7a911a2 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/PatternLayoutTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/PatternLayoutTest.java @@ -22,10 +22,8 @@ import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.List; -import ch.qos.logback.core.status.Status; import ch.qos.logback.core.util.StatusPrinter; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import ch.qos.logback.classic.joran.JoranConfigurator; diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/boolex/ConditionalWithoutJanino.java b/logback-classic/src/test/java/ch/qos/logback/classic/boolex/ConditionalWithoutJanino.java index 8d732da..2bc4341 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/boolex/ConditionalWithoutJanino.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/boolex/ConditionalWithoutJanino.java @@ -18,11 +18,8 @@ import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.joran.JoranConfigurator; -import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.joran.conditional.IfAction; import ch.qos.logback.core.joran.spi.JoranException; -import ch.qos.logback.core.read.ListAppender; -import ch.qos.logback.core.status.Status; import ch.qos.logback.core.status.StatusChecker; import ch.qos.logback.core.util.StatusPrinter; import org.junit.Test; diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbcore_155/OThread.java b/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbcore_155/OThread.java index 03a1f6f..d6e7fb8 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbcore_155/OThread.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/issue/lbcore_155/OThread.java @@ -14,8 +14,6 @@ package ch.qos.logback.classic.issue.lbcore_155; -import ch.qos.logback.classic.LoggerContext; -import ch.qos.logback.core.util.StatusPrinter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java index 8f85033..b4c1e74 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java @@ -15,8 +15,6 @@ package ch.qos.logback.classic.joran; import java.io.File; import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; import java.util.concurrent.TimeUnit; import java.util.logging.LogManager; diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/jul/LevelChangePropagatorTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/jul/LevelChangePropagatorTest.java index 244ad6a..9f6fc56 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/jul/LevelChangePropagatorTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/jul/LevelChangePropagatorTest.java @@ -20,8 +20,6 @@ import org.junit.Before; import org.junit.Test; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - public class LevelChangePropagatorTest { LoggerContext loggerContext = new LoggerContext(); diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppender_SubethaSMTPTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppender_SubethaSMTPTest.java index 826010c..58bfd11 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppender_SubethaSMTPTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/net/SMTPAppender_SubethaSMTPTest.java @@ -18,7 +18,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.io.ByteArrayOutputStream; -import java.net.BindException; import java.util.List; import java.util.Random; import java.util.concurrent.ThreadPoolExecutor; diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/rolling/UniqueFileTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/rolling/UniqueFileTest.java index 5624e8c..e517ff3 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/rolling/UniqueFileTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/rolling/UniqueFileTest.java @@ -15,9 +15,6 @@ package ch.qos.logback.classic.rolling; import static org.junit.Assert.assertTrue; -import java.text.SimpleDateFormat; -import java.util.Date; - import ch.qos.logback.core.util.CachingDateFormatter; import org.junit.Test; diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/sift/MDCBasedDiscriminatorTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/sift/MDCBasedDiscriminatorTest.java index edd0013..08ef733 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/sift/MDCBasedDiscriminatorTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/sift/MDCBasedDiscriminatorTest.java @@ -28,7 +28,6 @@ import org.slf4j.MDC; import java.util.HashMap; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; /** diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/turbo/LRUMessageCacheTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/turbo/LRUMessageCacheTest.java index 77fb653..3ec9f39 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/turbo/LRUMessageCacheTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/turbo/LRUMessageCacheTest.java @@ -13,14 +13,6 @@ */ package ch.qos.logback.classic.turbo; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.Callable; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; - import junit.framework.Assert; import org.junit.Test; diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigurePerf.java b/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigurePerf.java index 2122bbe..b8ce4bd 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigurePerf.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigurePerf.java @@ -15,26 +15,20 @@ package ch.qos.logback.classic.turbo; import java.io.File; import java.io.IOException; -import java.net.MalformedURLException; import org.junit.Before; import org.junit.Test; import ch.qos.logback.classic.ClassicTestConstants; -import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.issue.lbclassic135.LoggingRunnable; import ch.qos.logback.classic.joran.JoranConfigurator; -import ch.qos.logback.core.CoreConstants; import ch.qos.logback.core.contention.MultiThreadedHarness; import ch.qos.logback.core.contention.RunnableWithCounterAndDone; import ch.qos.logback.core.joran.spi.JoranException; -import ch.qos.logback.core.status.InfoStatus; import ch.qos.logback.core.testUtil.Env; -import static org.junit.Assert.fail; - public class ReconfigurePerf { final static int THREAD_COUNT = 50; //final static int LOOP_LEN = 1000 * 1000; diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/util/InitializationIntegrationTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/util/InitializationIntegrationTest.java index 20fd239..f10ba01 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/util/InitializationIntegrationTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/util/InitializationIntegrationTest.java @@ -14,9 +14,7 @@ package ch.qos.logback.classic.util; import ch.qos.logback.classic.Logger; -import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.core.read.ListAppender; -import ch.qos.logback.core.util.StatusPrinter; import org.junit.Test; import org.slf4j.LoggerFactory; diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/util/LogbackMDCAdapterTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/util/LogbackMDCAdapterTest.java index dca0e26..6918e70 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/util/LogbackMDCAdapterTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/util/LogbackMDCAdapterTest.java @@ -20,7 +20,6 @@ import static org.junit.Assert.assertTrue; import java.util.HashMap; import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CountDownLatch; import org.junit.Test; diff --git a/logback-classic/src/test/java/org/slf4j/impl/RecursiveInitializationTest.java b/logback-classic/src/test/java/org/slf4j/impl/RecursiveInitializationTest.java index 1b4bb16..4c4006e 100644 --- a/logback-classic/src/test/java/org/slf4j/impl/RecursiveInitializationTest.java +++ b/logback-classic/src/test/java/org/slf4j/impl/RecursiveInitializationTest.java @@ -26,7 +26,6 @@ import org.slf4j.LoggerFactoryFriend; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.util.ContextInitializer; import ch.qos.logback.core.status.Status; -import ch.qos.logback.core.status.StatusManager; import ch.qos.logback.core.testUtil.RandomUtil; import ch.qos.logback.core.util.StatusPrinter; diff --git a/logback-core/src/main/java/ch/qos/logback/core/Context.java b/logback-core/src/main/java/ch/qos/logback/core/Context.java index cacfa2f..07d9612 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/Context.java +++ b/logback-core/src/main/java/ch/qos/logback/core/Context.java @@ -14,7 +14,6 @@ package ch.qos.logback.core; import java.util.Map; -import java.util.concurrent.Executor; import java.util.concurrent.ExecutorService; import ch.qos.logback.core.spi.PropertyContainer; diff --git a/logback-core/src/main/java/ch/qos/logback/core/boolex/JaninoEventEvaluatorBase.java b/logback-core/src/main/java/ch/qos/logback/core/boolex/JaninoEventEvaluatorBase.java index c5ea1e2..79ffabe 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/boolex/JaninoEventEvaluatorBase.java +++ b/logback-core/src/main/java/ch/qos/logback/core/boolex/JaninoEventEvaluatorBase.java @@ -16,7 +16,6 @@ package ch.qos.logback.core.boolex; import java.util.ArrayList; import java.util.List; -import org.codehaus.janino.ExpressionEvaluator; import org.codehaus.janino.ScriptEvaluator; /** diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/GenericConfigurator.java b/logback-core/src/main/java/ch/qos/logback/core/joran/GenericConfigurator.java index 75a2014..a93d371 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/GenericConfigurator.java +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/GenericConfigurator.java @@ -31,7 +31,6 @@ import org.xml.sax.InputSource; import ch.qos.logback.core.joran.event.SaxEvent; import ch.qos.logback.core.joran.event.SaxEventRecorder; import ch.qos.logback.core.joran.spi.DefaultNestedComponentRegistry; -import ch.qos.logback.core.joran.spi.EventPlayer; import ch.qos.logback.core.joran.spi.InterpretationContext; import ch.qos.logback.core.joran.spi.Interpreter; import ch.qos.logback.core.joran.spi.JoranException; diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/action/PropertyAction.java b/logback-core/src/main/java/ch/qos/logback/core/joran/action/PropertyAction.java index 9531547..4d2f076 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/action/PropertyAction.java +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/action/PropertyAction.java @@ -13,7 +13,6 @@ */ package ch.qos.logback.core.joran.action; -import ch.qos.logback.core.CoreConstants; import ch.qos.logback.core.util.ContextUtil; import org.xml.sax.Attributes; diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/action/TimestampAction.java b/logback-core/src/main/java/ch/qos/logback/core/joran/action/TimestampAction.java index 533b81f..ec189a9 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/action/TimestampAction.java +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/action/TimestampAction.java @@ -13,9 +13,6 @@ */ package ch.qos.logback.core.joran.action; -import java.text.SimpleDateFormat; -import java.util.Date; - import ch.qos.logback.core.util.CachingDateFormatter; import org.xml.sax.Attributes; diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/PropertyWrapperForScripts.java b/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/PropertyWrapperForScripts.java index f277885..fd832a9 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/PropertyWrapperForScripts.java +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/PropertyWrapperForScripts.java @@ -16,9 +16,6 @@ package ch.qos.logback.core.joran.conditional; import ch.qos.logback.core.spi.PropertyContainer; import ch.qos.logback.core.util.OptionHelper; -import java.util.HashMap; -import java.util.Map; - public class PropertyWrapperForScripts { PropertyContainer local; diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/spi/Interpreter.java b/logback-core/src/main/java/ch/qos/logback/core/joran/spi/Interpreter.java index 3f2698a..a0b7d1d 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/spi/Interpreter.java +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/spi/Interpreter.java @@ -28,7 +28,6 @@ import ch.qos.logback.core.joran.action.Action; import ch.qos.logback.core.joran.action.ImplicitAction; import ch.qos.logback.core.joran.event.BodyEvent; import ch.qos.logback.core.joran.event.EndEvent; -import ch.qos.logback.core.joran.event.SaxEvent; import ch.qos.logback.core.joran.event.StartEvent; import ch.qos.logback.core.spi.ContextAwareImpl; diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/util/ConfigurationWatchListUtil.java b/logback-core/src/main/java/ch/qos/logback/core/joran/util/ConfigurationWatchListUtil.java index f2b0c53..0a09a80 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/util/ConfigurationWatchListUtil.java +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/util/ConfigurationWatchListUtil.java @@ -21,10 +21,6 @@ import ch.qos.logback.core.status.Status; import ch.qos.logback.core.status.StatusManager; import ch.qos.logback.core.status.WarnStatus; -import javax.security.auth.login.Configuration; -import java.io.File; -import java.net.MalformedURLException; -import java.net.URI; import java.net.URL; /** diff --git a/logback-core/src/main/java/ch/qos/logback/core/pattern/ReplacingCompositeConverter.java b/logback-core/src/main/java/ch/qos/logback/core/pattern/ReplacingCompositeConverter.java index 91f6caf..49794ca 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/pattern/ReplacingCompositeConverter.java +++ b/logback-core/src/main/java/ch/qos/logback/core/pattern/ReplacingCompositeConverter.java @@ -13,9 +13,6 @@ */ package ch.qos.logback.core.pattern; -import ch.qos.logback.core.Context; -import ch.qos.logback.core.spi.ContextAware; - import java.util.List; import java.util.regex.Pattern; diff --git a/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/OptionTokenizer.java b/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/OptionTokenizer.java index f396a1d..25e89d5 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/OptionTokenizer.java +++ b/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/OptionTokenizer.java @@ -18,7 +18,6 @@ import java.util.List; import ch.qos.logback.core.pattern.util.AsIsEscapeUtil; import ch.qos.logback.core.pattern.util.IEscapeUtil; -import ch.qos.logback.core.pattern.util.RegularEscapeUtil; import static ch.qos.logback.core.CoreConstants.CURLY_RIGHT; diff --git a/logback-core/src/main/java/ch/qos/logback/core/pattern/util/AsIsEscapeUtil.java b/logback-core/src/main/java/ch/qos/logback/core/pattern/util/AsIsEscapeUtil.java index f724091..e3f7810 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/pattern/util/AsIsEscapeUtil.java +++ b/logback-core/src/main/java/ch/qos/logback/core/pattern/util/AsIsEscapeUtil.java @@ -13,9 +13,6 @@ */ package ch.qos.logback.core.pattern.util; -import ch.qos.logback.core.CoreConstants; -import ch.qos.logback.core.rolling.helper.FileNamePattern; - /** * @author Ceki Gülcü */ diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/DefaultTimeBasedFileNamingAndTriggeringPolicy.java b/logback-core/src/main/java/ch/qos/logback/core/rolling/DefaultTimeBasedFileNamingAndTriggeringPolicy.java index 1947c84..6010c43 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/rolling/DefaultTimeBasedFileNamingAndTriggeringPolicy.java +++ b/logback-core/src/main/java/ch/qos/logback/core/rolling/DefaultTimeBasedFileNamingAndTriggeringPolicy.java @@ -16,7 +16,6 @@ package ch.qos.logback.core.rolling; import java.io.File; import java.util.Date; -import ch.qos.logback.core.rolling.helper.DefaultArchiveRemover; import ch.qos.logback.core.rolling.helper.TimeBasedArchiveRemover; /** diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/DateTokenConverter.java b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/DateTokenConverter.java index 5f0a239..5e6fa2a 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/DateTokenConverter.java +++ b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/DateTokenConverter.java @@ -13,7 +13,6 @@ */ package ch.qos.logback.core.rolling.helper; -import java.text.SimpleDateFormat; import java.util.Date; import ch.qos.logback.core.CoreConstants; diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/TimeBasedArchiveRemover.java b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/TimeBasedArchiveRemover.java index a44b65a..2c65c41 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/TimeBasedArchiveRemover.java +++ b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/TimeBasedArchiveRemover.java @@ -16,11 +16,6 @@ package ch.qos.logback.core.rolling.helper; import java.io.File; import java.util.Date; -import ch.qos.logback.core.pattern.Converter; -import ch.qos.logback.core.pattern.LiteralConverter; -import ch.qos.logback.core.spi.ContextAwareBase; -import org.codehaus.groovy.tools.shell.util.NoExitSecurityManager; - public class TimeBasedArchiveRemover extends DefaultArchiveRemover { public TimeBasedArchiveRemover(FileNamePattern fileNamePattern, diff --git a/logback-core/src/main/java/ch/qos/logback/core/spi/AppenderAttachableImpl.java b/logback-core/src/main/java/ch/qos/logback/core/spi/AppenderAttachableImpl.java index ff4f5af..f21e334 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/spi/AppenderAttachableImpl.java +++ b/logback-core/src/main/java/ch/qos/logback/core/spi/AppenderAttachableImpl.java @@ -13,13 +13,8 @@ */ package ch.qos.logback.core.spi; -import java.util.ArrayList; import java.util.Iterator; -import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReadWriteLock; -import java.util.concurrent.locks.ReentrantReadWriteLock; import ch.qos.logback.core.Appender; diff --git a/logback-core/src/main/java/ch/qos/logback/core/status/ViewStatusMessagesServletBase.java b/logback-core/src/main/java/ch/qos/logback/core/status/ViewStatusMessagesServletBase.java index c694246..c60a323 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/status/ViewStatusMessagesServletBase.java +++ b/logback-core/src/main/java/ch/qos/logback/core/status/ViewStatusMessagesServletBase.java @@ -18,7 +18,6 @@ import static ch.qos.logback.core.CoreConstants.LINE_SEPARATOR; import java.io.IOException; import java.io.PrintWriter; import java.io.StringWriter; -import java.text.SimpleDateFormat; import java.util.List; import javax.servlet.ServletException; diff --git a/logback-core/src/test/java/ch/qos/logback/core/appender/FileAppenderTest.java b/logback-core/src/test/java/ch/qos/logback/core/appender/FileAppenderTest.java index 0250640..355213b 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/appender/FileAppenderTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/appender/FileAppenderTest.java @@ -32,7 +32,6 @@ import ch.qos.logback.core.status.StatusManager; import ch.qos.logback.core.testUtil.RandomUtil; import ch.qos.logback.core.util.CoreTestConstants; import ch.qos.logback.core.util.FileUtil; -import ch.qos.logback.core.util.StatusPrinter; public class FileAppenderTest extends AbstractAppenderTest<Object> { diff --git a/logback-core/src/test/java/ch/qos/logback/core/helpers/FileFilterUtilTest.java b/logback-core/src/test/java/ch/qos/logback/core/helpers/FileFilterUtilTest.java index 3267207..38a1041 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/helpers/FileFilterUtilTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/helpers/FileFilterUtilTest.java @@ -20,10 +20,8 @@ import ch.qos.logback.core.rolling.helper.FileNamePattern; import org.junit.Test; import java.io.File; -import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Date; import static junit.framework.Assert.assertEquals; diff --git a/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialConfiguratorTest.java b/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialConfiguratorTest.java index 3697c58..89b8869 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialConfiguratorTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialConfiguratorTest.java @@ -28,8 +28,6 @@ import java.util.jar.JarOutputStream; import java.util.zip.ZipEntry; import ch.qos.logback.core.CoreConstants; -import ch.qos.logback.core.db.dialect.SQLDialect; -import ch.qos.logback.core.util.StatusPrinter; import org.junit.Test; import ch.qos.logback.core.Context; diff --git a/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java b/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java index 379a804..5aee968 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java @@ -27,6 +27,7 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Stack; +import ch.qos.logback.core.testUtil.FileTestUtil; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -87,6 +88,7 @@ public class IncludeActionTest { @Before public void setUp() throws Exception { + FileTestUtil.makeTestOutputDir(); HashMap<Pattern, Action> rulesMap = new HashMap<Pattern, Action>(); rulesMap.put(new Pattern("x"), new NOPAction()); rulesMap.put(new Pattern("x/include"), new IncludeAction()); diff --git a/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/PropertyEvalScriptBuilderTest.java b/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/PropertyEvalScriptBuilderTest.java index be57653..98d68da 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/PropertyEvalScriptBuilderTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/PropertyEvalScriptBuilderTest.java @@ -16,11 +16,7 @@ package ch.qos.logback.core.joran.conditional; import static org.junit.Assert.*; import ch.qos.logback.core.joran.spi.InterpretationContext; -import ch.qos.logback.core.joran.spi.Interpreter; -import ch.qos.logback.core.spi.PropertyContainer; -import org.codehaus.janino.CompileException; -import org.codehaus.janino.Parser; -import org.codehaus.janino.Scanner; + import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -29,8 +25,6 @@ import ch.qos.logback.core.Context; import ch.qos.logback.core.ContextBase; import ch.qos.logback.core.testUtil.RandomUtil; -import java.lang.reflect.InvocationTargetException; - public class PropertyEvalScriptBuilderTest { diff --git a/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/CompilerTest.java b/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/CompilerTest.java index 0541f84..7e6a932 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/CompilerTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/CompilerTest.java @@ -29,7 +29,6 @@ import ch.qos.logback.core.pattern.Converter123; import ch.qos.logback.core.pattern.ConverterHello; import ch.qos.logback.core.status.StatusChecker; import ch.qos.logback.core.util.StatusPrinter; -import static ch.qos.logback.core.pattern.parser.Parser.DEFAULT_COMPOSITE_CONVERTER_MAP; public class CompilerTest { diff --git a/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/OptionTokenizerTest.java b/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/OptionTokenizerTest.java index 975b617..58a3ecb 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/OptionTokenizerTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/OptionTokenizerTest.java @@ -13,11 +13,6 @@ */ package ch.qos.logback.core.pattern.parser; -import static org.junit.Assert.assertEquals; - -import java.util.ArrayList; -import java.util.List; - import org.junit.Test; public class OptionTokenizerTest { diff --git a/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/ParserTest.java b/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/ParserTest.java index 3c8ac79..e2541f7 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/ParserTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/ParserTest.java @@ -22,9 +22,7 @@ import java.util.List; import ch.qos.logback.core.Context; import ch.qos.logback.core.ContextBase; -import ch.qos.logback.core.status.Status; import ch.qos.logback.core.status.StatusChecker; -import ch.qos.logback.core.util.StatusPrinter; import org.junit.Test; import ch.qos.logback.core.pattern.FormatInfo; diff --git a/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/TokenStreamTest.java b/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/TokenStreamTest.java index 5efaee8..1e81679 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/TokenStreamTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/TokenStreamTest.java @@ -19,7 +19,6 @@ import static org.junit.Assert.fail; import java.util.ArrayList; import java.util.List; -import org.junit.Ignore; import org.junit.Test; import ch.qos.logback.core.pattern.util.AlmostAsIsEscapeUtil; diff --git a/logback-core/src/test/java/ch/qos/logback/core/rolling/RenameUtilTest.java b/logback-core/src/test/java/ch/qos/logback/core/rolling/RenameUtilTest.java index 05f5891..8473c08 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/rolling/RenameUtilTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/rolling/RenameUtilTest.java @@ -13,14 +13,11 @@ */ package ch.qos.logback.core.rolling; -import static junit.framework.Assert.fail; import static org.junit.Assert.assertTrue; import java.io.File; import java.io.IOException; -import java.text.SimpleDateFormat; -import ch.qos.logback.core.CoreConstants; import ch.qos.logback.core.rolling.helper.RenameUtil; import ch.qos.logback.core.status.StatusChecker; import ch.qos.logback.core.testUtil.RandomUtil; @@ -32,7 +29,6 @@ import ch.qos.logback.core.Context; import ch.qos.logback.core.ContextBase; import ch.qos.logback.core.encoder.EchoEncoder; import ch.qos.logback.core.encoder.Encoder; -import ch.qos.logback.core.util.Compare; import ch.qos.logback.core.util.CoreTestConstants; public class RenameUtilTest { diff --git a/logback-core/src/test/java/ch/qos/logback/core/rolling/RollingFileAppenderTest.java b/logback-core/src/test/java/ch/qos/logback/core/rolling/RollingFileAppenderTest.java index d1b2b06..a8c0e8a 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/rolling/RollingFileAppenderTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/rolling/RollingFileAppenderTest.java @@ -29,7 +29,6 @@ import ch.qos.logback.core.appender.AbstractAppenderTest; import ch.qos.logback.core.encoder.DummyEncoder; import ch.qos.logback.core.status.Status; import ch.qos.logback.core.status.StatusChecker; -import ch.qos.logback.core.status.StatusManager; import ch.qos.logback.core.testUtil.RandomUtil; import ch.qos.logback.core.util.CoreTestConstants; import ch.qos.logback.core.util.StatusPrinter; diff --git a/logback-core/src/test/java/ch/qos/logback/core/spi/CyclicBufferTrackerImplTest.java b/logback-core/src/test/java/ch/qos/logback/core/spi/CyclicBufferTrackerImplTest.java index 3b932c0..fd83798 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/spi/CyclicBufferTrackerImplTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/spi/CyclicBufferTrackerImplTest.java @@ -18,7 +18,6 @@ import ch.qos.logback.core.sift.AppenderTrackerImpl; import org.junit.Test; import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertNull; import static junit.framework.Assert.assertNotNull; /** diff --git a/logback-core/src/test/java/ch/qos/logback/core/spi/CyclicBufferTracker_TImpl.java b/logback-core/src/test/java/ch/qos/logback/core/spi/CyclicBufferTracker_TImpl.java index 7449f22..4ac331a 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/spi/CyclicBufferTracker_TImpl.java +++ b/logback-core/src/test/java/ch/qos/logback/core/spi/CyclicBufferTracker_TImpl.java @@ -13,10 +13,8 @@ */ package ch.qos.logback.core.spi; -import ch.qos.logback.core.Appender; import ch.qos.logback.core.CoreConstants; import ch.qos.logback.core.helpers.CyclicBuffer; -import ch.qos.logback.core.sift.tracker.TEntry; import java.util.Collections; import java.util.LinkedList; diff --git a/logback-core/src/test/java/ch/qos/logback/core/spi/ScenarioBasedCyclicBufferTrackerTest.java b/logback-core/src/test/java/ch/qos/logback/core/spi/ScenarioBasedCyclicBufferTrackerTest.java index d2aa2cd..b44e5de 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/spi/ScenarioBasedCyclicBufferTrackerTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/spi/ScenarioBasedCyclicBufferTrackerTest.java @@ -16,8 +16,6 @@ package ch.qos.logback.core.spi; import org.junit.Test; import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertNull; -import static junit.framework.Assert.assertNotNull; /** * @author Ceki Gücü diff --git a/logback-core/src/test/java/ch/qos/logback/core/testUtil/FileTestUtil.java b/logback-core/src/test/java/ch/qos/logback/core/testUtil/FileTestUtil.java index 79c971e..e4d66f5 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/testUtil/FileTestUtil.java +++ b/logback-core/src/test/java/ch/qos/logback/core/testUtil/FileTestUtil.java @@ -1,6 +1,5 @@ package ch.qos.logback.core.testUtil; -import ch.qos.logback.core.CoreConstants; import ch.qos.logback.core.util.CoreTestConstants; import java.io.File; diff --git a/logback-core/src/test/scala/ch/qos/logback/core/rolling/TimeBasedRolling_STest.scala b/logback-core/src/test/scala/ch/qos/logback/core/rolling/TimeBasedRolling_STest.scala index 30ae0be..78a75c7 100644 --- a/logback-core/src/test/scala/ch/qos/logback/core/rolling/TimeBasedRolling_STest.scala +++ b/logback-core/src/test/scala/ch/qos/logback/core/rolling/TimeBasedRolling_STest.scala @@ -180,7 +180,7 @@ class TimeBasedRolling_STest extends RollingScaffolding { @Test def failed_rename: Unit = { - if(!Env.isWindows) return null + if(!Env.isWindows) null var fos: FileOutputStream = null try { ----------------------------------------------------------------------- Summary of changes: .../logback/access/jetty/JettyServerAdapter.java | 1 - .../access/servlet/TeeHttpServletRequest.java | 1 - .../access/servlet/TeeServletInputStream.java | 2 -- .../qos/logback/access/joran/ConditionalTest.java | 2 -- .../ch/qos/logback/access/servlet/PackageTest.java | 1 - .../qos/logback/access/servlet/TeeFilterTest.java | 2 -- .../logback/classic/boolex/GEventEvaluator.java | 1 - .../ch/qos/logback/classic/gaffer/GafferUtil.java | 1 - .../joran/action/LoggerContextListenerAction.java | 8 -------- .../ch/qos/logback/classic/net/SocketNode.java | 1 - .../logback/classic/pattern/ClassicConverter.java | 5 ----- .../qos/logback/classic/pattern/DateConverter.java | 2 -- .../classic/sift/MDCBasedDiscriminator.java | 2 -- .../qos/logback/classic/sift/SiftingAppender.java | 1 - .../classic/spi/PackagingDataCalculator.java | 1 - .../qos/logback/classic/turbo/LRUMessageCache.java | 1 - .../classic/turbo/ReconfigureOnChangeFilter.java | 4 ---- .../logback/classic/util/ContextInitializer.java | 2 -- .../ch/qos/logback/classic/PatternLayoutTest.java | 2 -- .../classic/boolex/ConditionalWithoutJanino.java | 3 --- .../logback/classic/issue/lbcore_155/OThread.java | 2 -- .../classic/joran/JoranConfiguratorTest.java | 2 -- .../classic/jul/LevelChangePropagatorTest.java | 2 -- .../classic/net/SMTPAppender_SubethaSMTPTest.java | 1 - .../logback/classic/rolling/UniqueFileTest.java | 3 --- .../classic/sift/MDCBasedDiscriminatorTest.java | 1 - .../logback/classic/turbo/LRUMessageCacheTest.java | 8 -------- .../qos/logback/classic/turbo/ReconfigurePerf.java | 6 ------ .../util/InitializationIntegrationTest.java | 2 -- .../classic/util/LogbackMDCAdapterTest.java | 1 - .../slf4j/impl/RecursiveInitializationTest.java | 1 - .../src/main/java/ch/qos/logback/core/Context.java | 1 - .../core/boolex/JaninoEventEvaluatorBase.java | 1 - .../logback/core/joran/GenericConfigurator.java | 1 - .../logback/core/joran/action/PropertyAction.java | 1 - .../logback/core/joran/action/TimestampAction.java | 3 --- .../conditional/PropertyWrapperForScripts.java | 3 --- .../ch/qos/logback/core/joran/spi/Interpreter.java | 1 - .../joran/util/ConfigurationWatchListUtil.java | 4 ---- .../core/pattern/ReplacingCompositeConverter.java | 3 --- .../core/pattern/parser/OptionTokenizer.java | 1 - .../logback/core/pattern/util/AsIsEscapeUtil.java | 3 --- ...aultTimeBasedFileNamingAndTriggeringPolicy.java | 1 - .../core/rolling/helper/DateTokenConverter.java | 1 - .../rolling/helper/TimeBasedArchiveRemover.java | 5 ----- .../logback/core/spi/AppenderAttachableImpl.java | 5 ----- .../core/status/ViewStatusMessagesServletBase.java | 1 - .../logback/core/appender/FileAppenderTest.java | 1 - .../logback/core/helpers/FileFilterUtilTest.java | 2 -- .../core/joran/TrivialConfiguratorTest.java | 2 -- .../core/joran/action/IncludeActionTest.java | 2 ++ .../conditional/PropertyEvalScriptBuilderTest.java | 8 +------- .../logback/core/pattern/parser/CompilerTest.java | 1 - .../core/pattern/parser/OptionTokenizerTest.java | 5 ----- .../logback/core/pattern/parser/ParserTest.java | 2 -- .../core/pattern/parser/TokenStreamTest.java | 1 - .../qos/logback/core/rolling/RenameUtilTest.java | 4 ---- .../core/rolling/RollingFileAppenderTest.java | 1 - .../core/spi/CyclicBufferTrackerImplTest.java | 1 - .../core/spi/CyclicBufferTracker_TImpl.java | 2 -- .../spi/ScenarioBasedCyclicBufferTrackerTest.java | 2 -- .../ch/qos/logback/core/testUtil/FileTestUtil.java | 1 - .../core/rolling/TimeBasedRolling_STest.scala | 2 +- 63 files changed, 4 insertions(+), 140 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBCORE-231) unknownURL Test fails on Ubuntu 10.04
by Greg Thomas (JIRA) 30 Oct '11

30 Oct '11

unknownURL Test fails on Ubuntu 10.04 ------------------------------------- Key: LBCORE-231 URL: http://jira.qos.ch/browse/LBCORE-231 Project: logback-core Issue Type: Bug Components: Joran Affects Versions: 1.0.0 Environment: Ubuntu 10.04, Sun jdk1.5.0_22, latest logback snapshot Reporter: Greg Thomas Assignee: Logback dev list When trying to build logback on Ubuntu 10.04, the test unknownURL in ch.qos.logback.core.joran.action.IncludeActionTest fails. The test is currently looking for either a UnknownHostException or IOException to be raised. In practice, on the stated environment, the following exceptions are raised; 19:04:20,488 |-ERROR in ch.qos.logback.core.joran.event.SaxEventRecorder@1016632 - XML_PARSING - Parsing fatal error on line 6 and column 113 org.xml.sax.SAXParseException: The reference to entity "ClientLocation" must end with the ';' delimiter. at org.xml.sax.SAXParseException: The reference to entity "ClientLocation" must end with the ';' delimiter. ... 19:04:20,488 |-ERROR in ch.qos.logback.core.joran.action.IncludeAction - Error while parsing http://logback2345.qos.ch ch.qos.logback.core.joran.spi.JoranException: Problem parsing XML document. See previously reported errors. at ch.qos.logback.core.joran.spi.JoranException: Problem parsing XML document. See previously reported errors. The simplest solution would to add the SAXParseException to the list of acceptable exceptions, but wonder if that's masking a wider problem ... -- 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

Building logback under Eclipse in 61 easy steps.
by ceki 29 Oct '11

29 Oct '11

Hi All, Here are step by step instruction for building logback under Eclipse in 61 easy steps. For me, the key to building logback under Eclipse is to avoid using m2eclipse. If you have it installed, you can disable it by removing the Maven Nature for a given project. - Install Eclipse Indigo, aka Eclipse 3.7 - in eclipse.ini file modify the parameter "mx", i.e. change -Xmx384m to -Xmx1384m - Install Groovy-Eclipse Feature from http://dist.springsource.org/release/GRECLIPSE/e3.7/ no installation of m2e Configurator for Groovy-Eclipse necessary - Install Scala IDE for Eclipse from http://download.scala-ide.org/releases-29/2.0.0-beta no installation of JDT Weaving, no Scala IDE for Eclipse Source feature necessary. - cd $LOGBACK_HOME where $LOGBACK_HOME stands for the location where you cloned the logback project from github - Remove any existing .settings, .classpath, .project directories under $LOGBACK_HOME and its sub-folders. This step seems to be crucial. - Run 'mvn eclipse:eclipse' in $LOGBACK_HOME - In eclipse import the logback project: Import -> General -> Existing Prokects into Workspace, select $LOGBACK_HOME folder for the import - add the scala nature to logback-core project: (right click on logback-core project -> Configure -> Add Scala Nature) - remove the logback-classic/target/generated-sources/groovy-sttubs/main directory from the list of source folders (logback-classic -> project properties -> Java Build Path) - clean all projects in Eclipse (Project -> Clean) - Select logback-classic project and convert it to "Groovy project" (right click on logback-classic project -> Configure -> Convert Groovy to Project) That's it. Please let me know if the above works for you. -- Ceki http://twitter.com/#!/ceki ps: The above also works for Helios. The only difference is that the Groovy-Eclipse feature needs to be installed from http://dist.springsource.org/release/GRECLIPSE/e3.6/

2 2

Missing file from Git?
by Greg Thomas 29 Oct '11

29 Oct '11

I may have missed something, but I recently forked ceki/logback on github and it seems to be missing GafferConfigurator? It's referenced in the code, but not in the git source. Judging by the number of classes in that package (6 - http://logback.qos.ch/apidocs/ch/qos/logback/classic/gaffer/package-summary…) and the number of files in git (1 - https://github.com/ceki/logback/tree/master/logback-classic/src/main/java/c…) there could be as many as five files missing. I could always grab the source release, add them to my fork, and issue a pull request, but I suspect it's probably easier to simply add/commit the files that you probably already have. Greg

2 4

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch master updated. v_0.9.30-62-gab6c1dd
by git-noreply＠pixie.qos.ch 29 Oct '11

29 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via ab6c1ddb8825e9e37a0250da5465bba5e34565b1 (commit) from cefb859c2c1a93b2a2fcc46e45d8cfaf7b596bd1 (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=ab6c1ddb8825e9e37a0250da… http://github.com/ceki/logback/commit/ab6c1ddb8825e9e37a0250da5465bba5e3456… commit ab6c1ddb8825e9e37a0250da5465bba5e34565b1 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Sat Oct 29 10:40:35 2011 +0200 editing diff --git a/logback-site/src/site/pages/setup.html b/logback-site/src/site/pages/setup.html index 899404f..4e63cdd 100644 --- a/logback-site/src/site/pages/setup.html +++ b/logback-site/src/site/pages/setup.html @@ -106,44 +106,65 @@ <h3><a name="ide" href="#ide">Building with an IDE</a></h3> - <p>Certain logback test cases are written in Scala. Moreover, - logback offers a Groovy-based configurator. If you wish to hack - logback, you will probably want to import it as a project into your - favorite IDE.</p> + <p>If you wish to contribute to hack to the project or just hack it + for your own needs, you will probably want to import logback as a + project into your favorite IDE. Logback uses Maven as its build + tool. The Scala language is used in certain logback test + cases. Moreover, logback offers a Groovy-based configurator so + there is a dependency on the Groovy language as well. It follows + that your IDE should have plugins for Maven, Scala and Groovy in + order to <em>build</em> logback from your within IDE. The + Scala+Groovy dependecy just mentioned are <em>build-time</em> + dependencies. The only mandatory logback dependency at runrime is + the JRE, unless of course you wish to use the Groovy configurator + in which case Groovy runtime will be a required dependency as + well. Also note that building from the command line is fairly + trivial, the command 'mvn install' given from $LOGBACK_HOME folder + should suffice. </p> <h3>Building logback with IntelliJ IDEA</h3> <p>Assuming you have the latest version of IntelliJ IDEA installed, - you need add the Scala plugin. Once you have the Scala plugin - installed, you can import logback into IDEA. Select File -> New - Project -> Import from external model -> Maven, then select - $LOGBACK_HOME as the Root directory. The import should finish - successfully in a few seconds.</p> + the only required additional plugin is the Scala plugin. IntelliJ + IDEA supports Maven as well as Groovy out of the box. Once you have + the Scala plugin installed, you can import logback into + IDEA. Select File→ New Project → Import from external + model→ Maven, then select $LOGBACK_HOME as the Root + directory. The import should finish successfully in a few + seconds. If you import logback before the scala-plugin is + installed, you would need to re-import logback as a project after + the Scala plugin is installed.</p> <h3>Building with Eclipse</h3> - <p>Building logback is a little trickier. Here are step by step - instruction for building logback under Eclipse in 61 easy steps. + <p>Building logback under Eclipse is a little trickier. Here are + instructions for building logback under Eclipse in 61 easy steps. </p> - <p>It appears that the key to building logback under Eclipse is to - avoid using m2eclipse. If you have m2eclipse installed, you can - disable it by removing the Maven Nature for a given project. + <p>The author does not wish to unduly disparage + <code>m2eclipse</code>. However, as of this writing that is October + 2011, it appears that the key to building logback under Eclipse is + to avoid using <code>m2eclipse</code>. If you have + <code>m2eclipse</code> installed, you can disable it by removing + the Maven Nature for a given project. And without further ado here + are the steps: </p> + <ol> <li>Install Eclipse Indigo, aka Eclipse 3.7</li> <li>in <em>eclipse.ini</em> file modify the parameter "mx", i.e. change -Xmx384m to -Xmx1384m</li> - <li>Select Help -> Intall new Software -> Work with <a + <li>In Eclipse, select Help → Intall new Software → + Work with <a href="http://dist.springsource.org/release/GRECLIPSE/e3.7/">http://dist.springsource.org/release/GRECLIPSE/e3.7/</a> and then Select "Groovy-Eclipse Feature". Installation of other plugins in particular "m2e Configurator for Groovy-Eclipse" is <b>not</b> necessary</li> - <li>Similar to the previous steps install Scala IDE for Eclipse - from <a + <li>Similar to the previous step, install Scala IDE for Eclipse + plugin from <a href="http://download.scala-ide.org/releases-29/2.0.0-beta">http://download.scala-ide.org/releases-29/2.0.0-beta</a>. Installation of "JDT Weaving" or "Scala IDE for Eclipse Source feature" are not necessary.</li> @@ -154,34 +175,37 @@ logback project from github </li> <li>In case they exist, remove <em>.settings</em>, - <em>.classpath</em>, <em>.project</em> directories (again if any) + <em>.classpath</em>, <em>.project</em> folders (again if any) under $LOGBACK_HOME and its sub-folders. Somehow, this step seems to be crucial.</li> - <li>Run 'mvn eclipse:eclipse' in $LOGBACK_HOME </li> + <li>From the command line, run <code>mvn eclipse:eclipse</code> + in $LOGBACK_HOME</li> - <li>In eclipse import the logback project: Import -> General -> - Existing Prokects into Workspace, select $LOGBACK_HOME folder for - the import + <li>In Eclipse, import the logback project: Import→ + General→ Existing Prokects into Workspace, select + $LOGBACK_HOME folder for the import </li> - - <li>add the scala nature to logback-core project: (right click on - logback-core project -> Configure -> Add Scala Nature) + + <li>In Eclipse, add the scala nature to logback-core project: + (right click on logback-core project→ Configure→ Add + Scala Nature) </li> - <li>remove the + <li>In Eclipse, remove the logback-classic/target/generated-sources/groovy-sttubs/main - directory from the list of source folders (logback-classic -> - project properties -> Java Build Path) + directory from the list of source folders (logback-classic→ + project properties → Java Build Path) </li> - <li>clean all projects in Eclipse (Project -> Clean) + <li>In Eclipse, clean all projects in Eclipse (Project → + Clean) </li> - <li>Select logback-classic project and convert it to "Groovy - project" (right click on logback-classic project -> Configure -> - Convert Groovy to Project) + <li>In Eclipse, select logback-classic project and convert it to + "Groovy project" (right click on logback-classic project → + Configure → Convert Groovy to Project) </li> </ol> ----------------------------------------------------------------------- Summary of changes: logback-site/src/site/pages/setup.html | 88 ++++++++++++++++++++------------ 1 files changed, 56 insertions(+), 32 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch master updated. v_0.9.30-61-gcefb859
by git-noreply＠pixie.qos.ch 28 Oct '11

28 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via cefb859c2c1a93b2a2fcc46e45d8cfaf7b596bd1 (commit) from 9aaa6391782fbb597ea1ed98386e5edbe2fe49ff (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=cefb859c2c1a93b2a2fcc46e… http://github.com/ceki/logback/commit/cefb859c2c1a93b2a2fcc46e45d8cfaf7b596… commit cefb859c2c1a93b2a2fcc46e45d8cfaf7b596bd1 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Sat Oct 29 00:17:51 2011 +0200 added instructions for building under Eclipse diff --git a/logback-site/src/site/pages/setup.html b/logback-site/src/site/pages/setup.html index 79638d0..899404f 100644 --- a/logback-site/src/site/pages/setup.html +++ b/logback-site/src/site/pages/setup.html @@ -104,22 +104,92 @@ - <h3><a name="ide" href="#ide">Building with an IDE, e.g. IntelliJ - IDEA</a></h3> + <h3><a name="ide" href="#ide">Building with an IDE</a></h3> <p>Certain logback test cases are written in Scala. Moreover, logback offers a Groovy-based configurator. If you wish to hack logback, you will probably want to import it as a project into your - favorite IDE. As of this writing (2011-10-26), the author was - unable to have the project build under Eclipse due to problems - related to Scala and/or Groovy support. Fortunately, assuming the - Scala plugin is installed, logback can be imported into IntelliJ - IDEA within seconds and built just fine. + favorite IDE.</p> + + <h3>Building logback with IntelliJ IDEA</h3> + + <p>Assuming you have the latest version of IntelliJ IDEA installed, + you need add the Scala plugin. Once you have the Scala plugin + installed, you can import logback into IDEA. Select File -> New + Project -> Import from external model -> Maven, then select + $LOGBACK_HOME as the Root directory. The import should finish + successfully in a few seconds.</p> + + <h3>Building with Eclipse</h3> + + <p>Building logback is a little trickier. Here are step by step + instruction for building logback under Eclipse in 61 easy steps. </p> - <p>If you are able to install both Scala and Groovy under Eclipse, - and thus presumably build logback under Eclipse, please report your - extraordinary technical feat on the logback-dev mailing list. + <p>It appears that the key to building logback under Eclipse is to + avoid using m2eclipse. If you have m2eclipse installed, you can + disable it by removing the Maven Nature for a given project. + </p> + + <ol> + <li>Install Eclipse Indigo, aka Eclipse 3.7</li> + <li>in <em>eclipse.ini</em> file modify the parameter "mx", + i.e. change -Xmx384m to -Xmx1384m</li> + + <li>Select Help -> Intall new Software -> Work with <a + href="http://dist.springsource.org/release/GRECLIPSE/e3.7/">http://dist.springsource.org/release/GRECLIPSE/e3.7/</a> + and then Select "Groovy-Eclipse Feature". Installation of other + plugins in particular "m2e Configurator for Groovy-Eclipse" is + <b>not</b> necessary</li> + + <li>Similar to the previous steps install Scala IDE for Eclipse + from <a + href="http://download.scala-ide.org/releases-29/2.0.0-beta">http://download.scala-ide.org/releases-29/2.0.0-beta</a>. Installation + of "JDT Weaving" or "Scala IDE for Eclipse Source feature" are + not necessary.</li> + + <li><pre>cd $LOGBACK_HOME</pre> + + where $LOGBACK_HOME stands for the location where you cloned the + logback project from github </li> + + <li>In case they exist, remove <em>.settings</em>, + <em>.classpath</em>, <em>.project</em> directories (again if any) + under $LOGBACK_HOME and its sub-folders. Somehow, this step seems + to be crucial.</li> + + <li>Run 'mvn eclipse:eclipse' in $LOGBACK_HOME </li> + + <li>In eclipse import the logback project: Import -> General -> + Existing Prokects into Workspace, select $LOGBACK_HOME folder for + the import + </li> + + + <li>add the scala nature to logback-core project: (right click on + logback-core project -> Configure -> Add Scala Nature) + </li> + + <li>remove the + logback-classic/target/generated-sources/groovy-sttubs/main + directory from the list of source folders (logback-classic -> + project properties -> Java Build Path) + </li> + + <li>clean all projects in Eclipse (Project -> Clean) + </li> + + <li>Select logback-classic project and convert it to "Groovy + project" (right click on logback-classic project -> Configure -> + Convert Groovy to Project) + </li> + + </ol> + + <p>The above should also work for Helios (Eclipse 3.6). The only + difference is that the Groovy-Eclipse feature needs to be installed + from <a + href="http://dist.springsource.org/release/GRECLIPSE/e3.6/">http://dist.springsource.org/release/GRECLIPSE/e3.6/</a>. </p> ----------------------------------------------------------------------- Summary of changes: logback-site/src/site/pages/setup.html | 90 ++++++++++++++++++++++++++++---- 1 files changed, 80 insertions(+), 10 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBCORE-220) DBAppender.java performance improvement
by Greg Thomas (JIRA) 28 Oct '11

28 Oct '11

DBAppender.java performance improvement --------------------------------------- Key: LBCORE-220 URL: http://jira.qos.ch/browse/LBCORE-220 Project: logback-core Issue Type: Bug Components: Other Affects Versions: 0.9.29 Reporter: Greg Thomas Assignee: Logback dev list We're seeing a distinct lack of performance with the DBAppender. Although it works fine in a single threaded environment, in a multi-threaded environment it slows down considerably. We've done some investigation, and narrowed it down to the pair of synchronized calls to subAppend() and selectEventId() (lines 107->110). I've had a look at this, and can see no reason for these to be synchronized; If using the JDBC3 getGeneratedKeys() method then as this applies to the thread specific statement there is no need to be synchronized. All the "Dialect" based calls are also connection specific; in detail; H2, HSQLDB and MySQL all call a database function, which is connection specific. MsSQL and Sybase both select a connection specific variable. Oracle and PostgreSQL both select the currval from a sequence, which again is connection specific. Having removed the synchronisation, we're seeing vastly improved logging throughput in our application. So to summarise; there is unnecessary synchronisation in the DBAppender that slows down multi-threaded applications; removing that synchronisation will improve performance in multi-threaded applications with no side affects. -- 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

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch master updated. v_0.9.30-60-g9aaa639
by git-noreply＠pixie.qos.ch 28 Oct '11

28 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via 9aaa6391782fbb597ea1ed98386e5edbe2fe49ff (commit) from d6b7424405ab7a6ec55ab7537664e230b1a3ab3f (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=9aaa6391782fbb597ea1ed98… http://github.com/ceki/logback/commit/9aaa6391782fbb597ea1ed98386e5edbe2fe4… commit 9aaa6391782fbb597ea1ed98386e5edbe2fe49ff Author: Ceki Gulcu <ceki(a)qos.ch> Date: Fri Oct 28 18:02:05 2011 +0200 remove cruft from eclipse plugin diff --git a/pom.xml b/pom.xml index 5a0c1d0..8565a3b 100755 --- a/pom.xml +++ b/pom.xml @@ -243,24 +243,6 @@ <configuration> <downloadSources>true</downloadSources> <downloadJavadocs>true</downloadJavadocs> - <projectnatures> - <projectnature>org.scala-ide.sdt.core.scalanature</projectnature> - <projectnature>org.eclipse.jdt.core.javanature</projectnature> - </projectnatures> - <buildcommands> - <buildcommand>org.scala-ide.sdt.core.scalabuilder</buildcommand> - </buildcommands> -  -  <sourceIncludes> <sourceInclude>**/*.scala</sourceInclude> <sourceInclude>**/*.java</sourceInclude> ----------------------------------------------------------------------- Summary of changes: pom.xml | 18 ------------------ 1 files changed, 0 insertions(+), 18 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch master updated. v_0.9.30-59-gd6b7424
by git-noreply＠pixie.qos.ch 28 Oct '11

28 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via d6b7424405ab7a6ec55ab7537664e230b1a3ab3f (commit) from a92ebc4fb60906beaa77d4c673159b430b752e88 (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=d6b7424405ab7a6ec55ab753… http://github.com/ceki/logback/commit/d6b7424405ab7a6ec55ab7537664e230b1a3a… commit d6b7424405ab7a6ec55ab7537664e230b1a3ab3f Author: Ceki Gulcu <ceki(a)qos.ch> Date: Fri Oct 28 17:06:34 2011 +0200 revert groovy 1.7.6, revert to gmaven instead of groovy-eclipse compiler diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml index f672bac..17a772f 100644 --- a/logback-classic/pom.xml +++ b/logback-classic/pom.xml @@ -226,33 +226,23 @@ <configuration> <source>1.5</source> <target>1.5</target> - <compilerId>groovy-eclipse-compiler</compilerId> - <verbose>true</verbose> </configuration> - - <dependencies> - <dependency> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-eclipse-compiler</artifactId> - <version>2.5.2-01</version> - </dependency> - </dependencies> </plugin> -  -  -  -  -  -  -  -  -  -  -  -  -  -  + <plugin> + <groupId>org.codehaus.groovy.maven</groupId> + <artifactId>gmaven-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>generateStubs</goal> + <goal>compile</goal> + <goal>generateTestStubs</goal> + <goal>testCompile</goal> + </goals> + </execution> + </executions> + </plugin> <plugin> <groupId>org.scala-tools</groupId> diff --git a/pom.xml b/pom.xml index 52cf6f7..5a0c1d0 100755 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ <junit.version>4.8.2</junit.version> <janino.version>2.5.10</janino.version> <scala.version>2.9.1</scala.version> - <groovy.version>1.8.3</groovy.version> + <groovy.version>1.7.6</groovy.version> <consolePlugin.version>1.1.0</consolePlugin.version> <tomcat.version>7.0.21</tomcat.version> <jetty.version>7.5.1.v20110908</jetty.version> ----------------------------------------------------------------------- Summary of changes: logback-classic/pom.xml | 38 ++++++++++++++------------------------ pom.xml | 2 +- 2 files changed, 15 insertions(+), 25 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch master updated. v_0.9.30-58-ga92ebc4
by git-noreply＠pixie.qos.ch 28 Oct '11

28 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via a92ebc4fb60906beaa77d4c673159b430b752e88 (commit) from ef24930c341565098856495fda5deb942fa975de (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=a92ebc4fb60906beaa77d4c6… http://github.com/ceki/logback/commit/a92ebc4fb60906beaa77d4c673159b430b752… commit a92ebc4fb60906beaa77d4c673159b430b752e88 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Fri Oct 28 15:33:11 2011 +0200 make tests pass, doc uptates, upgrade to Groovy 1.8.3 diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml index 7a34642..f672bac 100644 --- a/logback-classic/pom.xml +++ b/logback-classic/pom.xml @@ -226,24 +226,34 @@ <configuration> <source>1.5</source> <target>1.5</target> + <compilerId>groovy-eclipse-compiler</compilerId> + <verbose>true</verbose> </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.groovy.maven</groupId> - <artifactId>gmaven-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>generateStubs</goal> - <goal>compile</goal> - <goal>generateTestStubs</goal> - <goal>testCompile</goal> - </goals> - </execution> - </executions> + <dependencies> + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-eclipse-compiler</artifactId> + <version>2.5.2-01</version> + </dependency> + </dependencies> </plugin> +  +  +  +  +  +  +  +  +  +  +  +  +  +  + <plugin> <groupId>org.scala-tools</groupId> <artifactId>maven-scala-plugin</artifactId> diff --git a/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/PropertyEvalScriptBuilderTest.java b/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/PropertyEvalScriptBuilderTest.java index 30f6e74..be57653 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/PropertyEvalScriptBuilderTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/PropertyEvalScriptBuilderTest.java @@ -44,6 +44,7 @@ public class PropertyEvalScriptBuilderTest { String containsScript = "p(\"" + k + "\").contains(\"" + v + "\")"; String isNullScriptStr = "isNull(\"" + k + "\")"; + String isDefiedScriptStr = "isDefined(\"" + k + "\")"; @Before public void setUp() { @@ -113,18 +114,15 @@ public class PropertyEvalScriptBuilderTest { buildAndAssertTrue(isNullScriptStr); } - @Test - public void nameOK() throws Exception { - Condition condition = pesb.build("name.contains(\"" + context.getName() + "\")"); - assertNotNull(condition); - assertTrue(condition.evaluate()); + public void isDefinedForIExistimgtPropertyShouldEvaluateToTrue() throws Exception { + localPropContainer.addSubstitutionProperty(k, v); + buildAndAssertTrue(isDefiedScriptStr); } @Test - public void wrongName() throws Exception { - Condition condition = pesb.build("name.contains(\"x\")"); - assertNotNull(condition); - assertFalse(condition.evaluate()); + public void isDefinedForInexistentPropertyShouldEvaluateToTrue() throws Exception { + buildAndAssertFalse(isDefiedScriptStr); } + } diff --git a/logback-site/src/site/pages/manual/configuration.html b/logback-site/src/site/pages/manual/configuration.html index 249ec27..c14f95d 100644 --- a/logback-site/src/site/pages/manual/configuration.html +++ b/logback-site/src/site/pages/manual/configuration.html @@ -1612,24 +1612,22 @@ fileName=myApp.log </else> </if></pre> - <p>The condition is a Java expression in which only context properties - or system properties are accessible. For a key passed as argument, - the <code>property</code>() or its shorter equivalent + <p>The condition is a Java expression in which only context + properties or system properties are accessible. For a key passed as + argument, the <code>property</code>() or its shorter equivalent <code>p</code>() methods return the String value of the property. - For example, to access the value of a property with key "k", you would - write <code>property("k")</code> or equivalently + For example, to access the value of a property with key "k", you + would write <code>property("k")</code> or equivalently <code>p("k")</code>. If the property with key "k" is undefined, the property method will return the empty string and not null. This - avoids the need to check for null values. If you need to check - whether a property is null, the <code>isNull()</code> method is - provided. For example, you can write <code>isNull("k")</code>.</p> - - <p>In the next example, the <code>ConsoleAppender</code> will be - attached to the root logger, but only if the HOSTNAME is - "torino". Note that the <code>FileAppender</code> named "FILE" is - attached to the root logger in any case. - </p> + avoids the need to check for null values.</p> + <p>The <code>isDefined()</code> method can be used to check whether + a property is defined. For example, to check whether the property + "k" is defined you would write <code>isDefined("k")</code> + Similarly, if you need to check whether a property is null, the + <code>isNull()</code> method is provided. Example: + <code>isNull("k")</code>.</p> <pre class="prettyprint source"><configuration> diff --git a/pom.xml b/pom.xml index 5a0c1d0..52cf6f7 100755 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ <junit.version>4.8.2</junit.version> <janino.version>2.5.10</janino.version> <scala.version>2.9.1</scala.version> - <groovy.version>1.7.6</groovy.version> + <groovy.version>1.8.3</groovy.version> <consolePlugin.version>1.1.0</consolePlugin.version> <tomcat.version>7.0.21</tomcat.version> <jetty.version>7.5.1.v20110908</jetty.version> ----------------------------------------------------------------------- Summary of changes: logback-classic/pom.xml | 38 ++++++++++++------- .../conditional/PropertyEvalScriptBuilderTest.java | 16 ++++----- .../src/site/pages/manual/configuration.html | 26 ++++++------- pom.xml | 2 +- 4 files changed, 44 insertions(+), 38 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0