[logback-dev] 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/core/status logback-core/src/test/lib logback-core/src/test/resources logback-examples logback-site logback-site/src/site/pages
noreply.ceki at qos.ch
noreply.ceki at qos.ch
Tue Aug 21 23:14:31 CEST 2007
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>
+ <!-- This file is invalid on purpose. Do not correct it -->
+
+ <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.
</p>
-
+
+ <p>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.
+ </p>
+
+ <p>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.
+ </p>
+
<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>
More information about the logback-dev
mailing list