- logback-dev - mailman3.qos.ch

svn commit: r1573 - logback/trunk/logback-classic
by noreply.ceki＠qos.ch 21 Aug '07

21 Aug '07

Author: ceki Date: Tue Aug 21 23:17:00 2007 New Revision: 1573 Modified: logback/trunk/logback-classic/pom.xml Log: removed useless <testResources> directive Modified: logback/trunk/logback-classic/pom.xml ============================================================================== --- logback/trunk/logback-classic/pom.xml (original) +++ logback/trunk/logback-classic/pom.xml Tue Aug 21 23:17:00 2007 @@ -167,17 +167,6 @@ </plugin> </plugins> - - <testResources> - <testResource> - <directory>src/test/input</directory> - <targetPath>input</targetPath> - </testResource> - <testResource> - <directory>src/test/resources</directory> - <targetPath>/</targetPath> - </testResource> - </testResources> </build> </project> \ No newline at end of file

1 0

svn commit: r1572 - in logback/trunk: . logback-access logback-classic logback-classic/src/main/java/ch/qos/logback/classic/joran logback-classic/src/main/java/ch/qos/logback/classic/joran/action 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/util logback-core/src/test/input/joran/inclusion logback-core/src/test/java/ch/qos/logback/core/joran/action logback-core/src/test/java/ch/qos/logback/co
by noreply.ceki＠qos.ch 21 Aug '07

21 Aug '07

