You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-dev@logging.apache.org by ce...@apache.org on 2004/12/29 00:16:16 UTC
cvs commit: logging-log4j/tests/input/joran conversionRule.xml
ceki 2004/12/28 15:16:16
Modified: tests/src/java/org/apache/joran InterpreterTest.java
tests/input/joran conversionRule.xml
Log:
Minor fixes to InterpreterTest
Revision Changes Path
1.14 +3 -3 logging-log4j/tests/src/java/org/apache/joran/InterpreterTest.java
Index: InterpreterTest.java
===================================================================
RCS file: /home/cvs/logging-log4j/tests/src/java/org/apache/joran/InterpreterTest.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- InterpreterTest.java 28 Dec 2004 23:08:12 -0000 1.13
+++ InterpreterTest.java 28 Dec 2004 23:16:16 -0000 1.14
@@ -329,11 +329,11 @@
RuleStore rs = new SimpleRuleStore();
rs.addRule(
- new Pattern("log4j:configuration/appender"), new AppenderAction());
+ new Pattern("configuration/appender"), new AppenderAction());
rs.addRule(
- new Pattern("log4j:configuration/appender/layout"), new LayoutAction());
+ new Pattern("configuration/appender/layout"), new LayoutAction());
rs.addRule(
- new Pattern("log4j:configuration/appender/layout/conversionRule"),
+ new Pattern("configuration/conversionRule"),
new ConversionRuleAction());
rs.addRule(new Pattern("*/param"), new ParamAction());
1.4 +3 -3 logging-log4j/tests/input/joran/conversionRule.xml
Index: conversionRule.xml
===================================================================
RCS file: /home/cvs/logging-log4j/tests/input/joran/conversionRule.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- conversionRule.xml 28 Dec 2004 23:08:12 -0000 1.3
+++ conversionRule.xml 28 Dec 2004 23:16:16 -0000 1.4
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration>
+<!DOCTYPE configuration>
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+<configuration xmlns="http://logging.apache.org/">
<conversionRule conversionWord="toto" converterClass="org.apache.log4j.toto"/>
@@ -19,4 +19,4 @@
<param name="ConversionPattern" value="%-5p %c{2} - %m%n"/>
</layout>
</appender>
-</log4j:configuration>
\ No newline at end of file
+</configuration>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org