- logback-dev - mailman3.qos.ch

svn commit: r2432 - logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling
by noreply.ceki＠qos.ch 09 Aug '09

09 Aug '09

Author: ceki Date: Sun Aug 9 20:25:19 2009 New Revision: 2432 Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/ScaffoldingForRollingTests.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java Log: - avoid cluttering the console Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/ScaffoldingForRollingTests.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/ScaffoldingForRollingTests.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/ScaffoldingForRollingTests.java Sun Aug 9 20:25:19 2009 @@ -57,7 +57,6 @@ cal.set(Calendar.MILLISECOND, 333); currentTime = cal.getTimeInMillis(); recomputeRolloverThreshold(currentTime); - System.out.println(randomOutputDir); } public static void existenceCheck(String filename) { @@ -148,7 +147,6 @@ boolean gzExtension) { String fn = randomOutputDir + testId + "-" + SDF.format(date); - System.out.println("adding " + fn); if (gzExtension) { fn += ".gz"; } Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java Sun Aug 9 20:25:19 2009 @@ -85,7 +85,6 @@ @Test public void montlyRolloverOverManyPeriods() throws Exception { - System.out.println(randomOutputDir); // small maxHistory, many periods slashCount = computeSlashCount(MONTHLY_CROLOLOG_DATE_PATTERN); doRollover(randomOutputDir + "/%d{" + MONTHLY_CROLOLOG_DATE_PATTERN @@ -104,7 +103,6 @@ @Test public void dailyCronologRollover() throws Exception { - System.out.println(randomOutputDir); slashCount = computeSlashCount(DAILY_CROLOLOG_DATE_PATTERN); doRollover(randomOutputDir + "/%d{" + DAILY_CROLOLOG_DATE_PATTERN + "}/clean.txt.zip", MILLIS_IN_DAY, 8, 8 * 3); @@ -278,8 +276,6 @@ File dir = new File(randomOutputDir); List<File> fileList = new ArrayList<File>(); findFilesInFolderRecursivelyByPatterMatch(dir, fileList, regex); - System.out.println("regex=" + regex); - System.out.println("fileList=" + fileList); Set<String> set = groupByClass(fileList, regex); assertEquals(expectedClassCount, set.size()); }

1 0

svn commit: r2431 - logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling
by noreply.ceki＠qos.ch 09 Aug '09

09 Aug '09

Author: ceki Date: Sun Aug 9 20:18:10 2009 New Revision: 2431 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFNATP.java Log: - avoid cluttering the console Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFNATP.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFNATP.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFNATP.java Sun Aug 9 20:18:10 2009 @@ -83,11 +83,9 @@ } if (activeFile.length() >= maxFileSize.getSize()) { - System.out.println("Size based trigger, currentPeriodsCounter="+currentPeriodsCounter); elapsedPeriodsFileName = tbrp.fileNamePatternWCS .convertMultipleArguments(dateInCurrentPeriod, currentPeriodsCounter); currentPeriodsCounter++; - System.out.println("Size based trigger, currentPeriodsCounter="+currentPeriodsCounter); return true; }

1 0

svn commit: r2430 - logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling
by noreply.ceki＠qos.ch 09 Aug '09

09 Aug '09

Author: ceki Date: Sun Aug 9 20:15:34 2009 New Revision: 2430 Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java Log: - rewording Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java Sun Aug 9 20:15:34 2009 @@ -109,7 +109,7 @@ doRollover(randomOutputDir + "/%d{" + DAILY_CROLOLOG_DATE_PATTERN + "}/clean.txt.zip", MILLIS_IN_DAY, 8, 8 * 3); int expectedDirMin = 9 + slashCount; - int expectDirMax = expectedDirMin + 1 + 1; // plus 1 of overllaping into a + int expectDirMax = expectedDirMin + 1 + 1; // plus 1 of stepping into a // new month, and another 1 into // a new year expectedFileAndDirCount(9, expectedDirMin, expectDirMax);

1 0

svn commit: r2429 - logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling
by noreply.ceki＠qos.ch 09 Aug '09

09 Aug '09

Author: ceki Date: Sun Aug 9 20:15:08 2009 New Revision: 2429 Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java Log: take into account stepping into a new month or a new year Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java Sun Aug 9 20:15:08 2009 @@ -104,10 +104,15 @@ @Test public void dailyCronologRollover() throws Exception { + System.out.println(randomOutputDir); slashCount = computeSlashCount(DAILY_CROLOLOG_DATE_PATTERN); doRollover(randomOutputDir + "/%d{" + DAILY_CROLOLOG_DATE_PATTERN + "}/clean.txt.zip", MILLIS_IN_DAY, 8, 8 * 3); - check(expectedCountWithDirs(8)); + int expectedDirMin = 9 + slashCount; + int expectDirMax = expectedDirMin + 1 + 1; // plus 1 of overllaping into a + // new month, and another 1 into + // a new year + expectedFileAndDirCount(9, expectedDirMin, expectDirMax); } @Test @@ -174,8 +179,22 @@ rfa.stop(); } - void findAllInFolderRecursivelyByStringContains(File dir, List<File> fileList, - final String pattern) { + void findAllFoldersRecursively(File dir, List<File> fileList) { + if (dir.isDirectory()) { + File[] match = dir.listFiles(new FileFilter() { + public boolean accept(File f) { + return (f.isDirectory()); + } + }); + for (File f : match) { + fileList.add(f); + findAllFoldersRecursively(f, fileList); + } + } + } + + void findAllInFolderRecursivelyByStringContains(File dir, + List<File> fileList, final String pattern) { if (dir.isDirectory()) { File[] match = dir.listFiles(new FileFilter() { public boolean accept(File f) { @@ -241,12 +260,26 @@ assertEquals(expectedCount, fileList.size()); } + void expectedFileAndDirCount(int expectedFileAndDirCount, + int expectedDirCountMin, int expectedDirCountMax) { + File dir = new File(randomOutputDir); + List<File> fileList = new ArrayList<File>(); + findFilesInFolderRecursivelyByPatterMatch(dir, fileList, "clean"); + + List<File> dirList = new ArrayList<File>(); + findAllFoldersRecursively(dir, dirList); + assertTrue("expectedDirCountMin=" + expectedDirCountMin + + ", expectedDirCountMax=" + expectedDirCountMax + " actual value=" + + dirList.size(), expectedDirCountMin <= dirList.size() + && dirList.size() <= expectedDirCountMax); + } + void checkPatternCompliance(int expectedClassCount, String regex) { File dir = new File(randomOutputDir); List<File> fileList = new ArrayList<File>(); findFilesInFolderRecursivelyByPatterMatch(dir, fileList, regex); - System.out.println("regex="+regex); - System.out.println("fileList="+fileList); + System.out.println("regex=" + regex); + System.out.println("fileList=" + fileList); Set<String> set = groupByClass(fileList, regex); assertEquals(expectedClassCount, set.size()); } @@ -255,13 +288,12 @@ File dir = new File(randomOutputDir); List<File> fileList = new ArrayList<File>(); findFoldersInFolderRecursively(dir, fileList); - for(File f: fileList) { + for (File f : fileList) { assertTrue(f.list().length >= 1); } assertEquals(expectedClassCount, fileList.size()); } - Set<String> groupByClass(List<File> fileList, String regex) { Pattern p = Pattern.compile(regex); Set<String> set = new HashSet<String>();

1 0

svn commit: r2428 - logback/trunk/logback-examples/src/main/java/chapter4/conf
by noreply.ceki＠qos.ch 09 Aug '09

09 Aug '09

Author: ceki Date: Sun Aug 9 19:54:56 2009 New Revision: 2428 Added: logback/trunk/logback-examples/src/main/java/chapter4/conf/logback-timestamp.xml Modified: logback/trunk/logback-examples/src/main/java/chapter4/conf/logback-fileAppender.xml Log: - added a new config file Modified: logback/trunk/logback-examples/src/main/java/chapter4/conf/logback-fileAppender.xml ============================================================================== --- logback/trunk/logback-examples/src/main/java/chapter4/conf/logback-fileAppender.xml (original) +++ logback/trunk/logback-examples/src/main/java/chapter4/conf/logback-fileAppender.xml Sun Aug 9 19:54:56 2009 @@ -4,7 +4,7 @@ <File>testFile.log</File> <Append>true</Append> - <layout class="ch.qos.logback.classic.PatternLayout"> + <layout> <Pattern>%-4relative [%thread] %-5level %logger{35} - %msg%n</Pattern> </layout> </appender> Added: logback/trunk/logback-examples/src/main/java/chapter4/conf/logback-timestamp.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-examples/src/main/java/chapter4/conf/logback-timestamp.xml Sun Aug 9 19:54:56 2009 @@ -0,0 +1,20 @@ +<configuration> + +  + <timestamp key="bySecond" datePattern="yyyyMMdd'T'HHmmss"/> + + <appender name="FILE" class="ch.qos.logback.core.FileAppender"> +  + <File>log-${bySecond}.txt</File> + <layout> + <Pattern>%logger{35} - %msg%n</Pattern> + </layout> + </appender> + + <root level="debug"> + <appender-ref ref="FILE" /> + </root> +</configuration>

1 0

[JIRA] Created: (LBCORE-91) Add new TriggeringPolicy class to cause one rollover at the start of each run
by Rick Beton (JIRA) 09 Aug '09

09 Aug '09

Add new TriggeringPolicy class to cause one rollover at the start of each run ----------------------------------------------------------------------------- Key: LBCORE-91 URL: http://jira.qos.ch/browse/LBCORE-91 Project: logback-core Issue Type: New Feature Components: Appender Affects Versions: 0.9.15 Environment: - Reporter: Rick Beton Assignee: Logback dev list Priority: Minor A new TriggeringPolicy will cause the logfile to rollover once at startup when used with FixedWindowRollingPolicy. This is useful during development so that the logfiles of recent runs are still available. Here is a candidate implementation. Note that * <append>true</append> is required - otherwise the previous file is overwritten before rollover happens, so rollover results in a useless list of empty files. * the documentation would need to warn users of the effect of running multiple applications concurrently (i.e. concurrent operating system processes) with the same logfiles. This applies even without the suggested feature. package ch.qos.logback.core.rolling; import java.io.File; import ch.qos.logback.core.rolling.TriggeringPolicyBase; /** * SimpleStartupTriggeringPolicy triggers a rollover once at startup only. This * is useful for preserving older logfiles during development. * * @author Rick Beton */ public final class SimpleStartupTriggeringPolicy<E> extends TriggeringPolicyBase<E> { private boolean fired = false; public SimpleStartupTriggeringPolicy () { // does nothing } public boolean isTriggeringEvent( final File activeFile, final E event ) { final boolean result = !fired && (activeFile.length() > 0); fired = true; if (result) { addInfo( "Triggering rollover for " + activeFile ); } return result; } } -- 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

3 4

svn commit: r2427 - in logback/trunk: logback-classic/src/test/input/joran logback-classic/src/test/java/ch/qos/logback/classic/joran logback-classic/src/test/java/ch/qos/logback/classic/rolling logback-core/src/test/java/ch/qos/logback/core/joran logback-core/src/test/java/ch/qos/logback/core/joran/action logback-site/src/site/pages logback-site/src/site/pages/manual
by noreply.ceki＠qos.ch 09 Aug '09

09 Aug '09

Author: ceki Date: Sun Aug 9 19:51:56 2009 New Revision: 2427 Added: logback/trunk/logback-classic/src/test/input/joran/timestamp.xml logback/trunk/logback-classic/src/test/input/joran/unique.xml logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/rolling/UniqueFileTest.java Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/rolling/PackageTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialConfiguratorTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/PropertyActionTest.java logback/trunk/logback-site/src/site/pages/manual/appenders.html logback/trunk/logback-site/src/site/pages/manual/configuration.html logback/trunk/logback-site/src/site/pages/news.html Log: - document and test the <timestamp> action. This fixes LBCORE-91. Added: logback/trunk/logback-classic/src/test/input/joran/timestamp.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/input/joran/timestamp.xml Sun Aug 9 19:51:56 2009 @@ -0,0 +1,4 @@ +<configuration> + <timestamp key="testTimestamp" datePattern="yyyy-MM"/> +</configuration> + \ No newline at end of file Added: logback/trunk/logback-classic/src/test/input/joran/unique.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/input/joran/unique.xml Sun Aug 9 19:51:56 2009 @@ -0,0 +1,15 @@ +<configuration> + <timestamp key="dayTimestamp" datePattern="yyyyMMdd'T'HHmmss" /> + + <appender name="FILE" class="ch.qos.logback.core.FileAppender"> + <File>target/test-output/TS_${dayTimestamp}log.txt</File> + <Append>false</Append> + <layout> + <Pattern>%-4relative [%thread] %-5level %logger{35} - %msg%n</Pattern> + </layout> + </appender> + + <root level="debug"> + <appender-ref ref="FILE" /> + </root> +</configuration> Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java Sun Aug 9 19:51:56 2009 @@ -15,6 +15,8 @@ import java.io.File; import java.io.IOException; +import java.text.SimpleDateFormat; +import java.util.Date; import org.junit.Test; import org.slf4j.MDC; @@ -46,7 +48,7 @@ } @Test - public void testSimpleList() throws JoranException { + public void simpleList() throws JoranException { configure(TeztConstants.TEST_DIR_PREFIX + "input/joran/simpleList.xml"); Logger logger = loggerContext.getLogger(this.getClass().getName()); @@ -61,7 +63,7 @@ } @Test - public void testLevel() throws JoranException { + public void level() throws JoranException { configure(TeztConstants.TEST_DIR_PREFIX + "input/joran/simpleLevel.xml"); ListAppender listAppender = (ListAppender) root.getAppender("LIST"); assertEquals(0, listAppender.list.size()); @@ -71,7 +73,7 @@ } @Test - public void testRootLoggerLevelSettingBySystemProperty() + public void rootLoggerLevelSettingBySystemProperty() throws JoranException { String propertyName = "logback.level"; @@ -88,7 +90,7 @@ } @Test - public void testLoggerLevelSettingBySystemProperty() throws JoranException { + public void loggerLevelSettingBySystemProperty() throws JoranException { String propertyName = "logback.level"; System.setProperty(propertyName, "DEBUG"); @@ -104,7 +106,7 @@ } @Test - public void testStatusListener() throws JoranException { + public void statusListener() throws JoranException { configure(TeztConstants.TEST_DIR_PREFIX + "input/joran/statusListener.xml"); // StatusPrinter.print(loggerContext); } @@ -117,7 +119,7 @@ } @Test - public void testEval() throws JoranException { + public void eval() throws JoranException { configure(TeztConstants.TEST_DIR_PREFIX + "input/joran/callerData.xml"); String msg = "hello world"; @@ -136,7 +138,7 @@ } @Test - public void testTurboFilter() throws JoranException { + public void turboFilter() throws JoranException { // Although this test uses turbo filters, it only checks // that Joran can see the xml element and create // and place the relevant object correctly. @@ -269,4 +271,19 @@ assertTrue(checker.isErrorFree()); assertTrue(checker.containsMatch("Resetting and reconfiguring context")); } + + @Test + public void timestamp() throws JoranException, IOException, InterruptedException { + + String configFileAsStr = TeztConstants.TEST_DIR_PREFIX + + "input/joran/timestamp.xml"; + configure(configFileAsStr); + + String r = loggerContext.getProperty("testTimestamp"); + assertNotNull(r); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM"); + String expected = sdf.format(new Date()); + assertEquals("expected \""+expected+"\" but got "+r, expected, r); + } + } Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/rolling/PackageTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/rolling/PackageTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/rolling/PackageTest.java Sun Aug 9 19:51:56 2009 @@ -13,8 +13,7 @@ import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; - @RunWith(Suite.class) -@SuiteClasses( { TimeBasedRollingWithConfigFileTest.class}) +@SuiteClasses( { UniqueFileTest.class, TimeBasedRollingWithConfigFileTest.class }) public class PackageTest { } \ No newline at end of file Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/rolling/UniqueFileTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/rolling/UniqueFileTest.java Sun Aug 9 19:51:56 2009 @@ -0,0 +1,61 @@ +/** + * Logback: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 2000-2009, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. + */ +package ch.qos.logback.classic.rolling; + +import static org.junit.Assert.assertTrue; + +import java.text.SimpleDateFormat; +import java.util.Date; + +import org.junit.Test; + +import ch.qos.logback.classic.ClassicTestConstants; +import ch.qos.logback.classic.Logger; +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.rolling.ScaffoldingForRollingTests; +import ch.qos.logback.core.status.StatusChecker; +import ch.qos.logback.core.util.CoreTestConstants; + +/** + * Test that we can create time-stamped log files with the help of + * the <timestamp> element in configuration files. + * + * @author Ceki Gülcü + * + */ +public class UniqueFileTest { + + LoggerContext lc = new LoggerContext(); + Logger logger = lc.getLogger(this.getClass()); + + + void loadConfig(String confifFile) throws JoranException { + JoranConfigurator jc = new JoranConfigurator(); + jc.setContext(lc); + jc.doConfigure(confifFile); + } + + @Test + public void basic() throws Exception { + loadConfig(ClassicTestConstants.JORAN_INPUT_PREFIX + "/unique.xml"); + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd'T'HHmmss"); + String timestamp = sdf.format(new Date()); + + StatusChecker sc = new StatusChecker(lc); + assertTrue(sc.isErrorFree()); + + Logger root = lc.getLogger(Logger.ROOT_LOGGER_NAME); + root.info("hello"); + + ScaffoldingForRollingTests.existenceCheck(CoreTestConstants.OUTPUT_DIR_PREFIX+"TS_"+timestamp+"log.txt"); + } +} Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialConfiguratorTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialConfiguratorTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialConfiguratorTest.java Sun Aug 9 19:51:56 2009 @@ -43,12 +43,12 @@ public void doTest(String filename) throws Exception { // rule store is case insensitve - rulesMap.put(new Pattern("x/INC"), new IncAction()); + rulesMap.put(new Pattern("x/inc"), new IncAction()); - TrivialConfigurator gc = new TrivialConfigurator(rulesMap); + TrivialConfigurator trivialConfigurator = new TrivialConfigurator(rulesMap); - gc.setContext(context); - gc.doConfigure(CoreTestConstants.TEST_DIR_PREFIX + "input/joran/" + trivialConfigurator.setContext(context); + trivialConfigurator.doConfigure(CoreTestConstants.TEST_DIR_PREFIX + "input/joran/" + filename); } 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 Sun Aug 9 19:51:56 2009 @@ -1,3 +1,12 @@ +/** + * Logback: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 2000-2009, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. + */ package ch.qos.logback.core.joran.action; import static org.junit.Assert.assertEquals; @@ -16,25 +25,29 @@ import ch.qos.logback.core.util.CoreTestConstants; import ch.qos.logback.core.util.StatusPrinter; +/** + * Test {@link PropertyAction}. + * @author Ceki Gülcü + */ public class PropertyActionTest { Context context; InterpretationContext ec; - PropertyAction spAction; + PropertyAction propertyAction; DummyAttributes atts = new DummyAttributes(); @Before public void setUp() throws Exception { context = new ContextBase(); ec = new InterpretationContext(context, null); - spAction = new PropertyAction(); - spAction.setContext(context); + propertyAction = new PropertyAction(); + propertyAction.setContext(context); } @After public void tearDown() throws Exception { context = null; - spAction = null; + propertyAction = null; atts = null; } @@ -42,7 +55,7 @@ public void nameValuePair() { atts.setValue("name", "v1"); atts.setValue("value", "work"); - spAction.begin(ec, null, atts); + propertyAction.begin(ec, null, atts); assertEquals("work", ec.getProperty("v1")); } @@ -51,14 +64,14 @@ context.putProperty("w", "wor"); atts.setValue("name", "v1"); atts.setValue("value", "${w}k"); - spAction.begin(ec, null, atts); + propertyAction.begin(ec, null, atts); assertEquals("work", ec.getProperty("v1")); } @Test public void noValue() { atts.setValue("name", "v1"); - spAction.begin(ec, null, atts); + propertyAction.begin(ec, null, atts); assertEquals(1, context.getStatusManager().getCount()); assertTrue(checkError()); } @@ -66,14 +79,14 @@ @Test public void noName() { atts.setValue("value", "v1"); - spAction.begin(ec, null, atts); + propertyAction.begin(ec, null, atts); assertEquals(1, context.getStatusManager().getCount()); assertTrue(checkError()); } @Test public void noAttributes() { - spAction.begin(ec, null, atts); + propertyAction.begin(ec, null, atts); assertEquals(1, context.getStatusManager().getCount()); assertTrue(checkError()); StatusPrinter.print(context); @@ -83,7 +96,7 @@ public void testFileNotLoaded() { atts.setValue("file", "toto"); atts.setValue("value", "work"); - spAction.begin(ec, null, atts); + propertyAction.begin(ec, null, atts); assertEquals(1, context.getStatusManager().getCount()); assertTrue(checkError()); } @@ -92,7 +105,7 @@ public void testLoadFileWithPrerequisiteSubsitution() { context.putProperty("STEM", CoreTestConstants.TEST_DIR_PREFIX + "input/joran"); atts.setValue("file", "${STEM}/propertyActionTest.properties"); - spAction.begin(ec, null, atts); + propertyAction.begin(ec, null, atts); assertEquals("tata", ec.getProperty("v1")); assertEquals("toto", ec.getProperty("v2")); } @@ -100,7 +113,7 @@ @Test public void testLoadFile() { atts.setValue("file", CoreTestConstants.TEST_DIR_PREFIX + "input/joran/propertyActionTest.properties"); - spAction.begin(ec, null, atts); + propertyAction.begin(ec, null, atts); assertEquals("tata", ec.getProperty("v1")); assertEquals("toto", ec.getProperty("v2")); } @@ -108,7 +121,7 @@ @Test public void testLoadResource() { atts.setValue("resource", "asResource/joran/propertyActionTest.properties"); - spAction.begin(ec, null, atts); + propertyAction.begin(ec, null, atts); assertEquals("tata", ec.getProperty("r1")); assertEquals("toto", ec.getProperty("r2")); } @@ -117,7 +130,7 @@ public void testLoadResourceWithPrerequisiteSubsitution() { context.putProperty("STEM", "asResource/joran"); atts.setValue("resource", "${STEM}/propertyActionTest.properties"); - spAction.begin(ec, null, atts); + propertyAction.begin(ec, null, atts); assertEquals("tata", ec.getProperty("r1")); assertEquals("toto", ec.getProperty("r2")); } @@ -125,7 +138,7 @@ @Test public void testLoadNotPossible() { atts.setValue("file", "toto"); - spAction.begin(ec, null, atts); + propertyAction.begin(ec, null, atts); assertEquals(1, context.getStatusManager().getCount()); assertTrue(checkFileErrors()); } 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 Sun Aug 9 19:51:56 2009 @@ -601,10 +601,57 @@ <p class="source">java chapter4.ConfigurationTester src/main/java/chapter4/conf/logback-fileAppender.xml</p> - <h3> - <a name="RollingFileAppender" - href="#RollingFileAppender">RollingFileAppender</a></h3> + <a name="uniquelyNamed" href="#uniquelyNamed">Uniquely named + files (by timestamp)</a> + </h3> + + <p>During the application development phase or in the case of + short-lived applications, e.g. batch applications, it is desriable + to create a new log file at each new application launch. This is + fairly easy to do with the help of the <code><timestamp></code> + element. Here's an example.</p> + + + <em>Example 4.<span class="autoEx"/>: Uniquely named FileAppender configuration by timestamp (logback-examples/src/main/java/chapter4/conf/logback-timestamp.xml)</em> + <pre class="prettyprint source"><configuration> + +  + <b><timestamp key="bySecond" datePattern="yyyyMMdd'T'HHmmss"/></b> + + <appender name="FILE" class="ch.qos.logback.core.FileAppender"> +  + <File><b>log-${bySecond}.txt</b></File> + <layout> + <Pattern>%logger{35} - %msg%n</Pattern> + </layout> + </appender> + + <root level="debug"> + <appender-ref ref="FILE" /> + </root> +</configuration></pre> + + + <p>The timestamp element takes two attributes <span + class="attr">key</span> and <span + class="attr">datePattern</span>. The <span class="attr">key</span> + attribute is the name of the key under which the timestamp will be + available to subsequent configuration elements <a + href="configuration.html#variableSubstitution">as a + variable</a>. The <span class="attr">datePattern</span> attribute + denoted the date pattern used to convert the current time (at which + the configuration file is parsed) into a string. The date pattern + should follow the conventions defined in <a + href="http://java.sun.com/j2se/1.4.2/docs/api/java/text/SimpleDateFormat.html">SimpleDateFormat</a>. + </p> + + <h3> + <a name="RollingFileAppender" href="#RollingFileAppender">RollingFileAppender</a> + </h3> <p><a href="../xref/ch/qos/logback/core/rolling/RollingFileAppender.html"><code>RollingFileAppender</code></a> Modified: logback/trunk/logback-site/src/site/pages/manual/configuration.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/manual/configuration.html (original) +++ logback/trunk/logback-site/src/site/pages/manual/configuration.html Sun Aug 9 19:51:56 2009 @@ -111,7 +111,8 @@ </p> - <p>Assuming the <em>logback-test.xml</em> file is placed under + <p>If you are using Maven and assuming the + <em>logback-test.xml</em> file is placed under <em>src/test/resources</em> folder, Maven will ensure that it won't be included in the artifact produced. Thus, you can use a different configuration file, namely <em>logback-test.xml</em> @@ -176,13 +177,16 @@ refer to the <a href="../setup.html">setup page</a> for further details. </p> - + + <p>Assuming the configuration files <em>logback-test.xml</em> or - <em>logback.xml</em> could not be found, logback will default to a - minimal configuration mentioned earlier. This configuration is - hardwired to attaching a <code>ConsoleAppender</code> to the root - logger. The output is formatted using a + <em>logback.xml</em> are not present, logback will default to + invoking <a + href="../xref/ch/qos/logback/classic/BasicConfigurator.html"><code>BasicConfigurator</code></a> + which will set up a minimal configuration. This minimal + configuration consists of a <code>ConsoleAppender</code> attached + to the root logger. The output is formatted using a <code>PatternLayout</code> set to the pattern <em>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</em>. Moreover, by default the root logger is assigned to the <code>DEBUG</code> level. @@ -192,22 +196,31 @@ should be similar to: </p> -<div class="source"><pre>16:06:09.031 [main] INFO chapter3.MyApp1 - Entering application. + <p class="source">16:06:09.031 [main] INFO chapter3.MyApp1 - Entering application. 16:06:09.046 [main] DEBUG chapter3.Foo - Did it again! -16:06:09.046 [main] INFO chapter3.MyApp1 - Exiting application.</pre></div> +16:06:09.046 [main] INFO chapter3.MyApp1 - Exiting application.</p> - <p>The <code>MyApp1</code> application links to logback via - calls <code>org.slf4j.LoggerFactory</code> and + <div class="highlight"> + <p> + Except code that configures logback (if such code exists) + client code does not need to depend on logback. Applications + that use logback as their logging framework will have a + compile-time dependency on SLF4J but not logback. + </p> + </div> + + <p>The <code>MyApp1</code> application links to logback via calls + <code>org.slf4j.LoggerFactory</code> and <code>org.slf4j.Logger</code> classes, retrieve the loggers it wishes to use, and chugs on. Note that the only dependence of the <code>Foo</code> class on logback are through <code>org.slf4j.LoggerFactory</code> and <code>org.slf4j.Logger</code> imports. Except code that configures logback (if such code exists) client code does not need to depend - on logback. Given that SLF4J permits the use of any implementation - under its abstraction layer, it is rather easy to migrate large - bodies of code from one logging system to another. + on logback. Given that SLF4J permits the use of any logging + framework under its abstraction layer, it is rather easy to migrate + large bodies of code from one logging framework to another. </p> <h3>Automatic configuration with <em>logback-test.xml</em> or @@ -242,15 +255,24 @@ directory accessible from the class path. Running the <em>MyApp1</em> application should give identical results to its previous run.</p> - <p>If and only if there are warnings or errors during the parsing - of the configuration file, logback will automatically print status - data on the console. In the absence of warnings or errors, if you - still wish to inspect logback's internal status, then you can - instruct logback to print status data by invoking the - <code>print()</code> of the <code>StatusPrinter</code> class. The - <em>MyApp2</em> application shown below is identical to - <em>MyApp1</em> except the addition of two lines of code for - printing internal status data.</p> + <h4>Automatic printing of status messages in case of warning or errors</h4> + + <div class="highlight"> + <p>If warning or errors occur during the parsing of the + configuration file, logback will automatically print its internal + status messages on the console. + </p> + </div> + + <p>If warnings or errors occur during the parsing of the + configuration file, logback will automatically print status data on + the console. In the absence of warnings or errors, if you still + wish to inspect logback's internal status, then you can instruct + logback to print status data by invoking the <code>print()</code> + of the <code>StatusPrinter</code> class. The <em>MyApp2</em> + application shown below is identical to <em>MyApp1</em> except the + addition of two lines of code for printing internal status + data.</p> <em>Example 3.<span class="autoEx"/>: Print logback's internal status information <a @@ -295,8 +317,8 @@ configuration file, as shown below. Please note that this <span class="attr">debug</span> attribute relates only to the status data. It does <em>not</em> affect logback's configuration - otherwise, in particular with respect to logger levels. (Put - differently, no, the root logger will <em>not</em> be set to + otherwise, in particular with respect to logger levels. (If you are + asking, no, the root logger will <em>not</em> be set to <code>DEBUG</code>.) </p> @@ -357,6 +379,13 @@ <h3><a name="autoScan" href="#autoScan">Automatically reloading configuration file upon modification</a></h3> + <div class="highlight"> + <p>Logback-classic can scan for changes in its configuration file + and automatically reconfigure itself when the said configuration + file changes. + </p> + </div> + <p>If instructed to do so, logback-classic will scan for changes in its configuration file and automatically reconfigure itself when the said configuration file changes. In order to instruct @@ -622,6 +651,34 @@ alt="basic Syntax" title="Basic configuration file structure"/> </p> + + <div class="highlight"> + <p>If you are unsure which case to use for a given tag name, just + follow the camelCase convention which should usually be + corrrect.</p> + </div> + + <p>As of logback version 0.9.17, tag names pertaining to explicit + rules are case insensitive. For example, both + <code><logger></code>, <code><Logger></code> and + <code><LOGGER></code> are valid configuration elements and will + be interpreted in the same way. Note that XML well-formedness rules + still apply, if you open a tag as <code><xyz></code> you must + close it as <code></xyz></code>, <code></XyZ></code> will not + work. As for <a href="onJoran.html#implicit">implicit rules</a>, tag + names are case sensitive except for the first letter. Thus, + <code><xyz></code> and <code><Xyz></code> are equivalent but + not <code><xYz></code>. Implicit rules usually follow the <a + href="http://en.wikipedia.org/wiki/CamelCase">camel case</a> + convention, common in the Java world. Since it is not trivially easy + tell when a tag is associated with an explicit action and when it is + associated with an implicit action, it is not trivial to say whether + an XML tag is totally case-insensitive or case-insensitive with + respect to the first letter. If you are unsure which case to use for + a given tag name, just follow the camelCase convention which should + usually be correct. + </p> + <h4>Configuring Loggers, or the <code><logger></code> element</h4> <p>A logger is configured using the <code>logger</code> element. A 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 Sun Aug 9 19:51:56 2009 @@ -38,6 +38,24 @@ reported by Roland Klein and independently by Didier Besset. </p> + <p>In configuration files, all tags names associated with explicit + actions are now case-insensitive. This should diminish + case-related errors users may make when writing configuration + files. Tag names associated with implicit actions which are + closely linked to the actual Java class being configured, still + need to follow the camelCase convention. If you are unsure which + case to use for a given tag name, just follow the camelCase + convention for tag names which should be correct in most + cases. </p> + + <p>It is now possible to create <a + href="manual/appenders.html#uniquelyNamed">uniquely named files by + timestamp</a>. Such files are appropriate for log files associated + with batch applications. This enhancement fulfills <a + href="http://jira.qos.ch/browse/LBCORE-91">LBCORE-91</a> as + requested by Rick Beton and Szel Zoltan. + </p> + <p>Append mode is now mandatory in <code>RollingFileAppender</code>. This was already the default and truncation mode is unreasonable in most cases. For example, in @@ -50,10 +68,10 @@ reported by Valery Shorin.</p> - <p>The TimeBasedTriggeringPolicy has been heavily refactored. It - is now possible to trigger rolling by <a - href="">XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXtime as well as by - size</a>, fixing <a + <p>The <code>TimeBasedTriggeringPolicy</code> has been heavily + refactored. It is now possible to trigger rolling simultaenously + by <a href="manual/appenders.html#SizeAndTimeBasedFNATP">time and + by size</a>, fixing <a href="http://jira.qos.ch/browse/LBCORE-61">LBCORE-61</a>. </p>

1 0

[JIRA] Created: (LBCORE-111) Support for crolonog type rolling
by Ceki Gulcu (JIRA) 09 Aug '09

09 Aug '09

Support for crolonog type rolling --------------------------------- Key: LBCORE-111 URL: http://jira.qos.ch/browse/LBCORE-111 Project: logback-core Issue Type: Improvement Components: Appender Reporter: Ceki Gulcu Assignee: Ceki Gulcu Add support for cronolog type logging file separation. For example: TransferLog "|/usr/sbin/cronolog /web/logs/%Y/%m/%d/access.log" ErrorLog "|/usr/sbin/cronolog /web/logs/%Y/%m/%d/errors.log" This allows each log file to be separated by year, month, etc. See http://cronolog.org/features.html for details. Interestingly enough, TimeBasedRollingPolicy already supports this feature. It's just not tested nor documented. -- 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

1 2

[JIRA] Created: (LBCORE-76) Joran patterns should be case insensitive
by Ceki Gulcu (JIRA) 09 Aug '09

09 Aug '09

Joran patterns should be case insensitive ----------------------------------------- Key: LBCORE-76 URL: http://jira.qos.ch/browse/LBCORE-76 Project: logback-core Issue Type: Improvement Components: Joran Affects Versions: 0.9.12 Reporter: Ceki Gulcu Assignee: Logback dev list At present time, joran patterns are case sensitive. However, implicit actions are case insensitive. For coherence, joran patterns should be case insensitive. -- 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

1 3

svn commit: r2426 - in logback/trunk/logback-core/src: main/java/ch/qos/logback/core/joran main/java/ch/qos/logback/core/joran/action main/java/ch/qos/logback/core/joran/spi test/java/ch/qos/logback/core/joran test/java/ch/qos/logback/core/joran/spi
by noreply.ceki＠qos.ch 09 Aug '09

09 Aug '09

Author: ceki Date: Sun Aug 9 13:54:23 2009 New Revision: 2426 Added: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/spi/CaseCombinator.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/spi/CaseCombinatorTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/spi/SimpleRuleStoreTest.java - copied, changed from r2425, /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/spi/SimpleStoreTest.java Removed: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/spi/SimpleStoreTest.java Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/JoranConfiguratorBase.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/Action.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/TimestampAction.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/Pattern.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialConfiguratorTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/spi/PackageTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/spi/PatternTest.java Log: - Explicit patterns in Joran are now case insensitive. The following config files will be interpreted identically: First config file: <configuration> <logger>...</logger> </configuration> Second config file: <CONFIGURAtion> <loGGer>...</loGGer> </CONFIGURAtion> This addresses http://jira.qos.ch/browse/LBCORE-76 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/JoranConfiguratorBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/JoranConfiguratorBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/JoranConfiguratorBase.java Sun Aug 9 13:54:23 2009 @@ -25,6 +25,7 @@ import ch.qos.logback.core.joran.action.ParamAction; import ch.qos.logback.core.joran.action.PropertyAction; import ch.qos.logback.core.joran.action.StatusListenerAction; +import ch.qos.logback.core.joran.action.TimestampAction; import ch.qos.logback.core.joran.spi.InterpretationContext; import ch.qos.logback.core.joran.spi.Interpreter; import ch.qos.logback.core.joran.spi.Pattern; @@ -59,6 +60,9 @@ rs.addRule(new Pattern("configuration/substitutionProperty"), new PropertyAction()); + rs.addRule(new Pattern("configuration/timestamp"), + new TimestampAction()); + // the contextProperty pattern is deprecated. It is undocumented // and will be dropped in future versions of logback rs.addRule(new Pattern("configuration/contextProperty"), Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/Action.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/Action.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/Action.java Sun Aug 9 13:54:23 2009 @@ -35,6 +35,7 @@ public abstract class Action extends ContextAwareBase { public static final String NAME_ATTRIBUTE = "name"; + public static final String KEY_ATTRIBUTE = "key"; public static final String VALUE_ATTRIBUTE = "value"; public static final String FILE_ATTRIBUTE = "file"; public static final String CLASS_ATTRIBUTE = "class"; Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/TimestampAction.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/TimestampAction.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/TimestampAction.java Sun Aug 9 13:54:23 2009 @@ -1,3 +1,12 @@ +/** + * Logback: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 2000-2009, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. + */ package ch.qos.logback.core.joran.action; import java.text.SimpleDateFormat; @@ -9,32 +18,43 @@ import ch.qos.logback.core.joran.spi.InterpretationContext; import ch.qos.logback.core.util.OptionHelper; +/** + * Given a key and a date-and-time pattern, puts a property to the context, with + * the specified key and value equal to the current time in the format + * corresponding to the specified date-and-time pattern. + * + * @author Ceki Gülcü + * + */ public class TimestampAction extends Action { static String DATE_PATTERN_ATTRIBUTE = "datePattern"; - + boolean inError = false; - + @Override - public void begin(InterpretationContext ec, String name, Attributes attributes) throws ActionException { - String nameStr = attributes.getValue(NAME_ATTRIBUTE); - if(OptionHelper.isEmpty(nameStr)) { - addError("["+NAME_ATTRIBUTE+"] attribute cannot be empty"); + public void begin(InterpretationContext ec, String name, Attributes attributes) + throws ActionException { + String keyStr = attributes.getValue(KEY_ATTRIBUTE); + if (OptionHelper.isEmpty(keyStr)) { + addError("Attrubute named [" + KEY_ATTRIBUTE + "] cannot be empty"); inError = true; } String datePatternStr = attributes.getValue(DATE_PATTERN_ATTRIBUTE); - if(OptionHelper.isEmpty(datePatternStr)) { - addError("["+DATE_PATTERN_ATTRIBUTE+"] attribute cannot be empty"); + if (OptionHelper.isEmpty(datePatternStr)) { + addError("Attribute named [" + DATE_PATTERN_ATTRIBUTE + + "] cannot be empty"); inError = true; } - - if(inError) + + if (inError) return; - + SimpleDateFormat sdf = new SimpleDateFormat(datePatternStr); String val = sdf.format(new Date()); - addInfo("Adding property ["+nameStr+"] with value ["+val+"] to the context"); - context.putProperty(nameStr, val); + addInfo("Adding property to the context with key=\"" + keyStr + + "\" and value=\"" + val + "\" to the context"); + context.putProperty(keyStr, val); } @Override Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/Pattern.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/Pattern.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/Pattern.java Sun Aug 9 13:54:23 2009 @@ -15,8 +15,8 @@ /** * A pattern is used to designate XML elements in a document. * - * <p>For more information see - * http://logback.qos.ch/manual/onJoran.html#pattern + * <p>For more information see + * http://logback.qos.ch/manual/onJoran.html#pattern * * @author Ceki Gülcü */ @@ -127,7 +127,7 @@ String l = (String) this.partList.get(lSize - i); String r = (String) p.partList.get(rSize - i); - if (l.equals(r)) { + if (equalityCheck(l, r)) { match++; } else { break; @@ -162,8 +162,7 @@ String l = (String) this.partList.get(i); String r = (String) p.partList.get(i); - // if (l.equals(r) || "*".equals(l) || "*".equals(r)) { - if (l.equals(r)) { + if (equalityCheck(l, r)) { match++; } else { break; @@ -173,30 +172,31 @@ return match; } + private boolean equalityCheck(String x, String y) { + return x.equalsIgnoreCase(y); + } + @Override public boolean equals(Object o) { - // System.out.println("in equals:" +this+ " vs. " + o); if ((o == null) || !(o instanceof Pattern)) { return false; } - // System.out.println("both are Patterns"); Pattern r = (Pattern) o; if (r.size() != size()) { return false; } - // System.out.println("both are size compatible"); int len = size(); for (int i = 0; i < len; i++) { - if (!(get(i).equals(r.get(i)))) { + if (!equalityCheck(get(i), r.get(i))) { return false; } } - // if everything matches, then the twp patterns are equal + // if everything matches, then the two patterns are equal return true; } @@ -206,9 +206,9 @@ int len = size(); for (int i = 0; i < len; i++) { - hc ^= get(i).hashCode(); - - // System.out.println("i = "+i+", hc="+hc); + // make Pattern comparisons case insensitive + // http://jira.qos.ch/browse/LBCORE-76 + hc ^= get(i).toLowerCase().hashCode(); } return hc; Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialConfiguratorTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialConfiguratorTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialConfiguratorTest.java Sun Aug 9 13:54:23 2009 @@ -42,7 +42,8 @@ public void doTest(String filename) throws Exception { - rulesMap.put(new Pattern("x/inc"), new IncAction()); + // rule store is case insensitve + rulesMap.put(new Pattern("x/INC"), new IncAction()); TrivialConfigurator gc = new TrivialConfigurator(rulesMap); @@ -50,7 +51,7 @@ gc.doConfigure(CoreTestConstants.TEST_DIR_PREFIX + "input/joran/" + filename); } - + @Test public void smoke() throws Exception { int oldBeginCount = IncAction.beginCount; Added: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/spi/CaseCombinator.java ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/spi/CaseCombinator.java Sun Aug 9 13:54:23 2009 @@ -0,0 +1,99 @@ +/** + * Logback: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 2000-2009, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. + */ +package ch.qos.logback.core.joran.spi; + +import java.util.ArrayList; +import java.util.List; + +public class CaseCombinator { + + + List<String> combinations(String in) { + int length = in.length(); + List<String> permutationsList = new ArrayList<String>(); + + int totalCombinations = computeTotalNumerOfCombinations(in, length); + + for (int j = 0; j < totalCombinations; j++) { + StringBuilder newCombination = new StringBuilder(); + int pos = 0; + for (int i = 0; i < length; i++) { + char c = in.charAt(i); + if (isEnglishLetter(c)) { + c = permute(c, j, pos); + pos++; + } + newCombination.append(c); + } + permutationsList.add(newCombination.toString()); + } + return permutationsList; + + } + + private char permute(char c, int permutation, int position) { + int mask = 1 << position; + boolean shouldBeInUpperCase = (permutation & mask) != 0; + boolean isEffectivelyUpperCase = isUpperCase(c); + if (shouldBeInUpperCase && !isEffectivelyUpperCase) + return toUpperCase(c); + if (!shouldBeInUpperCase && isEffectivelyUpperCase) + return toLowerCase(c); + return c; + } + + private int computeTotalNumerOfCombinations(String in, int length) { + int count = 0; + for (int i = 0; i < length; i++) { + char c = in.charAt(i); + if (isEnglishLetter(c)) + count++; + } + // return 2^count (2 to the power of count) + return (1 << count); + } + + private char toUpperCase(char c) { + if ('A' <= c && c <= 'Z') { + return c; + } + if ('a' <= c && c <= 'z') { + int ci = c; + return (char) (ci + 'A' - 'a'); + } + // code should never reach this point + return c; + } + + private char toLowerCase(char c) { + if ('a' <= c && c <= 'z') { + return c; + } + if ('A' <= c && c <= 'Z') { + int ci = c; + return (char) (ci + 'a' - 'A'); + } + // code should never reach this point + return c; + } + + private boolean isEnglishLetter(char c) { + if ('a' <= c && c <= 'z') + return true; + + if ('A' <= c && c <= 'Z') + return true; + return false; + } + + private boolean isUpperCase(char c) { + return ('A' <= c && c <= 'Z'); + } +} Added: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/spi/CaseCombinatorTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/spi/CaseCombinatorTest.java Sun Aug 9 13:54:23 2009 @@ -0,0 +1,49 @@ +/** + * Logback: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 2000-2009, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. + */ +package ch.qos.logback.core.joran.spi; + +import static org.junit.Assert.assertEquals; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import org.junit.Test; + + +public class CaseCombinatorTest { + + CaseCombinator p = new CaseCombinator(); + + + @Test + public void smoke() { + CaseCombinator p = new CaseCombinator(); + + List<String> result = p.combinations("a-B="); + + List<String> witness = new ArrayList<String>(); + witness.add("a-b="); + witness.add("A-b="); + witness.add("a-B="); + witness.add("A-B="); + assertEquals(witness, result); + } + + @Test + public void other() { + List<String> result = p.combinations("aBCd"); + assertEquals(16, result.size()); + Set<String> witness = new HashSet<String>(result); + // check that there are no duplicates + assertEquals(16, witness.size()); + } +} Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/spi/PackageTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/spi/PackageTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/spi/PackageTest.java Sun Aug 9 13:54:23 2009 @@ -14,8 +14,8 @@ import org.junit.runners.Suite.SuiteClasses; @RunWith(Suite.class) -@SuiteClasses( { PatternTest.class, SimpleStoreTest.class, +@SuiteClasses( { PatternTest.class, SimpleRuleStoreTest.class, PropertySetterTest.class, NoAutoStartUtilTest.class, - DefaultNestedComponentRegistryTest.class }) + DefaultNestedComponentRegistryTest.class, CaseCombinatorTest.class }) public class PackageTest { } Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/spi/PatternTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/spi/PatternTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/spi/PatternTest.java Sun Aug 9 13:54:23 2009 @@ -94,6 +94,19 @@ Pattern rulePattern = new Pattern("*/a"); assertEquals(1, p.getTailMatchLength(rulePattern)); } + + { + Pattern p = new Pattern("/A"); + Pattern rulePattern = new Pattern("*/a"); + assertEquals(1, p.getTailMatchLength(rulePattern)); + } + + { + Pattern p = new Pattern("/a"); + Pattern rulePattern = new Pattern("*/A"); + assertEquals(1, p.getTailMatchLength(rulePattern)); + } + { Pattern p = new Pattern("/a/b"); @@ -101,6 +114,11 @@ assertEquals(1, p.getTailMatchLength(rulePattern)); } + { + Pattern p = new Pattern("/a/B"); + Pattern rulePattern = new Pattern("*/b"); + assertEquals(1, p.getTailMatchLength(rulePattern)); + } { Pattern p = new Pattern("/a/b/c"); @@ -129,6 +147,18 @@ Pattern rulePattern = new Pattern("/a/*"); assertEquals(1, p.getPrefixMatchLength(rulePattern)); } + + { + Pattern p = new Pattern("/a/b"); + Pattern rulePattern = new Pattern("/A/*"); + assertEquals(1, p.getPrefixMatchLength(rulePattern)); + } + + { + Pattern p = new Pattern("/A/b"); + Pattern rulePattern = new Pattern("/a/*"); + assertEquals(1, p.getPrefixMatchLength(rulePattern)); + } { Pattern p = new Pattern("/a/b"); Copied: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/spi/SimpleRuleStoreTest.java (from r2425, /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/spi/SimpleStoreTest.java) ============================================================================== --- /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/spi/SimpleStoreTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/spi/SimpleRuleStoreTest.java Sun Aug 9 13:54:23 2009 @@ -1,7 +1,7 @@ /** * Logback: the generic, reliable, fast and flexible logging framework. * - * Copyright (C) 2000-2008, QOS.ch + * Copyright (C) 2000-2009, QOS.ch * * This library is free software, you can redistribute it and/or modify it under * the terms of the GNU Lesser General Public License as published by the Free @@ -24,186 +24,203 @@ import ch.qos.logback.core.joran.action.Action; /** + * Test SimpleRuleStore for various explicit rule combinations. * - * @author Ceki Gulcu + * We also test that explicit patterns are case sensitive. + * + * @author Ceki Gülcü */ -public class SimpleStoreTest { +public class SimpleRuleStoreTest { + SimpleRuleStore srs = new SimpleRuleStore(new ContextBase()); + CaseCombinator cc = new CaseCombinator(); + @Test - public void test1() throws Exception { - // Document doc = getW3Document("file:input/joran/parser1.xml"); - SimpleRuleStore srs = new SimpleRuleStore(new ContextBase()); + public void smoke() throws Exception { srs.addRule(new Pattern("a/b"), new XAction()); - List r = srs.matchActions(new Pattern("a/b")); - assertNotNull(r); - assertEquals(1, r.size()); - - if (!(r.get(0) instanceof XAction)) { - fail("Wrong type"); + // test for all possible case combinations of "a/b" + for (String s : cc.combinations("a/b")) { + List r = srs.matchActions(new Pattern(s)); + assertNotNull(r); + assertEquals(1, r.size()); + + if (!(r.get(0) instanceof XAction)) { + fail("Wrong type"); + } } + } - srs = new SimpleRuleStore(new ContextBase()); + @Test + public void smokeII() throws Exception { srs.addRule(new Pattern("a/b"), new XAction()); srs.addRule(new Pattern("a/b"), new YAction()); - r = srs.matchActions(new Pattern("a/b")); - assertNotNull(r); - assertEquals(2, r.size()); - - if (!(r.get(0) instanceof XAction)) { - fail("Wrong type"); - } - - if (!(r.get(1) instanceof YAction)) { - fail("Wrong type"); + for (String s : cc.combinations("a/b")) { + List r = srs.matchActions(new Pattern(s)); + assertNotNull(r); + assertEquals(2, r.size()); + + if (!(r.get(0) instanceof XAction)) { + fail("Wrong type"); + } + + if (!(r.get(1) instanceof YAction)) { + fail("Wrong type"); + } } - } @Test public void testSlashSuffix() throws Exception { - SimpleRuleStore srs = new SimpleRuleStore(new ContextBase()); Pattern pa = new Pattern("a/"); srs.addRule(pa, new XAction()); - - List r = srs.matchActions(new Pattern("a")); - assertNotNull(r); - assertEquals(1, r.size()); - if (!(r.get(0) instanceof XAction)) { - fail("Wrong type"); + for (String s : cc.combinations("a")) { + List r = srs.matchActions(new Pattern(s)); + assertNotNull(r); + assertEquals(1, r.size()); + + if (!(r.get(0) instanceof XAction)) { + fail("Wrong type"); + } } - } - + @Test public void testTail1() throws Exception { - SimpleRuleStore srs = new SimpleRuleStore(new ContextBase()); srs.addRule(new Pattern("*/b"), new XAction()); - List r = srs.matchActions(new Pattern("a/b")); - assertNotNull(r); - - assertEquals(1, r.size()); - - if (!(r.get(0) instanceof XAction)) { - fail("Wrong type"); + for (String s : cc.combinations("a/b")) { + List r = srs.matchActions(new Pattern(s)); + assertNotNull(r); + + assertEquals(1, r.size()); + + if (!(r.get(0) instanceof XAction)) { + fail("Wrong type"); + } } } - @Test public void testTail2() throws Exception { SimpleRuleStore srs = new SimpleRuleStore(new ContextBase()); srs.addRule(new Pattern("*/c"), new XAction()); - List r = srs.matchActions(new Pattern("a/b/c")); - assertNotNull(r); - - assertEquals(1, r.size()); - - if (!(r.get(0) instanceof XAction)) { - fail("Wrong type"); + for (String s : cc.combinations("a/b/c")) { + List r = srs.matchActions(new Pattern(s)); + assertNotNull(r); + + assertEquals(1, r.size()); + + if (!(r.get(0) instanceof XAction)) { + fail("Wrong type"); + } } } - + @Test public void testTail3() throws Exception { - SimpleRuleStore srs = new SimpleRuleStore(new ContextBase()); srs.addRule(new Pattern("*/b"), new XAction()); srs.addRule(new Pattern("*/a/b"), new YAction()); - List r = srs.matchActions(new Pattern("a/b")); - assertNotNull(r); - - // System.out.println("restulg list is: "+r); - assertEquals(1, r.size()); - - if (!(r.get(0) instanceof YAction)) { - fail("Wrong type"); + for (String s : cc.combinations("a/b")) { + List r = srs.matchActions(new Pattern(s)); + assertNotNull(r); + assertEquals(1, r.size()); + + if (!(r.get(0) instanceof YAction)) { + fail("Wrong type"); + } } } @Test public void testTail4() throws Exception { - SimpleRuleStore srs = new SimpleRuleStore(new ContextBase()); srs.addRule(new Pattern("*/b"), new XAction()); srs.addRule(new Pattern("*/a/b"), new YAction()); srs.addRule(new Pattern("a/b"), new ZAction()); - List r = srs.matchActions(new Pattern("a/b")); - assertNotNull(r); - - // System.out.println("result list is: "+r); - assertEquals(1, r.size()); - - if (!(r.get(0) instanceof ZAction)) { - fail("Wrong type"); + for (String s : cc.combinations("a/b")) { + List r = srs.matchActions(new Pattern(s)); + assertNotNull(r); + assertEquals(1, r.size()); + + if (!(r.get(0) instanceof ZAction)) { + fail("Wrong type"); + } } } - + @Test public void testSuffix() throws Exception { - SimpleRuleStore srs = new SimpleRuleStore(new ContextBase()); srs.addRule(new Pattern("a"), new XAction()); srs.addRule(new Pattern("a/*"), new YAction()); - List r = srs.matchActions(new Pattern("a/b")); - assertNotNull(r); - assertEquals(1, r.size()); - assertTrue(r.get(0) instanceof YAction); + for (String s : cc.combinations("a/b")) { + List r = srs.matchActions(new Pattern(s)); + assertNotNull(r); + assertEquals(1, r.size()); + assertTrue(r.get(0) instanceof YAction); + } } - + @Test public void testDeepSuffix() throws Exception { - SimpleRuleStore srs = new SimpleRuleStore(new ContextBase()); srs.addRule(new Pattern("a"), new XAction(1)); srs.addRule(new Pattern("a/b/*"), new XAction(2)); - List r = srs.matchActions(new Pattern("a/other")); - assertNull(r); + for (String s : cc.combinations("a/other")) { + List r = srs.matchActions(new Pattern(s)); + assertNull(r); + } } @Test public void testPrefixSuffixInteraction1() throws Exception { - SimpleRuleStore srs = new SimpleRuleStore(new ContextBase()); srs.addRule(new Pattern("a"), new ZAction()); srs.addRule(new Pattern("a/*"), new YAction()); srs.addRule(new Pattern("*/a/b"), new XAction(3)); - List r = srs.matchActions(new Pattern("a/b")); - assertNotNull(r); - - assertEquals(1, r.size()); - - assertTrue(r.get(0) instanceof XAction); - XAction xaction = (XAction) r.get(0); - assertEquals(3, xaction.id); + for (String s : cc.combinations("a/b")) { + List r = srs.matchActions(new Pattern(s)); + assertNotNull(r); + + assertEquals(1, r.size()); + + assertTrue(r.get(0) instanceof XAction); + XAction xaction = (XAction) r.get(0); + assertEquals(3, xaction.id); + } } @Test public void testPrefixSuffixInteraction2() throws Exception { - SimpleRuleStore srs = new SimpleRuleStore(new ContextBase()); - srs.addRule(new Pattern("testGroup"), new XAction()); - srs.addRule(new Pattern("testGroup/testShell"), new YAction()); - srs.addRule(new Pattern("testGroup/testShell/test"), new ZAction()); - srs.addRule(new Pattern("testGroup/testShell/test/*"), new XAction(9)); - - List r = srs.matchActions(new Pattern("testGroup/testShell/toto")); - assertNull(r); + srs.addRule(new Pattern("tG"), new XAction()); + srs.addRule(new Pattern("tG/tS"), new YAction()); + srs.addRule(new Pattern("tG/tS/test"), new ZAction()); + srs.addRule(new Pattern("tG/tS/test/*"), new XAction(9)); + + for (String s : cc.combinations("tG/tS/toto")) { + List r = srs.matchActions(new Pattern(s)); + assertNull(r); + } } - + class XAction extends Action { int id = 0; + XAction() { } + XAction(int id) { this.id = id; } - public void begin(InterpretationContext ec, String name, Attributes attributes) { + public void begin(InterpretationContext ec, String name, + Attributes attributes) { } public void end(InterpretationContext ec, String name) { @@ -211,14 +228,15 @@ public void finish(InterpretationContext ec) { } - + public String toString() { - return "XAction("+id+")"; - } + return "XAction(" + id + ")"; + } } class YAction extends Action { - public void begin(InterpretationContext ec, String name, Attributes attributes) { + public void begin(InterpretationContext ec, String name, + Attributes attributes) { } public void end(InterpretationContext ec, String name) { @@ -229,7 +247,8 @@ } class ZAction extends Action { - public void begin(InterpretationContext ec, String name, Attributes attributes) { + public void begin(InterpretationContext ec, String name, + Attributes attributes) { } public void end(InterpretationContext ec, String name) {

1 0