Author: ceki Date: Tue Aug 21 23:14:30 2007 New Revision: 1572 Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/util/TestConstants.java - copied, changed from r1563, /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/util/Constants.java logback/trunk/logback-core/src/test/input/joran/inclusion/ logback/trunk/logback-core/src/test/input/joran/inclusion/includeByFile.xml logback/trunk/logback-core/src/test/input/joran/inclusion/includeByResource.xml logback/trunk/logback-core/src/test/input/joran/inclusion/includeByUrl.xml logback/trunk/logback-core/src/test/input/joran/inclusion/included.xml logback/trunk/logback-core/src/test/input/joran/inclusion/invalid.xml logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeFileActionTest.java - copied, changed from r1563, /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/IncludeFileActionTest.java logback/trunk/logback-core/src/test/resources/ Removed: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/IncludeFileAction.java logback/trunk/logback-classic/src/test/input/joran/invalidConfig.xml logback/trunk/logback-classic/src/test/input/joran/invalidRedirect.xml logback/trunk/logback-classic/src/test/input/joran/redirectConfig.xml logback/trunk/logback-classic/src/test/input/joran/redirectToFile.xml logback/trunk/logback-classic/src/test/input/joran/redirectToUrl.xml logback/trunk/logback-classic/src/test/input/joran/simpleConfig.xml logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/IncludeFileActionTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/util/Constants.java logback/trunk/logback-core/src/test/lib/ Modified: logback/trunk/logback-access/pom.xml logback/trunk/logback-classic/pom.xml logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/JoranConfigurator.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/BasicJoranTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/EvaluatorJoranTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/PackageTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/PackageTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/StackCounterAction.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/status/StatusChecker.java logback/trunk/logback-examples/pom.xml logback/trunk/logback-site/pom.xml logback/trunk/logback-site/src/site/pages/news.html logback/trunk/pom.xml Log: - moving to 0.9.8 - adding resource reading capability in IncludeFileAction (see bug 89) cleaning up IncludeFileActionTest.java - other minor changes Modified: logback/trunk/logback-access/pom.xml ============================================================================== --- logback/trunk/logback-access/pom.xml (original) +++ logback/trunk/logback-access/pom.xml Tue Aug 21 23:14:30 2007 @@ -3,7 +3,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.8-SNAPSHOT</version> + <version>0.9.8</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: logback/trunk/logback-classic/pom.xml ============================================================================== --- logback/trunk/logback-classic/pom.xml (original) +++ logback/trunk/logback-classic/pom.xml Tue Aug 21 23:14:30 2007 @@ -5,7 +5,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.8-SNAPSHOT</version> + <version>0.9.8</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/JoranConfigurator.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/JoranConfigurator.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/JoranConfigurator.java Tue Aug 21 23:14:30 2007 @@ -17,11 +17,11 @@ import ch.qos.logback.classic.joran.action.JMXConfiguratorAction; import ch.qos.logback.classic.joran.action.LayoutAction; import ch.qos.logback.classic.joran.action.LevelAction; -import ch.qos.logback.classic.joran.action.IncludeFileAction; import ch.qos.logback.classic.joran.action.LoggerAction; import ch.qos.logback.classic.joran.action.RootLoggerAction; import ch.qos.logback.core.joran.JoranConfiguratorBase; import ch.qos.logback.core.joran.action.AppenderRefAction; +import ch.qos.logback.core.joran.action.IncludeFileAction; import ch.qos.logback.core.joran.action.MatcherAction; import ch.qos.logback.core.joran.spi.Pattern; import ch.qos.logback.core.joran.spi.RuleStore; Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/BasicJoranTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/BasicJoranTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/BasicJoranTest.java Tue Aug 21 23:14:30 2007 @@ -19,7 +19,7 @@ import ch.qos.logback.classic.turbo.DebugUsersTurboFilter; import ch.qos.logback.classic.turbo.NOPTurboFilter; import ch.qos.logback.classic.turbo.TurboFilter; -import ch.qos.logback.classic.util.Constants; +import ch.qos.logback.classic.util.TestConstants; import ch.qos.logback.core.joran.spi.JoranException; import ch.qos.logback.core.read.ListAppender; import ch.qos.logback.core.util.StatusPrinter; @@ -34,7 +34,7 @@ JoranConfigurator jc = new JoranConfigurator(); LoggerContext loggerContext = new LoggerContext(); jc.setContext(loggerContext); - jc.doConfigure(Constants.TEST_DIR_PREFIX + "input/joran/simpleList.xml"); + jc.doConfigure(TestConstants.TEST_DIR_PREFIX + "input/joran/simpleList.xml"); //StatusPrinter.print(loggerContext.getStatusManager()); @@ -53,7 +53,7 @@ JoranConfigurator jc = new JoranConfigurator(); LoggerContext loggerContext = new LoggerContext(); jc.setContext(loggerContext); - jc.doConfigure(Constants.TEST_DIR_PREFIX + "input/joran/simpleLevel.xml"); + jc.doConfigure(TestConstants.TEST_DIR_PREFIX + "input/joran/simpleLevel.xml"); //StatusPrinter.print(loggerContext.getStatusManager()); @@ -72,7 +72,7 @@ JoranConfigurator jc = new JoranConfigurator(); LoggerContext loggerContext = new LoggerContext(); jc.setContext(loggerContext); - jc.doConfigure(Constants.TEST_DIR_PREFIX + "input/joran/callerData.xml"); + jc.doConfigure(TestConstants.TEST_DIR_PREFIX + "input/joran/callerData.xml"); StatusPrinter.print(loggerContext); @@ -98,7 +98,7 @@ JoranConfigurator jc = new JoranConfigurator(); LoggerContext loggerContext = new LoggerContext(); jc.setContext(loggerContext); - jc.doConfigure(Constants.TEST_DIR_PREFIX + "input/joran/turbo.xml"); + jc.doConfigure(TestConstants.TEST_DIR_PREFIX + "input/joran/turbo.xml"); //StatusPrinter.print(loggerContext.getStatusManager()); @@ -114,7 +114,7 @@ JoranConfigurator jc = new JoranConfigurator(); LoggerContext loggerContext = new LoggerContext(); jc.setContext(loggerContext); - jc.doConfigure(Constants.TEST_DIR_PREFIX + "input/joran/turbo2.xml"); + jc.doConfigure(TestConstants.TEST_DIR_PREFIX + "input/joran/turbo2.xml"); //StatusPrinter.print(loggerContext.getStatusManager()); Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/EvaluatorJoranTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/EvaluatorJoranTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/EvaluatorJoranTest.java Tue Aug 21 23:14:30 2007 @@ -21,7 +21,7 @@ import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.boolex.JaninoEventEvaluator; import ch.qos.logback.classic.spi.LoggingEvent; -import ch.qos.logback.classic.util.Constants; +import ch.qos.logback.classic.util.TestConstants; import ch.qos.logback.core.CoreGlobal; import ch.qos.logback.core.boolex.EvaluationException; import ch.qos.logback.core.joran.spi.JoranException; @@ -33,7 +33,7 @@ JoranConfigurator jc = new JoranConfigurator(); LoggerContext loggerContext = new LoggerContext(); jc.setContext(loggerContext); - jc.doConfigure(Constants.TEST_DIR_PREFIX + "input/joran/simpleEvaluator.xml"); + jc.doConfigure(TestConstants.TEST_DIR_PREFIX + "input/joran/simpleEvaluator.xml"); Map evalMap = (Map) loggerContext.getObject(CoreGlobal.EVALUATOR_MAP); @@ -54,7 +54,7 @@ JoranConfigurator jc = new JoranConfigurator(); LoggerContext loggerContext = new LoggerContext(); jc.setContext(loggerContext); - jc.doConfigure(Constants.TEST_DIR_PREFIX + "input/joran/ignore.xml"); + jc.doConfigure(TestConstants.TEST_DIR_PREFIX + "input/joran/ignore.xml"); //StatusPrinter.print(loggerContext.getStatusManager()); Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/PackageTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/PackageTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/PackageTest.java Tue Aug 21 23:14:30 2007 @@ -17,7 +17,6 @@ TestSuite suite = new TestSuite(); suite.addTestSuite(BasicJoranTest.class); suite.addTestSuite(EvaluatorJoranTest.class); - suite.addTestSuite(IncludeFileActionTest.class); return suite; } } \ No newline at end of file Copied: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/util/TestConstants.java (from r1563, /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/util/Constants.java) ============================================================================== --- /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/util/Constants.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/util/TestConstants.java Tue Aug 21 23:14:30 2007 @@ -1,20 +1,9 @@ package ch.qos.logback.classic.util; -public class Constants { +public class TestConstants { public static final String TEST_DIR_PREFIX = "src/test/"; -// static { -// File f = new File(""); -// String path = ""; -// String absolute = f.getAbsolutePath(); -// if (!absolute.endsWith("logback-classic")) { -// path = "logback-classic/"; -// } -// TEST_DIR_PREFIX = path + "src/test/"; -// } - - } Added: logback/trunk/logback-core/src/test/input/joran/inclusion/includeByFile.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/test/input/joran/inclusion/includeByFile.xml Tue Aug 21 23:14:30 2007 @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE x> + +<x> + <include file="${testing}" /> +</x> Added: logback/trunk/logback-core/src/test/input/joran/inclusion/includeByResource.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/test/input/joran/inclusion/includeByResource.xml Tue Aug 21 23:14:30 2007 @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE x> + +<x> + + <include resource="${testing}" /> + +</x> Added: logback/trunk/logback-core/src/test/input/joran/inclusion/includeByUrl.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/test/input/joran/inclusion/includeByUrl.xml Tue Aug 21 23:14:30 2007 @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE x> + +<x> + <include url="${testing}" /> +</x> Added: logback/trunk/logback-core/src/test/input/joran/inclusion/included.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/test/input/joran/inclusion/included.xml Tue Aug 21 23:14:30 2007 @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE included> + +<included> + + <inc increment="1"/> + <inc increment="1"/> + +</included> \ No newline at end of file Added: logback/trunk/logback-core/src/test/input/joran/inclusion/invalid.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/test/input/joran/inclusion/invalid.xml Tue Aug 21 23:14:30 2007 @@ -0,0 +1,8 @@ +<included> +  + + <inc increment="1"> + + <inc increment="1"/> + +</included> \ No newline at end of file Copied: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeFileActionTest.java (from r1563, /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/IncludeFileActionTest.java) ============================================================================== --- /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/IncludeFileActionTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeFileActionTest.java Tue Aug 21 23:14:30 2007 @@ -1,113 +1,127 @@ -package ch.qos.logback.classic.joran; +package ch.qos.logback.core.joran.action; + +import java.io.FileNotFoundException; +import java.net.MalformedURLException; +import java.net.UnknownHostException; +import java.util.HashMap; import junit.framework.TestCase; -import ch.qos.logback.classic.Logger; -import ch.qos.logback.classic.LoggerContext; -import ch.qos.logback.classic.PatternLayout; -import ch.qos.logback.classic.joran.action.IncludeFileAction; -import ch.qos.logback.classic.util.Constants; -import ch.qos.logback.core.Appender; -import ch.qos.logback.core.ConsoleAppender; + +import org.xml.sax.SAXParseException; + +import ch.qos.logback.core.Context; +import ch.qos.logback.core.ContextBase; +import ch.qos.logback.core.joran.TrivialConfigurator; 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.StatusChecker; +import ch.qos.logback.core.util.StatusPrinter; public class IncludeFileActionTest extends TestCase { - LoggerContext context; - IncludeFileAction action; + final static String FILE_KEY = "testing"; + + Context context = new ContextBase(); + TrivialConfigurator tc; + + static final String INCLUSION_DIR_PREFIX = "src/test/input/joran/inclusion/"; + + static final String INCLUDE_BY_FILE = INCLUSION_DIR_PREFIX + + "includeByFile.xml"; + static final String INCLUDE_BY_URL = INCLUSION_DIR_PREFIX + + "includeByUrl.xml"; + + static final String INCLUDE_BY_RESOURCE = INCLUSION_DIR_PREFIX + + "includeByResource.xml"; + + static final String INCLUDED_FILE = INCLUSION_DIR_PREFIX + "included.xml"; + static final String URL_TO_INCLUDE = "file://./" + INCLUDED_FILE; + + static final String INVALID = INCLUSION_DIR_PREFIX + "invalid.xml"; + + static final String INCLUDED_AS_RESOURCE = "input/joran/inclusion/includedAsResource.xml"; - String redirectToFile = Constants.TEST_DIR_PREFIX - + "input/joran/redirectToFile.xml"; - String redirectToURL = Constants.TEST_DIR_PREFIX - + "input/joran/redirectToUrl.xml"; - - String urlConfig = "http://logback.qos.ch/simpleConfig.xml"; - String simpleConfig = Constants.TEST_DIR_PREFIX - + "input/joran/simpleConfig.xml"; - String invalidConfig = Constants.TEST_DIR_PREFIX - + "input/joran/invalidConfig.xml"; + public IncludeFileActionTest(String arg0) { + super(arg0); + HashMap<Pattern, Action> rulesMap = new HashMap<Pattern, Action>(); + rulesMap.put(new Pattern("x"), new NOPAction()); + rulesMap.put(new Pattern("x/inc"), new IncAction()); + rulesMap.put(new Pattern("x/include"), new IncludeFileAction()); + + tc = new TrivialConfigurator(rulesMap); + tc.setContext(context); + } @Override protected void setUp() throws Exception { super.setUp(); - context = new LoggerContext(); - action = new IncludeFileAction(); - action.setContext(context); + IncAction.beginCount = 0; + IncAction.errorCount = 0; + IncAction.endCount = 0; } @Override protected void tearDown() throws Exception { super.tearDown(); - action = null; context = null; + System.clearProperty(FILE_KEY); } - public void testLoadFileOK() throws JoranException { - System.setProperty("testing.value.file", simpleConfig); - JoranConfigurator jc = new JoranConfigurator(); - jc.setContext(context); - jc.doConfigure(redirectToFile); + public void testBasicFile() throws JoranException { + System.setProperty(FILE_KEY, INCLUDED_FILE); + tc.doConfigure(INCLUDE_BY_FILE); + verifyConfig(2); + } - verifyConfig(); + public void testBasicResource() throws JoranException { + System.setProperty(FILE_KEY, INCLUDED_AS_RESOURCE); + tc.doConfigure(INCLUDE_BY_RESOURCE); + StatusPrinter.print(context); + verifyConfig(2); } - public void testNoFileFound() throws JoranException { - System.setProperty("testing.value.file", "toto"); - JoranConfigurator jc = new JoranConfigurator(); - jc.setContext(context); - jc.doConfigure(redirectToFile); + // public void testBasicURL() throws JoranException { + // System.setProperty(FILE_KEY, URL_TO_INCLUDE); + // tc.doConfigure(INCLUDE_BY_URL); + // StatusPrinter.print(context); + // verifyConfig(2); + // } - assertEquals(2, context.getStatusManager().getCount()); + public void testNoFileFound() throws JoranException { + System.setProperty(FILE_KEY, "toto"); + tc.doConfigure(INCLUDE_BY_FILE); assertEquals(Status.ERROR, context.getStatusManager().getLevel()); + StatusChecker sc = new StatusChecker(context.getStatusManager()); + assertTrue(sc.containsException(FileNotFoundException.class)); } public void testWithCorruptFile() throws JoranException { - System.setProperty("testing.value.file", invalidConfig); - JoranConfigurator jc = new JoranConfigurator(); - jc.setContext(context); - jc.doConfigure(redirectToFile); - - assertEquals(10, context.getStatusManager().getCount()); + System.setProperty(FILE_KEY, INVALID); + tc.doConfigure(INCLUDE_BY_FILE); assertEquals(Status.ERROR, context.getStatusManager().getLevel()); + StatusChecker sc = new StatusChecker(context.getStatusManager()); + assertTrue(sc.containsException(SAXParseException.class)); } -// public void testURLOK() throws JoranException { -// //This one needs that we put a file on the web -// //and requires a net connection on the test-runner's side. -// System.setProperty("testing.value.url", urlConfig); -// JoranConfigurator jc = new JoranConfigurator(); -// jc.setContext(context); -// jc.doConfigure(redirectToURL); -// -// verifyConfig(); -// } - public void testMalformedURL() throws JoranException { - System.setProperty("testing.value.url", "htp://logback.qos.ch"); - JoranConfigurator jc = new JoranConfigurator(); - jc.setContext(context); - jc.doConfigure(redirectToURL); - - assertEquals(2, context.getStatusManager().getCount()); + System.setProperty(FILE_KEY, "htp://logback.qos.ch"); + tc.doConfigure(INCLUDE_BY_URL); assertEquals(Status.ERROR, context.getStatusManager().getLevel()); + StatusChecker sc = new StatusChecker(context.getStatusManager()); + assertTrue(sc.containsException(MalformedURLException.class)); } public void testUnknownURL() throws JoranException { - System.setProperty("testing.value.url", "http://logback2345.qos.ch"); - JoranConfigurator jc = new JoranConfigurator(); - jc.setContext(context); - jc.doConfigure(redirectToURL); - - assertEquals(2, context.getStatusManager().getCount()); + System.setProperty(FILE_KEY, "http://logback2345.qos.ch"); + tc.doConfigure(INCLUDE_BY_URL); assertEquals(Status.ERROR, context.getStatusManager().getLevel()); + StatusChecker sc = new StatusChecker(context.getStatusManager()); + assertTrue(sc.containsException(UnknownHostException.class)); } - private void verifyConfig() { - Logger logger = context.getLogger(LoggerContext.ROOT_NAME); - Appender appender = (ConsoleAppender) logger.getAppender("redirectConsole"); - assertNotNull(appender); - PatternLayout layout = (PatternLayout) appender.getLayout(); - assertNotNull(layout); - assertEquals("%d - %m%n", layout.getPattern()); + void verifyConfig(int expected) { + assertEquals(expected, IncAction.beginCount); + assertEquals(expected, IncAction.endCount); } } Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/PackageTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/PackageTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/PackageTest.java Tue Aug 21 23:14:30 2007 @@ -18,6 +18,8 @@ public static Test suite() { TestSuite suite = new TestSuite(); suite.addTestSuite(PropertyActionTest.class); + suite.addTestSuite(IncludeFileActionTest.class); + return suite; } } Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/StackCounterAction.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/StackCounterAction.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/StackCounterAction.java Tue Aug 21 23:14:30 2007 @@ -25,21 +25,13 @@ public StackCounterAction() { } - /** - * Instantiates an layout of the given class and sets its name. - * - */ + public void begin(InterpretationContext ec, String name, Attributes attributes) { //String str = "Pushing "+name+"-begin"; ec.pushObject(name+"-begin"); } - /** - * Once the children elements are also parsed, now is the time to activate - * the appender options. - */ public void end(InterpretationContext ec, String name) { - //String str = "Pushing "+name+"-end"; ec.pushObject(name+"-end"); } 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 Tue Aug 21 23:14:30 2007 @@ -45,4 +45,17 @@ return false; } + + public boolean containsException(Class exceptionType) { + Iterator stati = sm.iterator(); + while(stati.hasNext()) { + Status status = (Status) stati.next(); + Throwable t = status.getThrowable(); + if(t != null && t.getClass().getName().equals(exceptionType.getName())) { + return true; + } + } + return false; + } + } Modified: logback/trunk/logback-examples/pom.xml ============================================================================== --- logback/trunk/logback-examples/pom.xml (original) +++ logback/trunk/logback-examples/pom.xml Tue Aug 21 23:14:30 2007 @@ -3,7 +3,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.8-SNAPSHOT</version> + <version>0.9.8</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: logback/trunk/logback-site/pom.xml ============================================================================== --- logback/trunk/logback-site/pom.xml (original) +++ logback/trunk/logback-site/pom.xml Tue Aug 21 23:14:30 2007 @@ -3,7 +3,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.8-SNAPSHOT</version> + <version>0.9.8</version> </parent> <modelVersion>4.0.0</modelVersion> 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 Aug 21 23:14:30 2007 @@ -37,7 +37,18 @@ href="http://bugzilla.qos.ch/show_bug.cgi?id=90">bug 88</a> reported by Sebastian Davids. - + + Fixed caller data extraction problem as reported in <a + href="http://bugzilla.qos.ch/show_bug.cgi?id=78">bug 78</a> by Hans + van der Meer. + + + The LoggingEvent class' constructor now correctly takes into + account the argument array passed by the user. This problem was + reported in <a href="http://bugzilla.qos.ch/show_bug.cgi?id=85">bug + 85</a> by Robert Christian. + + <hr width="80%" align="center" /> Modified: logback/trunk/pom.xml ============================================================================== --- logback/trunk/pom.xml (original) +++ logback/trunk/pom.xml Tue Aug 21 23:14:30 2007 @@ -5,7 +5,7 @@ <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.8-SNAPSHOT</version> + <version>0.9.8</version> <packaging>pom</packaging> <name>Logback-Parent</name>

