- logback-dev - mailman3.qos.ch

svn commit: r1613 - in logback/trunk/logback-access/src: main/java/ch/qos/logback/access/jetty main/java/ch/qos/logback/access/spi main/java/ch/qos/logback/access/tomcat test/java/ch/qos/logback/access/dummy
by noreply.ceki＠qos.ch 28 Jan '08

28 Jan '08

Author: ceki Date: Mon Jan 28 11:06:58 2008 New Revision: 1613 Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/JettyServerAdapter.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/AccessEvent.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/ServerAdapter.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/tomcat/TomcatServerAdapter.java logback/trunk/logback-access/src/test/java/ch/qos/logback/access/dummy/DummyServerAdapter.java Log: - applying some of the changes proposed by Joern Huxhorn in his patch dated 2008-01-26 (bug 109) The defensive code compensating for the bug in 0.9.8 until 0.9.9 is released was not merged because it is a workaround hiding the true logic of the code. void buildResponseHeaderMap() { if (responseHeaderMap == null) { if(serverAdapter != null) { <-- ---- not merged responseHeaderMap = serverAdapter.buildResponseHeaderMap(); } else { responseHeaderMap = new HashMap<String, String>(); } } } Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/JettyServerAdapter.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/JettyServerAdapter.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/jetty/JettyServerAdapter.java Mon Jan 28 11:06:58 2008 @@ -34,8 +34,7 @@ return response.getStatus(); } - - public Map<String, String> builResponseHeaderMap() { + public Map<String, String> buildResponseHeaderMap() { Map<String, String> responseHeaderMap = new HashMap<String, String>(); HttpFields httpFields = response.getHttpFields(); Enumeration e = httpFields.getFieldNames(); Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/AccessEvent.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/AccessEvent.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/AccessEvent.java Mon Jan 28 11:06:58 2008 @@ -205,10 +205,10 @@ if (requestHeaderMap == null) { if (httpRequest != null) { buildRequestHeaderMap(); - result = (String) requestHeaderMap.get(key); + result = requestHeaderMap.get(key); } } else { - result = (String) requestHeaderMap.get(key); + result = requestHeaderMap.get(key); } if (result != null) { @@ -270,7 +270,6 @@ * Attributes are not serialized * * @param key - * @return */ public String getAttribute(String key) { if (httpRequest != null) { @@ -306,9 +305,9 @@ return AccessEvent.NA; } - for (int i = 0; cookieArray != null && i < cookieArray.length; i++) { - if (key.equals(cookieArray[i].getName())) { - return cookieArray[i].getValue(); + for (Cookie cookie : cookieArray) { + if (key.equals(cookie.getName())) { + return cookie.getValue(); } } } @@ -432,7 +431,7 @@ void buildResponseHeaderMap() { if (responseHeaderMap == null) { - responseHeaderMap = serverAdapter.builResponseHeaderMap(); + responseHeaderMap = serverAdapter.buildResponseHeaderMap(); } } Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/ServerAdapter.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/ServerAdapter.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/ServerAdapter.java Mon Jan 28 11:06:58 2008 @@ -17,5 +17,5 @@ // List<String> getResponseHeaderNameList(); // Map<String, String> getResponseHeaderMap(); - Map<String, String> builResponseHeaderMap(); + Map<String, String> buildResponseHeaderMap(); } Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/tomcat/TomcatServerAdapter.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/tomcat/TomcatServerAdapter.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/tomcat/TomcatServerAdapter.java Mon Jan 28 11:06:58 2008 @@ -32,7 +32,7 @@ } - public Map<String, String> builResponseHeaderMap() { + public Map<String, String> buildResponseHeaderMap() { Map<String, String> responseHeaderMap = new HashMap<String, String>(); for (String key : response.getHeaderNames()) { String value = response.getHeader(key); Modified: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/dummy/DummyServerAdapter.java ============================================================================== --- logback/trunk/logback-access/src/test/java/ch/qos/logback/access/dummy/DummyServerAdapter.java (original) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/dummy/DummyServerAdapter.java Mon Jan 28 11:06:58 2008 @@ -22,7 +22,7 @@ return response.getStatus(); } - public Map<String, String> builResponseHeaderMap() { + public Map<String, String> buildResponseHeaderMap() { return response.headerMap; }

1 0

[Bug 110] New: AccessEvent is missing getters for RequestParameters.
by bugzilla-daemon＠pixie.qos.ch 25 Jan '08

25 Jan '08

http://bugzilla.qos.ch/show_bug.cgi?id=110 Summary: AccessEvent is missing getters for RequestParameters. Product: logback-access Version: unspecified Platform: All OS/Version: All Status: NEW Severity: major Priority: P1 Component: Other AssignedTo: logback-dev(a)qos.ch ReportedBy: joern(a)huxhorn.de Please provide the following method in AccessEvent: public Map<String, Object> getRequestParameterMap() { if (requestParameterMap == null) { buildRequestParameterMap(); } return requestParameterMap; } requestParameterMap is initialized but there is no method to access it or it's contents. -- 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 7

[Bug 125] New: StopWatchTest fails in Germany.
by bugzilla-daemon＠pixie.qos.ch 25 Jan '08

25 Jan '08

http://bugzilla.qos.ch/show_bug.cgi?id=125 Summary: StopWatchTest fails in Germany. Product: logback-core Version: unspecified Platform: All OS/Version: All Status: NEW Severity: major Priority: P1 Component: Other AssignedTo: logback-dev(a)qos.ch ReportedBy: joern(a)huxhorn.de StopWatchTest must also use a DecimalFormat to check the 6.000 seconds. DecimalFormat is using DecimalFormatSymbols(Locale.getDefault()) by default so the string contained is "6,000 seconds." in Germany. -- 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

[continuum] BUILD FAILURE: Logback-Parent - Logback Access Module - Build Def: default maven2 buildDefinition
by John Noreplai 25 Jan '08

25 Jan '08

Online report : http://pixie:8091/continuum/buildResult.action?buildId=198&projectId=19 Build statistics: State: Failed Previous State: Ok Started at: Fri 25 Jan 2008 18:20:37 +0100 Finished at: Fri 25 Jan 2008 18:20:48 +0100 Total time: 10s Build Trigger: Schedule Build Number: 2 Exit code: 1 Building machine hostname: pixie Operating system : Linux(unknown) Java Home version : java version "1.5.0_08" Java(TM) 2 Runtime Environment, Standard Edition (build 1.5.0_08-b03) Java HotSpot(TM) 64-Bit Server VM (build 1.5.0_08-b03, mixed mode) Builder version : Maven version: 2.0.4 **************************************************************************** SCM Changes: **************************************************************************** Changed: ceki @ Fri 25 Jan 2008 18:13:41 +0100 Comment: - ongoing work Files changed: /logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyBasicTest.java ( 1612 ) /logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyFixture.java (from /logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyTestSetup.java:1608) ( 1612 ) /logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyTestSetup.java ( 1612 ) /logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/PackageTest.java ( 1612 ) **************************************************************************** Dependencies Changes: **************************************************************************** ch.qos.logback:logback-core:0.9.9-SNAPSHOT ch.qos.logback:logback-core:0.9.9-SNAPSHOT ch.qos.logback:logback-parent:0.9.9-SNAPSHOT **************************************************************************** Build Defintion: **************************************************************************** POM filename: pom.xml Goals: clean install Arguments: --batch-mode --non-recursive Build Fresh: false Always Build: false Default Build Definition: true Schedule: DEFAULT_SCHEDULE Description: default maven2 buildDefinition **************************************************************************** Test Summary: **************************************************************************** Tests: 0 Failures: 0 Total time: 0.0

1 0

svn commit: r1612 - logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty
by noreply.ceki＠qos.ch 25 Jan '08

25 Jan '08

Author: ceki Date: Fri Jan 25 18:13:41 2008 New Revision: 1612 Added: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyFixture.java - copied, changed from r1608, /logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyTestSetup.java Removed: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyTestSetup.java Modified: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyBasicTest.java logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/PackageTest.java Log: - ongoing work Modified: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyBasicTest.java ============================================================================== --- logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyBasicTest.java (original) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyBasicTest.java Fri Jan 25 18:13:41 2008 @@ -1,41 +1,58 @@ package ch.qos.logback.access.jetty; +import static org.junit.Assert.assertEquals; + +import java.io.OutputStreamWriter; +import java.io.PrintWriter; import java.net.HttpURLConnection; import java.net.URL; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + import ch.qos.logback.access.spi.AccessEvent; import ch.qos.logback.access.spi.Util; import ch.qos.logback.core.read.ListAppender; -public class JettyBasicTest extends TestCase { +public class JettyBasicTest { static RequestLogImpl requestLogImpl; - - public static Test suite() { - TestSuite suite = new TestSuite(); - suite.addTestSuite(JettyBasicTest.class); + static JettyFixture fixture; + + @BeforeClass + static public void startServer() throws Exception { + System.out.println("*** JettyBasicTest.startServer called"); requestLogImpl = new RequestLogImpl(); - return new JettyTestSetup(suite, requestLogImpl); + JettyFixture fixture = new JettyFixture(requestLogImpl); + fixture.start(); } - + + @AfterClass + static public void stopServer() throws Exception { + System.out.println("*** JettyBasicTest.stopServer called"); + if(fixture != null) { + fixture.stop(); + } + } + + @Test public void testGetRequest() throws Exception { - URL url = new URL("http://localhost:"+ JettyTestSetup.PORT + "/"); + URL url = new URL("http://localhost:"+ JettyFixture.PORT + "/"); HttpURLConnection connection = (HttpURLConnection) url.openConnection(); connection.setDoInput(true); String result = Util.readToString(connection.getInputStream()); - assertEquals("hello world", result); + assertEquals("hello world", result); ListAppender appender = (ListAppender) requestLogImpl.getAppender("list"); appender.list.clear(); } + @Test public void testEventGoesToAppenders() throws Exception { - URL url = new URL("http://localhost:"+ JettyTestSetup.PORT + "/"); + URL url = new URL("http://localhost:"+ JettyFixture.PORT + "/"); HttpURLConnection connection = (HttpURLConnection) url.openConnection(); connection.setDoInput(true); @@ -50,33 +67,37 @@ appender.list.clear(); } -// public void testPostContentConverter() throws Exception { -// //System.out.println("into test"); -// URL url = new URL("http://localhost:8080/"); -// String msg = "test message"; -// -// HttpURLConnection connection = (HttpURLConnection) url.openConnection(); -// //this line is necessary to make the stream aware of when the message is over. -// connection.setFixedLengthStreamingMode(msg.getBytes().length); -// ((HttpURLConnection) connection).setRequestMethod("POST"); -// connection.setDoOutput(true); -// connection.setDoInput(true); -// connection.setUseCaches(false); -// connection.setRequestProperty("Content-Type", "text/plain"); -// -// -// PrintWriter output = new PrintWriter(new OutputStreamWriter(connection -// .getOutputStream())); -// output.print(msg); -// output.flush(); -// output.close(); -// -// // StatusPrinter.print(requestLogImpl.getStatusManager()); -// -// ListAppender listAppender = (ListAppender) requestLogImpl -// .getAppender("list"); -// Thread.sleep(100); -// AccessEvent event = (AccessEvent) listAppender.list.get(0); -// assertEquals(msg, event.getPostContent()); -// } + @Test + public void testPostContentConverter() throws Exception { + //System.out.println("into test"); + URL url = new URL("http://localhost:"+ JettyFixture.PORT + "/"); + String msg = "test message"; + + HttpURLConnection connection = (HttpURLConnection) url.openConnection(); + //this line is necessary to make the stream aware of when the message is over. + connection.setFixedLengthStreamingMode(msg.getBytes().length); + ((HttpURLConnection) connection).setRequestMethod("POST"); + connection.setDoOutput(true); + connection.setDoInput(true); + connection.setUseCaches(false); + connection.setRequestProperty("Content-Type", "text/plain"); + + + PrintWriter output = new PrintWriter(new OutputStreamWriter(connection + .getOutputStream())); + output.print(msg); + output.flush(); + output.close(); + + // StatusPrinter.print(requestLogImpl.getStatusManager()); + + ListAppender listAppender = (ListAppender) requestLogImpl + .getAppender("list"); + Thread.sleep(100); + @SuppressWarnings("unused") + AccessEvent event = (AccessEvent) listAppender.list.get(0); + + // we should test the contents of the requests + // assertEquals(msg, event.getRequestContent()); + } } Copied: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyFixture.java (from r1608, /logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyTestSetup.java) ============================================================================== --- /logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyTestSetup.java (original) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyFixture.java Fri Jan 25 18:13:41 2008 @@ -7,9 +7,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import junit.extensions.TestSetup; -import junit.framework.Test; - import org.mortbay.jetty.Connector; import org.mortbay.jetty.Handler; import org.mortbay.jetty.HttpConnection; @@ -26,13 +23,12 @@ import ch.qos.logback.core.ConsoleAppender; import ch.qos.logback.core.read.ListAppender; -public class JettyTestSetup extends TestSetup { +public class JettyFixture { RequestLogImpl requestLogImpl; public static final int PORT = 1234; - public JettyTestSetup(Test suite, RequestLogImpl impl) { - super(suite); + public JettyFixture(RequestLogImpl impl) { requestLogImpl = impl; } @@ -43,9 +39,8 @@ Server server; String url = "http://localhost:" + PORT + "/"; - public void setUp() throws Exception { + public void start() throws Exception { // System.out.println("into setUp"); - super.setUp(); server = new Server(); Connector connector = new SelectChannelConnector(); @@ -71,9 +66,8 @@ Thread.yield(); } - public void tearDown() throws Exception { + public void stop() throws Exception { // System.out.println("into tearDown"); - super.tearDown(); server.stop(); Thread.sleep(1000); server = null; Modified: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/PackageTest.java ============================================================================== --- logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/PackageTest.java (original) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/PackageTest.java Fri Jan 25 18:13:41 2008 @@ -16,7 +16,7 @@ public static Test suite() { TestSuite suite = new TestSuite(); - suite.addTest(JettyBasicTest.suite()); + suite.addTest(new JUnit4TestAdapter(JettyBasicTest.class)); return suite; } } \ No newline at end of file

1 0

[continuum] BUILD SUCCESSFUL: Logback-Parent - Logback Access Module - Build Def: default maven2 buildDefinition
by John Noreplai 25 Jan '08

25 Jan '08

Online report : http://pixie:8091/continuum/buildResult.action?buildId=192&projectId=19 Build statistics: State: Ok Previous State: Failed Started at: Fri 25 Jan 2008 17:20:41 +0100 Finished at: Fri 25 Jan 2008 17:20:53 +0100 Total time: 12s Build Trigger: Schedule Build Number: 2 Exit code: 0 Building machine hostname: pixie Operating system : Linux(unknown) Java Home version : java version "1.5.0_08" Java(TM) 2 Runtime Environment, Standard Edition (build 1.5.0_08-b03) Java HotSpot(TM) 64-Bit Server VM (build 1.5.0_08-b03, mixed mode) Builder version : Maven version: 2.0.4 **************************************************************************** SCM Changes: **************************************************************************** Changed: ceki @ Fri 25 Jan 2008 17:13:12 +0100 Comment: - Joran's InterpretationContext no longer includes a substitutionPropertyMap. Now, only Context's have a property map. A number of classes has to change to reflect this change. - first-step to using JUnit 4. Files changed: /logback/trunk/logback-access/pom.xml ( 1611 ) /logback/trunk/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java ( 1611 ) /logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java ( 1611 ) /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/DynamicLoggerContextTest.java ( 1611 ) /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/ControlAction.java ( 1611 ) /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/CreateLogger.java ( 1611 ) /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/PackageTest.java ( 1611 ) /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/RandomUtilTest.java ( 1611 ) /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/Scenario.java ( 1611 ) /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/ScenarioMakerTest.java ( 1611 ) /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/SetLevel.java ( 1611 ) /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/TestAction.java ( 1611 ) /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderTest.java ( 1611 ) /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/BasicJoranTest.java ( 1611 ) /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/EvaluatorJoranTest.java ( 1611 ) /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/LoggingEventSerializationTest.java ( 1611 ) /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java ( 1611 ) /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/util/TestConstants.java ( 1611 ) /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/util/TeztConstants.java (from /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/util/TestConstants.java:1608) ( 1611 ) /logback/trunk/logback-core/src/main/java/ch/qos/logback/core/Context.java ( 1611 ) /logback/trunk/logback-core/src/main/java/ch/qos/logback/core/ContextBase.java ( 1611 ) /logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/ContextPropertyAction.java ( 1611 ) /logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/InterpretationContext.java ( 1611 ) /logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/OptionHelper.java ( 1611 ) /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/HelloAction.java ( 1611 ) /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/replay/FruitFactory.java ( 1611 ) /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/OptionHelperTest.java ( 1611 ) /logback/trunk/pom.xml ( 1611 ) **************************************************************************** Dependencies Changes: **************************************************************************** ch.qos.logback:logback-core:0.9.9-SNAPSHOT ch.qos.logback:logback-core:0.9.9-SNAPSHOT ch.qos.logback:logback-parent:0.9.9-SNAPSHOT **************************************************************************** Build Defintion: **************************************************************************** POM filename: pom.xml Goals: clean install Arguments: --batch-mode --non-recursive Build Fresh: false Always Build: false Default Build Definition: true Schedule: DEFAULT_SCHEDULE Description: default maven2 buildDefinition **************************************************************************** Test Summary: **************************************************************************** Tests: 0 Failures: 0 Total time: 0.0

1 0

svn commit: r1611 - in logback/trunk: . logback-access logback-access/src/main/java/ch/qos/logback/access/tomcat logback-classic/src/main/java/ch/qos/logback/classic logback-classic/src/test/java/ch/qos/logback/classic logback-classic/src/test/java/ch/qos/logback/classic/control logback-classic/src/test/java/ch/qos/logback/classic/db logback-classic/src/test/java/ch/qos/logback/classic/joran logback-classic/src/test/java/ch/qos/logback/classic/net logback-classic/src/test/java/ch/qos/logback/c
by noreply.ceki＠qos.ch 25 Jan '08

25 Jan '08

Author: ceki Date: Fri Jan 25 17:13:12 2008 New Revision: 1611 Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/ControlAction.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/util/TeztConstants.java - copied, changed from r1608, /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/util/TestConstants.java Removed: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/TestAction.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/util/TestConstants.java Modified: logback/trunk/logback-access/pom.xml logback/trunk/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/DynamicLoggerContextTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/CreateLogger.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/PackageTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/RandomUtilTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/Scenario.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/ScenarioMakerTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/SetLevel.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderTest.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/net/LoggingEventSerializationTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/Context.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/ContextBase.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/ContextPropertyAction.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/InterpretationContext.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/OptionHelper.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/HelloAction.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/replay/FruitFactory.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/OptionHelperTest.java logback/trunk/pom.xml Log: - Joran's InterpretationContext no longer includes a substitutionPropertyMap. Now, only Context's have a property map. A number of classes has to change to reflect this change. - first-step to using JUnit 4. Modified: logback/trunk/logback-access/pom.xml ============================================================================== --- logback/trunk/logback-access/pom.xml (original) +++ logback/trunk/logback-access/pom.xml Fri Jan 25 17:13:12 2008 @@ -103,9 +103,9 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <forkMode>once</forkMode> - <reportFormat>plain</reportFormat> - <trimStackTrace>false</trimStackTrace> + <fork>once</fork> + <reportFormat>plain</reportFormat> + <disableXmlReport>true</disableXmlReport> <excludes> <exclude>**/AllTest.java</exclude> <exclude>**/PackageTest.java</exclude> Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java Fri Jan 25 17:13:12 2008 @@ -189,7 +189,7 @@ return propertyMap; } - public void setProperty(String key, String val) { + public void putProperty(String key, String val) { this.propertyMap.put(key, val); } Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java Fri Jan 25 17:13:12 2008 @@ -86,8 +86,8 @@ } @Override - public void setProperty(String key, String val) { - super.setProperty(key, val); + public void putProperty(String key, String val) { + super.putProperty(key, val); syncRemoteView(); } Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/DynamicLoggerContextTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/DynamicLoggerContextTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/DynamicLoggerContextTest.java Fri Jan 25 17:13:12 2008 @@ -24,7 +24,7 @@ import ch.qos.logback.classic.control.Scenario; import ch.qos.logback.classic.control.ScenarioMaker; import ch.qos.logback.classic.control.SetLevel; -import ch.qos.logback.classic.control.TestAction; +import ch.qos.logback.classic.control.ControlAction; public class DynamicLoggerContextTest extends TestCase { @@ -54,7 +54,7 @@ List actionList = s.getActionList(); int size = actionList.size(); for (int i = 0; i < size; i++) { - TestAction action = (TestAction) actionList.get(i); + ControlAction action = (ControlAction) actionList.get(i); if (action instanceof CreateLogger) { CreateLogger cl = (CreateLogger) action; lc.getLogger(cl.getLoggerName()); Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/ControlAction.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/ControlAction.java Fri Jan 25 17:13:12 2008 @@ -0,0 +1,14 @@ +/** + * LOGBack: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 1999-2006, QOS.ch + * + * This library is free software, you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation. + */ +package ch.qos.logback.classic.control; + +public class ControlAction { + +} Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/CreateLogger.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/CreateLogger.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/CreateLogger.java Fri Jan 25 17:13:12 2008 @@ -10,7 +10,7 @@ package ch.qos.logback.classic.control; -public class CreateLogger extends TestAction { +public class CreateLogger extends ControlAction { final String loggerName; Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/PackageTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/PackageTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/PackageTest.java Fri Jan 25 17:13:12 2008 @@ -15,8 +15,8 @@ public static Test suite() { TestSuite suite = new TestSuite(); - suite.addTestSuite(RandomUtilTest.class); - suite.addTestSuite(ScenarioMakerTest.class); + suite.addTest(new JUnit4TestAdapter(RandomUtilTest.class)); + suite.addTest(new JUnit4TestAdapter(ScenarioMakerTest.class)); return suite; } } \ No newline at end of file Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/RandomUtilTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/RandomUtilTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/RandomUtilTest.java Fri Jan 25 17:13:12 2008 @@ -9,11 +9,12 @@ */ package ch.qos.logback.classic.control; +import org.junit.Test; +import static org.junit.Assert.assertTrue; -import junit.framework.*; - -public class RandomUtilTest extends TestCase { +public class RandomUtilTest { + @Test public void testGaussian() { long sum = 0; Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/Scenario.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/Scenario.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/Scenario.java Fri Jan 25 17:13:12 2008 @@ -19,7 +19,7 @@ // the frequency of a set levelInt event for every create logger event private final static int CREATE_LOGGER_TO_SET_LEVEL_FREQUENCY = 5; - private List<TestAction> actionList = new Vector<TestAction>(); + private List<ControlAction> actionList = new Vector<ControlAction>(); public void addAction(CreateLogger action) { actionList.add(action); @@ -29,15 +29,15 @@ } } - public List<TestAction> getActionList() { - return new ArrayList<TestAction>(actionList); + public List<ControlAction> getActionList() { + return new ArrayList<ControlAction>(actionList); } public int size() { return actionList.size(); } - public TestAction get(int i) { - return (TestAction) actionList.get(i); + public ControlAction get(int i) { + return (ControlAction) actionList.get(i); } } Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/ScenarioMakerTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/ScenarioMakerTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/ScenarioMakerTest.java Fri Jan 25 17:13:12 2008 @@ -9,12 +9,12 @@ */ package ch.qos.logback.classic.control; -import junit.framework.*; - import java.util.List; +import org.junit.Test; + -public class ScenarioMakerTest extends TestCase { +public class ScenarioMakerTest { // public void test1() { // Scenario s = ScenarioMaker.makeTypeAScenario(10); @@ -24,9 +24,10 @@ // } // } + @Test public void testTypeB() { Scenario s = ScenarioMaker.makeTypeBScenario(30); - List actionList = s.getActionList(); + List<ControlAction> actionList = s.getActionList(); for(int i = 0; i < actionList.size(); i++) { //System.out.println(actionList.get(i)) ; } Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/SetLevel.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/SetLevel.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/control/SetLevel.java Fri Jan 25 17:13:12 2008 @@ -11,7 +11,7 @@ import ch.qos.logback.classic.Level; -public class SetLevel extends TestAction { +public class SetLevel extends ControlAction { final String loggerName; final Level level; Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderTest.java Fri Jan 25 17:13:12 2008 @@ -98,7 +98,7 @@ public void testContextInfo() throws SQLException { LoggingEvent event = createLoggingEvent(); - lc.setProperty("testKey1", "testValue1"); + lc.putProperty("testKey1", "testValue1"); appender.append(event); 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 Fri Jan 25 17:13:12 2008 @@ -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.TestConstants; +import ch.qos.logback.classic.util.TeztConstants; import ch.qos.logback.core.joran.spi.JoranException; import ch.qos.logback.core.read.ListAppender; @@ -33,7 +33,7 @@ JoranConfigurator jc = new JoranConfigurator(); LoggerContext loggerContext = new LoggerContext(); jc.setContext(loggerContext); - jc.doConfigure(TestConstants.TEST_DIR_PREFIX + "input/joran/simpleList.xml"); + jc.doConfigure(TeztConstants.TEST_DIR_PREFIX + "input/joran/simpleList.xml"); //StatusPrinter.print(loggerContext.getStatusManager()); @@ -52,7 +52,7 @@ JoranConfigurator jc = new JoranConfigurator(); LoggerContext loggerContext = new LoggerContext(); jc.setContext(loggerContext); - jc.doConfigure(TestConstants.TEST_DIR_PREFIX + "input/joran/simpleLevel.xml"); + jc.doConfigure(TeztConstants.TEST_DIR_PREFIX + "input/joran/simpleLevel.xml"); Logger logger = loggerContext.getLogger(this.getClass().getName()); Logger root = loggerContext.getLogger(LoggerContext.ROOT_NAME); @@ -67,7 +67,7 @@ JoranConfigurator jc = new JoranConfigurator(); LoggerContext loggerContext = new LoggerContext(); jc.setContext(loggerContext); - jc.doConfigure(TestConstants.TEST_DIR_PREFIX + "input/joran/callerData.xml"); + jc.doConfigure(TeztConstants.TEST_DIR_PREFIX + "input/joran/callerData.xml"); //StatusPrinter.print(loggerContext); @@ -93,7 +93,7 @@ JoranConfigurator jc = new JoranConfigurator(); LoggerContext loggerContext = new LoggerContext(); jc.setContext(loggerContext); - jc.doConfigure(TestConstants.TEST_DIR_PREFIX + "input/joran/turbo.xml"); + jc.doConfigure(TeztConstants.TEST_DIR_PREFIX + "input/joran/turbo.xml"); //StatusPrinter.print(loggerContext.getStatusManager()); @@ -109,7 +109,7 @@ JoranConfigurator jc = new JoranConfigurator(); LoggerContext loggerContext = new LoggerContext(); jc.setContext(loggerContext); - jc.doConfigure(TestConstants.TEST_DIR_PREFIX + "input/joran/turbo2.xml"); + jc.doConfigure(TeztConstants.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 Fri Jan 25 17:13:12 2008 @@ -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.TestConstants; +import ch.qos.logback.classic.util.TeztConstants; 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(TestConstants.TEST_DIR_PREFIX + "input/joran/simpleEvaluator.xml"); + jc.doConfigure(TeztConstants.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(TestConstants.TEST_DIR_PREFIX + "input/joran/ignore.xml"); + jc.doConfigure(TeztConstants.TEST_DIR_PREFIX + "input/joran/ignore.xml"); //StatusPrinter.print(loggerContext.getStatusManager()); Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/LoggingEventSerializationTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/LoggingEventSerializationTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/LoggingEventSerializationTest.java Fri Jan 25 17:13:12 2008 @@ -62,7 +62,7 @@ bos = new ByteArrayOutputStream(); oos = new ObjectOutputStream(bos); - lc.setProperty("testKey", "testValue"); + lc.putProperty("testKey", "testValue"); LoggingEvent event = createLoggingEvent(); oos.writeObject(event); Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java Fri Jan 25 17:13:12 2008 @@ -158,7 +158,7 @@ private void configureClient() { lc = new LoggerContext(); lc.setName("test"); - lc.setProperty("testKey", "testValue"); + lc.putProperty("testKey", "testValue"); Logger root = lc.getLogger(LoggerContext.ROOT_NAME); SocketAppender socketAppender = new SocketAppender(); socketAppender.setContext(lc); Copied: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/util/TeztConstants.java (from r1608, /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/util/TestConstants.java) ============================================================================== --- /logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/util/TestConstants.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/util/TeztConstants.java Fri Jan 25 17:13:12 2008 @@ -1,7 +1,13 @@ package ch.qos.logback.classic.util; - -public class TestConstants { +/** + * + * It seems to bother + * + * @author gulcu + * + */ +public class TeztConstants { public static final String TEST_DIR_PREFIX = "src/test/"; Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/Context.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/Context.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/Context.java Fri Jan 25 17:13:12 2008 @@ -9,8 +9,6 @@ */ package ch.qos.logback.core; -import java.util.Map; - import ch.qos.logback.core.status.StatusManager; @@ -41,7 +39,7 @@ * the returned Map will have no effect (on the original.) * @return */ - public Map<String, String> getPropertyMap(); + //public Map<String, String> getPropertyMap(); /** * Get the property of this context. @@ -51,7 +49,7 @@ /** * Set a property of this context. */ - public void setProperty(String key, String value); + public void putProperty(String key, String value); /** * Contexts are named objects. Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/ContextBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/ContextBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/ContextBase.java Fri Jan 25 17:13:12 2008 @@ -32,7 +32,7 @@ return new HashMap<String, String>(propertyMap); } - public void setProperty(String key, String val) { + public void putProperty(String key, String val) { this.propertyMap.put(key, val); } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/ContextPropertyAction.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/ContextPropertyAction.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/ContextPropertyAction.java Fri Jan 25 17:13:12 2008 @@ -18,11 +18,11 @@ // TODO : test this method for(Object o: props.keySet()) { String key = (String) o; - this.context.setProperty(key, props.getProperty(key)); + this.context.putProperty(key, props.getProperty(key)); } } public void setProperty(InterpretationContext ec, String key, String value) { - this.context.setProperty(key, value); + this.context.putProperty(key, value); } } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/InterpretationContext.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/InterpretationContext.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/InterpretationContext.java Fri Jan 25 17:13:12 2008 @@ -38,15 +38,14 @@ public class InterpretationContext extends ContextAwareBase { Stack<Object> objectStack; Map<String, Object> objectMap; - Map<String, String> substitutionMap; Interpreter joranInterpreter; final List<InPlayListener> listenerList = new ArrayList<InPlayListener>(); public InterpretationContext(Context context, Interpreter joranInterpreter) { + this.context = context; this.joranInterpreter = joranInterpreter; objectStack = new Stack<Object> (); objectMap = new HashMap<String, Object>(5); - substitutionMap = new HashMap<String, String>(); } String updateLocationInfo(String msg) { @@ -111,7 +110,7 @@ // values with leading or trailing spaces are bad. We remove them now. value = value.trim(); - substitutionMap.put(key, value); + context.putProperty(key, value); } public void addSubstitutionProperties(Properties props) { @@ -139,14 +138,14 @@ public String getSubstitutionProperty(String key) { - return substitutionMap.get(key); + return context.getProperty(key); } public String subst(String value) { if (value == null) { return null; } - return OptionHelper.substVars(value, substitutionMap, context.getPropertyMap()); + return OptionHelper.substVars(value, context, null); } public void addInPlayListener(InPlayListener ipl) { Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/OptionHelper.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/OptionHelper.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/OptionHelper.java Fri Jan 25 17:13:12 2008 @@ -129,7 +129,7 @@ * @throws IllegalArgumentException * if <code>val</code> is malformed. */ - public static String substVars(String val, Map<String, String> primaryMap, + public static String substVars(String val, Context context, Map<String, String> secondaryMap) { StringBuffer sbuf = new StringBuffer(); @@ -172,9 +172,7 @@ String replacement = null; // first try the props passed as parameter - if (primaryMap != null) { - replacement = primaryMap.get(key); - } + replacement = context.getProperty(key); if (replacement == null && secondaryMap != null) { replacement = secondaryMap.get(key); @@ -197,7 +195,7 @@ // where the properties are // x1=p1 // x2=${x1} - String recursiveReplacement = substVars(replacement, primaryMap, + String recursiveReplacement = substVars(replacement, context, secondaryMap); sbuf.append(recursiveReplacement); } Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/HelloAction.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/HelloAction.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/HelloAction.java Fri Jan 25 17:13:12 2008 @@ -27,7 +27,7 @@ */ public void begin(InterpretationContext ec, String name, Attributes attributes) { String str = "Hello "+attributes.getValue("name")+"."; - ec.getContext().setProperty("hello", str); + ec.getContext().putProperty("hello", str); } /** Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/replay/FruitFactory.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/replay/FruitFactory.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/replay/FruitFactory.java Fri Jan 25 17:13:12 2008 @@ -22,7 +22,7 @@ Context context = new ContextBase(); this.fruit = null; - context.setProperty("fruitKey", "orange-"+count); + context.putProperty("fruitKey", "orange-"+count); // for next round count++; FruitConfigurator fruitConfigurator = new FruitConfigurator(this); Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/OptionHelperTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/OptionHelperTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/OptionHelperTest.java Fri Jan 25 17:13:12 2008 @@ -3,28 +3,28 @@ import java.util.HashMap; import java.util.Map; +import ch.qos.logback.core.Context; +import ch.qos.logback.core.ContextBase; + import junit.framework.TestCase; public class OptionHelperTest extends TestCase { String text = "Testing ${v1} variable substitution ${v2}"; String expected = "Testing if variable substitution works"; - Map<String, String> primaryMap; + Context context = new ContextBase(); Map<String, String> secondaryMap; @Override protected void setUp() throws Exception { - primaryMap = new HashMap<String, String>(); secondaryMap = new HashMap<String, String>(); super.setUp(); } @Override protected void tearDown() throws Exception { - primaryMap = null; - primaryMap = null; super.tearDown(); } @@ -48,18 +48,18 @@ } public void testSubstVarsPrimaryOnly() { - primaryMap.put("v1", "if"); - primaryMap.put("v2", "works"); + context.putProperty("v1", "if"); + context.putProperty("v2", "works"); - String result = OptionHelper.substVars(text, primaryMap, null); + String result = OptionHelper.substVars(text, context, null); assertEquals(expected, result); } public void testSubstVarsPrimaryAndSecondary() { - primaryMap.put("v1", "if"); + context.putProperty("v1", "if"); secondaryMap.put("v2", "works"); - String result = OptionHelper.substVars(text, primaryMap, secondaryMap); + String result = OptionHelper.substVars(text, context, secondaryMap); assertEquals(expected, result); } @@ -68,7 +68,7 @@ System.setProperty("v1", "if"); System.setProperty("v2", "works"); - String result = OptionHelper.substVars(text, null, null); + String result = OptionHelper.substVars(text, context, null); assertEquals(expected, result); System.clearProperty("v1"); @@ -76,20 +76,20 @@ } public void testSubstVarsWithDefault() { - primaryMap.put("v1", "if"); + context.putProperty("v1", "if"); String textWithDefault = "Testing ${v1} variable substitution ${v2:-toto}"; String resultWithDefault = "Testing if variable substitution toto"; - String result = OptionHelper.substVars(textWithDefault, primaryMap, null); + String result = OptionHelper.substVars(textWithDefault, context, null); assertEquals(resultWithDefault, result); } public void testSubstVarsRecursive() { - primaryMap.put("v1", "if"); - primaryMap.put("v2", "${v3}"); - primaryMap.put("v3", "works"); + context.putProperty("v1", "if"); + context.putProperty("v2", "${v3}"); + context.putProperty("v3", "works"); - String result = OptionHelper.substVars(text, primaryMap, null); + String result = OptionHelper.substVars(text, context, null); assertEquals(expected, result); } Modified: logback/trunk/pom.xml ============================================================================== --- logback/trunk/pom.xml (original) +++ logback/trunk/pom.xml Fri Jan 25 17:13:12 2008 @@ -29,7 +29,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>3.8.1</version> + <version>4.4</version> <scope>test</scope> </dependency> </dependencies>

1 0

[Bug 124] New: no log messages after redeployment
by bugzilla-daemon＠pixie.qos.ch 25 Jan '08

25 Jan '08

http://bugzilla.qos.ch/show_bug.cgi?id=124 Summary: no log messages after redeployment 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: ingo.siebert(a)cas.de Hi, I use the JNDI switch for logback. If I undeploy my application, the old JNDI context ist destroyed (it's a log messge). That's fine. But I redeploy the same application with the same context name, no logging messages are displayed. That's very frustrating. If I restart Tomcat6, then the deployed application comes up and i see the messages again. The libs which are needed by my application are stored in the tomcat6/sharedLib folder. Any idea why the messages are missing? Ingo This is my web.xml: <filter> <filter-name>LoggerContextFilter</filter-name> <filter-class>ch.qos.logback.classic.selector.servlet.LoggerContextFilter</filter-class> </filter> <filter-mapping> <filter-name>LoggerContextFilter</filter-name> <url-pattern>/*</url-pattern> </filter-mapping> <listener> <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class> </listener>  <listener> <listener-class>ch.qos.logback.classic.selector.servlet.ContextDetachingSCL</listener-class> </listener> ... <env-entry> <description>JNDI logging context for this app</description> <env-entry-name>logback/context-name</env-entry-name> <env-entry-value>EIMContext-1</env-entry-value> <env-entry-type>java.lang.String</env-entry-type> </env-entry> <env-entry> <description>URL for configuring logback context</description> <env-entry-name>logback/configuration-resource</env-entry-name> <env-entry-value>eim_logback.xml</env-entry-value> <env-entry-type>java.lang.String</env-entry-type> </env-entry> -- 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 0

[continuum] BUILD FAILURE: Logback-Parent - Logback Access Module - Build Def: default maven2 buildDefinition
by John Noreplai 25 Jan '08

25 Jan '08

Online report : http://pixie:8091/continuum/buildResult.action?buildId=186&projectId=19 Build statistics: State: Failed Previous State: Failed Started at: Fri 25 Jan 2008 12:40:39 +0100 Finished at: Fri 25 Jan 2008 12:40:51 +0100 Total time: 11s Build Trigger: Schedule Build Number: 1 Exit code: 1 Building machine hostname: pixie Operating system : Linux(unknown) Java Home version : java version "1.5.0_08" Java(TM) 2 Runtime Environment, Standard Edition (build 1.5.0_08-b03) Java HotSpot(TM) 64-Bit Server VM (build 1.5.0_08-b03, mixed mode) Builder version : Maven version: 2.0.4 **************************************************************************** SCM Changes: **************************************************************************** Changed: ceki @ Fri 25 Jan 2008 12:21:19 +0100 Comment: - bug 109 (corrected, with test case showing correct survival of AccessEvent fields values) Files changed: /logback/trunk/logback-access/src/main/java/ch/qos/logback/access/spi/AccessEvent.java ( 1609 ) /logback/trunk/logback-access/src/test/java/ch/qos/logback/access/dummy/DummyResponse.java ( 1609 ) /logback/trunk/logback-access/src/test/java/ch/qos/logback/access/spi/AccessEventTest.java ( 1609 ) **************************************************************************** Dependencies Changes: **************************************************************************** ch.qos.logback:logback-core:0.9.9-SNAPSHOT ch.qos.logback:logback-core:0.9.9-SNAPSHOT ch.qos.logback:logback-parent:0.9.9-SNAPSHOT **************************************************************************** Build Defintion: **************************************************************************** POM filename: pom.xml Goals: clean install Arguments: --batch-mode --non-recursive Build Fresh: false Always Build: false Default Build Definition: true Schedule: DEFAULT_SCHEDULE Description: default maven2 buildDefinition **************************************************************************** Test Summary: **************************************************************************** Tests: 30 Failures: 0 Total time: 2.4359999

1 0

svn commit: r1610 - logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic
by noreply.ceki＠qos.ch 25 Jan '08

25 Jan '08

Author: ceki Date: Fri Jan 25 12:32:25 2008 New Revision: 1610 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/Logger.java Log: - removing unnecessary "if(isDebugEnabledTest())" test Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/Logger.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/Logger.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/Logger.java Fri Jan 25 12:32:25 2008 @@ -411,9 +411,7 @@ } public void debug(String msg, Throwable t) { - if (isDebugEnabled()) { - filterAndLog(FQCN, null, Level.DEBUG, msg, null, t); - } + filterAndLog(FQCN, null, Level.DEBUG, msg, null, t); } public final void debug(Marker marker, String msg) {

1 0