- logback-dev - mailman3.qos.ch

07 Jul '09

Author: ceki Date: Tue Jul 7 20:22:04 2009 New Revision: 2321 Added: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/CoreTestConstants.java - copied, changed from r2315, /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/Constants.java Removed: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/Constants.java Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/GenericConfigurator.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/appender/FileAppenderTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/SkippingInInterpreterTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialcConfiguratorTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/PropertyActionTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/event/EventRecorderTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/event/InPlayFireTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/ImplicitActionTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/replay/FruitConfigurationTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/RenamingTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeBasedRollingTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithCleanTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/helper/CompressTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/FileUtilTest.java logback/trunk/logback-site/src/site/pages/news.html Log: - Renamed Constants as CoreTestConstants - Fixed LBCORE-105 Configuration files placed in jar files will no longer lock the jar file. Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/GenericConfigurator.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/GenericConfigurator.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/GenericConfigurator.java Tue Jul 7 20:22:04 2009 @@ -14,6 +14,7 @@ import java.io.IOException; import java.io.InputStream; import java.net.URL; +import java.net.URLConnection; import java.util.List; import org.xml.sax.InputSource; @@ -36,7 +37,10 @@ final public void doConfigure(URL url) throws JoranException { try { - InputStream in = url.openStream(); + URLConnection urlConnection = url.openConnection(); + // per http://jira.qos.ch/browse/LBCORE-105 + urlConnection.setDefaultUseCaches(false); + InputStream in = urlConnection.getInputStream(); doConfigure(in); in.close(); } catch (IOException ioe) { Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/appender/FileAppenderTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/appender/FileAppenderTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/appender/FileAppenderTest.java Tue Jul 7 20:22:04 2009 @@ -27,7 +27,7 @@ import ch.qos.logback.core.layout.NopLayout; import ch.qos.logback.core.status.Status; import ch.qos.logback.core.status.StatusManager; -import ch.qos.logback.core.util.Constants; +import ch.qos.logback.core.util.CoreTestConstants; import ch.qos.logback.core.util.FileUtil; public class FileAppenderTest extends AbstractAppenderTest<Object> { @@ -51,7 +51,7 @@ @Test public void smoke() { - String filename = Constants.OUTPUT_DIR_PREFIX + "temp.log"; + String filename = CoreTestConstants.OUTPUT_DIR_PREFIX + "temp.log"; FileAppender<Object> appender = new FileAppender<Object>(); appender.setLayout(new DummyLayout<Object>()); @@ -70,7 +70,7 @@ @Test public void testCreateParentFolders() { - String filename = Constants.OUTPUT_DIR_PREFIX + "/fat" + diff + String filename = CoreTestConstants.OUTPUT_DIR_PREFIX + "/fat" + diff + "/testing.txt"; File file = new File(filename); FileAppender<Object> appender = new FileAppender<Object>(); @@ -93,7 +93,7 @@ @Test public void testPrudentModeLogicalImplications() { - String filename = Constants.OUTPUT_DIR_PREFIX + diff + "testing.txt"; + String filename = CoreTestConstants.OUTPUT_DIR_PREFIX + diff + "testing.txt"; File file = new File(filename); FileAppender<Object> appender = new FileAppender<Object>(); appender.setLayout(new DummyLayout<Object>()); Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/SkippingInInterpreterTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/SkippingInInterpreterTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/SkippingInInterpreterTest.java Tue Jul 7 20:22:04 2009 @@ -33,7 +33,7 @@ import ch.qos.logback.core.joran.spi.Pattern; import ch.qos.logback.core.status.Status; import ch.qos.logback.core.status.StatusManager; -import ch.qos.logback.core.util.Constants; +import ch.qos.logback.core.util.CoreTestConstants; /** * Test the way Interpreter skips child elements in case of exceptions thrown by @@ -70,7 +70,7 @@ TrivialConfigurator tc = new TrivialConfigurator(rulesMap); tc.setContext(context); - tc.doConfigure(Constants.TEST_DIR_PREFIX + "input/joran/skip/" + filename); + tc.doConfigure(CoreTestConstants.TEST_DIR_PREFIX + "input/joran/skip/" + filename); String str = context.getProperty(HelloAction.PROPERTY_KEY); assertEquals("Hello John Doe.", str); Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialcConfiguratorTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialcConfiguratorTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialcConfiguratorTest.java Tue Jul 7 20:22:04 2009 @@ -11,9 +11,16 @@ package ch.qos.logback.core.joran; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.net.URL; import java.util.HashMap; +import java.util.jar.JarOutputStream; +import java.util.zip.ZipEntry; import org.junit.Test; @@ -21,24 +28,27 @@ import ch.qos.logback.core.ContextBase; import ch.qos.logback.core.joran.action.Action; import ch.qos.logback.core.joran.action.ext.IncAction; +import ch.qos.logback.core.joran.spi.JoranException; import ch.qos.logback.core.joran.spi.Pattern; import ch.qos.logback.core.status.Status; import ch.qos.logback.core.status.TrivialStatusListener; -import ch.qos.logback.core.util.Constants; +import ch.qos.logback.core.testUtil.RandomUtil; +import ch.qos.logback.core.util.CoreTestConstants; public class TrivialcConfiguratorTest { Context context = new ContextBase(); + HashMap<Pattern, Action> rulesMap = new HashMap<Pattern, Action>(); public void doTest(String filename) throws Exception { - HashMap<Pattern, Action> rulesMap = new HashMap<Pattern, Action>(); rulesMap.put(new Pattern("x/inc"), new IncAction()); TrivialConfigurator gc = new TrivialConfigurator(rulesMap); gc.setContext(context); - gc.doConfigure(Constants.TEST_DIR_PREFIX + "input/joran/" + filename); + gc.doConfigure(CoreTestConstants.TEST_DIR_PREFIX + "input/joran/" + + filename); } @Test @@ -86,4 +96,41 @@ .startsWith( "Problem parsing XML document. See previously reported errors. Abandoning all further processing.")); } + + @Test + public void lbcore105() throws IOException, JoranException { + String jarEntry = "buzz.xml"; + File jarFile = makeJarFile(); + fillInJarFile(jarFile, jarEntry); + URL url = asURL(jarFile, jarEntry); + TrivialConfigurator tc = new TrivialConfigurator(rulesMap); + tc.setContext(context); + tc.doConfigure(url); + // deleting an open file fails + assertTrue(jarFile.delete()); + assertFalse(jarFile.exists()); + } + + File makeJarFile() { + File outputDir = new File(CoreTestConstants.OUTPUT_DIR_PREFIX); + outputDir.mkdirs(); + int randomInt = RandomUtil.getPositiveInt(); + return new File(CoreTestConstants.OUTPUT_DIR_PREFIX + "foo-" + randomInt + + ".jar"); + } + + private void fillInJarFile(File jarFile, String jarEntryName) + throws IOException { + JarOutputStream jos = new JarOutputStream(new FileOutputStream(jarFile)); + jos.putNextEntry(new ZipEntry(jarEntryName)); + jos.write("<x/>".getBytes()); + jos.closeEntry(); + jos.close(); + } + + URL asURL(File jarFile, String jarEntryName) throws IOException { + URL innerURL = jarFile.toURI().toURL(); + return new URL("jar:" + innerURL + "!/" + jarEntryName); + } + } Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/PropertyActionTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/PropertyActionTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/PropertyActionTest.java Tue Jul 7 20:22:04 2009 @@ -13,7 +13,7 @@ import ch.qos.logback.core.ContextBase; import ch.qos.logback.core.joran.spi.InterpretationContext; import ch.qos.logback.core.status.ErrorStatus; -import ch.qos.logback.core.util.Constants; +import ch.qos.logback.core.util.CoreTestConstants; import ch.qos.logback.core.util.StatusPrinter; public class PropertyActionTest { @@ -90,7 +90,7 @@ @Test public void testLoadFileWithPrerequisiteSubsitution() { - context.putProperty("STEM", Constants.TEST_DIR_PREFIX + "input/joran"); + context.putProperty("STEM", CoreTestConstants.TEST_DIR_PREFIX + "input/joran"); atts.setValue("file", "${STEM}/propertyActionTest.properties"); spAction.begin(ec, null, atts); assertEquals("tata", ec.getProperty("v1")); @@ -99,7 +99,7 @@ @Test public void testLoadFile() { - atts.setValue("file", Constants.TEST_DIR_PREFIX + "input/joran/propertyActionTest.properties"); + atts.setValue("file", CoreTestConstants.TEST_DIR_PREFIX + "input/joran/propertyActionTest.properties"); spAction.begin(ec, null, atts); assertEquals("tata", ec.getProperty("v1")); assertEquals("toto", ec.getProperty("v2")); Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/event/EventRecorderTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/event/EventRecorderTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/event/EventRecorderTest.java Tue Jul 7 20:22:04 2009 @@ -24,7 +24,7 @@ import ch.qos.logback.core.ContextBase; import ch.qos.logback.core.status.Status; import ch.qos.logback.core.status.StatusManager; -import ch.qos.logback.core.util.Constants; +import ch.qos.logback.core.util.CoreTestConstants; /** * Test whether SaxEventRecorder does a good job. @@ -44,7 +44,7 @@ public List<SaxEvent> doTest(String filename) throws Exception { SaxEventRecorder recorder = new SaxEventRecorder(); recorder.setContext(context); - FileInputStream fis = new FileInputStream(Constants.TEST_DIR_PREFIX + FileInputStream fis = new FileInputStream(CoreTestConstants.TEST_DIR_PREFIX + "input/joran/"+ filename); recorder.recordEvents(fis); return recorder.getSaxEventList(); Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/event/InPlayFireTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/event/InPlayFireTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/event/InPlayFireTest.java Tue Jul 7 20:22:04 2009 @@ -22,7 +22,7 @@ import ch.qos.logback.core.joran.action.Action; import ch.qos.logback.core.joran.spi.JoranException; import ch.qos.logback.core.joran.spi.Pattern; -import ch.qos.logback.core.util.Constants; +import ch.qos.logback.core.util.CoreTestConstants; public class InPlayFireTest { @@ -37,7 +37,7 @@ TrivialConfigurator gc = new TrivialConfigurator(rulesMap); gc.setContext(context); - gc.doConfigure(Constants.TEST_DIR_PREFIX + "input/joran/fire1.xml"); + gc.doConfigure(CoreTestConstants.TEST_DIR_PREFIX + "input/joran/fire1.xml"); //for(SaxEvent se: listenAction.getSeList()) { // System.out.println(se); @@ -57,7 +57,7 @@ TrivialConfigurator gc = new TrivialConfigurator(rulesMap); gc.setContext(context); - gc.doConfigure(Constants.TEST_DIR_PREFIX + "input/joran/fire1.xml"); + gc.doConfigure(CoreTestConstants.TEST_DIR_PREFIX + "input/joran/fire1.xml"); // for(SaxEvent se: listenAction.getSeList()) { // System.out.println(se); Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/ImplicitActionTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/ImplicitActionTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/ImplicitActionTest.java Tue Jul 7 20:22:04 2009 @@ -12,12 +12,12 @@ import ch.qos.logback.core.joran.SimpleConfigurator; import ch.qos.logback.core.joran.action.Action; import ch.qos.logback.core.joran.spi.Pattern; -import ch.qos.logback.core.util.Constants; +import ch.qos.logback.core.util.CoreTestConstants; import ch.qos.logback.core.util.StatusPrinter; public class ImplicitActionTest { - static final String IMPLCIT_DIR = Constants.TEST_DIR_PREFIX + static final String IMPLCIT_DIR = CoreTestConstants.TEST_DIR_PREFIX + "input/joran/implicitAction/"; FruitContext fruitContext = new FruitContext(); Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/replay/FruitConfigurationTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/replay/FruitConfigurationTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/replay/FruitConfigurationTest.java Tue Jul 7 20:22:04 2009 @@ -22,7 +22,7 @@ import ch.qos.logback.core.joran.action.Action; import ch.qos.logback.core.joran.action.NOPAction; import ch.qos.logback.core.joran.spi.Pattern; -import ch.qos.logback.core.util.Constants; +import ch.qos.logback.core.util.CoreTestConstants; import ch.qos.logback.core.util.StatusPrinter; /** @@ -44,7 +44,7 @@ simpleConfigurator.setContext(fruitContext); - simpleConfigurator.doConfigure(Constants.TEST_DIR_PREFIX + "input/joran/replay/" + simpleConfigurator.doConfigure(CoreTestConstants.TEST_DIR_PREFIX + "input/joran/replay/" + filename); return fruitContext.getFruitShellList(); Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/RenamingTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/RenamingTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/RenamingTest.java Tue Jul 7 20:22:04 2009 @@ -24,7 +24,7 @@ import ch.qos.logback.core.Layout; import ch.qos.logback.core.layout.EchoLayout; import ch.qos.logback.core.util.Compare; -import ch.qos.logback.core.util.Constants; +import ch.qos.logback.core.util.CoreTestConstants; /** * @@ -43,7 +43,7 @@ public void setUp() throws Exception { layout = new EchoLayout<Object>(); - File target = new File(Constants.OUTPUT_DIR_PREFIX + "test.log"); + File target = new File(CoreTestConstants.OUTPUT_DIR_PREFIX + "test.log"); target.mkdirs(); target.delete(); } @@ -54,7 +54,7 @@ RollingFileAppender<Object> rfa = new RollingFileAppender<Object>(); rfa.setLayout(layout); rfa.setContext(context); - rfa.setFile(Constants.OUTPUT_DIR_PREFIX + "test.log"); + rfa.setFile(CoreTestConstants.OUTPUT_DIR_PREFIX + "test.log"); // rollover by the second String datePattern = "yyyy-MM-dd_HH_mm_ss"; @@ -62,7 +62,7 @@ String[] filenames = new String[2]; TimeBasedRollingPolicy tbrp = new TimeBasedRollingPolicy(); - tbrp.setFileNamePattern(Constants.OUTPUT_DIR_PREFIX + "test-%d{" + tbrp.setFileNamePattern(CoreTestConstants.OUTPUT_DIR_PREFIX + "test-%d{" + datePattern + "}"); // tbrp.setActiveFileName("src/test/output/test.log"); tbrp.setContext(context); @@ -79,13 +79,13 @@ DelayerUtil.delayUntilNextSecond(50); rfa.doAppend("Hello 1"); - filenames[0] = Constants.OUTPUT_DIR_PREFIX + "test-" + filenames[0] = CoreTestConstants.OUTPUT_DIR_PREFIX + "test-" + sdf.format(cal.getTime()); - filenames[1] = Constants.OUTPUT_DIR_PREFIX + "test.log"; + filenames[1] = CoreTestConstants.OUTPUT_DIR_PREFIX + "test.log"; for (int i = 0; i < filenames.length; i++) { // System.out.println("before i=" + i); - assertTrue(Compare.compare(filenames[i], Constants.TEST_DIR_PREFIX + assertTrue(Compare.compare(filenames[i], CoreTestConstants.TEST_DIR_PREFIX + "witness/rolling/renaming." + i)); // System.out.println("post i=" + i); } Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeBasedRollingTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeBasedRollingTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeBasedRollingTest.java Tue Jul 7 20:22:04 2009 @@ -31,7 +31,7 @@ import ch.qos.logback.core.layout.DummyLayout; import ch.qos.logback.core.testUtil.Env; import ch.qos.logback.core.util.Compare; -import ch.qos.logback.core.util.Constants; +import ch.qos.logback.core.util.CoreTestConstants; /** * @@ -47,13 +47,13 @@ @Before public void setUp() { { - File target = new File(Constants.OUTPUT_DIR_PREFIX + File target = new File(CoreTestConstants.OUTPUT_DIR_PREFIX + "sizeBased-test2.log"); target.mkdirs(); target.delete(); } { - File target = new File(Constants.OUTPUT_DIR_PREFIX + "sbr-test3.log"); + File target = new File(CoreTestConstants.OUTPUT_DIR_PREFIX + "sbr-test3.log"); target.mkdirs(); target.delete(); } @@ -85,7 +85,7 @@ sbtp.setMaxFileSize("100"); sbtp.start(); - fwrp.setFileNamePattern(Constants.OUTPUT_DIR_PREFIX + fwrp.setFileNamePattern(CoreTestConstants.OUTPUT_DIR_PREFIX + "sizeBased-test1.%i"); try { fwrp.start(); @@ -109,7 +109,7 @@ rfa.setName("ROLLING"); rfa.setLayout(layout); rfa.setContext(context); - rfa.setFile(Constants.OUTPUT_DIR_PREFIX + rfa.setFile(CoreTestConstants.OUTPUT_DIR_PREFIX + "sizeBased-test2.log"); FixedWindowRollingPolicy swrp = new FixedWindowRollingPolicy(); @@ -122,7 +122,7 @@ // swrp.setActiveFileName(Constants.TEST_DIR_PREFIX // + "output/sizeBased-test2.log"); - swrp.setFileNamePattern(Constants.OUTPUT_DIR_PREFIX + swrp.setFileNamePattern(CoreTestConstants.OUTPUT_DIR_PREFIX + "sizeBased-test2.%i"); swrp.setParent(rfa); swrp.start(); @@ -148,25 +148,25 @@ rfa.doAppend("hello"); } - assertTrue(new File(Constants.OUTPUT_DIR_PREFIX + assertTrue(new File(CoreTestConstants.OUTPUT_DIR_PREFIX + "sizeBased-test2.log").exists()); - assertTrue(new File(Constants.OUTPUT_DIR_PREFIX + "sizeBased-test2.0") + assertTrue(new File(CoreTestConstants.OUTPUT_DIR_PREFIX + "sizeBased-test2.0") .exists()); - assertTrue(new File(Constants.OUTPUT_DIR_PREFIX + "sizeBased-test2.1") + assertTrue(new File(CoreTestConstants.OUTPUT_DIR_PREFIX + "sizeBased-test2.1") .exists()); // The File.length() method is not accurate under Windows if (!Env.isWindows()) { - assertTrue(Compare.compare(Constants.OUTPUT_DIR_PREFIX - + "sizeBased-test2.log", Constants.TEST_DIR_PREFIX + assertTrue(Compare.compare(CoreTestConstants.OUTPUT_DIR_PREFIX + + "sizeBased-test2.log", CoreTestConstants.TEST_DIR_PREFIX + "witness/rolling/sbr-test2.l")); - assertTrue(Compare.compare(Constants.OUTPUT_DIR_PREFIX - + "sizeBased-test2.0", Constants.TEST_DIR_PREFIX + assertTrue(Compare.compare(CoreTestConstants.OUTPUT_DIR_PREFIX + + "sizeBased-test2.0", CoreTestConstants.TEST_DIR_PREFIX + "witness/rolling/sbr-test2.0")); - assertTrue(Compare.compare(Constants.OUTPUT_DIR_PREFIX - + "sizeBased-test2.1", Constants.TEST_DIR_PREFIX + assertTrue(Compare.compare(CoreTestConstants.OUTPUT_DIR_PREFIX + + "sizeBased-test2.1", CoreTestConstants.TEST_DIR_PREFIX + "witness/rolling/sbr-test2.1")); } @@ -183,7 +183,7 @@ RollingFileAppender<Object> rfa = new RollingFileAppender<Object>(); rfa.setLayout(layout); rfa.setContext(context); - rfa.setFile(Constants.OUTPUT_DIR_PREFIX + "sbr-test3.log"); + rfa.setFile(CoreTestConstants.OUTPUT_DIR_PREFIX + "sbr-test3.log"); FixedWindowRollingPolicy fwrp = new FixedWindowRollingPolicy(); fwrp.setContext(context); @@ -193,7 +193,7 @@ sbtp.setMaxFileSize("100"); fwrp.setMinIndex(0); //fwrp.setActiveFileName(Constants.TEST_DIR_PREFIX + "output/sbr-test3.log"); - fwrp.setFileNamePattern(Constants.OUTPUT_DIR_PREFIX + fwrp.setFileNamePattern(CoreTestConstants.OUTPUT_DIR_PREFIX + "sbr-test3.%i.gz"); fwrp.setParent(rfa); fwrp.start(); @@ -218,24 +218,24 @@ rfa.doAppend("hello"); } - assertTrue(new File(Constants.OUTPUT_DIR_PREFIX + "sbr-test3.log") + assertTrue(new File(CoreTestConstants.OUTPUT_DIR_PREFIX + "sbr-test3.log") .exists()); - assertTrue(new File(Constants.OUTPUT_DIR_PREFIX + "sbr-test3.0.gz") + assertTrue(new File(CoreTestConstants.OUTPUT_DIR_PREFIX + "sbr-test3.0.gz") .exists()); - assertTrue(new File(Constants.OUTPUT_DIR_PREFIX + "sbr-test3.1.gz") + assertTrue(new File(CoreTestConstants.OUTPUT_DIR_PREFIX + "sbr-test3.1.gz") .exists()); if (!Env.isWindows()) { assertTrue(Compare.compare( - Constants.OUTPUT_DIR_PREFIX+"sbr-test3.log", - Constants.TEST_DIR_PREFIX + "witness/rolling/sbr-test3.l")); + CoreTestConstants.OUTPUT_DIR_PREFIX+"sbr-test3.log", + CoreTestConstants.TEST_DIR_PREFIX + "witness/rolling/sbr-test3.l")); assertTrue(Compare.gzCompare( - Constants.OUTPUT_DIR_PREFIX+"sbr-test3.0.gz", - Constants.TEST_DIR_PREFIX + "witness/rolling/sbr-test3.0.gz")); + CoreTestConstants.OUTPUT_DIR_PREFIX+"sbr-test3.0.gz", + CoreTestConstants.TEST_DIR_PREFIX + "witness/rolling/sbr-test3.0.gz")); assertTrue(Compare.gzCompare( - Constants.OUTPUT_DIR_PREFIX+"sbr-test3.1.gz", - Constants.TEST_DIR_PREFIX + "witness/rolling/sbr-test3.1.gz")); + CoreTestConstants.OUTPUT_DIR_PREFIX+"sbr-test3.1.gz", + CoreTestConstants.TEST_DIR_PREFIX + "witness/rolling/sbr-test3.1.gz")); } // StatusPrinter.print(context.getStatusManager()); Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java Tue Jul 7 20:22:04 2009 @@ -28,7 +28,7 @@ import ch.qos.logback.core.ContextBase; import ch.qos.logback.core.layout.EchoLayout; import ch.qos.logback.core.util.Compare; -import ch.qos.logback.core.util.Constants; +import ch.qos.logback.core.util.CoreTestConstants; /** * A rather exhaustive set of tests. Tests include leaving the file option @@ -86,7 +86,7 @@ } void deleteStaleLogFile(String filename) { - File target = new File(Constants.OUTPUT_DIR_PREFIX + filename); + File target = new File(CoreTestConstants.OUTPUT_DIR_PREFIX + filename); target.mkdirs(); target.delete(); } @@ -124,7 +124,7 @@ public void noCompression_FileBlank_NoRestart_1() throws Exception { String testId = "test1"; initRFA(rfa1, null); - initTRBP(rfa1, tbrp1, Constants.OUTPUT_DIR_PREFIX + testId + "-%d{" + initTRBP(rfa1, tbrp1, CoreTestConstants.OUTPUT_DIR_PREFIX + testId + "-%d{" + DATE_PATTERN + "}", currentTime, 0); // compute the current filename @@ -142,7 +142,7 @@ int i = 0; for (String fn : expectedFilenameList) { - assertTrue(Compare.compare(fn, Constants.TEST_DIR_PREFIX + assertTrue(Compare.compare(fn, CoreTestConstants.TEST_DIR_PREFIX + "witness/rolling/tbr-" + testId + "." + i++)); } } @@ -155,7 +155,7 @@ String testId = "test2"; initRFA(rfa1, null); - initTRBP(rfa1, tbrp1, Constants.OUTPUT_DIR_PREFIX + testId + "-%d{" + initTRBP(rfa1, tbrp1, CoreTestConstants.OUTPUT_DIR_PREFIX + testId + "-%d{" + DATE_PATTERN + "}", currentTime, 0); // a new file is created by virtue of rfa.start(); @@ -174,7 +174,7 @@ rfa1.stop(); initRFA(rfa2, null); - initTRBP(rfa2, tbrp2, Constants.OUTPUT_DIR_PREFIX + testId + "-%d{" + initTRBP(rfa2, tbrp2, CoreTestConstants.OUTPUT_DIR_PREFIX + testId + "-%d{" + DATE_PATTERN + "}", tbrp1.getCurrentTime(), 0); for (int i = 0; i <= 2; i++) { @@ -186,7 +186,7 @@ int i = 0; for (String fn : expectedFilenameList) { - assertTrue(Compare.compare(fn, Constants.TEST_DIR_PREFIX + assertTrue(Compare.compare(fn, CoreTestConstants.TEST_DIR_PREFIX + "witness/rolling/tbr-" + testId + "." + i++)); } } @@ -198,7 +198,7 @@ public void withCompression_FileBlank_NoRestart_3() throws Exception { String testId = "test3"; initRFA(rfa1, null); - initTRBP(rfa1, tbrp1, Constants.OUTPUT_DIR_PREFIX + testId + "-%d{" + initTRBP(rfa1, tbrp1, CoreTestConstants.OUTPUT_DIR_PREFIX + testId + "-%d{" + DATE_PATTERN + "}.gz", currentTime, 0); addExpectedFileName_ByDate(testId, getDateOfCurrentPeriodsStart(), true); @@ -217,7 +217,7 @@ int i = 0; for (String fn : expectedFilenameList) { - assertTrue(Compare.compare(fn, Constants.TEST_DIR_PREFIX + assertTrue(Compare.compare(fn, CoreTestConstants.TEST_DIR_PREFIX + "witness/rolling/tbr-" + testId + "." + i + addGZIfNotLast(i))); i++; } @@ -230,7 +230,7 @@ public void noCompression_FileSet_StopRestart_4() throws Exception { String testId = "test4"; initRFA(rfa1, testId2FileName(testId)); - initTRBP(rfa1, tbrp1, Constants.OUTPUT_DIR_PREFIX + testId + "-%d{" + initTRBP(rfa1, tbrp1, CoreTestConstants.OUTPUT_DIR_PREFIX + testId + "-%d{" + DATE_PATTERN + "}", currentTime, 0); addExpectedFileName_ByDate(testId, getDateOfCurrentPeriodsStart(), false); @@ -248,7 +248,7 @@ rfa1.stop(); initRFA(rfa2, testId2FileName(testId)); - initTRBP(rfa2, tbrp2, Constants.OUTPUT_DIR_PREFIX + testId + "-%d{" + initTRBP(rfa2, tbrp2, CoreTestConstants.OUTPUT_DIR_PREFIX + testId + "-%d{" + DATE_PATTERN + "}", currentTime, currentTime); for (int i = 0; i <= 2; i++) { @@ -262,7 +262,7 @@ int i = 0; for (String fn : expectedFilenameList) { - assertTrue(Compare.compare(fn, Constants.TEST_DIR_PREFIX + assertTrue(Compare.compare(fn, CoreTestConstants.TEST_DIR_PREFIX + "witness/rolling/tbr-" + testId + "." + i++)); } } @@ -272,7 +272,7 @@ throws Exception { String testId = "test4B"; initRFA(rfa1, testId2FileName(testId)); - initTRBP(rfa1, tbrp1, Constants.OUTPUT_DIR_PREFIX + testId + "-%d{" + initTRBP(rfa1, tbrp1, CoreTestConstants.OUTPUT_DIR_PREFIX + testId + "-%d{" + DATE_PATTERN + "}", currentTime, 0); addExpectedFileName_ByDate(testId, getDateOfCurrentPeriodsStart(), false); @@ -292,8 +292,8 @@ long fileTimestamp = currentTime; incCurrentTime(2000); - initRFA(rfa2, Constants.OUTPUT_DIR_PREFIX + "test4B.log"); - initTRBP(rfa2, tbrp2, Constants.OUTPUT_DIR_PREFIX + testId +"-%d{" + initRFA(rfa2, CoreTestConstants.OUTPUT_DIR_PREFIX + "test4B.log"); + initTRBP(rfa2, tbrp2, CoreTestConstants.OUTPUT_DIR_PREFIX + testId +"-%d{" + DATE_PATTERN + "}", currentTime, fileTimestamp); for (int i = 0; i <= 2; i++) { @@ -307,7 +307,7 @@ int i = 0; for (String fn : expectedFilenameList) { - assertTrue(Compare.compare(fn, Constants.TEST_DIR_PREFIX + assertTrue(Compare.compare(fn, CoreTestConstants.TEST_DIR_PREFIX + "witness/rolling/tbr-test4B." + i++)); } @@ -321,7 +321,7 @@ String testId = "test5"; initRFA(rfa1, testId2FileName(testId)); - initTRBP(rfa1, tbrp1, Constants.OUTPUT_DIR_PREFIX + testId + "-%d{" + initTRBP(rfa1, tbrp1, CoreTestConstants.OUTPUT_DIR_PREFIX + testId + "-%d{" + DATE_PATTERN + "}", currentTime, 0); addExpectedFileName_ByDate(testId, getDateOfCurrentPeriodsStart(), false); @@ -340,7 +340,7 @@ int i = 0; for (String fn : expectedFilenameList) { - assertTrue(Compare.compare(fn, Constants.TEST_DIR_PREFIX + assertTrue(Compare.compare(fn, CoreTestConstants.TEST_DIR_PREFIX + "witness/rolling/tbr-test5." + i++)); } } @@ -354,7 +354,7 @@ String testId = "test6"; initRFA(rfa1, testId2FileName(testId)); - initTRBP(rfa1, tbrp1, Constants.OUTPUT_DIR_PREFIX + testId + "-%d{" + initTRBP(rfa1, tbrp1, CoreTestConstants.OUTPUT_DIR_PREFIX + testId + "-%d{" + DATE_PATTERN + "}.gz", currentTime, 0); addExpectedFileName_ByDate(testId, getDateOfCurrentPeriodsStart(), true); @@ -376,7 +376,7 @@ int i = 0; for (String fn : expectedFilenameList) { - assertTrue(Compare.compare(fn, Constants.TEST_DIR_PREFIX + assertTrue(Compare.compare(fn, CoreTestConstants.TEST_DIR_PREFIX + "witness/rolling/tbr-" + testId + "." + i + addGZIfNotLast(i))); i++; } @@ -387,7 +387,7 @@ // ========================================================================= String testId2FileName(String testId) { - return Constants.OUTPUT_DIR_PREFIX + testId + ".log"; + return CoreTestConstants.OUTPUT_DIR_PREFIX + testId + ".log"; } void massageExpectedFilesToCorresponToCurrentTarget(String file) { @@ -407,7 +407,7 @@ } void addExpectedFileName_ByDate(String testId, Date date, boolean gzExtension) { - String fn = Constants.OUTPUT_DIR_PREFIX + testId + "-" + sdf.format(date); + String fn = CoreTestConstants.OUTPUT_DIR_PREFIX + testId + "-" + sdf.format(date); if (gzExtension) { fn += ".gz"; } @@ -423,7 +423,7 @@ } void addExpectedFileName_ByFile(String filenameSuffix) { - String fn = Constants.OUTPUT_DIR_PREFIX + filenameSuffix; + String fn = CoreTestConstants.OUTPUT_DIR_PREFIX + filenameSuffix; expectedFilenameList.add(fn); } Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithCleanTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithCleanTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithCleanTest.java Tue Jul 7 20:22:04 2009 @@ -13,7 +13,7 @@ import ch.qos.logback.core.Context; import ch.qos.logback.core.ContextBase; import ch.qos.logback.core.layout.EchoLayout; -import ch.qos.logback.core.util.Constants; +import ch.qos.logback.core.util.CoreTestConstants; public class TimeBasedRollingWithCleanTest { @@ -33,7 +33,7 @@ context.setName("test"); // remove all files containing the string 'clean' - File dir = new File(Constants.OUTPUT_DIR_PREFIX); + File dir = new File(CoreTestConstants.OUTPUT_DIR_PREFIX); if (dir.isDirectory()) { File[] toDelete = dir.listFiles(new FilenameFilter() { public boolean accept(File dir, String name) { @@ -53,14 +53,14 @@ @Test public void montlyRollover() throws Exception { - doRollover(Constants.OUTPUT_DIR_PREFIX + "clean-%d{" + MONTHLY_DATE_PATTERN + doRollover(CoreTestConstants.OUTPUT_DIR_PREFIX + "clean-%d{" + MONTHLY_DATE_PATTERN + "}.txt", MILLIS_IN_MONTH, 20); } @Test public void dailyRollover() throws Exception { - doRollover(Constants.OUTPUT_DIR_PREFIX + "clean-%d{" + DAILY_DATE_PATTERN + doRollover(CoreTestConstants.OUTPUT_DIR_PREFIX + "clean-%d{" + DAILY_DATE_PATTERN + "}.txt.zip", MILLIS_IN_DAY, 5); } @@ -96,7 +96,7 @@ void check(int expectedCount) { // remove all files containing the string 'clean' - File dir = new File(Constants.OUTPUT_DIR_PREFIX); + File dir = new File(CoreTestConstants.OUTPUT_DIR_PREFIX); if (dir.isDirectory()) { File[] match = dir.listFiles(new FilenameFilter() { public boolean accept(File dir, String name) { Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/helper/CompressTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/helper/CompressTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/helper/CompressTest.java Tue Jul 7 20:22:04 2009 @@ -25,7 +25,7 @@ import ch.qos.logback.core.Context; import ch.qos.logback.core.ContextBase; import ch.qos.logback.core.util.Compare; -import ch.qos.logback.core.util.Constants; +import ch.qos.logback.core.util.CoreTestConstants; import ch.qos.logback.core.util.StatusPrinter; /** @@ -40,29 +40,29 @@ // Copy source files // Delete output files { - File source = new File(Constants.TEST_DIR_PREFIX + "input/compress1.copy"); - File dest = new File(Constants.TEST_DIR_PREFIX + "input/compress1.txt"); + File source = new File(CoreTestConstants.TEST_DIR_PREFIX + "input/compress1.copy"); + File dest = new File(CoreTestConstants.TEST_DIR_PREFIX + "input/compress1.txt"); copy(source, dest); - File target = new File(Constants.OUTPUT_DIR_PREFIX + File target = new File(CoreTestConstants.OUTPUT_DIR_PREFIX + "compress1.txt.gz"); target.mkdirs(); target.delete(); } { - File source = new File(Constants.TEST_DIR_PREFIX + "input/compress2.copy"); - File dest = new File(Constants.TEST_DIR_PREFIX + "input/compress2.txt"); + File source = new File(CoreTestConstants.TEST_DIR_PREFIX + "input/compress2.copy"); + File dest = new File(CoreTestConstants.TEST_DIR_PREFIX + "input/compress2.txt"); copy(source, dest); - File target = new File(Constants.OUTPUT_DIR_PREFIX + File target = new File(CoreTestConstants.OUTPUT_DIR_PREFIX + "compress2.txt.gz"); target.mkdirs(); target.delete(); } { - File source = new File(Constants.TEST_DIR_PREFIX + "input/compress3.copy"); - File dest = new File(Constants.TEST_DIR_PREFIX + "input/compress3.txt"); + File source = new File(CoreTestConstants.TEST_DIR_PREFIX + "input/compress3.copy"); + File dest = new File(CoreTestConstants.TEST_DIR_PREFIX + "input/compress3.txt"); copy(source, dest); - File target = new File(Constants.OUTPUT_DIR_PREFIX + File target = new File(CoreTestConstants.OUTPUT_DIR_PREFIX + "compress3.txt.zip"); target.mkdirs(); target.delete(); @@ -73,38 +73,38 @@ @Test public void test1() throws Exception { Compressor compressor = new Compressor(CompressionMode.GZ, - Constants.TEST_DIR_PREFIX + "input/compress1.txt", - Constants.OUTPUT_DIR_PREFIX + "compress1.txt.gz"); + CoreTestConstants.TEST_DIR_PREFIX + "input/compress1.txt", + CoreTestConstants.OUTPUT_DIR_PREFIX + "compress1.txt.gz"); compressor.setContext(context); compressor.compress(); StatusPrinter.print(context.getStatusManager()); assertEquals(0, context.getStatusManager().getCount()); - assertTrue(Compare.gzCompare(Constants.OUTPUT_DIR_PREFIX - + "compress1.txt.gz", Constants.TEST_DIR_PREFIX + assertTrue(Compare.gzCompare(CoreTestConstants.OUTPUT_DIR_PREFIX + + "compress1.txt.gz", CoreTestConstants.TEST_DIR_PREFIX + "witness/compress1.txt.gz")); } @Test public void test2() throws Exception { Compressor compressor = new Compressor(CompressionMode.GZ, - Constants.TEST_DIR_PREFIX + "input/compress2.txt", - Constants.OUTPUT_DIR_PREFIX + "compress2.txt"); + CoreTestConstants.TEST_DIR_PREFIX + "input/compress2.txt", + CoreTestConstants.OUTPUT_DIR_PREFIX + "compress2.txt"); compressor.setContext(context); compressor.compress(); StatusPrinter.print(context.getStatusManager()); assertEquals(0, context.getStatusManager().getCount()); - assertTrue(Compare.gzCompare(Constants.OUTPUT_DIR_PREFIX - + "compress2.txt.gz", Constants.TEST_DIR_PREFIX + assertTrue(Compare.gzCompare(CoreTestConstants.OUTPUT_DIR_PREFIX + + "compress2.txt.gz", CoreTestConstants.TEST_DIR_PREFIX + "witness/compress2.txt.gz")); } @Test public void test3() throws Exception { Compressor compressor = new Compressor(CompressionMode.ZIP, - Constants.TEST_DIR_PREFIX + "input/compress3.txt", - Constants.OUTPUT_DIR_PREFIX + "compress3.txt"); + CoreTestConstants.TEST_DIR_PREFIX + "input/compress3.txt", + CoreTestConstants.OUTPUT_DIR_PREFIX + "compress3.txt"); compressor.setContext(context); compressor.compress(); StatusPrinter.print(context.getStatusManager()); Copied: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/CoreTestConstants.java (from r2315, /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/Constants.java) ============================================================================== --- /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/Constants.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/CoreTestConstants.java Tue Jul 7 20:22:04 2009 @@ -1,7 +1,7 @@ package ch.qos.logback.core.util; -public class Constants { +public class CoreTestConstants { public static final String TEST_DIR_PREFIX = "src/test/"; public static final String OUTPUT_DIR_PREFIX = "target/test-output/"; Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/FileUtilTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/FileUtilTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/FileUtilTest.java Tue Jul 7 20:22:04 2009 @@ -42,7 +42,7 @@ @Test public void smoke() { int diff = new Random().nextInt(100); - File file = new File(Constants.OUTPUT_DIR_PREFIX+"/fu"+diff+"/testing.txt"); + File file = new File(CoreTestConstants.OUTPUT_DIR_PREFIX+"/fu"+diff+"/testing.txt"); // these will be deleted later cleanupList.add(file); cleanupList.add(file.getParentFile()); @@ -55,7 +55,7 @@ @Test public void smokeII() { int diff = new Random().nextInt(100); - File file = new File(Constants.OUTPUT_DIR_PREFIX+"/fu"+diff+"/bla/testing.txt"); + File file = new File(CoreTestConstants.OUTPUT_DIR_PREFIX+"/fu"+diff+"/bla/testing.txt"); // these will be deleted later cleanupList.add(file); cleanupList.add(file.getParentFile()); Modified: logback/trunk/logback-site/src/site/pages/news.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/news.html (original) +++ logback/trunk/logback-site/src/site/pages/news.html Tue Jul 7 20:22:04 2009 @@ -71,6 +71,14 @@ reported by Johan Bos. + Fixed <a + href="http://jira.qos.ch/browse/LBCORE-105">LBCORE-105</a>. Configuration + files placed in jar files will no longer lock the jar file. This + issue was initially reported for log4j in <a + href="https://issues.apache.org/bugzilla/show_bug.cgi?id=47465">bug + 47465</a> Mark Thomas. + + <hr width="80%" align="center" /> <h3>12th of February 2009 - Release of version 0.9.15</h3>

1 0

svn commit: r2320 - logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran
by noreply.ceki＠qos.ch 07 Jul '09

07 Jul '09

Author: ceki Date: Tue Jul 7 13:36:56 2009 New Revision: 2320 Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialcConfiguratorTest.java Log: - renamed method names (minor changes) Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialcConfiguratorTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialcConfiguratorTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialcConfiguratorTest.java Tue Jul 7 13:36:56 2009 @@ -42,7 +42,7 @@ } @Test - public void smokeTezt() throws Exception { + public void smoke() throws Exception { int oldBeginCount = IncAction.beginCount; int oldEndCount = IncAction.endCount; int oldErrorCount = IncAction.errorCount; @@ -53,7 +53,7 @@ } @Test - public void teztInexistentFile() { + public void inexistentFile() { TrivialStatusListener tsl = new TrivialStatusListener(); String filename = "nothereBLAH.xml"; context.getStatusManager().add(tsl); @@ -68,7 +68,7 @@ } @Test - public void teztIllFormedXML() { + public void illFormedXML() { TrivialStatusListener tsl = new TrivialStatusListener(); String filename = "illformed.xml"; context.getStatusManager().add(tsl);

1 0

Devoxx Conference
by Ceki Gulcu 06 Jul '09

06 Jul '09

Hello all, My submission for a SLF4J/logback talk for this year's Devoxx conference has been accepted. For those who don't know Devoxx, rumor has it that it is the biggest Java conference in Europe. Cheers, -- Ceki Gülcü Logback: The reliable, generic, fast and flexible logging framework for Java. http://logback.qos.ch

2 3

svn commit: r2319 - in logback/trunk/logback-site/src/site: pages resources/images
by noreply.ceki＠qos.ch 06 Jul '09

06 Jul '09

Author: ceki Date: Mon Jul 6 22:24:30 2009 New Revision: 2319 Added: logback/trunk/logback-site/src/site/resources/images/devoxx09.jpeg (contents, props changed) logback/trunk/logback-site/src/site/resources/images/jazoon09.gif (contents, props changed) Modified: logback/trunk/logback-site/src/site/pages/documentation.html Log: -added list of conferences Modified: logback/trunk/logback-site/src/site/pages/documentation.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/documentation.html (original) +++ logback/trunk/logback-site/src/site/pages/documentation.html Mon Jul 6 22:24:30 2009 @@ -86,6 +86,26 @@ </ul> + <h2>Conferences</h2> + <table cellspacing="20" border="0"> + <tr> + <td valign="top" align="right"> + Jazoon, June 22-25, 2009 Zurich + <a href="http://jazoon.com/"> + <img src="images/jazoon09.gif" alt="Jazoon 2009" border="0"/> + </a> + </td> + + <td align="right"> + Devoxx, November 16-20, 2009 Antwerp + <a href="http://devoxx.com/"> + <img src="images/devoxx09.jpeg" alt="Devoxx 2009" border="0"/> + </a> + </td> + </tr> + </table> + + <script src="templates/footer.js" type="text/javascript"></script> </div> </body> Added: logback/trunk/logback-site/src/site/resources/images/devoxx09.jpeg ============================================================================== Binary file. No diff available. Added: logback/trunk/logback-site/src/site/resources/images/jazoon09.gif ============================================================================== Binary file. No diff available.

1 0

synchronization style?
by Ceki Gulcu 06 Jul '09

06 Jul '09

Hello, I am hesitating between the two following styles of synchronization. First style, with one lengthy synchronization block synchronize(x) { shortOpA(); shortOpB(); shortOpC(); shortOpD(); longOp(); } Second style, with shorter but more numerous synchronization blocks synchronize(a) { shortOpA(); } synchronize(b) { shortOpB(); } shortOpC(); // no need for synchronization shortOpD(); // no need for synchronization synchronize(x) { longOp(); } Let us assume that longOp() takes about 5 times longer than shortOp_N() to complete. Moreover, all operations are self contained, with no further synchronization (locking) dependencies to external code. I wonder which style is better. The first style is simpler to understand, because there is just one synchronization block. However, the monitor is held for a longer period. In the second style, there are more locks, so the code may be harder to follow but each lock is held for a shorter period. Surprisingly enough, tests (with 10 threads) show that performance is slightly better with the first style. Am I splitting hairs? -- Ceki Gülcü Logback: The reliable, generic, fast and flexible logging framework for Java. http://logback.qos.ch

5 17

[Bug 100] Serialization of objectArray in LoggingEvent does not always work
by bugzilla-daemon＠pixie.qos.ch 05 Jul '09

05 Jul '09

show_bug.cgi?id=100 --- Comment #20 from Walter Smith <walter.smith(a)sinntr.eu> 2009-07-05 23:18:13 --- Hi! (In reply to comment #19) > I am inclined to think that the use case is > an important one, and worth tying application code to logback's > implementation. I thoroughly second Cekis point of view!!! This is even a use case that we switched from log4j to logback! log4j completely formats the message before it creates a LogEvent. We wrote an appender to collect statistics to be sent to a monitoring system... extracting them from the message string is not what we think to be very robust, as you may agree. We where glad that logback postpones the formatting until it has to. While our specific use case is not using a remote appender, the use case is IMHO very important! Locale specific formatting of dates and numbers is just one convincing example. If an Object is not Serializable, then toString would be a good option, but for all other cases the class should get over the wire as well... but there are in deed some very interesting issues with the same objects of the same type coming from different machines with different versions... or one machine doing a hot redeploy of a class! Kind regards Walter -- Configure bugmail: userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug.

1 0

svn commit: r2318 - logback/trunk/logback-core/src/test/java/ch/qos/logback/core/issue
by noreply.ceki＠qos.ch 04 Jul '09

04 Jul '09

Author: ceki Date: Sat Jul 4 12:38:07 2009 New Revision: 2318 Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/issue/SelectiveLockRunnable.java Log: - minor typo fix Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/issue/SelectiveLockRunnable.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/issue/SelectiveLockRunnable.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/issue/SelectiveLockRunnable.java Sat Jul 4 12:38:07 2009 @@ -33,7 +33,7 @@ nolockRun(); break; case SYNC: - synchronizedRUn(); + synchronizedRun(); break; case FAIR: fairLockRun(); @@ -75,7 +75,7 @@ } } - void synchronizedRUn() { + void synchronizedRun() { for (;;) { synchronized (LOCK) { counter++;

1 0

[JIRA] Created: (LBSITE-29) Typo in description for 'prudent' property of FileAppender inChapter 4
by Mark Vedder (JIRA) 02 Jul '09

02 Jul '09

Typo in description for 'prudent' property of FileAppender inChapter 4 ---------------------------------------------------------------------- Key: LBSITE-29 URL: http://jira.qos.ch/browse/LBSITE-29 Project: logback-site Issue Type: Bug Components: Documentation Affects Versions: 0.9.15 Reporter: Mark Vedder Assignee: Logback dev list Priority: Trivial In the description for the 'prudent' property for the FileAppender, 'automatically' is misspelled as 'autmatically' in the second paragraph: "Prudent mode implies that Append and ImmediateFlush properties are autmatically set to true and the BufferedIO set to false." -- 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 1

svn commit: r2317 - logback/trunk/logback-site/src/site/pages/manual
by noreply.ceki＠qos.ch 02 Jul '09

02 Jul '09

Author: ceki Date: Thu Jul 2 23:09:47 2009 New Revision: 2317 Modified: logback/trunk/logback-site/src/site/pages/manual/appenders.html Log: correct misspelled worlds. Related to LBSITE-29 Modified: logback/trunk/logback-site/src/site/pages/manual/appenders.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/manual/appenders.html (original) +++ logback/trunk/logback-site/src/site/pages/manual/appenders.html Thu Jul 2 23:09:47 2009 @@ -81,7 +81,7 @@ referenced by name, a quality confirmed to be instrumental in configuration scripts. The <code>Appender</code> interface extends the <code>FilterAttachable</code> interface. It follows that one or - more filters can be attaqched to an appender instance. Filters are + more filters can be attached to an appender instance. Filters are discussed in detail in a subsequent chapter. @@ -214,9 +214,9 @@ Logback-core lays the foundation upon which the other logback modules are built. In general, the components in logback-core - require some, albeit minimal, amount of customisation. However, in - the next few sections, we describe several appenders which are ready - for use out of the box. + require some, albeit minimal, customization. However, in the next + few sections, we describe several appenders which are ready for use + out of the box. @@ -434,7 +434,7 @@ The <a href="../xref/ch/qos/logback/core/FileAppender.html"><code>FileAppender</code></a>, a subclass of <code>WriterAppender</code>, appends log events into - a file. The target fileis specified by the File option. If the file already exists, it is either appended to, or truncated depending on the value of the Append option. @@ -532,7 +532,7 @@ Prudent mode implies that Append and ImmediateFlush properties are - autmatically set to true and the BufferedIO set to false. @@ -571,7 +571,7 @@ actual source code. - Below is an example of a cconfiguration file for + Below is an example of a configuration file for <code>FileAppender</code>: @@ -593,7 +593,7 @@ </configuration> After changing the current directory to - logback-examples, run this example by lauching the + logback-examples, run this example by launching the following command: @@ -613,11 +613,11 @@ met, change its logging target to another file. - There are two important logback componenents that interact with + There are two important logback components that interact with <code>RollingFileAppender</code>. First, a <code>RollingPolicy</code> instance attached to the <code>RollingFileAppender</code> is responsible for undertaking the - action for perfoming a rollover. Second, a + action for performing a rollover. Second, a <code>TriggeringPolicy</code> instance attached to a <code>RollingFileAppender</code> will determine if and exactly when rollover happens Thus, <code>RollingPolicy</code> is responsible @@ -675,7 +675,7 @@ <td>RollingPolicy</td> <td><code>RollingPolicy</code></td> <td>This option is the component that will dictate - <code>RollingFileAppender</code>'s behaviour when rollover + <code>RollingFileAppender</code>'s behavior when rollover occurs. See more information below. </td> </tr> @@ -876,7 +876,7 @@ <td>foo.log</td> <td>foo1.log, foo2.log, foo3.log</td> <td>In this and subsequent rounds, the rollover begins by - deleting foo3.log. Otherfiles are renamed by + deleting foo3.log. Other files are renamed by incrementing their index as shown in previous steps. In this and subsequent rollovers, there will be three archive logs and one active log file. @@ -909,7 +909,7 @@ <MaxFileSize>5MB</MaxFileSize> </triggeringPolicy> <layout class="ch.qos.logback.classic.PatternLayout"> - <Pattern>%-4relative [%thread] %-5levelu %logger{35} - %msg%n</Pattern> + <Pattern>%-4relative [%thread] %-5level %logger{35} - %msg%n</Pattern> </layout> </appender> @@ -925,7 +925,7 @@ <a href="../xref/ch/qos/logback/core/rolling/TimeBasedRollingPolicy.html"> <code>TimeBasedRollingPolicy</code></a> is possibly the most - popular rolling polciy. It defines a rollover policy based on time, + popular rolling policy. It defines a rollover policy based on time, say by day or by month. @@ -1010,7 +1010,7 @@ <td class="small"> /wombat/foo.    / %d{yyyy-MM-dd_HH-mm}.log </td> - <td>Rollover at the beggining of every minute.</td> + <td>Rollover at the beginning of every minute.</td> <td>Between 11.32,001 and 11.32,999, on November 3rd, 2006, the logging will be output to /wombat/foo.2006-11-03_11-32.log. After that, and @@ -1051,7 +1051,7 @@ <tr class="b"> <td>/wombat/foo.%d.gz</td> <td>Daily rollover (at midnight) with automatic GZIP compression of the - arcived files.</td> + archived files.</td> <td>During November 23rd, 2004, logging output will go to the file /wombat/foo.2004-11-23. However, at midnight that file will be compressed to become /wombat/foo.2004-11-23.gz. @@ -1072,7 +1072,7 @@ Thus, <code>TimeBasedRollingPolicy</code> assumes the - responsiblity for rollover as well as for the triggering of said + responsibility for rollover as well as for the triggering of said rollover. Indeed, <code>TimeBasedTriggeringPolicy</code> implements both <code>RollingPolicy</code> and <code>TriggeringPolicy</code> interfaces. @@ -1112,7 +1112,7 @@ Here is a sample configuration for - <code>RollingFileAppender</code> in conjuction with a + <code>RollingFileAppender</code> in conjunction with a <code>TimeBasedRollingPolicy</code>. @@ -1219,7 +1219,7 @@ Here is a sample configuration with a - <code>RollingFileAppender</code> in conjuction with + <code>RollingFileAppender</code> in conjunction with <code>SizeBasedTriggeringPolicy</code>. @@ -1256,7 +1256,7 @@ While logging events are generic in logback-core, within logback-classic they are always instances of <code>ILoggingEvent</code>. Logback-classic is nothing more than a - specialized processing pipleline handling instances of + specialized processing pipeline handling instances of <code>ILoggingEvent</code>. @@ -1822,7 +1822,7 @@ <code>TopicSession</code> and then setting its payload to the logging event received as the input parameter. Once the payload of the message is set, it is published. Note that the - <code>ILoggingEvent</code> is transfomed to a serializable + <code>ILoggingEvent</code> is transformed to a serializable object by a <a href="../xref/ch/qos/logback/core/spi/PreSerializationTransformer.html">PreSerializationTransformer</a>. Only Serializable objects can be transported within an @@ -2053,7 +2053,7 @@ Assuming the Subject option - is set to "Log: %logger - %msg" and the triggerring event's + is set to "Log: %logger - %msg" and the triggering event's logger is named "com.foo.Bar", and contains the message "Hello world", then the outgoing email will have the subject line "Log: com.foo.Bar - Hello World". @@ -2110,36 +2110,24 @@ </tr> <tr class="alt"> <td>Username</td> - <td><code>String</code></td> - <td>The username value to use during plain user/password - authentication. By default, this parameter is null. - </td> - </tr> - <tr > - <td>Password</td> - <td><code>String</code></td> - <td>The password value to use for plain user/password - authentication. By default, this parameter is null. - </td> - </tr> - <tr class="alt"> - <td>STARTTLS</td> - <td><code>boolean</code></td> - <td>If this parameter is set to true, then this appender will - issue the STARTTLS command (if the server supports it) causing - the connection to switch to SSL. Note that the connection is - initally non-encrypted. By default, this parameter is set to - false. - </td> - </tr> - <tr > + <td><code>String</code></td> <td>The username value to use + during plain user/password authentication. By default, this + parameter is null. </td> </tr> <tr > <td>Password</td> + <td><code>String</code></td> <td>The password value to use for + plain user/password authentication. By default, this parameter + is null. </td> </tr> <tr class="alt"> <td>STARTTLS</td> + <td><code>boolean</code></td> <td>If this parameter is set to + true, then this appender will issue the STARTTLS command (if + the server supports it) causing the connection to switch to + SSL. Note that the connection is initially non-encrypted. By + default, this parameter is set to false. </td> </tr> <tr > <td>SSL</td> - <td><code>boolean</code></td> - <td>If this parameter is set to true, then this appender will - open an SSL conneciton to the server. By default, this - parameter is set to false. - </td> - </tr> + <td><code>boolean</code></td> <td>If this parameter is set to + true, then this appender will open an SSL connection to the + server. By default, this parameter is set to false. </td> + </tr> <tr class="alt"> <td>CharsetEncoding</td> @@ -2224,12 +2212,12 @@ The recipient you specified should receive an email message containing 300 logging events formatted by <code>PatternLayout</code> The figure below is the resulting email - message as shown by Mozialla Thunderbird. + message as shown by Mozilla Thunderbird. <img src="images/chapter4/smtpAppender1.jpg" alt="resulting email"/> - In the next exampleconfiguration file mail2.xml, the + In the next example configuration file mail2.xml, the values for the SMTPHost, To and From properties are determined by variable substitution. Here is the @@ -2273,7 +2261,7 @@ <img src="images/chapter4/smtpAppender2.jpg" alt="2nd email"/> - Email clients such as Mozilla Thunderbird, Eurdora or MS + Email clients such as Mozilla Thunderbird, Eudora or MS Outlook, offer reasonably good CSS support for HTML email. However, they sometimes automatically downgrade HTML to plaintext. For example, to view HTML email in Thunderbird, the @@ -2347,7 +2335,7 @@ Note that this implementation extends <code>ContextAwareBase</code> and implements <code>EventEvaluator</code>. This allows the user to concentrate on the core functions of her <code>EventEvaluator</code> and let the base class - provide the common functionnality. + provide the common functionality. @@ -2459,7 +2447,7 @@ The <a href="../xref/ch/qos/logback/classic/db/DBAppender.html"><code>DBAppender</code></a> - inserts loggin events into three database tables in a format + inserts logging events into three database tables in a format independent of the Java programming language. @@ -2850,7 +2838,7 @@ Not that in this configuration sample, we make heavy use of substitution variables. - They are sometimes handy when connection details have to be centralised in a + They are sometimes handy when connection details have to be centralized in a single configuration file and shared by logback and other frameworks. @@ -2877,9 +2865,9 @@ source will be bound to a JNDI context. - - This is a very powerfull possibility of Joran. If you'd like to read more about Joran, please - see the <a href="onJoran.html">chapter to Joran</a>. + This is a very powerful possibility of Joran. If you'd like to + read more about Joran, please see the <a + href="onJoran.html">chapter to Joran</a>. --> @@ -2924,7 +2912,7 @@ Logging events can be created at a rather fast pace. To keep up with the flow of events that must be inserted into a database, - it is recommanded to use connection pooling with + it is recommended to use connection pooling with <code>DBAppender</code>. @@ -2956,7 +2944,7 @@ </configuration With this configuration file, sending 500 logging events to a - MySQL database takes a whopping 5 seconds, that is 10 miliseconds + MySQL database takes a whopping 5 seconds, that is 10 milliseconds per requests. This figure is unacceptable when dealing with large applications. @@ -2991,7 +2979,7 @@ With this new configuration, sending 500 logging requests to the same MySQL database as previously used takes around 0.5 - seconds, for an average time of 1 milisecond per request. The + seconds, for an average time of 1 millisecond per request. The gain is a 10 factor. @@ -3007,7 +2995,7 @@ href="../xref/ch/qos/logback/classic/net/SyslogAppender.html"><code>SyslogAppender</code></a>. - Here are the properties upi can pass to a SyslogAppender. + Here are the properties you can pass to a SyslogAppender. <table class="bodyTable"> <tr class="a"> @@ -3143,7 +3131,7 @@ values. The built appender is specified in a configuration file within the <code>SiftingAppender</code> definition itself. By default, <code>SiftingAppender</code> uses MDC key/value pairs as - a discriminator. + a discriminatorg. After configuring logback, the <a @@ -3195,7 +3183,7 @@ discriminator type is <a href="xref/ch/qos/logback/classic/sift/MDCBasedDiscriminator.html">MDCBasedDiscriminator</a>. It will use the MDC value associated with the Key property as a districimator. If that + class="option">Key property as a discriminator. If that value is null, then the value associated with the DefaultValue property will be used. @@ -3333,8 +3321,8 @@ Access</a></h2> Most of the appenders found in logback-classic have their - equivalent in logback-access. These work essentialy in the same - way as their locback-classic counterparts. In the next section, we + equivalent in logback-access. These work essentially in the same + way as their logback-classic counterparts. In the next section, we will cover their use. @@ -3364,12 +3352,12 @@ However, the evaluator option is rather different. By default, a <code>URLEvaluator</code> object is used by <code>SMTPAppender</code>. This evaluator contains a list of URLs that are - checked agains the current request's URL. When one of the pages given to the + checked against the current request's URL. When one of the pages given to the <code>URLEvaluator</code> is requested, <code>SMTPAppender</code> sends an email. - Here is a sample configuration of a <code>SMTPAppender</code> in the access environnement. + Here is a sample configuration of a <code>SMTPAppender</code> in the access environment. Example 4.: <code>SMTPAppender</code> configuration (logback-examples/src/main/java/chapter4/conf/access/logback-smtp.xml) <div class="source"><pre><appender name="SMTP"

1 0

[JIRA] Created: (LBCORE-104) Entry key/value if removed from the Property file, still exist as properties of the execution context
by Johan Bos (JIRA) 02 Jul '09

02 Jul '09

Entry key/value if removed from the Property file, still exist as properties of the execution context ----------------------------------------------------------------------------------------------------- Key: LBCORE-104 URL: http://jira.qos.ch/browse/LBCORE-104 Project: logback-core Issue Type: Bug Components: Joran Affects Versions: 0.9.15 Environment: Windows XP, Tomcat 5.0.27, Java 1.5 Sun JVM Reporter: Johan Bos Assignee: Logback dev list When logback.xml has a property file declaration. keys/values from the property file are not cleaned out from the configuration... they are overwritten in case they already exist. Which means that if the properties change while the application is loaded, and dynamically I reload the Logback configuration... the property file linked to it will only take into account new key or new values... removed key/value are still available in the context. InterpretationContext allows the LoggerContext to use the properties but the reset() method on the LoggerContext doesn't flush properties loaded. Is there a workaround? If so, pass the bug to Minor! I just found this annoying in case of a dynamical reload of configuration where even after reset, some setting are still present. 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