1 0

svn commit: r1571 - logback/trunk/logback-core
by noreply.ceki＠qos.ch 21 Aug '07

21 Aug '07

Author: ceki Date: Tue Aug 21 23:12:40 2007 New Revision: 1571 Modified: logback/trunk/logback-core/pom.xml Log: It is not necessary, and actually quite counter-productive to set "testResources" in pom.xml Modified: logback/trunk/logback-core/pom.xml ============================================================================== --- logback/trunk/logback-core/pom.xml (original) +++ logback/trunk/logback-core/pom.xml Tue Aug 21 23:12:40 2007 @@ -5,7 +5,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.8-SNAPSHOT</version> + <version>0.9.8</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -125,17 +125,6 @@ </plugin> </plugins> - <testResources> - <testResource> - <directory>src/test/input</directory> - <targetPath>input</targetPath> - </testResource> - <testResource> - <directory>src/test/witness</directory> - <targetPath>witness</targetPath> - </testResource> - </testResources> - </build> </project> \ No newline at end of file

1 0

svn commit: r1570 - logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action
by noreply.ceki＠qos.ch 21 Aug '07

21 Aug '07

Author: ceki Date: Tue Aug 21 21:47:31 2007 New Revision: 1570 Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/IncludeFileAction.java - copied, changed from r1563, /logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/IncludeFileAction.java Log: inclusion should be a core joran feature Copied: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/IncludeFileAction.java (from r1563, /logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/IncludeFileAction.java) ============================================================================== --- /logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/IncludeFileAction.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/IncludeFileAction.java Tue Aug 21 21:47:31 2007 @@ -7,7 +7,7 @@ * the terms of the GNU Lesser General Public License as published by the Free * Software Foundation. */ -package ch.qos.logback.classic.joran.action; +package ch.qos.logback.core.joran.action; import java.io.FileInputStream; import java.io.IOException; @@ -23,63 +23,54 @@ import ch.qos.logback.core.joran.spi.ActionException; import ch.qos.logback.core.joran.spi.InterpretationContext; import ch.qos.logback.core.joran.spi.JoranException; +import ch.qos.logback.core.util.Loader; +import ch.qos.logback.core.util.OptionHelper; public class IncludeFileAction extends Action { private static final String INCLUDED_TAG = "included"; private static final String FILE_ATTR = "file"; private static final String URL_ATTR = "url"; + private static final String RESOURCE_ATTR = "resource"; private SaxEventRecorder recorder = new SaxEventRecorder();; @Override public void begin(InterpretationContext ec, String name, Attributes attributes) throws ActionException { - String attFile = attributes.getValue(FILE_ATTR); - String attUrl = attributes.getValue(URL_ATTR); - // if both are null, report error and do nothing. - if (attFile == null && attUrl == null) { - addError("One of path and URL attribute must be set."); + String fileAttribute = attributes.getValue(FILE_ATTR); + String urlAttribute = attributes.getValue(URL_ATTR); + String resourceAttribute = attributes.getValue(RESOURCE_ATTR); + String attributeInUse = null; + + if(!checkAttributes(fileAttribute, urlAttribute, resourceAttribute)) { return; } - String pathToFile = null; - if (attFile != null) { - if (attFile.startsWith("$")) { - pathToFile = ec.subst(attFile); - } else { - pathToFile = attFile; - } + InputStream in = null; + + if (!OptionHelper.isEmpty(fileAttribute)) { + attributeInUse = ec.subst(fileAttribute); + in = getInputStreamByFilePath(attributeInUse); } - URL urlToFile = null; - String tmpUrl; - if (attUrl != null) { - if (attUrl.startsWith("$")) { - tmpUrl = ec.subst(attUrl); - } else { - tmpUrl = attUrl; - } - try { - urlToFile = new URL(tmpUrl); - } catch (MalformedURLException mue) { - String errMsg = "URL [" + tmpUrl + "] is not well formed."; - addError(errMsg, mue); - return; - } + if (!OptionHelper.isEmpty(urlAttribute)) { + attributeInUse = ec.subst(urlAttribute); + in = getInputStreamByUrl(attributeInUse); } - // we know now that either pathToFile or urlToFile - // is not null and correctly formed (in case of urlToFile). + if (!OptionHelper.isEmpty(resourceAttribute)) { + attributeInUse = ec.subst(resourceAttribute); + in = getInputStreamByResource(attributeInUse); + } try { - InputStream in = getInputStream(pathToFile, urlToFile); if (in != null) { parseAndRecord(in); in.close(); } } catch (JoranException e) { - addError("Error while parsing file " + pathToFile + e); + addError("Error while parsing " + attributeInUse, e); } catch (IOException e) { // called if in.close did not work } @@ -88,8 +79,8 @@ return; } - //Let's remove the two <included> events before - //adding the events to the player. + // Let's remove the two <included> events before + // adding the events to the player. SaxEvent first = recorder.saxEventList.get(0); if (first != null && first.qName.equalsIgnoreCase(INCLUDED_TAG)) { recorder.saxEventList.remove(0); @@ -103,24 +94,73 @@ ec.getJoranInterpreter().addEvents(recorder.saxEventList); } - private InputStream getInputStream(String pathToFile, URL urlToFile) { - if (pathToFile != null) { - try { - return new FileInputStream(pathToFile); - } catch (IOException ioe) { - String errMsg = "File [" + pathToFile + "] does not exist."; - addError(errMsg, ioe); - return null; - } - } else { - try { - return urlToFile.openStream(); - } catch (IOException e) { - String errMsg = "URL [" + urlToFile.toString() + "] does not exist."; - addError(errMsg, e); - return null; - } + private boolean checkAttributes(String fileAttribute, + String urlAttribute, String resourceAttribute) { + int count = 0; + + if (!OptionHelper.isEmpty(fileAttribute)) { + count++; + } + if (!OptionHelper.isEmpty(urlAttribute)) { + count++; + } + if (!OptionHelper.isEmpty(resourceAttribute)) { + count++; + } + + if (count == 0) { + addError("One of \"path\", \"resource\" or \"url\" attributes must be set."); + return false; + } else if (count > 1) { + addError("Only one of \"file\", \"url\" or \"resource\" attributes should be set."); + return false; + } else if (count == 1) { + return true; + } + throw new IllegalStateException("Count value ["+count+"] is not expected"); + } + + private InputStream getInputStreamByFilePath(String pathToFile) { + try { + return new FileInputStream(pathToFile); + } catch (IOException ioe) { + String errMsg = "File [" + pathToFile + "] does not exist."; + addError(errMsg, ioe); + return null; + } + } + + private InputStream getInputStreamByUrl(String urlAttribute) { + URL url; + try { + url = new URL(urlAttribute); + } catch (MalformedURLException mue) { + String errMsg = "URL [" + urlAttribute + "] is not well formed."; + addError(errMsg, mue); + return null; + } + return openURL(url); + } + + InputStream openURL(URL url) { + try { + return url.openStream(); + } catch (IOException e) { + String errMsg = "Failed to open [" + url.toString() + "]"; + addError(errMsg, e); + return null; + } + } + + private InputStream getInputStreamByResource(String resourceAttribute) { + URL url = Loader.getResourceByTCL(resourceAttribute); + if (url == null) { + String errMsg = "Could not find resource corresponding to [" + + resourceAttribute + "]"; + addError(errMsg); + return null; } + return openURL(url); } private void parseAndRecord(InputStream inputSource) throws JoranException {

1 0

svn commit: r1569 - logback-demo/trunk/src/main/java/ch/qos/logback/demo/login
by noreply.ceki＠qos.ch 21 Aug '07

21 Aug '07

Author: ceki Date: Tue Aug 21 21:43:54 2007 New Revision: 1569 Modified: logback-demo/trunk/src/main/java/ch/qos/logback/demo/login/LoginAction.java logback-demo/trunk/src/main/java/ch/qos/logback/demo/login/LogoutAction.java Log: MDC has been moved into SLF4J Modified: logback-demo/trunk/src/main/java/ch/qos/logback/demo/login/LoginAction.java ============================================================================== --- logback-demo/trunk/src/main/java/ch/qos/logback/demo/login/LoginAction.java (original) +++ logback-demo/trunk/src/main/java/ch/qos/logback/demo/login/LoginAction.java Tue Aug 21 21:43:54 2007 @@ -10,7 +10,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import ch.qos.logback.classic.MDC; +import org.slf4j.MDC; import ch.qos.logback.demo.Constants; public class LoginAction extends Action { Modified: logback-demo/trunk/src/main/java/ch/qos/logback/demo/login/LogoutAction.java ============================================================================== --- logback-demo/trunk/src/main/java/ch/qos/logback/demo/login/LogoutAction.java (original) +++ logback-demo/trunk/src/main/java/ch/qos/logback/demo/login/LogoutAction.java Tue Aug 21 21:43:54 2007 @@ -10,7 +10,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import ch.qos.logback.classic.MDC; +import org.slf4j.MDC; import ch.qos.logback.demo.Constants; public class LogoutAction extends Action {

1 0

[Bug 87] New: logback-demo not working
by bugzilla-daemon＠pixie.qos.ch 21 Aug '07

21 Aug '07

http://bugzilla.qos.ch/show_bug.cgi?id=87 Summary: logback-demo not working Product: logback-general Version: unspecified Platform: PC URL: http://svn.qos.ch/repos/logback-demo/trunk OS/Version: Windows Status: NEW Severity: normal Priority: P4 Component: build-structure AssignedTo: logback-dev(a)qos.ch ReportedBy: tbondz(a)gmail.com logback-demo depends on an older version of logback (0.9) which does not implement getContextSelector(). Need to update the logback-demo pom to depend on version 0.9.7 or later. -- Configure bugmail: http://bugzilla.qos.ch/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee.

1 1

svn commit: r1568 - logback-demo/trunk
by noreply.ceki＠qos.ch 21 Aug '07

21 Aug '07

Author: ceki Date: Tue Aug 21 20:13:48 2007 New Revision: 1568 Modified: logback-demo/trunk/pom.xml Log: syncing logback 0.9.8, latest version of logback (this also fixed bug 87) Modified: logback-demo/trunk/pom.xml ============================================================================== --- logback-demo/trunk/pom.xml (original) +++ logback-demo/trunk/pom.xml Tue Aug 21 20:13:48 2007 @@ -8,6 +8,11 @@ <packaging>war</packaging> <version>1.0</version> + <properties> + <lb.version>0.9.8</lb.version> + </properties> + + <dependencies> <dependency> <groupId>struts</groupId> @@ -26,7 +31,7 @@ <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> - <version>0.9</version> + <version>${lb.version}</version> <scope>compile</scope> <exclusions> <exclusion> @@ -39,7 +44,7 @@ <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-access</artifactId> - <version>0.9</version> + <version>${lb.version}</version> <scope>provided</scope> </dependency> </dependencies> @@ -70,13 +75,13 @@ <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-access</artifactId> - <version>0.9</version> + <version>${lb.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-core</artifactId> - <version>0.9</version> + <version>${lb.version}</version> <scope>runtime</scope> </dependency> <dependency>

1 0

[Bug 85] New: ch.qos.logback.classic.spi.LoggingEvent swallows Object[]
by bugzilla-daemon＠pixie.qos.ch 21 Aug '07

21 Aug '07

http://bugzilla.qos.ch/show_bug.cgi?id=85 Summary: ch.qos.logback.classic.spi.LoggingEvent swallows Object[] Product: logback-classic Version: unspecified Platform: PC OS/Version: Windows Status: NEW Severity: blocker Priority: P1 Component: Other AssignedTo: logback-dev(a)qos.ch ReportedBy: robertjchristian(a)gmail.com The Object[] used to construct LoggingEvent should be populated in the argumentArray field. Unfortunately, Logger does not populate this via the setter method, and the LoggingEvent constructor swallows it. -- Configure bugmail: http://bugzilla.qos.ch/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee.

1 1

svn commit: r1567 - logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi
by noreply.ceki＠qos.ch 21 Aug '07

21 Aug '07

Author: ceki Date: Tue Aug 21 19:53:37 2007 New Revision: 1567 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java Log: we now set the argumentArray variable in the LoggingEvent class' constructor. Problem reported by Robert Christian in bug #85. Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEvent.java Tue Aug 21 19:53:37 2007 @@ -111,6 +111,9 @@ this.throwableInfo = new ThrowableInformation(throwable); } + // bug 85 (we previously failed to set this.argumentArray) + this.argumentArray = argArray; + if (argArray != null) { formattedMessage = MessageFormatter.arrayFormat(message, argArray); } else {

1 0

[Bug 78] New: bad index in extract CallerData
by bugzilla-daemon＠pixie.qos.ch 21 Aug '07

21 Aug '07

http://bugzilla.qos.ch/show_bug.cgi?id=78 Summary: bad index in extract CallerData Product: logback-classic Version: unspecified Platform: Macintosh OS/Version: Mac OS Status: NEW Severity: blocker Priority: P1 Component: Other AssignedTo: logback-dev(a)qos.ch ReportedBy: hansm(a)science.uva.nl CC: hansm(a)science.uva.nl Below is code from CallerData (logback 0.9.7) This gives an error as shown below. java.lang.ArrayIndexOutOfBoundsException: -1 at ch.qos.logback.classic.spi.CallerData.extract(CallerData.java:101) at ch.qos.logback.classic.spi.LoggingEvent.getCallerData(LoggingEvent.java:246) In my code (Eclipse RCP) LoggingEvent's are collected by an appender in a java.util.List. Then a Jface TableViewer is allocated and the input set to that list. The processing of the accumulated LoggingEvents now each throw the ArrayIndexOutOfBoundsException. After registering the viewer containing object with the appender, new incoming LoggingEvents are given to the viewer and are processed without problem. It looks like the "int found" has kept its value of -1, presumably because the equals in line 88 never becomes true. I am inclined to consider this a bug, or at least unsafe coding, because a bad index in certain circumstances can reach the code in line 101. The code in lines 86-97 does not guarantee that a bad index cannot occur. 78 public static CallerData[] extract(Throwable t, String fqnOfInvokingClass) { 79 if (t == null) { 80 return null; 81 } 82 83 StackTraceElement[] steArray = t.getStackTrace(); 84 CallerData[] callerDataArray; 85 86 int found = -1; 87 for (int i = 0; i < steArray.length; i++) { 88 if(steArray[i].getClassName().equals(fqnOfInvokingClass)) { 89 // the caller is assumed to be the next stack frame, hence the +1. 90 found = i + 1; 91 } else { 92 if(found != -1) { 93 break; 94 } 95 } 96 97 } 98 99 callerDataArray = new CallerData[steArray.length - found]; 100 for (int i = found; i < steArray.length; i++) { 101 callerDataArray[i-found] = new CallerData(steArray[i]); 102 } 103 return callerDataArray; 104 } 105 -- Configure bugmail: http://bugzilla.qos.ch/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee.

1 3