July 2009 - logback-dev - mailman3.qos.ch

svn commit: r2327 - logback/trunk/logback-core/src/main/java/ch/qos/logback/core
by noreply.ceki＠qos.ch 08 Jul '09

08 Jul '09

Author: ceki Date: Wed Jul 8 13:53:10 2009 New Revision: 2327 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/FileAppender.java Log: - typo fix Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/FileAppender.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/FileAppender.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/FileAppender.java Wed Jul 8 13:53:10 2009 @@ -93,7 +93,7 @@ /** * This method is used by derived classes to obtain the raw file property. - * Regular users should not be using calling method. + * Regular users should not be calling this method. * * @return the value of the file property */

1 0

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

08 Jul '09

Author: ceki Date: Wed Jul 8 13:52:45 2009 New Revision: 2326 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingFileAppender.java Log: - rename a field Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingFileAppender.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingFileAppender.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingFileAppender.java Wed Jul 8 13:52:45 2009 @@ -27,7 +27,7 @@ * @author Ceki Gülcü */ public class RollingFileAppender<E> extends FileAppender<E> { - File activeFileCache; + File activeFile; TriggeringPolicy<E> triggeringPolicy; RollingPolicy rollingPolicy; @@ -64,7 +64,7 @@ } } - activeFileCache = new File(getFile()); + activeFile = new File(getFile()); addInfo("Active log file name: " + getFile()); super.start(); } @@ -108,11 +108,6 @@ // does not work for open files. this.closeWriter(); - // By default, the newly created file will be created in truncate mode. - // (See the setFile() call a few lines below.) - // FIXME don't change the append mode - // this.append = false; - try { rollingPolicy.rollover(); } catch (RolloverFailure rf) { @@ -136,7 +131,7 @@ protected void subAppend(E event) { // The roll-over check must precede actual writing. This is the // only correct behavior for time driven triggers. - if (triggeringPolicy.isTriggeringEvent(activeFileCache, event)) { + if (triggeringPolicy.isTriggeringEvent(activeFile, event)) { rollover(); }

1 0

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

08 Jul '09

Author: ceki Date: Wed Jul 8 12:44:39 2009 New Revision: 2325 Modified: logback/trunk/logback-site/src/site/pages/news.html Log: blurb about LBCLASSIC-134 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 Wed Jul 8 12:44:39 2009 @@ -86,6 +86,13 @@ now generate an error status message. + Fixed <a + href="http://jira.qos.ch/browse/LBCLASSIC-134">LBCLASSIC-134</a> + reported by Darryl Smith. <code>DuplicateMessageFilter</code> will + now behave correctly when invoked via + <code>Logger.isXXXEnabled</code> methods. + + <hr width="80%" align="center" /> <h3>12th of February 2009 - Release of version 0.9.15</h3>

1 0

[JIRA] Created: (LBCLASSIC-134) DuplicateMessageFilter should bypass checking msgCache for null formats
by Darryl Smith (JIRA) 08 Jul '09

08 Jul '09

DuplicateMessageFilter should bypass checking msgCache for null formats ----------------------------------------------------------------------- Key: LBCLASSIC-134 URL: http://jira.qos.ch/browse/LBCLASSIC-134 Project: logback-classic Issue Type: Bug Affects Versions: 0.9.15 Reporter: Darryl Smith Assignee: Logback dev list Attachments: LBCLASSIC-134.patch Calls to isXXXEnabled translate to a call to Logger.callTurboFilters which invokes DuplicateMessageFilter with a null format DuplicateMessageFilter usage of LRUMessageCache will group together all null formats under msgCount. e.g. msgCache.getMessageCount(null) = msgCount 1 msgCache.getMessageCount(null) = msgCount 2 msgCache.getMessageCount(null) = msgCount 3 -- 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

svn commit: r2324 - in logback/trunk/logback-classic/src: main/java/ch/qos/logback/classic/turbo test/java/ch/qos/logback/classic/turbo
by noreply.ceki＠qos.ch 08 Jul '09

08 Jul '09

