ceki 2004/11/29 15:54:38
Modified: tests/input/xml customLevel2.xml customLevel4.xml
filters.LevelMatchFilter.test4.3.xml
customLogger1.xml customLevel3.xml
filters.LevelMatchFilter.test4.1.xml
filters.LevelMatchFilter.test4.2.xml
customLogger2.xml
filters.LevelMatchFilter.test4.4.xml
customLogger3.xml
filters.LevelMatchFilter.test4.0.xml
defaultInit.xml
src/java/org/apache/log4j/chainsaw log4j-receiver-sample.xml
src/java/org/apache/log4j/test/xml domTest11.xml
asyncTest.xml domTest7.xml domTest1.xml
domTest6.xml domTest12.xml stressAsyncAppender.xml
fallback1.xml domTest9.xml domTest4.xml ext1.xml
domTest2.xml domTest3.xml domTest10.xml
domTest8.xml domTest5.xml
src/java/org/apache/log4j/spi ErrorItem.java
src/java/org/apache/log4j/xml/examples sample5.xml
sample3.xml sample2.xml sample4.xml extension2.xml
sample1.xml
examples/tiny-webapp/Hello/src/resources log4j.xml
src/java/org/apache/log4j/joran/util
WellfomednessChecker.java XMLUtil.java
src/java/org/apache/log4j/xml Log4jEntityResolver.java
examples/tiny-webapp/Tata/src/resources log4j.xml
src/java/org/apache/log4j/xml/test testlog.xml
src/java/org/apache/log4j/joran JoranConfigurator.java
Log:
As discussed on log4j-dev@ Joran no longer tries to compensate for the
existance of log4j.dtd in XML file declarations.
Revision Changes Path
1.5 +1 -1 logging-log4j/tests/input/xml/customLevel2.xml
Index: customLevel2.xml
===================================================================
RCS file: /home/cvs/logging-log4j/tests/input/xml/customLevel2.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- customLevel2.xml 18 Nov 2004 22:33:00 -0000 1.4
+++ customLevel2.xml 29 Nov 2004 23:54:37 -0000 1.5
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration >
<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'
debug="false">
1.5 +1 -1 logging-log4j/tests/input/xml/customLevel4.xml
Index: customLevel4.xml
===================================================================
RCS file: /home/cvs/logging-log4j/tests/input/xml/customLevel4.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- customLevel4.xml 18 Nov 2004 22:33:00 -0000 1.4
+++ customLevel4.xml 29 Nov 2004 23:54:37 -0000 1.5
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration >
<log4j:configuration debug="true"
xmlns:log4j='http://jakarta.apache.org/log4j/'>
1.2 +1 -1
logging-log4j/tests/input/xml/filters.LevelMatchFilter.test4.3.xml
Index: filters.LevelMatchFilter.test4.3.xml
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/input/xml/filters.LevelMatchFilter.test4.3.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- filters.LevelMatchFilter.test4.3.xml 12 Jun 2002 06:09:24 -0000
1.1
+++ filters.LevelMatchFilter.test4.3.xml 29 Nov 2004 23:54:37 -0000
1.2
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration >
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";>
<appender name="A1" class="org.apache.log4j.FileAppender">
1.5 +1 -1 logging-log4j/tests/input/xml/customLogger1.xml
Index: customLogger1.xml
===================================================================
RCS file: /home/cvs/logging-log4j/tests/input/xml/customLogger1.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- customLogger1.xml 18 Nov 2004 22:48:02 -0000 1.4
+++ customLogger1.xml 29 Nov 2004 23:54:37 -0000 1.5
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration >
<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'
debug="false">
1.5 +1 -1 logging-log4j/tests/input/xml/customLevel3.xml
Index: customLevel3.xml
===================================================================
RCS file: /home/cvs/logging-log4j/tests/input/xml/customLevel3.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- customLevel3.xml 18 Nov 2004 22:33:00 -0000 1.4
+++ customLevel3.xml 29 Nov 2004 23:54:37 -0000 1.5
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration >
<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'
debug="false">
1.2 +1 -1
logging-log4j/tests/input/xml/filters.LevelMatchFilter.test4.1.xml
Index: filters.LevelMatchFilter.test4.1.xml
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/input/xml/filters.LevelMatchFilter.test4.1.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- filters.LevelMatchFilter.test4.1.xml 12 Jun 2002 06:09:24 -0000
1.1
+++ filters.LevelMatchFilter.test4.1.xml 29 Nov 2004 23:54:37 -0000
1.2
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration >
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";>
<appender name="A1" class="org.apache.log4j.FileAppender">
1.2 +1 -1
logging-log4j/tests/input/xml/filters.LevelMatchFilter.test4.2.xml
Index: filters.LevelMatchFilter.test4.2.xml
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/input/xml/filters.LevelMatchFilter.test4.2.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- filters.LevelMatchFilter.test4.2.xml 12 Jun 2002 06:09:24 -0000
1.1
+++ filters.LevelMatchFilter.test4.2.xml 29 Nov 2004 23:54:37 -0000
1.2
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration >
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";>
<appender name="A1" class="org.apache.log4j.FileAppender">
1.5 +1 -1 logging-log4j/tests/input/xml/customLogger2.xml
Index: customLogger2.xml
===================================================================
RCS file: /home/cvs/logging-log4j/tests/input/xml/customLogger2.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- customLogger2.xml 18 Nov 2004 22:48:02 -0000 1.4
+++ customLogger2.xml 29 Nov 2004 23:54:37 -0000 1.5
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration >
<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'
debug="true">
1.2 +2 -2
logging-log4j/tests/input/xml/filters.LevelMatchFilter.test4.4.xml
Index: filters.LevelMatchFilter.test4.4.xml
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/input/xml/filters.LevelMatchFilter.test4.4.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- filters.LevelMatchFilter.test4.4.xml 12 Jun 2002 06:09:24 -0000
1.1
+++ filters.LevelMatchFilter.test4.4.xml 29 Nov 2004 23:54:37 -0000
1.2
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration >
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";>
+<log4j:configuration>
<appender name="A1" class="org.apache.log4j.FileAppender">
<param name="File" value="output/filters.LevelMatchFilter.test4.txt" />
<param name="Append" value="true" />
1.5 +1 -1 logging-log4j/tests/input/xml/customLogger3.xml
Index: customLogger3.xml
===================================================================
RCS file: /home/cvs/logging-log4j/tests/input/xml/customLogger3.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- customLogger3.xml 18 Nov 2004 22:48:02 -0000 1.4
+++ customLogger3.xml 29 Nov 2004 23:54:37 -0000 1.5
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration >
<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'
debug="true">
1.2 +1 -1
logging-log4j/tests/input/xml/filters.LevelMatchFilter.test4.0.xml
Index: filters.LevelMatchFilter.test4.0.xml
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/input/xml/filters.LevelMatchFilter.test4.0.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- filters.LevelMatchFilter.test4.0.xml 12 Jun 2002 06:09:24 -0000
1.1
+++ filters.LevelMatchFilter.test4.0.xml 29 Nov 2004 23:54:37 -0000
1.2
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration >
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";>
<appender name="A1" class="org.apache.log4j.FileAppender">
1.6 +1 -1 logging-log4j/tests/input/xml/defaultInit.xml
Index: defaultInit.xml
===================================================================
RCS file: /home/cvs/logging-log4j/tests/input/xml/defaultInit.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- defaultInit.xml 7 Jun 2004 17:13:36 -0000 1.5
+++ defaultInit.xml 29 Nov 2004 23:54:37 -0000 1.6
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration >
<log4j:configuration debug="true"
xmlns:log4j="http://jakarta.apache.org/log4j/";>
1.2 +1 -1
logging-log4j/src/java/org/apache/log4j/chainsaw/log4j-receiver-sample.xml
Index: log4j-receiver-sample.xml
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/log4j-receiver-sample.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- log4j-receiver-sample.xml 25 Jun 2003 04:05:21 -0000 1.1
+++ log4j-receiver-sample.xml 29 Nov 2004 23:54:37 -0000 1.2
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration >
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";
debug="true">
<appender name="A2" class="org.apache.log4j.ConsoleAppender">
<layout class="org.apache.log4j.SimpleLayout"/>
1.3 +1 -1
logging-log4j/src/java/org/apache/log4j/test/xml/domTest11.xml
Index: domTest11.xml
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/test/xml/domTest11.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- domTest11.xml 18 Feb 2002 21:43:31 -0000 1.2
+++ domTest11.xml 29 Nov 2004 23:54:37 -0000 1.3
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration >
<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'
configDebug="true">
1.3 +1 -1
logging-log4j/src/java/org/apache/log4j/test/xml/asyncTest.xml
Index: asyncTest.xml
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/test/xml/asyncTest.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- asyncTest.xml 19 Jan 2001 16:45:33 -0000 1.2
+++ asyncTest.xml 29 Nov 2004 23:54:37 -0000 1.3
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration >
<log4j:configuration>
<appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
1.2 +1 -1
logging-log4j/src/java/org/apache/log4j/test/xml/domTest7.xml
Index: domTest7.xml
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/test/xml/domTest7.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- domTest7.xml 4 Oct 2001 20:57:57 -0000 1.1
+++ domTest7.xml 29 Nov 2004 23:54:37 -0000 1.2
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration >
<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'>
1.2 +1 -1
logging-log4j/src/java/org/apache/log4j/test/xml/domTest1.xml
Index: domTest1.xml
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/test/xml/domTest1.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- domTest1.xml 4 Oct 2001 20:57:57 -0000 1.1
+++ domTest1.xml 29 Nov 2004 23:54:37 -0000 1.2
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration >
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";>
<appender name="A1" class="org.apache.log4j.FileAppender">
1.2 +1 -1
logging-log4j/src/java/org/apache/log4j/test/xml/domTest6.xml
Index: domTest6.xml
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/test/xml/domTest6.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- domTest6.xml 4 Oct 2001 20:57:57 -0000 1.1
+++ domTest6.xml 29 Nov 2004 23:54:37 -0000 1.2
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration >
<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'>
1.3 +1 -1
logging-log4j/src/java/org/apache/log4j/test/xml/domTest12.xml
Index: domTest12.xml
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/test/xml/domTest12.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- domTest12.xml 18 Feb 2002 21:43:31 -0000 1.2
+++ domTest12.xml 29 Nov 2004 23:54:37 -0000 1.3
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration >
<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'
configDebug="true">
1.3 +1 -1
logging-log4j/src/java/org/apache/log4j/test/xml/stressAsyncAppender.xml
Index: stressAsyncAppender.xml
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/test/xml/stressAsyncAppender.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- stressAsyncAppender.xml 19 Jan 2001 16:45:33 -0000 1.2
+++ stressAsyncAppender.xml 29 Nov 2004 23:54:37 -0000 1.3
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration >
<log4j:configuration>
<appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
1.3 +1 -1
logging-log4j/src/java/org/apache/log4j/test/xml/fallback1.xml
Index: fallback1.xml
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/test/xml/fallback1.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fallback1.xml 18 Nov 2001 12:57:26 -0000 1.2
+++ fallback1.xml 29 Nov 2004 23:54:37 -0000 1.3
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration >
<log4j:configuration debug="true"
xmlns:log4j="http://jakarta.apache.org/log4j/";>
1.2 +1 -1
logging-log4j/src/java/org/apache/log4j/test/xml/domTest9.xml
Index: domTest9.xml
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/test/xml/domTest9.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- domTest9.xml 4 Oct 2001 20:57:57 -0000 1.1
+++ domTest9.xml 29 Nov 2004 23:54:37 -0000 1.2
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration >
<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'>
1.4 +1 -1
logging-log4j/src/java/org/apache/log4j/test/xml/domTest4.xml
Index: domTest4.xml
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/test/xml/domTest4.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- domTest4.xml 17 Nov 2001 01:04:22 -0000 1.3
+++ domTest4.xml 29 Nov 2004 23:54:37 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration >
<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'>
1.3 +1 -1 logging-log4j/src/java/org/apache/log4j/test/xml/ext1.xml
Index: ext1.xml
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/test/xml/ext1.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ext1.xml 2 Sep 2001 20:05:40 -0000 1.2
+++ ext1.xml 29 Nov 2004 23:54:37 -0000 1.3
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration >
<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'
debug="true">
1.2 +1 -1
logging-log4j/src/java/org/apache/log4j/test/xml/domTest2.xml
Index: domTest2.xml
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/test/xml/domTest2.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- domTest2.xml 4 Oct 2001 20:57:57 -0000 1.1
+++ domTest2.xml 29 Nov 2004 23:54:37 -0000 1.2
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration >
<!-- This test XML file
- references an INEXISTENT appender in root
1.2 +1 -1
logging-log4j/src/java/org/apache/log4j/test/xml/domTest3.xml
Index: domTest3.xml
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/test/xml/domTest3.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- domTest3.xml 4 Oct 2001 20:57:57 -0000 1.1
+++ domTest3.xml 29 Nov 2004 23:54:37 -0000 1.2
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration >
<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'>
<appender name="A1" class="org.apache.log4j.RollingFileAppender">
1.2 +1 -1
logging-log4j/src/java/org/apache/log4j/test/xml/domTest10.xml
Index: domTest10.xml
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/test/xml/domTest10.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- domTest10.xml 4 Oct 2001 20:57:57 -0000 1.1
+++ domTest10.xml 29 Nov 2004 23:54:37 -0000 1.2
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration >
<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'>
1.2 +1 -1
logging-log4j/src/java/org/apache/log4j/test/xml/domTest8.xml
Index: domTest8.xml
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/test/xml/domTest8.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- domTest8.xml 4 Oct 2001 20:57:57 -0000 1.1
+++ domTest8.xml 29 Nov 2004 23:54:37 -0000 1.2
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration >
<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'>
1.2 +1 -1
logging-log4j/src/java/org/apache/log4j/test/xml/domTest5.xml
Index: domTest5.xml
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/test/xml/domTest5.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- domTest5.xml 4 Oct 2001 20:57:57 -0000 1.1
+++ domTest5.xml 29 Nov 2004 23:54:37 -0000 1.2
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE configuration >
<configuration>
1.2 +5 -3
logging-log4j/src/java/org/apache/log4j/spi/ErrorItem.java
Index: ErrorItem.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/spi/ErrorItem.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ErrorItem.java 19 Nov 2004 15:19:07 -0000 1.1
+++ ErrorItem.java 29 Nov 2004 23:54:38 -0000 1.2
@@ -73,9 +73,11 @@
public String toString() {
String str =
- "Reported error: \"" + message + "\" at line " + lineNumber + " column
"
- + colNumber;
-
+ "Reported error: \"" + message + "\"";
+
+ if(lineNumber != -1) {
+ str += " at line " + lineNumber + " column " + colNumber;
+ }
if (exception != null) {
str += (" with exception " + exception);
}
1.3 +1 -1
logging-log4j/src/java/org/apache/log4j/xml/examples/sample5.xml
Index: sample5.xml
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/xml/examples/sample5.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sample5.xml 18 Jun 2001 09:13:24 -0000 1.2
+++ sample5.xml 29 Nov 2004 23:54:38 -0000 1.3
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration >
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";
configDebug="true">
1.7 +1 -1
logging-log4j/src/java/org/apache/log4j/xml/examples/sample3.xml
Index: sample3.xml
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/xml/examples/sample3.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sample3.xml 21 Jun 2001 05:19:47 -0000 1.6
+++ sample3.xml 29 Nov 2004 23:54:38 -0000 1.7
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration >
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";>
<appender name="A1" class="org.apache.log4j.net.SocketAppender">
1.7 +1 -1
logging-log4j/src/java/org/apache/log4j/xml/examples/sample2.xml
Index: sample2.xml
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/xml/examples/sample2.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sample2.xml 21 Jun 2001 05:19:47 -0000 1.6
+++ sample2.xml 29 Nov 2004 23:54:38 -0000 1.7
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration >
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";>
1.7 +2 -3
logging-log4j/src/java/org/apache/log4j/xml/examples/sample4.xml
Index: sample4.xml
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/xml/examples/sample4.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sample4.xml 18 Jun 2001 09:13:23 -0000 1.6
+++ sample4.xml 29 Nov 2004 23:54:38 -0000 1.7
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration >
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";
- configDebug="true">
+<log4j:configuration debug="true">
<appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
<appender-ref ref="TEMP"/>
1.5 +1 -1
logging-log4j/src/java/org/apache/log4j/xml/examples/extension2.xml
Index: extension2.xml
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/xml/examples/extension2.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- extension2.xml 21 Jun 2001 05:19:46 -0000 1.4
+++ extension2.xml 29 Nov 2004 23:54:38 -0000 1.5
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd" [
+<!DOCTYPE log4j:configuration [
<!ENTITY XCategory "org.log4j.xml.examples.XCategory">
]>
1.7 +1 -1
logging-log4j/src/java/org/apache/log4j/xml/examples/sample1.xml
Index: sample1.xml
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/xml/examples/sample1.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sample1.xml 21 Jun 2001 05:19:47 -0000 1.6
+++ sample1.xml 29 Nov 2004 23:54:38 -0000 1.7
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration >
<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'>
1.2 +1 -1
logging-log4j/examples/tiny-webapp/Hello/src/resources/log4j.xml
Index: log4j.xml
===================================================================
RCS file:
/home/cvs/logging-log4j/examples/tiny-webapp/Hello/src/resources/log4j.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- log4j.xml 27 Mar 2004 15:55:12 -0000 1.1
+++ log4j.xml 29 Nov 2004 23:54:38 -0000 1.2
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration >
<log4j:configuration debug="true"
xmlns:log4j='http://jakarta.apache.org/log4j/'>
1.3 +16 -33
logging-log4j/src/java/org/apache/log4j/joran/util/WellfomednessChecker.java
Index: WellfomednessChecker.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/joran/util/WellfomednessChecker.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WellfomednessChecker.java 25 Nov 2004 19:25:48 -0000 1.2
+++ WellfomednessChecker.java 29 Nov 2004 23:54:38 -0000 1.3
@@ -6,12 +6,11 @@
*/
package org.apache.log4j.joran.util;
-import java.io.IOException;
-import java.util.List;
+import java.util.List;
+import org.apache.log4j.helpers.Constants;
import org.apache.log4j.spi.ErrorItem;
import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
import org.xml.sax.helpers.DefaultHandler;
@@ -34,47 +33,31 @@
}
public void error(SAXParseException spe) throws SAXException {
- ErrorItem errorItem = new ErrorItem("Parsing error", spe);
- errorItem.setLineNumber(spe.getLineNumber());
- errorItem.setColNumber(spe.getColumnNumber());
- errorList.add(errorItem);
+ errorReport(spe);
}
public void fatalError(SAXParseException spe) throws SAXException {
- ErrorItem errorItem = new ErrorItem("Parsing fatal error", spe);
- errorItem.setLineNumber(spe.getLineNumber());
- errorItem.setColNumber(spe.getColumnNumber());
- errorList.add(errorItem);
-
+ errorReport(spe);
}
public void warning(SAXParseException spe) throws SAXException {
+ errorReport(spe);
+ }
+
+ private void errorReport(SAXParseException spe) throws SAXException {
+ int line = spe.getLineNumber();
ErrorItem errorItem = new ErrorItem("Parsing warning", spe);
- errorItem.setLineNumber(spe.getLineNumber());
+ errorItem.setLineNumber(line);
errorItem.setColNumber(spe.getColumnNumber());
errorList.add(errorItem);
+ if(line == 2) {
+ ErrorItem e1 = new ErrorItem("The 'log4j.dtd' is no longer used nor
needed.");
+ errorList.add(e1);
+ ErrorItem e2 = new ErrorItem("See "+Constants.CODES_HREF+"#log4j_dtd
for more details.");
+ errorList.add(e2);
+ }
}
- public EntityResolver getEntityResolver() {
- return entityResolver;
- }
-
- public void setEntityResolver(EntityResolver entityResolver) {
- this.entityResolver = entityResolver;
- }
- public InputSource resolveEntity(String publicId, String systemId) throws
SAXException {
- if(entityResolver == null) {
- // the default implementation is to return null
- return null;
- } else {
- try {
- return entityResolver.resolveEntity(publicId, systemId);
- } catch(IOException ioe) {
- // fall back to the default "implementation"
- return null;
- }
- }
- }
}
1.5 +0 -2
logging-log4j/src/java/org/apache/log4j/joran/util/XMLUtil.java
Index: XMLUtil.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/joran/util/XMLUtil.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLUtil.java 25 Nov 2004 19:25:48 -0000 1.4
+++ XMLUtil.java 29 Nov 2004 23:54:38 -0000 1.5
@@ -23,7 +23,6 @@
package org.apache.log4j.joran.util;
import org.apache.log4j.spi.ErrorItem;
-import org.apache.log4j.xml.Log4jEntityResolver;
import org.xml.sax.InputSource;
@@ -102,7 +101,6 @@
SAXParser saxParser = spf.newSAXParser();
WellfomednessChecker wc = new WellfomednessChecker(errorList);
- wc.setEntityResolver(new Log4jEntityResolver());
saxParser.parse(inputSource, wc);
result = WELL_FORMED;
1.10 +2 -3
logging-log4j/src/java/org/apache/log4j/xml/Log4jEntityResolver.java
Index: Log4jEntityResolver.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/xml/Log4jEntityResolver.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Log4jEntityResolver.java 22 Nov 2004 20:21:01 -0000 1.9
+++ Log4jEntityResolver.java 29 Nov 2004 23:54:38 -0000 1.10
@@ -18,7 +18,6 @@
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
-import org.apache.log4j.helpers.Constants;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
@@ -40,8 +39,8 @@
logger.debug(
"Log4jEntityResolver.resolveEntity({}, {}) called", publicId,
systemId);
if (systemId.endsWith("log4j.dtd")) {
- logger.warn("The 'log4j.dtd' is no longer used nor needed.");
- logger.warn("See {}#log4j_dtd for more details.",
Constants.CODES_HREF);
+ //logger.warn("The 'log4j.dtd' is no longer used nor needed.");
+ //logger.warn("See {}#log4j_dtd for more details.",
Constants.CODES_HREF);
Class clazz = getClass();
InputStream in =
clazz.getResourceAsStream("/org/apache/log4j/xml/log4j.dtd");
1.4 +1 -1
logging-log4j/examples/tiny-webapp/Tata/src/resources/log4j.xml
Index: log4j.xml
===================================================================
RCS file:
/home/cvs/logging-log4j/examples/tiny-webapp/Tata/src/resources/log4j.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- log4j.xml 27 Mar 2004 18:00:04 -0000 1.3
+++ log4j.xml 29 Nov 2004 23:54:38 -0000 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration >
<log4j:configuration debug="true"
xmlns:log4j='http://jakarta.apache.org/log4j/'>
1.3 +1 -1
logging-log4j/src/java/org/apache/log4j/xml/test/testlog.xml
Index: testlog.xml
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/xml/test/testlog.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- testlog.xml 14 Dec 2000 21:08:45 -0000 1.2
+++ testlog.xml 29 Nov 2004 23:54:38 -0000 1.3
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j SYSTEM "log4j.dtd">
+<!DOCTYPE log4j >
<log4j>
<appender name="A1" class="org.apache.log4j.FileAppender">
<layout class="org.apache.log4j.PatternLayout">
1.22 +1 -7
logging-log4j/src/java/org/apache/log4j/joran/JoranConfigurator.java
Index: JoranConfigurator.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/joran/JoranConfigurator.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- JoranConfigurator.java 22 Nov 2004 17:49:43 -0000 1.21
+++ JoranConfigurator.java 29 Nov 2004 23:54:38 -0000 1.22
@@ -42,7 +42,6 @@
import org.apache.log4j.joran.util.XMLUtil;
import org.apache.log4j.spi.ErrorItem;
import org.apache.log4j.spi.LoggerRepository;
-import org.apache.log4j.xml.Log4jEntityResolver;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -177,7 +176,7 @@
// we want non-validating parsers
spf.setValidating(false);
SAXParser saxParser = spf.newSAXParser();
-
+
saxParser.parse(inputSource, joranInterpreter);
getLogger(repository).debug("Finished parsing.");
} catch (SAXException e) {
@@ -233,11 +232,6 @@
rs.addRule(new Pattern("*/param"), new ParamAction());
joranInterpreter = new Interpreter(rs);
-
- // We need to bother with an entity resolver in order to be compatible
- // with config files written for DOMConfigurator containing the
following:
- // <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
- joranInterpreter.setEntityResolver(new Log4jEntityResolver());
// The following line adds the capability to parse nested components
joranInterpreter.addImplcitAction(new NestComponentIA());
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
