October 2006 - logback-dev - mailman3.qos.ch

svn commit: r695 - in logback/trunk: . logback-core/src/main/java/ch/qos/logback/core/joran logback-core/src/test/java/ch/qos/logback/core/joran
by noreply.ceki＠qos.ch 16 Oct '06

16 Oct '06

Author: ceki Date: Mon Oct 16 17:43:30 2006 New Revision: 695 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/GenericConfigurator.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/JoranConfiguratorBase.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialConfigurator.java logback/trunk/pom.xml Log: Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/GenericConfigurator.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/GenericConfigurator.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/GenericConfigurator.java Mon Oct 16 17:43:30 2006 @@ -77,7 +77,7 @@ } abstract protected void addInstanceRules(RuleStore rs); - abstract protected void addImpliciutRules(Interpreter interpreter); + abstract protected void addImplicitRules(Interpreter interpreter); protected void buildInterpreter() { RuleStore rs = new SimpleRuleStore(context); @@ -85,7 +85,7 @@ this.interpreter = new Interpreter(rs); ExecutionContext ec = interpreter.getExecutionContext(); ec.setContext(context); - addImpliciutRules(interpreter); + addImplicitRules(interpreter); } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/JoranConfiguratorBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/JoranConfiguratorBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/JoranConfiguratorBase.java Mon Oct 16 17:43:30 2006 @@ -66,7 +66,7 @@ } @Override - protected void addImpliciutRules(Interpreter interpreter) { + protected void addImplicitRules(Interpreter interpreter) { // The following line adds the capability to parse nested components NestedComponentIA nestedIA = new NestedComponentIA(); nestedIA.setContext(context); Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialConfigurator.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialConfigurator.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialConfigurator.java Mon Oct 16 17:43:30 2006 @@ -8,7 +8,7 @@ public class TrivialConfigurator extends GenericConfigurator { @Override - protected void addImpliciutRules(Interpreter interpreter) { + protected void addImplicitRules(Interpreter interpreter) { } @Override Modified: logback/trunk/pom.xml ============================================================================== --- logback/trunk/pom.xml (original) +++ logback/trunk/pom.xml Mon Oct 16 17:43:30 2006 @@ -115,6 +115,27 @@ <version>1.0-beta-1</version> </extension> </extensions> + + <plugins> +  + <plugin> + <artifactId>maven-one-plugin</artifactId> + <executions> + <execution> + <configuration> + <remoteRepositoryUrl>file:////magma/maven/remote_repository</remoteRepositoryUrl> + </configuration> + <goals> + <goal>deploy-maven-one-repository</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + + + + </build> <reporting> @@ -183,7 +204,6 @@ <outputDirectory>target/site/dist/</outputDirectory> </configuration> </plugin> - </plugins> </reporting> @@ -199,17 +219,19 @@ <id>pixie</id> <url>scp://pixie/var/www/logback.qos.ch/htdocs/kidding/</url> </site> - + <id>lodh-release-repository</id> + <name>LODH repository</name> + <url>file:////gaugin.dev.biz.lodh.com/maven2/lodh-release-repository</url> + </repository> + <snapshotRepository> + <id>lodh-snapshot-repository</id> + <name>LODH repository</name> + <url>file:////gaugin.dev.biz.lodh.com/maven2/lodh-snapshot-repository</url> + <uniqueVersion>false</uniqueVersion> + </snapshotRepository> + + </distributionManagement> </project> \ No newline at end of file

1 0

svn commit: r694 - logback/trunk/logback-classic/examples/src/chapter5
by noreply.seb＠qos.ch 16 Oct '06

16 Oct '06

Author: seb Date: Mon Oct 16 17:37:44 2006 New Revision: 694 Modified: logback/trunk/logback-classic/examples/src/chapter5/callerEvaluatorConfig.xml Log: updated joran doc and examples Modified: logback/trunk/logback-classic/examples/src/chapter5/callerEvaluatorConfig.xml ============================================================================== --- logback/trunk/logback-classic/examples/src/chapter5/callerEvaluatorConfig.xml (original) +++ logback/trunk/logback-classic/examples/src/chapter5/callerEvaluatorConfig.xml Mon Oct 16 17:37:44 2006 @@ -1,7 +1,7 @@ <configuration> <evaluator name="DISPLAY_CALLER_EVAL"> - <Expression>logger.getName().contains("chapter5") && message.contains("stacktrace")</Expression> + <Expression>logger.getName().contains("chapter5") && message.contains("stacktrace")</Expression> </evaluator> <appender name="STDOUT"

1 0

svn commit: r693 - in logback/trunk: logback-core/src/test/java/ch/qos/logback/core/rolling logback-core/src/test/witness/rolling logback-site/src/site/xdocTemplates logback-site/src/site/xdocTemplates/manual
by noreply.seb＠qos.ch 16 Oct '06

16 Oct '06

Author: seb Date: Mon Oct 16 16:54:52 2006 New Revision: 693 Added: logback/trunk/logback-core/src/test/witness/rolling/tbr-test3.2 logback/trunk/logback-core/src/test/witness/rolling/tbr-test6.2 Removed: logback/trunk/logback-core/src/test/witness/rolling/tbr-test1.3 logback/trunk/logback-core/src/test/witness/rolling/tbr-test2.3 logback/trunk/logback-core/src/test/witness/rolling/tbr-test3.2.gz logback/trunk/logback-core/src/test/witness/rolling/tbr-test3.3 logback/trunk/logback-core/src/test/witness/rolling/tbr-test4.3 logback/trunk/logback-core/src/test/witness/rolling/tbr-test5.3 logback/trunk/logback-core/src/test/witness/rolling/tbr-test6.2.gz logback/trunk/logback-core/src/test/witness/rolling/tbr-test6.3 Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeBasedRollingTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java logback/trunk/logback-core/src/test/witness/rolling/tbr-test1.1 logback/trunk/logback-core/src/test/witness/rolling/tbr-test1.2 logback/trunk/logback-core/src/test/witness/rolling/tbr-test2.1 logback/trunk/logback-core/src/test/witness/rolling/tbr-test2.2 logback/trunk/logback-core/src/test/witness/rolling/tbr-test3.0.gz logback/trunk/logback-core/src/test/witness/rolling/tbr-test3.1.gz logback/trunk/logback-core/src/test/witness/rolling/tbr-test4.1 logback/trunk/logback-core/src/test/witness/rolling/tbr-test4.2 logback/trunk/logback-core/src/test/witness/rolling/tbr-test5.1 logback/trunk/logback-core/src/test/witness/rolling/tbr-test5.2 logback/trunk/logback-core/src/test/witness/rolling/tbr-test6.1.gz logback/trunk/logback-site/src/site/xdocTemplates/joran.xml logback/trunk/logback-site/src/site/xdocTemplates/manual/layouts.xml Log: faster tests. Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeBasedRollingTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeBasedRollingTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/SizeBasedRollingTest.java Mon Oct 16 16:54:52 2006 @@ -134,7 +134,7 @@ // } for (int i = 0; i < 45; i++) { - Thread.sleep(100); + Thread.sleep(10); rfa.doAppend("hello"); } @@ -201,7 +201,7 @@ // } for (int i = 0; i < 45; i++) { - Thread.sleep(100); + Thread.sleep(10); rfa.doAppend("hello"); } Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java Mon Oct 16 16:54:52 2006 @@ -91,11 +91,11 @@ rfa.start(); SimpleDateFormat sdf = new SimpleDateFormat(DATE_PATTERN); - String[] filenames = new String[4]; + String[] filenames = new String[3]; Calendar cal = Calendar.getInstance(); - for (int i = 0; i < 4; i++) { + for (int i = 0; i < 3; i++) { filenames[i] = Constants.TEST_DIR_PREFIX + "output/test1-" + sdf.format(cal.getTime()); cal.add(Calendar.SECOND, 1); @@ -105,16 +105,16 @@ delayUntilNextSecond(100); System.out.println("Done waiting."); - for (int i = 0; i < 5; i++) { + for (int i = 0; i < 20; i++) { rfa.doAppend("Hello---" + i); - Thread.sleep(500); + Thread.sleep(50); } - for (int i = 0; i < 4; i++) { - // System.out.println(i + " expected filename [" + filenames[i] + "]."); - } +// for (int i = 0; i < 3; i++) { +// System.out.println(i + " expected filename [" + filenames[i] + "]."); +// } - for (int i = 0; i < 4; i++) { + for (int i = 0; i < 3; i++) { assertTrue(Compare.compare(filenames[i], Constants.TEST_DIR_PREFIX + "witness/rolling/tbr-test1." + i)); } @@ -135,11 +135,11 @@ rfa1.start(); SimpleDateFormat sdf = new SimpleDateFormat(DATE_PATTERN); - String[] filenames = new String[4]; + String[] filenames = new String[3]; Calendar cal = Calendar.getInstance(); - for (int i = 0; i < 4; i++) { + for (int i = 0; i < 3; i++) { filenames[i] = Constants.TEST_DIR_PREFIX + "output/test2-" + sdf.format(cal.getTime()); cal.add(Calendar.SECOND, 1); @@ -149,9 +149,9 @@ delayUntilNextSecond(100); System.out.println("Done waiting."); - for (int i = 0; i <= 2; i++) { + for (int i = 0; i <= 10; i++) { rfa1.doAppend("Hello---" + i); - Thread.sleep(500); + Thread.sleep(50); } rfa1.stop(); @@ -166,12 +166,12 @@ rfa2.setRollingPolicy(tbrp2); rfa2.start(); - for (int i = 3; i <= 4; i++) { + for (int i = 3; i <= 10; i++) { rfa2.doAppend("Hello---" + i); - Thread.sleep(500); + Thread.sleep(50); } - for (int i = 0; i < 4; i++) { + for (int i = 0; i < 3; i++) { assertTrue(Compare.compare(filenames[i], Constants.TEST_DIR_PREFIX + "witness/rolling/tbr-test2." + i)); } @@ -196,7 +196,7 @@ Calendar cal = Calendar.getInstance(); - for (int i = 0; i < 3; i++) { + for (int i = 0; i < 2; i++) { filenames[i] = Constants.TEST_DIR_PREFIX + "output/test3-" + sdf.format(cal.getTime()) + ".gz"; cal.add(Calendar.SECOND, 1); @@ -208,22 +208,22 @@ delayUntilNextSecond(100); System.out.println("Done waiting."); - for (int i = 0; i < 5; i++) { + for (int i = 0; i < 20; i++) { rfa.doAppend("Hello---" + i); - Thread.sleep(500); + Thread.sleep(50); } - for (int i = 0; i < 4; i++) { - // System.out.println(i + " expected filename [" + filenames[i] + "]."); - } +// for (int i = 0; i < 3; i++) { +// System.out.println(i + " expected filename [" + filenames[i] + "]."); +// } - for (int i = 0; i < 3; i++) { + for (int i = 0; i < 2; i++) { assertTrue(Compare.gzCompare(filenames[i], Constants.TEST_DIR_PREFIX + "witness/rolling/tbr-test3." + i + ".gz")); } assertTrue(Compare.compare(filenames[3], Constants.TEST_DIR_PREFIX - + "witness/rolling/tbr-test3.3")); + + "witness/rolling/tbr-test3.2")); } /** @@ -242,24 +242,24 @@ rfa1.start(); SimpleDateFormat sdf = new SimpleDateFormat(DATE_PATTERN); - String[] filenames = new String[4]; + String[] filenames = new String[3]; Calendar cal = Calendar.getInstance(); - for (int i = 0; i < 3; i++) { + for (int i = 0; i < 2; i++) { filenames[i] = Constants.TEST_DIR_PREFIX + "output/test4-" + sdf.format(cal.getTime()); cal.add(Calendar.SECOND, 1); } - filenames[3] = Constants.TEST_DIR_PREFIX + "output/test4.log"; + filenames[2] = Constants.TEST_DIR_PREFIX + "output/test4.log"; System.out.println("Waiting until next second and 100 millis."); delayUntilNextSecond(100); System.out.println("Done waiting."); - for (int i = 0; i <= 2; i++) { + for (int i = 0; i <= 22; i++) { rfa1.doAppend("Hello---" + i); - Thread.sleep(500); + Thread.sleep(50); } rfa1.stop(); @@ -275,12 +275,12 @@ rfa2.setRollingPolicy(tbrp2); rfa2.start(); - for (int i = 3; i <= 4; i++) { + for (int i = 3; i <= 5; i++) { rfa2.doAppend("Hello---" + i); - Thread.sleep(500); + Thread.sleep(20); } - for (int i = 0; i < 4; i++) { + for (int i = 0; i < 3; i++) { assertTrue(Compare.compare(filenames[i], Constants.TEST_DIR_PREFIX + "witness/rolling/tbr-test4." + i)); } @@ -306,24 +306,24 @@ Calendar cal = Calendar.getInstance(); - for (int i = 0; i < 3; i++) { + for (int i = 0; i < 2; i++) { filenames[i] = Constants.TEST_DIR_PREFIX + "output/test5-" + sdf.format(cal.getTime()); cal.add(Calendar.SECOND, 1); } - filenames[3] = Constants.TEST_DIR_PREFIX + "output/test5.log"; + filenames[2] = Constants.TEST_DIR_PREFIX + "output/test5.log"; System.out.println("Waiting until next second and 100 millis."); delayUntilNextSecond(100); System.out.println("Done waiting."); - for (int i = 0; i < 5; i++) { + for (int i = 0; i < 20; i++) { rfa.doAppend("Hello---" + i); - Thread.sleep(500); + Thread.sleep(50); } - for (int i = 0; i < 4; i++) { + for (int i = 0; i < 3; i++) { assertTrue(Compare.compare(filenames[i], Constants.TEST_DIR_PREFIX + "witness/rolling/tbr-test5." + i)); } @@ -349,34 +349,34 @@ Calendar cal = Calendar.getInstance(); - for (int i = 0; i < 3; i++) { + for (int i = 0; i < 2; i++) { filenames[i] = Constants.TEST_DIR_PREFIX + "output/test6-" + sdf.format(cal.getTime()) + ".gz"; cal.add(Calendar.SECOND, 1); } - filenames[3] = Constants.TEST_DIR_PREFIX + "output/test6.log"; + filenames[2] = Constants.TEST_DIR_PREFIX + "output/test6.log"; System.out.println("Waiting until next second and 100 millis."); delayUntilNextSecond(100); System.out.println("Done waiting."); - for (int i = 0; i < 5; i++) { + for (int i = 0; i < 20; i++) { rfa.doAppend("Hello---" + i); - Thread.sleep(500); + Thread.sleep(50); } for (int i = 0; i < 4; i++) { // System.out.println(i + " expected filename [" + filenames[i] + "]."); } - for (int i = 0; i < 3; i++) { + for (int i = 0; i < 2; i++) { assertTrue(Compare.gzCompare(filenames[i], Constants.TEST_DIR_PREFIX + "witness/rolling/tbr-test6." + i + ".gz")); } - assertTrue(Compare.compare(filenames[3], Constants.TEST_DIR_PREFIX - + "witness/rolling/tbr-test6.3")); + assertTrue(Compare.compare(filenames[2], Constants.TEST_DIR_PREFIX + + "witness/rolling/tbr-test6.2")); } // public void testWithJoran1() throws Exception { Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test1.1 ============================================================================== --- logback/trunk/logback-core/src/test/witness/rolling/tbr-test1.1 (original) +++ logback/trunk/logback-core/src/test/witness/rolling/tbr-test1.1 Mon Oct 16 16:54:52 2006 @@ -1,2 +1,15 @@ -Hello---0 -Hello---1 +Hello---0 +Hello---1 +Hello---2 +Hello---3 +Hello---4 +Hello---5 +Hello---6 +Hello---7 +Hello---8 +Hello---9 +Hello---10 +Hello---11 +Hello---12 +Hello---13 +Hello---14 Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test1.2 ============================================================================== --- logback/trunk/logback-core/src/test/witness/rolling/tbr-test1.2 (original) +++ logback/trunk/logback-core/src/test/witness/rolling/tbr-test1.2 Mon Oct 16 16:54:52 2006 @@ -1,2 +1,5 @@ -Hello---2 -Hello---3 +Hello---15 +Hello---16 +Hello---17 +Hello---18 +Hello---19 Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test2.1 ============================================================================== --- logback/trunk/logback-core/src/test/witness/rolling/tbr-test2.1 (original) +++ logback/trunk/logback-core/src/test/witness/rolling/tbr-test2.1 Mon Oct 16 16:54:52 2006 @@ -1,2 +1,15 @@ -Hello---0 -Hello---1 +Hello---0 +Hello---1 +Hello---2 +Hello---3 +Hello---4 +Hello---5 +Hello---6 +Hello---7 +Hello---8 +Hello---9 +Hello---10 +Hello---3 +Hello---4 +Hello---5 +Hello---6 Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test2.2 ============================================================================== --- logback/trunk/logback-core/src/test/witness/rolling/tbr-test2.2 (original) +++ logback/trunk/logback-core/src/test/witness/rolling/tbr-test2.2 Mon Oct 16 16:54:52 2006 @@ -1,2 +1,4 @@ -Hello---2 -Hello---3 +Hello---7 +Hello---8 +Hello---9 +Hello---10 Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test3.0.gz ============================================================================== Binary files. No diff available. Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test3.1.gz ============================================================================== Binary files. No diff available. Added: logback/trunk/logback-core/src/test/witness/rolling/tbr-test3.2 ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/test/witness/rolling/tbr-test3.2 Mon Oct 16 16:54:52 2006 @@ -0,0 +1,5 @@ +Hello---15 +Hello---16 +Hello---17 +Hello---18 +Hello---19 Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test4.1 ============================================================================== --- logback/trunk/logback-core/src/test/witness/rolling/tbr-test4.1 (original) +++ logback/trunk/logback-core/src/test/witness/rolling/tbr-test4.1 Mon Oct 16 16:54:52 2006 @@ -1,2 +1,15 @@ -Hello---0 -Hello---1 +Hello---0 +Hello---1 +Hello---2 +Hello---3 +Hello---4 +Hello---5 +Hello---6 +Hello---7 +Hello---8 +Hello---9 +Hello---10 +Hello---11 +Hello---12 +Hello---13 +Hello---14 Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test4.2 ============================================================================== --- logback/trunk/logback-core/src/test/witness/rolling/tbr-test4.2 (original) +++ logback/trunk/logback-core/src/test/witness/rolling/tbr-test4.2 Mon Oct 16 16:54:52 2006 @@ -1,2 +1,11 @@ -Hello---2 -Hello---3 +Hello---15 +Hello---16 +Hello---17 +Hello---18 +Hello---19 +Hello---20 +Hello---21 +Hello---22 +Hello---3 +Hello---4 +Hello---5 \ No newline at end of file Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test5.1 ============================================================================== --- logback/trunk/logback-core/src/test/witness/rolling/tbr-test5.1 (original) +++ logback/trunk/logback-core/src/test/witness/rolling/tbr-test5.1 Mon Oct 16 16:54:52 2006 @@ -1,2 +1,15 @@ -Hello---0 -Hello---1 +Hello---0 +Hello---1 +Hello---2 +Hello---3 +Hello---4 +Hello---5 +Hello---6 +Hello---7 +Hello---8 +Hello---9 +Hello---10 +Hello---11 +Hello---12 +Hello---13 +Hello---14 Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test5.2 ============================================================================== --- logback/trunk/logback-core/src/test/witness/rolling/tbr-test5.2 (original) +++ logback/trunk/logback-core/src/test/witness/rolling/tbr-test5.2 Mon Oct 16 16:54:52 2006 @@ -1,2 +1,5 @@ -Hello---2 -Hello---3 +Hello---15 +Hello---16 +Hello---17 +Hello---18 +Hello---19 Modified: logback/trunk/logback-core/src/test/witness/rolling/tbr-test6.1.gz ============================================================================== Binary files. No diff available. Added: logback/trunk/logback-core/src/test/witness/rolling/tbr-test6.2 ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/test/witness/rolling/tbr-test6.2 Mon Oct 16 16:54:52 2006 @@ -0,0 +1,5 @@ +Hello---15 +Hello---16 +Hello---17 +Hello---18 +Hello---19 Modified: logback/trunk/logback-site/src/site/xdocTemplates/joran.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/joran.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/joran.xml Mon Oct 16 16:54:52 2006 @@ -237,7 +237,7 @@ What is interesting here is the way that the Actions collaborate. The <code>LiteralAction</code> reads a literal value and pushes it in the object stack maintained by the <code>ExecutionContext</code>. Once done, -any other action can pop the value back to read or modify it. Here, the +any other action can pop the value to read or modify it. Here, the <code>end()</code> method of the <code>ComputationAction1</code> class pops the value from the stack and prints it. </p> @@ -303,6 +303,31 @@ and a <em>actionClass</em> attribute. The action class is then instanciated and added to the <code>RuleStore</code>, along with its corresponding pattern.</p> +<p>Here is how new rules can be declared in an xml file:</p> + +<div class="source"><new-rule pattern="*/computation/literal" actionClass="joran.calculator.LiteralAction"/></div> + +<p>Using new rule declarations, the preceding example, involving the calculation, could be +expressed this way:</p> + +<div class="source"><computation name="toto"> + <new-rule pattern="*/computation/literal" + actionClass="joran.calculator.LiteralAction"/> + <new-rule pattern="*/computation/add" + actionClass="joran.calculator.AddAction"/> + <new-rule pattern="*/computation/multiply" + actionClass="joran.calculator.MultiplyAction"/> + + <computation> + <literal value="7"/> + <literal value="3"/> + <add/> + </computation> + + <literal value="3"/> + <multiply/> +</computation></div> + <a name="implicit" /> <h3>Implicit actions </h3> <p>The rules defined thus far are called explicit rules because they @@ -357,11 +382,11 @@ directory for an example of an implicit action. </p> -<p>In that directory, you will find two actions, one xml file and one +<p>In that directory, you will find two actions classes, one xml file and one class containing the setup of Joran.</p> <p>The <code>NOPAction</code> class does nothing. It is used to set -the context of the <em>foo</em> element, using that line:</p> +the context of the <em>foo</em> element, using this line:</p> <source>ruleStore.addRule(new Pattern("*/foo"), new NOPAction());</source> @@ -399,6 +424,16 @@ we added a <code>NOPAction</code> with the <em>*/foo</em> pattern, it will be used instead of the <code>PrintMeImplicitAction</code>.</p> +<p>Running the example yields the following output:</p> + +<div class="source">Element <xyz> asked to be printed. +Element <abc> asked to be printed. +ERROR in ch.qos.logback.core.joran.spi.ExecutionContext@1c5c1 - no applicable action \ +for <xyz>, current pattern is [/foo/xyz]</div> + +<p>The last line was printed because of a call to <code>StatusPrinter</code> at the end +of the main class.</p> + <h3>Non goals</h3> <p>The Joran API is not intended to be used to parse documents with Modified: logback/trunk/logback-site/src/site/xdocTemplates/manual/layouts.xml ============================================================================== --- logback/trunk/logback-site/src/site/xdocTemplates/manual/layouts.xml (original) +++ logback/trunk/logback-site/src/site/xdocTemplates/manual/layouts.xml Mon Oct 16 16:54:52 2006 @@ -704,7 +704,7 @@ </em> <div class="source"><configuration> <b><evaluator name="DISP_CALLER_EVAL"> - <Expression>logger.getName().contains("chapter5") && \ + <Expression>logger.getName().contains("chapter5") &amp;&amp; \ message.contains("stacktrace")</Expression> </evaluator></b> @@ -720,6 +720,8 @@ <appender-ref ref="STDOUT" /> </root> </configuration></div> + <p>Please note that & value cannot be written like one would in a java + class, because of XML format encoding.</p> <p>Let's test this configuration with the following code.</p> <em> Example 5.2: Sample usage of EventEvaluators

1 0

svn commit: r692 - logback/trunk/logback-classic
by noreply.seb＠qos.ch 16 Oct '06

16 Oct '06

Author: seb Date: Mon Oct 16 15:53:46 2006 New Revision: 692 Modified: logback/trunk/logback-classic/pom.xml Log: corrected test resources declaration Modified: logback/trunk/logback-classic/pom.xml ============================================================================== --- logback/trunk/logback-classic/pom.xml (original) +++ logback/trunk/logback-classic/pom.xml Mon Oct 16 15:53:46 2006 @@ -130,9 +130,9 @@ <directory>src/test/input</directory> <targetPath>input</targetPath> </testResource> - <testResource> + <testResource> <directory>src/test/resources</directory> - <targetPath>resources</targetPath> + <targetPath>/</targetPath> </testResource> </testResources> </build>

1 0

[Bug 14] New: HTMLLayoutTest fails if there is no network or if the user is behind a firewall
by bugzilla-daemon＠pixie.qos.ch 16 Oct '06

16 Oct '06

http://bugzilla.qos.ch/show_bug.cgi?id=14 Summary: HTMLLayoutTest fails if there is no network or if the user is behind a firewall Product: logback-classic Version: unspecified Platform: PC OS/Version: Windows Status: NEW Severity: major Priority: P1 Component: Other AssignedTo: logback-dev(a)qos.ch ReportedBy: noreply.ceki(a)qos.ch Running ch.qos.logback.classic.html.HTMLLayoutTest yields: org.dom4j.DocumentException: Connection timed out: connect Nested exception: Connection timed out: connect at org.dom4j.io.SAXReader.read(SAXReader.java:484) at org.dom4j.DocumentHelper.parseText(DocumentHelper.java:278) at ch.qos.logback.classic.html.HTMLLayoutTest.parseOutput(HTMLLayoutTest.java:142) at ch.qos.logback.classic.html.HTMLLayoutTest.testHeader(HTMLLayoutTest.java:55) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) at java.lang.reflect.Method.invoke(Method.java:585) at junit.framework.TestCase.runTest(TestCase.java:154) at junit.framework.TestCase.runBare(TestCase.java:127) at junit.framework.TestResult$1.protect(TestResult.java:106) at junit.framework.TestResult.runProtected(TestResult.java:124) at junit.framework.TestResult.run(TestResult.java:109) at junit.framework.TestCase.run(TestCase.java:118) at junit.framework.TestSuite.runTest(TestSuite.java:208) at junit.framework.TestSuite.run(TestSuite.java:203) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) at java.lang.reflect.Method.invoke(Method.java:585) at org.apache.maven.surefire.junit.JUnitTestSet.execute(JUnitTestSet.java:210) at org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.executeTestSet(AbstractDirectoryTestSuite.java:135) at org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.execute(AbstractDirectoryTestSuite.java:122) at org.apache.maven.surefire.Surefire.run(Surefire.java:129) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25) at java.lang.reflect.Method.invoke(Method.java:585) at org.apache.maven.surefire.booter.SurefireBooter.runSuitesInProcess(SurefireBooter.java:225) at org.apache.maven.surefire.booter.SurefireBooter.main(SurefireBooter.java:747) Nested exception: java.net.ConnectException: Connection timed out: connect at java.net.PlainSocketImpl.socketConnect(Native Method) at java.net.PlainSocketImpl.doConnect(PlainSocketImpl.java:333) at java.net.PlainSocketImpl.connectToAddress(PlainSocketImpl.java:195) [snip] This occurs if host machine does not have network conneciton or if behind a corporate firewall. -- 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 5

svn commit: r691 - in logback/trunk/logback-classic: . src/test/java/ch/qos/logback/classic/html src/test/resources src/test/resources/dtd
by noreply.seb＠qos.ch 16 Oct '06

16 Oct '06

Author: seb Date: Mon Oct 16 11:56:12 2006 New Revision: 691 Added: logback/trunk/logback-classic/src/test/resources/ logback/trunk/logback-classic/src/test/resources/dtd/ logback/trunk/logback-classic/src/test/resources/dtd/xhtml-lat1.ent logback/trunk/logback-classic/src/test/resources/dtd/xhtml-special.ent logback/trunk/logback-classic/src/test/resources/dtd/xhtml-symbol.ent logback/trunk/logback-classic/src/test/resources/dtd/xhtml1-strict.dtd Modified: logback/trunk/logback-classic/pom.xml logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/html/HTMLLayoutTest.java Log: - HTMLLayoutTest now does not need to connect to anything anymore. Modified: logback/trunk/logback-classic/pom.xml ============================================================================== --- logback/trunk/logback-classic/pom.xml (original) +++ logback/trunk/logback-classic/pom.xml Mon Oct 16 11:56:12 2006 @@ -130,6 +130,10 @@ <directory>src/test/input</directory> <targetPath>input</targetPath> </testResource> + <testResource> + <directory>src/test/resources</directory> + <targetPath>resources</targetPath> + </testResource> </testResources> </build> Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/html/HTMLLayoutTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/html/HTMLLayoutTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/html/HTMLLayoutTest.java Mon Oct 16 11:56:12 2006 @@ -1,12 +1,18 @@ package ch.qos.logback.classic.html; +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import java.util.HashMap; import java.util.List; +import java.util.Map; import junit.framework.TestCase; import org.dom4j.Document; -import org.dom4j.DocumentHelper; import org.dom4j.Element; +import org.dom4j.io.SAXReader; +import org.xml.sax.EntityResolver; +import org.xml.sax.InputSource; import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; @@ -48,10 +54,10 @@ } @SuppressWarnings("unchecked") - public void testHeader() throws Exception { + public void testHeader() { String header = layout.getHeader(); //System.out.println(header); - + Document doc = parseOutput(header + "</table></body></html>"); Element rootElement = doc.getRootElement(); Element bodyElement = rootElement.element("body"); @@ -66,9 +72,10 @@ public void testAppendThrowable() throws Exception { StringBuffer buf = new StringBuffer(); String[] strArray = { "test1", "test2" }; - DefaultThrowableRenderer renderer = (DefaultThrowableRenderer)layout.getThrowableRenderer(); + DefaultThrowableRenderer renderer = (DefaultThrowableRenderer) layout + .getThrowableRenderer(); renderer.render(buf, strArray); - System.out.println(buf.toString()); + // System.out.println(buf.toString()); String[] result = buf.toString().split(HTMLLayout.LINE_SEP); assertEquals("<tr><td class=\"Exception\" colspan=\"6\">test1", result[0]); assertEquals(DefaultThrowableRenderer.TRACE_PREFIX + "test2", result[1]); @@ -107,8 +114,8 @@ stringToParse += result; stringToParse += "</table></body></html>"; - System.out.println(stringToParse); - + // System.out.println(stringToParse); + Document doc = parseOutput(stringToParse); Element rootElement = doc.getRootElement(); Element bodyElement = rootElement.element("body"); @@ -116,20 +123,21 @@ List<Element> trElementList = tableElement.elements(); Element exceptionRowElement = trElementList.get(2); Element exceptionElement = exceptionRowElement.element("td"); - + assertEquals(3, tableElement.elements().size()); - assertTrue(exceptionElement.getText().contains("java.lang.Exception: test Exception")); + assertTrue(exceptionElement.getText().contains( + "java.lang.Exception: test Exception")); } - -// public void testLog() { -// for (int i = 1; i <= 10; i++) { -// if (i == 5 || i == 8) { -// logger.debug("test", new Exception("test exception")); -// } else { -// logger.debug("test message" + i); -// } -// } -// } + + // public void testLog() { + // for (int i = 1; i <= 10; i++) { + // if (i == 5 || i == 8) { + // logger.debug("test", new Exception("test exception")); + // } else { + // logger.debug("test message" + i); + // } + // } + // } private LoggingEvent createLoggingEvent() { LoggingEvent le = new LoggingEvent(this.getClass().getName(), logger, @@ -138,13 +146,65 @@ } Document parseOutput(String output) { - try { - Document document = DocumentHelper.parseText(output); - return document; + + EntityResolver resolver = new XHTMLEntityResolver(); + + SAXReader reader = new SAXReader(); + reader.setEntityResolver(resolver); + Document doc = null; + + try { + doc = reader.read(new ByteArrayInputStream(output.getBytes())); } catch (Exception e) { - System.err.println(e); - fail(); + e.printStackTrace(); + } + return doc; + + // try { + // + // Document document = DocumentHelper.parseText(output); + // return document; + // } catch (Exception e) { + // System.err.println(e); + // fail(); + // } + // return null; + } +} + +class XHTMLEntityResolver implements EntityResolver { + + + // key: public id, value: relative path to DTD file + static Map<String, String> entityMap = new HashMap<String, String>(); + + static { + entityMap.put("-//W3C//DTD XHTML 1.0 Strict//EN", + "/dtd/xhtml1-strict.dtd"); + entityMap.put("-//W3C//ENTITIES Latin 1 for XHTML//EN", + "/dtd/xhtml-lat1.ent"); + entityMap.put("-//W3C//ENTITIES Symbols for XHTML//EN", + "/dtd/xhtml-symbol.ent"); + entityMap.put("-//W3C//ENTITIES Special for XHTML//EN", + "/dtd/xhtml-special.ent"); + } + + public InputSource resolveEntity(String publicId, String systemId) { + //System.out.println(publicId); + final String relativePath = (String)entityMap.get(publicId); + + if (relativePath != null) { + Class clazz = getClass(); + InputStream in = + clazz.getResourceAsStream(relativePath); + + if (in == null) { + return null; + } else { + return new InputSource(in); + } + } else { + return null; } - return null; } } Added: logback/trunk/logback-classic/src/test/resources/dtd/xhtml-lat1.ent ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/resources/dtd/xhtml-lat1.ent Mon Oct 16 11:56:12 2006 @@ -0,0 +1,196 @@ + + + +<!ENTITY nbsp " ">  +<!ENTITY iexcl "¡">  +<!ENTITY cent "¢">  +<!ENTITY pound "£">  +<!ENTITY curren "¤">  +<!ENTITY yen "¥">  +<!ENTITY brvbar "¦">  +<!ENTITY sect "§">  +<!ENTITY uml "¨">  +<!ENTITY copy "©">  +<!ENTITY ordf "ª">  +<!ENTITY laquo "«">  +<!ENTITY not "¬">  +<!ENTITY shy "">  +<!ENTITY reg "®">  +<!ENTITY macr "¯">  +<!ENTITY deg "°">  +<!ENTITY plusmn "±">  +<!ENTITY sup2 "²">  +<!ENTITY sup3 "³">  +<!ENTITY acute "´">  +<!ENTITY micro "µ">  +<!ENTITY para "¶">  +<!ENTITY middot "·">  +<!ENTITY cedil "¸">  +<!ENTITY sup1 "¹">  +<!ENTITY ordm "º">  +<!ENTITY raquo "»">  +<!ENTITY frac14 "¼">  +<!ENTITY frac12 "½">  +<!ENTITY frac34 "¾">  +<!ENTITY iquest "¿">  +<!ENTITY Agrave "À">  +<!ENTITY Aacute "Á">  +<!ENTITY Acirc "Â">  +<!ENTITY Atilde "Ã">  +<!ENTITY Auml "Ä">  +<!ENTITY Aring "Å">  +<!ENTITY AElig "Æ">  +<!ENTITY Ccedil "Ç">  +<!ENTITY Egrave "È">  +<!ENTITY Eacute "É">  +<!ENTITY Ecirc "Ê">  +<!ENTITY Euml "Ë">  +<!ENTITY Igrave "Ì">  +<!ENTITY Iacute "Í">  +<!ENTITY Icirc "Î">  +<!ENTITY Iuml "Ï">  +<!ENTITY ETH "Ð">  +<!ENTITY Ntilde "Ñ">  +<!ENTITY Ograve "Ò">  +<!ENTITY Oacute "Ó">  +<!ENTITY Ocirc "Ô">  +<!ENTITY Otilde "Õ">  +<!ENTITY Ouml "Ö">  +<!ENTITY times "×">  +<!ENTITY Oslash "Ø">  +<!ENTITY Ugrave "Ù">  +<!ENTITY Uacute "Ú">  +<!ENTITY Ucirc "Û">  +<!ENTITY Uuml "Ü">  +<!ENTITY Yacute "Ý">  +<!ENTITY THORN "Þ">  +<!ENTITY szlig "ß">  +<!ENTITY agrave "à">  +<!ENTITY aacute "á">  +<!ENTITY acirc "â">  +<!ENTITY atilde "ã">  +<!ENTITY auml "ä">  +<!ENTITY aring "å">  +<!ENTITY aelig "æ">  +<!ENTITY ccedil "ç">  +<!ENTITY egrave "è">  +<!ENTITY eacute "é">  +<!ENTITY ecirc "ê">  +<!ENTITY euml "ë">  +<!ENTITY igrave "ì">  +<!ENTITY iacute "í">  +<!ENTITY icirc "î">  +<!ENTITY iuml "ï">  +<!ENTITY eth "ð">  +<!ENTITY ntilde "ñ">  +<!ENTITY ograve "ò">  +<!ENTITY oacute "ó">  +<!ENTITY ocirc "ô">  +<!ENTITY otilde "õ">  +<!ENTITY ouml "ö">  +<!ENTITY divide "÷">  +<!ENTITY oslash "ø">  +<!ENTITY ugrave "ù">  +<!ENTITY uacute "ú">  +<!ENTITY ucirc "û">  +<!ENTITY uuml "ü">  +<!ENTITY yacute "ý">  +<!ENTITY thorn "þ">  +<!ENTITY yuml "ÿ">  Added: logback/trunk/logback-classic/src/test/resources/dtd/xhtml-special.ent ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/resources/dtd/xhtml-special.ent Mon Oct 16 11:56:12 2006 @@ -0,0 +1,80 @@ + + + + + + + + + +<!ENTITY quot """>  +<!ENTITY amp "&#38;">  +<!ENTITY lt "&#60;">  +<!ENTITY gt ">">  +<!ENTITY apos "'">  + + +<!ENTITY OElig "Œ">  +<!ENTITY oelig "œ">  + +<!ENTITY Scaron "Š">  +<!ENTITY scaron "š">  +<!ENTITY Yuml "Ÿ">  + + +<!ENTITY circ "ˆ">  +<!ENTITY tilde "˜">  + + +<!ENTITY ensp " ">  +<!ENTITY emsp " ">  +<!ENTITY thinsp " ">  +<!ENTITY zwnj "‌">  +<!ENTITY zwj "‍">  +<!ENTITY lrm "‎">  +<!ENTITY rlm "‏">  +<!ENTITY ndash "–">  +<!ENTITY mdash "—">  +<!ENTITY lsquo "‘">  +<!ENTITY rsquo "’">  +<!ENTITY sbquo "‚">  +<!ENTITY ldquo "“">  +<!ENTITY rdquo "”">  +<!ENTITY bdquo "„">  +<!ENTITY dagger "†">  +<!ENTITY Dagger "‡">  +<!ENTITY permil "‰">  +<!ENTITY lsaquo "‹">  + +<!ENTITY rsaquo "›">  + + + +<!ENTITY euro "€">  Added: logback/trunk/logback-classic/src/test/resources/dtd/xhtml-symbol.ent ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/resources/dtd/xhtml-symbol.ent Mon Oct 16 11:56:12 2006 @@ -0,0 +1,237 @@ + + + + + + + + + +<!ENTITY fnof "ƒ">  + + +<!ENTITY Alpha "Α">  +<!ENTITY Beta "Β">  +<!ENTITY Gamma "Γ">  +<!ENTITY Delta "Δ">  +<!ENTITY Epsilon "Ε">  +<!ENTITY Zeta "Ζ">  +<!ENTITY Eta "Η">  +<!ENTITY Theta "Θ">  +<!ENTITY Iota "Ι">  +<!ENTITY Kappa "Κ">  +<!ENTITY Lambda "Λ">  +<!ENTITY Mu "Μ">  +<!ENTITY Nu "Ν">  +<!ENTITY Xi "Ξ">  +<!ENTITY Omicron "Ο">  +<!ENTITY Pi "Π">  +<!ENTITY Rho "Ρ">  + +<!ENTITY Sigma "Σ">  +<!ENTITY Tau "Τ">  +<!ENTITY Upsilon "Υ">  +<!ENTITY Phi "Φ">  +<!ENTITY Chi "Χ">  +<!ENTITY Psi "Ψ">  +<!ENTITY Omega "Ω">  + +<!ENTITY alpha "α">  +<!ENTITY beta "β">  +<!ENTITY gamma "γ">  +<!ENTITY delta "δ">  +<!ENTITY epsilon "ε">  +<!ENTITY zeta "ζ">  +<!ENTITY eta "η">  +<!ENTITY theta "θ">  +<!ENTITY iota "ι">  +<!ENTITY kappa "κ">  +<!ENTITY lambda "λ">  +<!ENTITY mu "μ">  +<!ENTITY nu "ν">  +<!ENTITY xi "ξ">  +<!ENTITY omicron "ο">  +<!ENTITY pi "π">  +<!ENTITY rho "ρ">  +<!ENTITY sigmaf "ς">  +<!ENTITY sigma "σ">  +<!ENTITY tau "τ">  +<!ENTITY upsilon "υ">  +<!ENTITY phi "φ">  +<!ENTITY chi "χ">  +<!ENTITY psi "ψ">  +<!ENTITY omega "ω">  +<!ENTITY thetasym "ϑ">  +<!ENTITY upsih "ϒ">  +<!ENTITY piv "ϖ">  + + +<!ENTITY bull "•">  + +<!ENTITY hellip "…">  +<!ENTITY prime "′">  +<!ENTITY Prime "″">  +<!ENTITY oline "‾">  +<!ENTITY frasl "⁄">  + + +<!ENTITY weierp "℘">  +<!ENTITY image "ℑ">  +<!ENTITY real "ℜ">  +<!ENTITY trade "™">  +<!ENTITY alefsym "ℵ">  + + + +<!ENTITY larr "←">  +<!ENTITY uarr "↑">  +<!ENTITY rarr "→">  +<!ENTITY darr "↓">  +<!ENTITY harr "↔">  +<!ENTITY crarr "↵">  +<!ENTITY lArr "⇐">  + +<!ENTITY uArr "⇑">  +<!ENTITY rArr "⇒">  + +<!ENTITY dArr "⇓">  +<!ENTITY hArr "⇔">  + + +<!ENTITY forall "∀">  +<!ENTITY part "∂">  +<!ENTITY exist "∃">  +<!ENTITY empty "∅">  +<!ENTITY nabla "∇">  +<!ENTITY isin "∈">  +<!ENTITY notin "∉">  +<!ENTITY ni "∋">  +<!ENTITY prod "∏">  + +<!ENTITY sum "∑">  + +<!ENTITY minus "−">  +<!ENTITY lowast "∗">  +<!ENTITY radic "√">  +<!ENTITY prop "∝">  +<!ENTITY infin "∞">  +<!ENTITY ang "∠">  +<!ENTITY and "∧">  +<!ENTITY or "∨">  +<!ENTITY cap "∩">  +<!ENTITY cup "∪">  +<!ENTITY int "∫">  +<!ENTITY there4 "∴">  +<!ENTITY sim "∼">  + +<!ENTITY cong "≅">  +<!ENTITY asymp "≈">  +<!ENTITY ne "≠">  +<!ENTITY equiv "≡">  +<!ENTITY le "≤">  +<!ENTITY ge "≥">  +<!ENTITY sub "⊂">  +<!ENTITY sup "⊃">  +<!ENTITY nsub "⊄">  +<!ENTITY sube "⊆">  +<!ENTITY supe "⊇">  +<!ENTITY oplus "⊕">  +<!ENTITY otimes "⊗">  +<!ENTITY perp "⊥">  +<!ENTITY sdot "⋅">  + + + +<!ENTITY lceil "⌈">  +<!ENTITY rceil "⌉">  +<!ENTITY lfloor "⌊">  +<!ENTITY rfloor "⌋">  +<!ENTITY lang "〈">  + +<!ENTITY rang "〉">  + + + +<!ENTITY loz "◊">  + + +<!ENTITY spades "♠">  + +<!ENTITY clubs "♣">  +<!ENTITY hearts "♥">  +<!ENTITY diams "♦">  Added: logback/trunk/logback-classic/src/test/resources/dtd/xhtml1-strict.dtd ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/resources/dtd/xhtml1-strict.dtd Mon Oct 16 11:56:12 2006 @@ -0,0 +1,978 @@ + + + + +<!ENTITY % HTMLlat1 PUBLIC + "-//W3C//ENTITIES Latin 1 for XHTML//EN" + "xhtml-lat1.ent"> +%HTMLlat1; + +<!ENTITY % HTMLsymbol PUBLIC + "-//W3C//ENTITIES Symbols for XHTML//EN" + "xhtml-symbol.ent"> +%HTMLsymbol; + +<!ENTITY % HTMLspecial PUBLIC + "-//W3C//ENTITIES Special for XHTML//EN" + "xhtml-special.ent"> +%HTMLspecial; + + + +<!ENTITY % ContentType "CDATA"> +  + +<!ENTITY % ContentTypes "CDATA"> +  + +<!ENTITY % Charset "CDATA"> +  + +<!ENTITY % Charsets "CDATA"> +  + +<!ENTITY % LanguageCode "NMTOKEN"> +  + +<!ENTITY % Character "CDATA"> +  + +<!ENTITY % Number "CDATA"> +  + +<!ENTITY % LinkTypes "CDATA"> +  + +<!ENTITY % MediaDesc "CDATA"> +  + +<!ENTITY % URI "CDATA"> +  + +<!ENTITY % UriList "CDATA"> +  + +<!ENTITY % Datetime "CDATA"> +  + +<!ENTITY % Script "CDATA"> +  + +<!ENTITY % StyleSheet "CDATA"> +  + +<!ENTITY % Text "CDATA"> +  + +<!ENTITY % Length "CDATA"> +  + +<!ENTITY % MultiLength "CDATA"> +  + +<!ENTITY % Pixels "CDATA"> +  + + + +<!ENTITY % Shape "(rect|circle|poly|default)"> + +<!ENTITY % Coords "CDATA"> +  + + + + +<!ENTITY % coreattrs + "id ID #IMPLIED + class CDATA #IMPLIED + style %StyleSheet; #IMPLIED + title %Text; #IMPLIED" + > + + +<!ENTITY % i18n + "lang %LanguageCode; #IMPLIED + xml:lang %LanguageCode; #IMPLIED + dir (ltr|rtl) #IMPLIED" + > + + +<!ENTITY % events + "onclick %Script; #IMPLIED + ondblclick %Script; #IMPLIED + onmousedown %Script; #IMPLIED + onmouseup %Script; #IMPLIED + onmouseover %Script; #IMPLIED + onmousemove %Script; #IMPLIED + onmouseout %Script; #IMPLIED + onkeypress %Script; #IMPLIED + onkeydown %Script; #IMPLIED + onkeyup %Script; #IMPLIED" + > + + +<!ENTITY % focus + "accesskey %Character; #IMPLIED + tabindex %Number; #IMPLIED + onfocus %Script; #IMPLIED + onblur %Script; #IMPLIED" + > + +<!ENTITY % attrs "%coreattrs; %i18n; %events;"> + + + +<!ENTITY % special.pre + "br | span | bdo | map"> + + +<!ENTITY % special + "%special.pre; | object | img "> + +<!ENTITY % fontstyle "tt | i | b | big | small "> + +<!ENTITY % phrase "em | strong | dfn | code | q | + samp | kbd | var | cite | abbr | acronym | sub | sup "> + +<!ENTITY % inline.forms "input | select | textarea | label | button"> + + +<!ENTITY % misc.inline "ins | del | script"> + + +<!ENTITY % misc "noscript | %misc.inline;"> + +<!ENTITY % inline "a | %special; | %fontstyle; | %phrase; | %inline.forms;"> + + +<!ENTITY % Inline "(#PCDATA | %inline; | %misc.inline;)*"> + + + +<!ENTITY % heading "h1|h2|h3|h4|h5|h6"> +<!ENTITY % lists "ul | ol | dl"> +<!ENTITY % blocktext "pre | hr | blockquote | address"> + +<!ENTITY % block + "p | %heading; | div | %lists; | %blocktext; | fieldset | table"> + +<!ENTITY % Block "(%block; | form | %misc;)*"> + + +<!ENTITY % Flow "(#PCDATA | %block; | form | %inline; | %misc;)*"> + + + + + +<!ENTITY % a.content + "(#PCDATA | %special; | %fontstyle; | %phrase; | %inline.forms; | %misc.inline;)*"> + + + +<!ENTITY % pre.content + "(#PCDATA | a | %fontstyle; | %phrase; | %special.pre; | %misc.inline; + | %inline.forms;)*"> + + + +<!ENTITY % form.content "(%block; | %misc;)*"> + + + +<!ENTITY % button.content + "(#PCDATA | p | %heading; | div | %lists; | %blocktext; | + table | %special; | %fontstyle; | %phrase; | %misc;)*"> + + + + + +<!ELEMENT html (head, body)> +<!ATTLIST html + %i18n; + id ID #IMPLIED + xmlns %URI; #FIXED 'http://www.w3.org/1999/xhtml' + > + + + +<!ENTITY % head.misc "(script|style|meta|link|object)*"> + + + +<!ELEMENT head (%head.misc;, + ((title, %head.misc;, (base, %head.misc;)?) | + (base, %head.misc;, (title, %head.misc;))))> + +<!ATTLIST head + %i18n; + id ID #IMPLIED + profile %URI; #IMPLIED + > + + +<!ELEMENT title (#PCDATA)> +<!ATTLIST title + %i18n; + id ID #IMPLIED + > + + + +<!ELEMENT base EMPTY> +<!ATTLIST base + href %URI; #REQUIRED + id ID #IMPLIED + > + + +<!ELEMENT meta EMPTY> +<!ATTLIST meta + %i18n; + id ID #IMPLIED + http-equiv CDATA #IMPLIED + name CDATA #IMPLIED + content CDATA #REQUIRED + scheme CDATA #IMPLIED + > + + + +<!ELEMENT link EMPTY> +<!ATTLIST link + %attrs; + charset %Charset; #IMPLIED + href %URI; #IMPLIED + hreflang %LanguageCode; #IMPLIED + type %ContentType; #IMPLIED + rel %LinkTypes; #IMPLIED + rev %LinkTypes; #IMPLIED + media %MediaDesc; #IMPLIED + > + + +<!ELEMENT style (#PCDATA)> +<!ATTLIST style + %i18n; + id ID #IMPLIED + type %ContentType; #REQUIRED + media %MediaDesc; #IMPLIED + title %Text; #IMPLIED + xml:space (preserve) #FIXED 'preserve' + > + + +<!ELEMENT script (#PCDATA)> +<!ATTLIST script + id ID #IMPLIED + charset %Charset; #IMPLIED + type %ContentType; #REQUIRED + src %URI; #IMPLIED + defer (defer) #IMPLIED + xml:space (preserve) #FIXED 'preserve' + > + + + +<!ELEMENT noscript %Block;> +<!ATTLIST noscript + %attrs; + > + + + +<!ELEMENT body %Block;> +<!ATTLIST body + %attrs; + onload %Script; #IMPLIED + onunload %Script; #IMPLIED + > + +<!ELEMENT div %Flow;>  +<!ATTLIST div + %attrs; + > + + + +<!ELEMENT p %Inline;> +<!ATTLIST p + %attrs; + > + + + + + +<!ELEMENT h1 %Inline;> +<!ATTLIST h1 + %attrs; + > + +<!ELEMENT h2 %Inline;> +<!ATTLIST h2 + %attrs; + > + +<!ELEMENT h3 %Inline;> +<!ATTLIST h3 + %attrs; + > + +<!ELEMENT h4 %Inline;> +<!ATTLIST h4 + %attrs; + > + +<!ELEMENT h5 %Inline;> +<!ATTLIST h5 + %attrs; + > + +<!ELEMENT h6 %Inline;> +<!ATTLIST h6 + %attrs; + > + + + + + +<!ELEMENT ul (li)+> +<!ATTLIST ul + %attrs; + > + + + +<!ELEMENT ol (li)+> +<!ATTLIST ol + %attrs; + > + + + +<!ELEMENT li %Flow;> +<!ATTLIST li + %attrs; + > + + + +<!ELEMENT dl (dt|dd)+> +<!ATTLIST dl + %attrs; + > + +<!ELEMENT dt %Inline;> +<!ATTLIST dt + %attrs; + > + +<!ELEMENT dd %Flow;> +<!ATTLIST dd + %attrs; + > + + + + + +<!ELEMENT address %Inline;> +<!ATTLIST address + %attrs; + > + + + +<!ELEMENT hr EMPTY> +<!ATTLIST hr + %attrs; + > + + + + + +<!ELEMENT pre %pre.content;> +<!ATTLIST pre + %attrs; + xml:space (preserve) #FIXED 'preserve' + > + + + +<!ELEMENT blockquote %Block;> +<!ATTLIST blockquote + %attrs; + cite %URI; #IMPLIED + > + + + + +<!ELEMENT ins %Flow;> +<!ATTLIST ins + %attrs; + cite %URI; #IMPLIED + datetime %Datetime; #IMPLIED + > + +<!ELEMENT del %Flow;> +<!ATTLIST del + %attrs; + cite %URI; #IMPLIED + datetime %Datetime; #IMPLIED + > + + + + + +<!ELEMENT a %a.content;> +<!ATTLIST a + %attrs; + %focus; + charset %Charset; #IMPLIED + type %ContentType; #IMPLIED + name NMTOKEN #IMPLIED + href %URI; #IMPLIED + hreflang %LanguageCode; #IMPLIED + rel %LinkTypes; #IMPLIED + rev %LinkTypes; #IMPLIED + shape %Shape; "rect" + coords %Coords; #IMPLIED + > + + + +<!ELEMENT span %Inline;>  +<!ATTLIST span + %attrs; + > + +<!ELEMENT bdo %Inline;>  +<!ATTLIST bdo + %coreattrs; + %events; + lang %LanguageCode; #IMPLIED + xml:lang %LanguageCode; #IMPLIED + dir (ltr|rtl) #REQUIRED + > + +<!ELEMENT br EMPTY>  +<!ATTLIST br + %coreattrs; + > + +<!ELEMENT em %Inline;>  +<!ATTLIST em %attrs;> + +<!ELEMENT strong %Inline;>  +<!ATTLIST strong %attrs;> + +<!ELEMENT dfn %Inline;>  +<!ATTLIST dfn %attrs;> + +<!ELEMENT code %Inline;>  +<!ATTLIST code %attrs;> + +<!ELEMENT samp %Inline;>  +<!ATTLIST samp %attrs;> + +<!ELEMENT kbd %Inline;>  +<!ATTLIST kbd %attrs;> + +<!ELEMENT var %Inline;>  +<!ATTLIST var %attrs;> + +<!ELEMENT cite %Inline;>  +<!ATTLIST cite %attrs;> + +<!ELEMENT abbr %Inline;>  +<!ATTLIST abbr %attrs;> + +<!ELEMENT acronym %Inline;>  +<!ATTLIST acronym %attrs;> + +<!ELEMENT q %Inline;>  +<!ATTLIST q + %attrs; + cite %URI; #IMPLIED + > + +<!ELEMENT sub %Inline;>  +<!ATTLIST sub %attrs;> + +<!ELEMENT sup %Inline;>  +<!ATTLIST sup %attrs;> + +<!ELEMENT tt %Inline;>  +<!ATTLIST tt %attrs;> + +<!ELEMENT i %Inline;>  +<!ATTLIST i %attrs;> + +<!ELEMENT b %Inline;>  +<!ATTLIST b %attrs;> + +<!ELEMENT big %Inline;>  +<!ATTLIST big %attrs;> + +<!ELEMENT small %Inline;>  +<!ATTLIST small %attrs;> + + + + +<!ELEMENT object (#PCDATA | param | %block; | form | %inline; | %misc;)*> +<!ATTLIST object + %attrs; + declare (declare) #IMPLIED + classid %URI; #IMPLIED + codebase %URI; #IMPLIED + data %URI; #IMPLIED + type %ContentType; #IMPLIED + codetype %ContentType; #IMPLIED + archive %UriList; #IMPLIED + standby %Text; #IMPLIED + height %Length; #IMPLIED + width %Length; #IMPLIED + usemap %URI; #IMPLIED + name NMTOKEN #IMPLIED + tabindex %Number; #IMPLIED + > + + +<!ELEMENT param EMPTY> +<!ATTLIST param + id ID #IMPLIED + name CDATA #IMPLIED + value CDATA #IMPLIED + valuetype (data|ref|object) "data" + type %ContentType; #IMPLIED + > + + + + + +<!ELEMENT img EMPTY> +<!ATTLIST img + %attrs; + src %URI; #REQUIRED + alt %Text; #REQUIRED + longdesc %URI; #IMPLIED + height %Length; #IMPLIED + width %Length; #IMPLIED + usemap %URI; #IMPLIED + ismap (ismap) #IMPLIED + > + + + + + + + +<!ELEMENT map ((%block; | form | %misc;)+ | area+)> +<!ATTLIST map + %i18n; + %events; + id ID #REQUIRED + class CDATA #IMPLIED + style %StyleSheet; #IMPLIED + title %Text; #IMPLIED + name NMTOKEN #IMPLIED + > + +<!ELEMENT area EMPTY> +<!ATTLIST area + %attrs; + %focus; + shape %Shape; "rect" + coords %Coords; #IMPLIED + href %URI; #IMPLIED + nohref (nohref) #IMPLIED + alt %Text; #REQUIRED + > + + +<!ELEMENT form %form.content;>  + +<!ATTLIST form + %attrs; + action %URI; #REQUIRED + method (get|post) "get" + enctype %ContentType; "application/x-www-form-urlencoded" + onsubmit %Script; #IMPLIED + onreset %Script; #IMPLIED + accept %ContentTypes; #IMPLIED + accept-charset %Charsets; #IMPLIED + > + + +<!ELEMENT label %Inline;> +<!ATTLIST label + %attrs; + for IDREF #IMPLIED + accesskey %Character; #IMPLIED + onfocus %Script; #IMPLIED + onblur %Script; #IMPLIED + > + +<!ENTITY % InputType + "(text | password | checkbox | + radio | submit | reset | + file | hidden | image | button)" + > + + + +<!ELEMENT input EMPTY>  +<!ATTLIST input + %attrs; + %focus; + type %InputType; "text" + name CDATA #IMPLIED + value CDATA #IMPLIED + checked (checked) #IMPLIED + disabled (disabled) #IMPLIED + readonly (readonly) #IMPLIED + size CDATA #IMPLIED + maxlength %Number; #IMPLIED + src %URI; #IMPLIED + alt CDATA #IMPLIED + usemap %URI; #IMPLIED + onselect %Script; #IMPLIED + onchange %Script; #IMPLIED + accept %ContentTypes; #IMPLIED + > + +<!ELEMENT select (optgroup|option)+>  +<!ATTLIST select + %attrs; + name CDATA #IMPLIED + size %Number; #IMPLIED + multiple (multiple) #IMPLIED + disabled (disabled) #IMPLIED + tabindex %Number; #IMPLIED + onfocus %Script; #IMPLIED + onblur %Script; #IMPLIED + onchange %Script; #IMPLIED + > + +<!ELEMENT optgroup (option)+>  +<!ATTLIST optgroup + %attrs; + disabled (disabled) #IMPLIED + label %Text; #REQUIRED + > + +<!ELEMENT option (#PCDATA)>  +<!ATTLIST option + %attrs; + selected (selected) #IMPLIED + disabled (disabled) #IMPLIED + label %Text; #IMPLIED + value CDATA #IMPLIED + > + +<!ELEMENT textarea (#PCDATA)>  +<!ATTLIST textarea + %attrs; + %focus; + name CDATA #IMPLIED + rows %Number; #REQUIRED + cols %Number; #REQUIRED + disabled (disabled) #IMPLIED + readonly (readonly) #IMPLIED + onselect %Script; #IMPLIED + onchange %Script; #IMPLIED + > + + +<!ELEMENT fieldset (#PCDATA | legend | %block; | form | %inline; | %misc;)*> +<!ATTLIST fieldset + %attrs; + > + +<!ELEMENT legend %Inline;>  +<!ATTLIST legend + %attrs; + accesskey %Character; #IMPLIED + > + + +<!ELEMENT button %button.content;>  +<!ATTLIST button + %attrs; + %focus; + name CDATA #IMPLIED + value CDATA #IMPLIED + type (button|submit|reset) "submit" + disabled (disabled) #IMPLIED + > + + + + + + +<!ENTITY % TFrame "(void|above|below|hsides|lhs|rhs|vsides|box|border)"> + + + +<!ENTITY % TRules "(none | groups | rows | cols | all)"> + + +<!ENTITY % cellhalign + "align (left|center|right|justify|char) #IMPLIED + char %Character; #IMPLIED + charoff %Length; #IMPLIED" + > + + +<!ENTITY % cellvalign + "valign (top|middle|bottom|baseline) #IMPLIED" + > + +<!ELEMENT table + (caption?, (col*|colgroup*), thead?, tfoot?, (tbody+|tr+))> +<!ELEMENT caption %Inline;> +<!ELEMENT thead (tr)+> +<!ELEMENT tfoot (tr)+> +<!ELEMENT tbody (tr)+> +<!ELEMENT colgroup (col)*> +<!ELEMENT col EMPTY> +<!ELEMENT tr (th|td)+> +<!ELEMENT th %Flow;> +<!ELEMENT td %Flow;> + +<!ATTLIST table + %attrs; + summary %Text; #IMPLIED + width %Length; #IMPLIED + border %Pixels; #IMPLIED + frame %TFrame; #IMPLIED + rules %TRules; #IMPLIED + cellspacing %Length; #IMPLIED + cellpadding %Length; #IMPLIED + > + +<!ATTLIST caption + %attrs; + > + + +<!ATTLIST colgroup + %attrs; + span %Number; "1" + width %MultiLength; #IMPLIED + %cellhalign; + %cellvalign; + > + + +<!ATTLIST col + %attrs; + span %Number; "1" + width %MultiLength; #IMPLIED + %cellhalign; + %cellvalign; + > + + +<!ATTLIST thead + %attrs; + %cellhalign; + %cellvalign; + > + +<!ATTLIST tfoot + %attrs; + %cellhalign; + %cellvalign; + > + +<!ATTLIST tbody + %attrs; + %cellhalign; + %cellvalign; + > + +<!ATTLIST tr + %attrs; + %cellhalign; + %cellvalign; + > + + + +<!ENTITY % Scope "(row|col|rowgroup|colgroup)"> + + + +<!ATTLIST th + %attrs; + abbr %Text; #IMPLIED + axis CDATA #IMPLIED + headers IDREFS #IMPLIED + scope %Scope; #IMPLIED + rowspan %Number; "1" + colspan %Number; "1" + %cellhalign; + %cellvalign; + > + +<!ATTLIST td + %attrs; + abbr %Text; #IMPLIED + axis CDATA #IMPLIED + headers IDREFS #IMPLIED + scope %Scope; #IMPLIED + rowspan %Number; "1" + colspan %Number; "1" + %cellhalign; + %cellvalign; + > +

1 0

[Bug 13] New: Clean build of logback-access results in compilation failure
by bugzilla-daemon＠pixie.qos.ch 16 Oct '06

16 Oct '06

http://bugzilla.qos.ch/show_bug.cgi?id=13 Summary: Clean build of logback-access results in compilation failure Product: logback-access Version: unspecified Platform: PC OS/Version: Windows Status: NEW Severity: blocker Priority: P1 Component: Other AssignedTo: logback-dev(a)qos.ch ReportedBy: noreply.ceki(a)qos.ch ~/LB/logback-access >mvn clean install [INFO] Scanning for projects... [INFO] ---------------------------------------------------------------------------- [INFO] Building Logback Access Module [INFO] task-segment: [clean, install] [INFO] ---------------------------------------------------------------------------- [INFO] [clean:clean] [INFO] Deleting directory c:\home\ceki\LB\logback-access\target [INFO] Deleting directory c:\home\ceki\LB\logback-access\target\classes [INFO] Deleting directory c:\home\ceki\LB\logback-access\target\test-classes [INFO] [resources:resources] [INFO] Using default encoding to copy filtered resources. [INFO] [compiler:compile] Compiling 36 source files to c:\home\ceki\LB\logback-access\target\classes [INFO] ------------------------------------------------------------------------ [ERROR] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Compilation failure c:\home\ceki\LB\logback-access\src\main\java\ch\qos\logback\access\tomcat\LogbackValve.java:[115,20] unreported exception ch.qos.logback.core.joran.spi.JoranExce ption; must be caught or declared to be thrown [INFO] ------------------------------------------------------------------------ [INFO] For more information, run Maven with the -e switch [INFO] ------------------------------------------------------------------------ [INFO] Total time: 4 seconds [INFO] Finished at: Sun Oct 15 19:54:33 CEST 2006 [INFO] Final Memory: 4M/10M -- 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

[Bug 12] New: Joran passing wrong Expression to EventEvaluator
by bugzilla-daemon＠pixie.qos.ch 16 Oct '06

16 Oct '06

http://bugzilla.qos.ch/show_bug.cgi?id=12 Summary: Joran passing wrong Expression to EventEvaluator Product: logback-core Version: unspecified Platform: PC OS/Version: All Status: NEW Severity: normal Priority: P1 Component: Joran AssignedTo: logback-dev(a)qos.ch ReportedBy: noreply.sebastien(a)qos.ch I've been trying to use two conditions in an expression, like this: <evaluator name="DISPLAY_CALLER_EVAL">  <Expression>message.contains("stacktrace") && message.contains("logging")</Expression> </evaluator> This precise configuration leads to a JaninoEventEvaluator using the following expression: message.contains("logging") If I replace the && part with either && or &&, it still doesn't work. The same expression is recieved by the EventEvaluator. I've added a test case in EvaluatorJoranTest called testMultipleConditionsInExpression() that proves that an Evaluator can work if given an expression containing multiple conditions. In my understanding, it seems that the process that is reading the xml file and passing it to the Evaluator does not work properly. -- 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 5

svn commit: r690 - logback/trunk/logback-access/lib
by noreply.ceki＠qos.ch 16 Oct '06

16 Oct '06

Author: ceki Date: Mon Oct 16 08:35:47 2006 New Revision: 690 Removed: logback/trunk/logback-access/lib/catalina.jar Log:

1 0

svn commit: r689 - logback/trunk/logback-classic/anakia-lib
by noreply.ceki＠qos.ch 16 Oct '06

16 Oct '06

Author: ceki Date: Mon Oct 16 08:34:45 2006 New Revision: 689 Removed: logback/trunk/logback-classic/anakia-lib/ Log:

1 0