Author: ceki Date: Wed Jul 8 12:14:59 2009 New Revision: 2324 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/DuplicateMessageFilter.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/LRUMessageCache.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/DuplicateMessageFilterTest.java Log: Fix LBCLASSIC-134 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/DuplicateMessageFilter.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/DuplicateMessageFilter.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/DuplicateMessageFilter.java Wed Jul 8 12:14:59 2009 @@ -55,7 +55,7 @@ @Override public FilterReply decide(Marker marker, Logger logger, Level level, String format, Object[] params, Throwable t) { - int count = msgCache.getMessageCount(format); + int count = msgCache.getMessageCountAndThenIncrement(format); if (count <= allowedRepetitions) { return FilterReply.NEUTRAL; } else { Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/LRUMessageCache.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/LRUMessageCache.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/LRUMessageCache.java Wed Jul 8 12:14:59 2009 @@ -14,6 +14,8 @@ class LRUMessageCache extends LinkedHashMap<String, Integer> { + // LinkedHashMap permits null elements to be inserted + private static final long serialVersionUID = 1L; final int cacheSize; @@ -26,7 +28,12 @@ this.cacheSize = cacheSize; } - int getMessageCount(String msg) { + int getMessageCountAndThenIncrement(String msg) { + // don't insert null elements + if(msg == null) { + return 0; + } + Integer i = super.get(msg); if(i == null) { i = 0; Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/DuplicateMessageFilterTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/DuplicateMessageFilterTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/DuplicateMessageFilterTest.java Wed Jul 8 12:14:59 2009 @@ -15,49 +15,71 @@ import ch.qos.logback.core.spi.FilterReply; - public class DuplicateMessageFilterTest { - @Test public void smoke() { DuplicateMessageFilter dmf = new DuplicateMessageFilter(); dmf.setAllowedRepetitions(0); dmf.start(); - assertEquals(FilterReply.NEUTRAL, dmf.decide(null, null, null, "x", null, null)); - assertEquals(FilterReply.NEUTRAL, dmf.decide(null, null, null, "y", null, null)); - assertEquals(FilterReply.DENY, dmf.decide(null, null, null, "x", null, null)); - assertEquals(FilterReply.DENY, dmf.decide(null, null, null, "y", null, null)); + assertEquals(FilterReply.NEUTRAL, dmf.decide(null, null, null, "x", null, + null)); + assertEquals(FilterReply.NEUTRAL, dmf.decide(null, null, null, "y", null, + null)); + assertEquals(FilterReply.DENY, dmf + .decide(null, null, null, "x", null, null)); + assertEquals(FilterReply.DENY, dmf + .decide(null, null, null, "y", null, null)); } - + @Test public void memoryLoss() { DuplicateMessageFilter dmf = new DuplicateMessageFilter(); dmf.setAllowedRepetitions(1); dmf.setCacheSize(1); dmf.start(); - assertEquals(FilterReply.NEUTRAL, dmf.decide(null, null, null, "a", null, null)); - assertEquals(FilterReply.NEUTRAL, dmf.decide(null, null, null, "b", null, null)); - assertEquals(FilterReply.NEUTRAL, dmf.decide(null, null, null, "a", null, null)); + assertEquals(FilterReply.NEUTRAL, dmf.decide(null, null, null, "a", null, + null)); + assertEquals(FilterReply.NEUTRAL, dmf.decide(null, null, null, "b", null, + null)); + assertEquals(FilterReply.NEUTRAL, dmf.decide(null, null, null, "a", null, + null)); } - @Test public void many() { DuplicateMessageFilter dmf = new DuplicateMessageFilter(); dmf.setAllowedRepetitions(0); int cacheSize = 10; - int margin = 2; + int margin = 2; dmf.setCacheSize(cacheSize); dmf.start(); - for(int i = 0; i < cacheSize+margin; i++) { - assertEquals(FilterReply.NEUTRAL, dmf.decide(null, null, null, "a"+i, null, null)); + for (int i = 0; i < cacheSize + margin; i++) { + assertEquals(FilterReply.NEUTRAL, dmf.decide(null, null, null, "a" + i, + null, null)); } - for(int i = cacheSize-1; i >= margin; i--) { - assertEquals(FilterReply.DENY, dmf.decide(null, null, null, "a"+i, null, null)); + for (int i = cacheSize - 1; i >= margin; i--) { + assertEquals(FilterReply.DENY, dmf.decide(null, null, null, "a" + i, + null, null)); } - for(int i = margin-1; i >= 0; i--) { - assertEquals(FilterReply.NEUTRAL, dmf.decide(null, null, null, "a"+i, null, null)); + for (int i = margin - 1; i >= 0; i--) { + assertEquals(FilterReply.NEUTRAL, dmf.decide(null, null, null, "a" + i, + null, null)); } } + + @Test + // isXXXEnabled invokes decide with a null format + // http://jira.qos.ch/browse/LBCLASSIC-134 + public void nullFormat() { + DuplicateMessageFilter dmf = new DuplicateMessageFilter(); + dmf.setAllowedRepetitions(0); + dmf.setCacheSize(10); + dmf.start(); + assertEquals(FilterReply.NEUTRAL, dmf.decide(null, null, null, null, null, + null)); + assertEquals(FilterReply.NEUTRAL, dmf.decide(null, null, null, null, null, + null)); + } + }

1 0

[JIRA] Created: (LBCORE-105) config files found in jar file lock the jar file
by Ceki Gulcu (JIRA) 08 Jul '09

08 Jul '09

config files found in jar file lock the jar file ------------------------------------------------ Key: LBCORE-105 URL: http://jira.qos.ch/browse/LBCORE-105 Project: logback-core Issue Type: Bug Components: Joran Affects Versions: 0.9.15 Reporter: Ceki Gulcu Assignee: Ceki Gulcu When a config file is obtained from within a jar file, the jar file is locked. This causes trouble when the application needs to be reloaded. See also bug #47465 in log4j. The solution is to set the setDefaultUseCaches to false when opening the url connection. -- 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

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

08 Jul '09

Author: ceki Date: Wed Jul 8 10:27:22 2009 New Revision: 2323 Modified: logback/trunk/logback-site/src/site/pages/news.html Log: minor rewording 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 Wed Jul 8 10:27:22 2009 @@ -82,7 +82,7 @@ Fixed <a href="http://jira.qos.ch/browse/LBCORE-94">LBCORE-94</a>. While configuring a RollingFileAppender, if the File property is - declared after any rolling triggering policies, then logback will + declared after any rolling or triggering policies, then logback will now generate an error status message.

1 0

[JIRA] Created: (LBCORE-94) Rollover at launch time
by Ceki Gulcu (JIRA) 08 Jul '09

08 Jul '09

Rollover at launch time ----------------------- Key: LBCORE-94 URL: http://jira.qos.ch/browse/LBCORE-94 Project: logback-core Issue Type: Bug Components: Rolling Affects Versions: 0.9.15 Reporter: Ceki Gulcu Assignee: Ceki Gulcu Rollover does not occur for old files when short lived application is restarted. This issue is related to LBCORE-26.However, the solution implemented in LBCORE-26 works if the RollingFileAppender has the File property set. This is not always the case. For instance <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <FileNamePattern>test.%d.log.zip</FileNamePattern> </rollingPolicy> <layout/> </appender> <root level="info"> <appender-ref ref="FILE"/> </root> Problem originally reported by Ch Pasha. See also http://www.qos.ch/pipermail/logback-user/2009-March/001030.html -- 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 4

svn commit: r2322 - in logback/trunk: logback-core/src/main/java/ch/qos/logback/core logback-core/src/main/java/ch/qos/logback/core/rolling logback-core/src/test/java/ch/qos/logback/core/rolling logback-core/src/test/java/ch/qos/logback/core/status logback-site/src/site/pages logback-site/src/site/pages/manual
by noreply.ceki＠qos.ch 08 Jul '09

08 Jul '09

Author: ceki Date: Wed Jul 8 10:24:27 2009 New Revision: 2322 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/CoreConstants.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/FileAppender.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/FixedWindowRollingPolicy.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingFileAppender.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedRollingPolicy.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/RollingFileAppenderTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/status/StatusChecker.java logback/trunk/logback-site/src/site/pages/codes.html logback/trunk/logback-site/src/site/pages/manual/appenders.html logback/trunk/logback-site/src/site/pages/news.html Log: Fix LBCORE-94 Within A RollingFileAppender, if the File property is declared after any rolling or triggering policies, then generate an error status message. Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/CoreConstants.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/CoreConstants.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/CoreConstants.java Wed Jul 8 10:24:27 2009 @@ -81,4 +81,6 @@ static public final char DOT = '.'; static public final char TAB = '\t'; + + static public final String SEE_FNP_NOT_SET = "See also http://logback.qos.ch/codes.html#tbr_fnp_not_set"; } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/FileAppender.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/FileAppender.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/FileAppender.java Wed Jul 8 10:24:27 2009 @@ -73,9 +73,7 @@ // trailing spaces in file names. String val = file.trim(); fileName = val; - } - } /** Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/FixedWindowRollingPolicy.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/FixedWindowRollingPolicy.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/FixedWindowRollingPolicy.java Wed Jul 8 10:24:27 2009 @@ -11,6 +11,7 @@ import java.io.File; +import ch.qos.logback.core.CoreConstants; import ch.qos.logback.core.rolling.helper.CompressionMode; import ch.qos.logback.core.rolling.helper.Compressor; import ch.qos.logback.core.rolling.helper.FileNamePattern; @@ -28,7 +29,6 @@ */ public class FixedWindowRollingPolicy extends RollingPolicyBase { static final String FNP_NOT_SET = "The \"FileNamePattern\" property must be set before using FixedWindowRollingPolicy. "; - static final String SEE_FNP_NOT_SET = "See also http://logback.qos.ch/codes.html#tbr_fnp_not_set"; static final String PRUDENT_MODE_UNSUPPORTED = "See also http://logback.qos.ch/codes.html#tbr_fnp_prudent_unsupported"; static final String SEE_PARENT_FN_NOT_SET = "Please refer to http://logback.qos.ch/codes.html#fwrp_parentFileName_not_set"; int maxIndex; @@ -54,8 +54,8 @@ determineCompressionMode(); } else { addError(FNP_NOT_SET); - addError(SEE_FNP_NOT_SET); - throw new IllegalStateException(FNP_NOT_SET + SEE_FNP_NOT_SET); + addError(CoreConstants.SEE_FNP_NOT_SET); + throw new IllegalStateException(FNP_NOT_SET + CoreConstants.SEE_FNP_NOT_SET); } if(isParentPrudent()) { Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingFileAppender.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingFileAppender.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingFileAppender.java Wed Jul 8 10:24:27 2009 @@ -70,6 +70,18 @@ } @Override + public void setFile(String file) { + // http://jira.qos.ch/browse/LBCORE-94 + // allow setting the file name to null if mandated by prudent mode + if(file != null && ((triggeringPolicy != null) || (rollingPolicy != null))) { + addError("File property must be set before any triggeringPolicy or rollingPolicy properties"); + addError("Visit http://logback.qos.ch/codes.html#rfa_file_after for more information"); + } + super.setFile(file); + } + + + @Override public String getFile() { return rollingPolicy.getActiveFileName(); } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedRollingPolicy.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedRollingPolicy.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedRollingPolicy.java Wed Jul 8 10:24:27 2009 @@ -13,6 +13,7 @@ import java.util.Date; import java.util.concurrent.Future; +import ch.qos.logback.core.CoreConstants; import ch.qos.logback.core.rolling.helper.AsynchronousCompressor; import ch.qos.logback.core.rolling.helper.CompressionMode; import ch.qos.logback.core.rolling.helper.Compressor; @@ -35,7 +36,6 @@ public class TimeBasedRollingPolicy<E> extends RollingPolicyBase implements TriggeringPolicy<E> { static final String FNP_NOT_SET = "The FileNamePattern option must be set before using TimeBasedRollingPolicy. "; - static final String SEE_FNP_NOT_SET = "See also http://logback.qos.ch/codes.html#tbr_fnp_not_set"; static final int NO_DELETE_HISTORY = 0; RollingCalendar rc; @@ -77,8 +77,8 @@ determineCompressionMode(); } else { addWarn(FNP_NOT_SET); - addWarn(SEE_FNP_NOT_SET); - throw new IllegalStateException(FNP_NOT_SET + SEE_FNP_NOT_SET); + addWarn(CoreConstants.SEE_FNP_NOT_SET); + throw new IllegalStateException(FNP_NOT_SET + CoreConstants.SEE_FNP_NOT_SET); } DateTokenConverter dtc = fileNamePattern.getDateTokenConverter(); Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/RollingFileAppenderTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/RollingFileAppenderTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/RollingFileAppenderTest.java Wed Jul 8 10:24:27 2009 @@ -9,11 +9,11 @@ */ package ch.qos.logback.core.rolling; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import org.junit.After; import org.junit.Before; @@ -25,7 +25,9 @@ import ch.qos.logback.core.appender.AbstractAppenderTest; import ch.qos.logback.core.layout.DummyLayout; import ch.qos.logback.core.status.Status; +import ch.qos.logback.core.status.StatusChecker; import ch.qos.logback.core.status.StatusManager; +import ch.qos.logback.core.util.StatusPrinter; public class RollingFileAppenderTest extends AbstractAppenderTest<Object> { @@ -36,10 +38,11 @@ @Before public void setUp() throws Exception { + // noStartTest fails if the context is set in setUp + // rfa.setContext(context); + rfa.setLayout(new DummyLayout<Object>()); rfa.setName("test"); - rfa.setRollingPolicy(tbrp); - tbrp.setContext(context); tbrp.setParent(rfa); } @@ -48,7 +51,6 @@ public void tearDown() throws Exception { } - @Override protected Appender<Object> getAppender() { return rfa; @@ -57,20 +59,16 @@ @Override protected Appender<Object> getConfiguredAppender() { rfa.setContext(context); - tbrp.setFileNamePattern("toto-%d.log"); tbrp.start(); - + rfa.setRollingPolicy(tbrp); + rfa.start(); return rfa; } - @Test public void testPrudentModeLogicalImplications() { - tbrp.setFileNamePattern("toto-%d.log"); - tbrp.start(); - rfa.setContext(context); // prudent mode will force "file" property to be null rfa.setFile("some non null value"); @@ -78,6 +76,11 @@ rfa.setImmediateFlush(false); rfa.setBufferedIO(true); rfa.setPrudent(true); + + tbrp.setFileNamePattern("toto-%d.log"); + tbrp.start(); + rfa.setRollingPolicy(tbrp); + rfa.start(); assertTrue(rfa.getImmediateFlush()); @@ -87,23 +90,43 @@ assertTrue(rfa.isStarted()); } - @Test public void testPrudentModeLogicalImplicationsOnCompression() { - tbrp.setFileNamePattern("toto-%d.log.zip"); - tbrp.start(); - rfa.setContext(context); rfa.setAppend(false); rfa.setImmediateFlush(false); rfa.setBufferedIO(true); rfa.setPrudent(true); + + tbrp.setFileNamePattern("toto-%d.log.zip"); + tbrp.start(); + rfa.setRollingPolicy(tbrp); + rfa.start(); StatusManager sm = context.getStatusManager(); assertFalse(rfa.isStarted()); assertEquals(Status.ERROR, sm.getLevel()); } - - + + @Test + public void testFilePropertyAfterRollingPolicy() { + rfa.setContext(context); + rfa.setRollingPolicy(tbrp); + rfa.setFile("x"); + StatusPrinter.print(context); + StatusChecker statusChecker = new StatusChecker(context.getStatusManager()); + statusChecker.containsMatch(Status.ERROR, + "File property must be set before any triggeringPolicy "); + } + + @Test + public void testFilePropertyAfterTriggeringPolicy() { + rfa.setContext(context); + rfa.setTriggeringPolicy(new SizeBasedTriggeringPolicy<Object>()); + rfa.setFile("x"); + StatusChecker statusChecker = new StatusChecker(context.getStatusManager()); + statusChecker.containsMatch(Status.ERROR, + "File property must be set before any triggeringPolicy "); + } } Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/status/StatusChecker.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/status/StatusChecker.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/status/StatusChecker.java Wed Jul 8 10:24:27 2009 @@ -24,21 +24,31 @@ this.sm = sm; } - public boolean containsMatch(String regex) { - + public boolean containsMatch(int level, String regex) { Pattern p = Pattern.compile(regex); - Iterator stati = sm.getCopyOfStatusList().iterator(); - while (stati.hasNext()) { - Status status = (Status) stati.next(); + for(Status status: sm.getCopyOfStatusList()) { + if(level != status.getLevel()) { + continue; + } String msg = status.getMessage(); Matcher matcher = p.matcher(msg); if (matcher.lookingAt()) { return true; - } else { - System.out.println("no match:" + msg); - System.out.println("regex :" + regex); - } + } + } + return false; + + } + + public boolean containsMatch(String regex) { + Pattern p = Pattern.compile(regex); + for(Status status: sm.getCopyOfStatusList()) { + String msg = status.getMessage(); + Matcher matcher = p.matcher(msg); + if (matcher.lookingAt()) { + return true; + } } return false; } Modified: logback/trunk/logback-site/src/site/pages/codes.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/codes.html (original) +++ logback/trunk/logback-site/src/site/pages/codes.html Wed Jul 8 10:24:27 2009 @@ -40,62 +40,6 @@ <hr/> - - - <a name="tbr_fnp_not_set" href="#tbr_fnp_not_set"> - The FileNamePattern option must be set before using - <code>TimeBasedRollingPolicy</code> or - <code>FixedWindowRollingPolicy</code> - </a> - - - - The FileNamePattern option for both - <code>TimeBasedRollingPolicy</code> and - <code>FixedWindowRollingPolicy</code> is mandatory. - - - See the <a - href="http://logback.qos.ch/apidocs/ch/qos/logback/core/rolling/FixedWindowRollin…"> - FixedWindowRollingPolicy javadoc </a> for more information. - - - <hr /> - - - <a name="fwrp_parentFileName_not_set" href="#fwrp_parentFileName_not_set"> - The File option must be set before - <code>FixedWindowRollingPolicy</code> - </a> - - - The File option is mandatory with - <code>FixedWindowRollingPolicy</code>. Moreover, the File option must be set before the - <code>FixedWindowRollingPolicy</code> element. - - - Refer to the logback manual on - <a href="manual/appenders.html#FixedWindowRollingPolicy"> - FixedWindowRollingPolicy </a> for more information. - - - <hr /> - - <a name="tbr_fnp_prudent_unsupported" - href="#tbr_fnp_prudent_unsupported">Prudent mode is not supported - with <code>FixedWindowRollingPolicy</code>.</a> - - - Given that <code>FixedWindowRollingPolicy</code> performs - multiple file rename operations suring roll over, and that these - operations cannot be guaranteed to be safe in a multi-JVM context, - prudent mode is not allowed in conjuction with a - <code>FixedWindowRollingPolicy</code>. - - - <hr/> - <a name="socket_no_host" href="#socket_no_host">No remote host or address is set for <code>SocketAppender</code> @@ -191,9 +135,11 @@ <hr /> - <a name="rfa_no_tp" href="#rfa_no_tp">No <code>TriggeringPolicy</code> was set for - the <code>RollingFileAppender</code>. - </a> + + <a name="rfa_no_tp" href="#rfa_no_tp">No + <code>TriggeringPolicy</code> was set for the + <code>RollingFileAppender</code>. + </a> The <code>RollingFileAppender</code> must be set up with a @@ -208,12 +154,12 @@ <ul> <li> <a - href="http://logback.qos.ch/apidocs/ch/qos/logback/core/rolling/SizeBasedTriggeri…"><code>SizeBasedTriggeringPolicy</code> + href="manual/appenders.html#SizeBasedTriggeringPolicy"><code>SizeBasedTriggeringPolicy</code> </a> </li> <li> <a - href="http://logback.qos.ch/apidocs/ch/qos/logback/core/rolling/TimeBasedRollingP…"><code>TimeBasedRollingPolicy</code> + href="manual/appenders.html#TimeBasedRollingPolicy"><code>TimeBasedRollingPolicy</code> </a> </li> </ul> @@ -243,12 +189,12 @@ <ul> <li> - <a href="http://logback.qos.ch/apidocs/ch/qos/logback/core/rolling/FixedWindowRollin…"> + <a href="apidocs/ch/qos/logback/core/rolling/FixedWindowRollingPolicy.html"> <code>FixedWindowRollingPolicy</code> </a> </li> <li> - <a href="http://logback.qos.ch/apidocs/ch/qos/logback/core/rolling/TimeBasedRollingP…"> + <a href="apidocs/ch/qos/logback/core/rolling/TimeBasedRollingPolicy.html"> <code>TimeBasedRollingPolicy</code> </a> </li> @@ -262,9 +208,82 @@ <hr/> + + <a name="tbr_fnp_not_set" href="#tbr_fnp_not_set"> + The FileNamePattern property is mandatory for both + <code>TimeBasedRollingPolicy</code> and + <code>FixedWindowRollingPolicy</code>. + </a> + + + + The FileNamePattern property for both + <code>TimeBasedRollingPolicy</code> and + <code>FixedWindowRollingPolicy</code> is mandatory. + + + Please refer to the documentation of <a + href="manual/appenders.html#TimeBasedRollingPolicy">TimeBasedRollingPolicy</a> + and <a + href="manual/appenders.html#FixedWindowRollingPolicy">FixedWindowRollingPolicy</a> for + examples. + + + + <hr/> + + + <a name="rfa_file_after" href="#rfa_file_after"> + The File property must be set before + any rolling policy or triggering policy. + </a> + + + The File property, if present, must + be placed before any rolling policy or triggering policy. Thus, in a + configuration file, the File property, + if present, must be declared declared before any rolling policy or + triggering policy declarations. + + + <hr/> + + + <a name="fwrp_parentFileName_not_set" href="#fwrp_parentFileName_not_set"> + The File property must be set before + <code>FixedWindowRollingPolicy</code> + </a> + + + The File property is mandatory with + <code>FixedWindowRollingPolicy</code>. Moreover, the File option must be set before the + <code>FixedWindowRollingPolicy</code> element. + + + Refer to the logback manual on + <a href="manual/appenders.html#FixedWindowRollingPolicy"> + FixedWindowRollingPolicy </a> for more information. + + + <hr /> + + <a name="tbr_fnp_prudent_unsupported" + href="#tbr_fnp_prudent_unsupported">Prudent mode is not supported + with <code>FixedWindowRollingPolicy</code>.</a> + + + Given that <code>FixedWindowRollingPolicy</code> performs + multiple file rename operations suring roll over, and that these + operations cannot be guaranteed to be safe in a multi-JVM context, + prudent mode is not allowed in conjuction with a + <code>FixedWindowRollingPolicy</code>. + + + <hr /> <a name="syslog_layout" href="#syslog_layout"> SyslogAppender - does not admit a layout parameter.</a> + does not admit a layout.</a> 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 Wed Jul 8 10:24:27 2009 @@ -1166,8 +1166,10 @@ - <a name="TriggeringPolicy"></a> - <h3>Triggering policies</h3> + + <h3> + <a name="TriggeringPolicy" href="#TriggeringPolicy">Triggering policies</a> + </h3> <a href="../xref/ch/qos/logback/core/rolling/TriggeringPolicy.html"><code>TriggeringPolicy</code></a> @@ -1193,8 +1195,9 @@ rollover should occur or not, based on the said parameters. - <a name="SizeBasedTriggeringPolicy"></a> - <h4>SizeBasedTriggeringPolicy</h4> + + <h4><a name="SizeBasedTriggeringPolicy" + href="#SizeBasedTriggeringPolicy">SizeBasedTriggeringPolicy</a></h4> <a href="../xref/ch/qos/logback/core/rolling/SizeBasedTriggeringPolicy.html"> 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 Wed Jul 8 10:24:27 2009 @@ -79,6 +79,13 @@ 47465</a> Mark Thomas. + Fixed <a + href="http://jira.qos.ch/browse/LBCORE-94">LBCORE-94</a>. While + configuring a RollingFileAppender, if the File property is + declared after any rolling triggering policies, then logback will + now generate an error status message. + + <hr width="80%" align="center" /> <h3>12th of February 2009 - Release of version 0.9.15</h3>

1 0

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