You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-cvs@jakarta.apache.org by ce...@apache.org on 2001/01/17 15:27:00 UTC
cvs commit: jakarta-log4j/org/apache/log4j/xml/test do1.xml do10.xml do11.xml do12.xml do2.xml do3.xml do4.xml do5.xml do6.xml do7.xml do8.xml do9.xml test1.xml test10.xml test11.xml test12.xml test2.xml test3.xml test4.xml test5.xml test6.xml test7.xml test8.xml test9.xml
ceki 01/01/17 06:27:00
Modified: org/apache/log4j/performance/xml logging1.xml logging10.xml
logging100.xml logging1000.xml logging101.xml
logging102.xml logging103.xml logging104.xml
logging105.xml logging106.xml logging107.xml
logging11.xml logging12.xml logging13.xml
logging2.xml logging200.xml logging201.xml
logging202.xml logging203.xml logging204.xml
logging205.xml logging206.xml logging207.xml
logging3.xml logging300.xml logging301.xml
logging302.xml logging303.xml logging304.xml
logging305.xml logging306.xml logging307.xml
logging4.xml logging5.xml logging6.xml logging7.xml
logging8.xml logging9.xml
org/apache/log4j/xml DOMConfigurator.java log4j.dtd
org/apache/log4j/xml/test do1.xml do10.xml do11.xml do12.xml
do2.xml do3.xml do4.xml do5.xml do6.xml do7.xml
do8.xml do9.xml test1.xml test10.xml test11.xml
test12.xml test2.xml test3.xml test4.xml test5.xml
test6.xml test7.xml test8.xml test9.xml
Log:
Migrated from <configuration> to <log4j:configuration>.
Revision Changes Path
1.3 +3 -3 jakarta-log4j/org/apache/log4j/performance/xml/logging1.xml
Index: logging1.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/performance/xml/logging1.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logging1.xml 2000/12/26 23:39:09 1.2
+++ logging1.xml 2001/01/17 14:26:54 1.3
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<!-- PropertyConfigurator equivalent:
log4j.rootCategory=, NULL
@@ -8,7 +8,7 @@
log4j.appender.NULL.layout=org.apache.log4j.SimpleLayout
-->
-<configuration>
+<log4j:configuration>
<appender name="NULL" class="org.apache.log4j.performance.NullAppender">
<layout class="org.apache.log4j.SimpleLayout"/>
@@ -19,4 +19,4 @@
<appender-ref ref="NULL" />
</root>
-</configuration>
+</log4j:configuration>
1.3 +3 -3 jakarta-log4j/org/apache/log4j/performance/xml/logging10.xml
Index: logging10.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/performance/xml/logging10.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logging10.xml 2000/12/26 23:39:09 1.2
+++ logging10.xml 2001/01/17 14:26:54 1.3
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<!-- PropertyConfigurator equivalent:
log4j.rootCategory=, NULL
@@ -8,7 +8,7 @@
log4j.appender.NULL.layout=org.apache.log4j.PatternLayout
log4j.appender.NULL.layout.ConversionPattern=%d{ISO8601} [%t] %-5p %c %x - %m%n
-->
-<configuration>
+<log4j:configuration>
<appender name="NULL" class="org.apache.log4j.performance.NullAppender">
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern"
@@ -25,4 +25,4 @@
<appender-ref ref="NULL" />
</root>
-</configuration>
+</log4j:configuration>
1.3 +3 -3 jakarta-log4j/org/apache/log4j/performance/xml/logging100.xml
Index: logging100.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/performance/xml/logging100.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logging100.xml 2000/12/26 23:39:09 1.2
+++ logging100.xml 2001/01/17 14:26:54 1.3
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<configuration>
+<log4j:configuration>
<appender name="NULL" class="org.apache.log4j.FileAppender">
<param name="File" value="test"/>
<param name="Append" value="false"/>
@@ -19,4 +19,4 @@
<appender-ref ref="NULL" />
</root>
-</configuration>
+</log4j:configuration>
1.3 +3 -3 jakarta-log4j/org/apache/log4j/performance/xml/logging1000.xml
Index: logging1000.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/performance/xml/logging1000.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logging1000.xml 2000/12/26 23:39:09 1.2
+++ logging1000.xml 2001/01/17 14:26:54 1.3
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<configuration>
+<log4j:configuration>
<appender name="NULL" class="org.apache.log4j.net.SocketAppender">
<param name="RemoteHost" value="localhost"/>
<param name="Port" value="1000"/>
@@ -17,4 +17,4 @@
<appender-ref ref="NULL" />
</root>
-</configuration>
+</log4j:configuration>
1.3 +3 -3 jakarta-log4j/org/apache/log4j/performance/xml/logging101.xml
Index: logging101.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/performance/xml/logging101.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logging101.xml 2000/12/26 23:39:09 1.2
+++ logging101.xml 2001/01/17 14:26:54 1.3
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<configuration>
+<log4j:configuration>
<appender name="NULL" class="org.apache.log4j.FileAppender">
<param name="File" value="temp"/>
<param name="Append" value="false"/>
@@ -21,4 +21,4 @@
<appender-ref ref="NULL" />
</root>
-</configuration>
+</log4j:configuration>
1.3 +3 -3 jakarta-log4j/org/apache/log4j/performance/xml/logging102.xml
Index: logging102.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/performance/xml/logging102.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logging102.xml 2000/12/26 23:39:09 1.2
+++ logging102.xml 2001/01/17 14:26:54 1.3
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<configuration>
+<log4j:configuration>
<appender name="NULL" class="org.apache.log4j.FileAppender">
<param name="File" value="temp"/>
<param name="Append" value="false"/>
@@ -20,4 +20,4 @@
<appender-ref ref="NULL" />
</root>
-</configuration>
+</log4j:configuration>
1.3 +3 -3 jakarta-log4j/org/apache/log4j/performance/xml/logging103.xml
Index: logging103.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/performance/xml/logging103.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logging103.xml 2000/12/26 23:39:09 1.2
+++ logging103.xml 2001/01/17 14:26:54 1.3
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<configuration>
+<log4j:configuration>
<appender name="TEMP" class="org.apache.log4j.FileAppender">
<param name="File" value="temp"/>
<param name="Append" value="false"/>
@@ -21,4 +21,4 @@
<appender-ref ref="TEMP" />
</root>
-</configuration>
+</log4j:configuration>
1.3 +3 -3 jakarta-log4j/org/apache/log4j/performance/xml/logging104.xml
Index: logging104.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/performance/xml/logging104.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logging104.xml 2000/12/26 23:39:09 1.2
+++ logging104.xml 2001/01/17 14:26:54 1.3
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<configuration>
+<log4j:configuration>
<appender name="NULL" class="org.apache.log4j.FileAppender">
<param name="File" value="temp"/>
<param name="Append" value="false"/>
@@ -21,4 +21,4 @@
<appender-ref ref="NULL" />
</root>
-</configuration>
+</log4j:configuration>
1.3 +3 -3 jakarta-log4j/org/apache/log4j/performance/xml/logging105.xml
Index: logging105.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/performance/xml/logging105.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logging105.xml 2000/12/26 23:39:09 1.2
+++ logging105.xml 2001/01/17 14:26:54 1.3
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<configuration>
+<log4j:configuration>
<appender name="NULL" class="org.apache.log4j.FileAppender">
<param name="File" value="temp"/>
<param name="Append" value="false"/>
@@ -21,4 +21,4 @@
<appender-ref ref="NULL" />
</root>
-</configuration>
+</log4j:configuration>
1.3 +3 -3 jakarta-log4j/org/apache/log4j/performance/xml/logging106.xml
Index: logging106.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/performance/xml/logging106.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logging106.xml 2000/12/26 23:39:09 1.2
+++ logging106.xml 2001/01/17 14:26:54 1.3
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<configuration>
+<log4j:configuration>
<appender name="NULL" class="org.apache.log4j.FileAppender">
<param name="File" value="temp"/>
<param name="Append" value="false"/>
@@ -21,4 +21,4 @@
<appender-ref ref="NULL" />
</root>
-</configuration>
+</log4j:configuration>
1.3 +3 -3 jakarta-log4j/org/apache/log4j/performance/xml/logging107.xml
Index: logging107.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/performance/xml/logging107.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logging107.xml 2000/12/26 23:39:09 1.2
+++ logging107.xml 2001/01/17 14:26:54 1.3
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<configuration>
+<log4j:configuration>
<appender name="NULL" class="org.apache.log4j.FileAppender">
<param name="File" value="temp"/>
<param name="Append" value="false"/>
@@ -21,4 +21,4 @@
<appender-ref ref="NULL" />
</root>
-</configuration>
+</log4j:configuration>
1.3 +3 -3 jakarta-log4j/org/apache/log4j/performance/xml/logging11.xml
Index: logging11.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/performance/xml/logging11.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logging11.xml 2000/12/26 23:39:09 1.2
+++ logging11.xml 2001/01/17 14:26:54 1.3
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<!-- PropertyConfigurator equivalent:
log4j.rootCategory=, NULL
@@ -8,7 +8,7 @@
log4j.appender.NULL.layout=org.apache.log4j.PatternLayout
log4j.appender.NULL.layout.ConversionPattern="%d{yyyy-MM-dd HH:mm:ss,SSS} [%t] %-5p %c %x - %m%n
-->
-<configuration>
+<log4j:configuration>
<appender name="NULL" class="org.apache.log4j.performance.NullAppender">
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern"
@@ -25,4 +25,4 @@
<appender-ref ref="NULL" />
</root>
-</configuration>
+</log4j:configuration>
1.3 +3 -3 jakarta-log4j/org/apache/log4j/performance/xml/logging12.xml
Index: logging12.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/performance/xml/logging12.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logging12.xml 2000/12/26 23:39:09 1.2
+++ logging12.xml 2001/01/17 14:26:54 1.3
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<!-- PropertyConfigurator equivalent:
log4j.rootCategory=, NULL
@@ -8,7 +8,7 @@
log4j.appender.NULL.layout=org.apache.log4j.PatternLayout
log4j.appender.NULL.layout.ConversionPattern=%l - %m%n
-->
-<configuration>
+<log4j:configuration>
<appender name="NULL" class="org.apache.log4j.performance.NullAppender">
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern"
@@ -25,4 +25,4 @@
<appender-ref ref="NULL" />
</root>
-</configuration>
+</log4j:configuration>
1.3 +3 -3 jakarta-log4j/org/apache/log4j/performance/xml/logging13.xml
Index: logging13.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/performance/xml/logging13.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logging13.xml 2000/12/26 23:39:09 1.2
+++ logging13.xml 2001/01/17 14:26:54 1.3
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<!-- PropertyConfigurator equivalent:
log4j.rootCategory=, NULL
@@ -8,7 +8,7 @@
log4j.appender.NULL.layout=org.apache.log4j.PatternLayout
log4j.appender.NULL.layout.ConversionPattern=%C.%M.%L - %m%n
-->
-<configuration>
+<log4j:configuration>
<appender name="NULL" class="org.apache.log4j.performance.NullAppender">
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern"
@@ -25,4 +25,4 @@
<appender-ref ref="NULL" />
</root>
-</configuration>
+</log4j:configuration>
1.3 +3 -3 jakarta-log4j/org/apache/log4j/performance/xml/logging2.xml
Index: logging2.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/performance/xml/logging2.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logging2.xml 2000/12/26 23:39:09 1.2
+++ logging2.xml 2001/01/17 14:26:54 1.3
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<!-- PropertyConfigurator equivalent:
log4j.rootCategory=, NULL
@@ -8,7 +8,7 @@
log4j.appender.NULL.layout=org.apache.log4j.PatternLayout
log4j.appender.NULL.layout.ConversionPattern=%p - %m%n
-->
-<configuration>
+<log4j:configuration>
<appender name="NULL" class="org.apache.log4j.performance.NullAppender">
<layout class="org.apache.log4j.PatternLayout">
@@ -25,4 +25,4 @@
<appender-ref ref="NULL" />
</root>
-</configuration>
+</log4j:configuration>
1.3 +3 -3 jakarta-log4j/org/apache/log4j/performance/xml/logging200.xml
Index: logging200.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/performance/xml/logging200.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logging200.xml 2000/12/26 23:39:09 1.2
+++ logging200.xml 2001/01/17 14:26:54 1.3
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<configuration>
+<log4j:configuration>
<appender name="NULL" class="org.apache.log4j.FileAppender">
<param name="File" value="test"/>
<param name="Append" value="false"/>
@@ -19,4 +19,4 @@
<appender-ref ref="NULL" />
</root>
-</configuration>
+</log4j:configuration>
1.3 +3 -3 jakarta-log4j/org/apache/log4j/performance/xml/logging201.xml
Index: logging201.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/performance/xml/logging201.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logging201.xml 2000/12/26 23:39:10 1.2
+++ logging201.xml 2001/01/17 14:26:54 1.3
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<configuration>
+<log4j:configuration>
<appender name="NULL" class="org.apache.log4j.FileAppender">
<param name="File" value="temp"/>
<param name="Append" value="false"/>
@@ -21,4 +21,4 @@
<appender-ref ref="NULL" />
</root>
-</configuration>
+</log4j:configuration>
1.3 +3 -3 jakarta-log4j/org/apache/log4j/performance/xml/logging202.xml
Index: logging202.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/performance/xml/logging202.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logging202.xml 2000/12/26 23:39:10 1.2
+++ logging202.xml 2001/01/17 14:26:54 1.3
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<configuration>
+<log4j:configuration>
<appender name="NULL" class="org.apache.log4j.FileAppender">
<param name="File" value="temp"/>
<param name="Append" value="false"/>
@@ -20,4 +20,4 @@
<appender-ref ref="NULL" />
</root>
-</configuration>
+</log4j:configuration>
1.3 +3 -3 jakarta-log4j/org/apache/log4j/performance/xml/logging203.xml
Index: logging203.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/performance/xml/logging203.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logging203.xml 2000/12/26 23:39:10 1.2
+++ logging203.xml 2001/01/17 14:26:54 1.3
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<configuration>
+<log4j:configuration>
<appender name="NULL" class="org.apache.log4j.FileAppender">
<param name="File" value="temp"/>
<param name="Append" value="false"/>
@@ -21,4 +21,4 @@
<appender-ref ref="NULL" />
</root>
-</configuration>
+</log4j:configuration>
1.3 +3 -3 jakarta-log4j/org/apache/log4j/performance/xml/logging204.xml
Index: logging204.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/performance/xml/logging204.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logging204.xml 2000/12/26 23:39:10 1.2
+++ logging204.xml 2001/01/17 14:26:54 1.3
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<configuration>
+<log4j:configuration>
<appender name="NULL" class="org.apache.log4j.FileAppender">
<param name="File" value="temp"/>
<param name="Append" value="false"/>
@@ -21,4 +21,4 @@
<appender-ref ref="NULL" />
</root>
-</configuration>
+</log4j:configuration>
1.3 +3 -3 jakarta-log4j/org/apache/log4j/performance/xml/logging205.xml
Index: logging205.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/performance/xml/logging205.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logging205.xml 2000/12/26 23:39:10 1.2
+++ logging205.xml 2001/01/17 14:26:54 1.3
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<configuration>
+<log4j:configuration>
<appender name="NULL" class="org.apache.log4j.FileAppender">
<param name="File" value="temp"/>
<param name="Append" value="false"/>
@@ -21,4 +21,4 @@
<appender-ref ref="NULL" />
</root>
-</configuration>
+</log4j:configuration>
1.3 +3 -3 jakarta-log4j/org/apache/log4j/performance/xml/logging206.xml
Index: logging206.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/performance/xml/logging206.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logging206.xml 2000/12/26 23:39:10 1.2
+++ logging206.xml 2001/01/17 14:26:54 1.3
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<configuration>
+<log4j:configuration>
<appender name="NULL" class="org.apache.log4j.FileAppender">
<param name="File" value="temp"/>
<param name="Append" value="false"/>
@@ -21,4 +21,4 @@
<appender-ref ref="NULL" />
</root>
-</configuration>
+</log4j:configuration>
1.3 +3 -3 jakarta-log4j/org/apache/log4j/performance/xml/logging207.xml
Index: logging207.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/performance/xml/logging207.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logging207.xml 2000/12/26 23:39:10 1.2
+++ logging207.xml 2001/01/17 14:26:54 1.3
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<configuration>
+<log4j:configuration>
<appender name="NULL" class="org.apache.log4j.FileAppender">
<param name="File" value="temp"/>
<param name="Append" value="false"/>
@@ -21,4 +21,4 @@
<appender-ref ref="NULL" />
</root>
-</configuration>
+</log4j:configuration>
1.3 +3 -3 jakarta-log4j/org/apache/log4j/performance/xml/logging3.xml
Index: logging3.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/performance/xml/logging3.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logging3.xml 2000/12/26 23:39:10 1.2
+++ logging3.xml 2001/01/17 14:26:54 1.3
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<!-- PropertyConfigurator equivalent:
log4j.rootCategory=, NULL
@@ -8,7 +8,7 @@
log4j.appender.NULL.layout=org.apache.log4j.PatternLayout
log4j.appender.NULL.layout.ConversionPattern=%-5p - %m%n
-->
-<configuration>
+<log4j:configuration>
<appender name="NULL" class="org.apache.log4j.performance.NullAppender">
<layout class="org.apache.log4j.PatternLayout">
@@ -25,4 +25,4 @@
<appender-ref ref="NULL" />
</root>
-</configuration>
+</log4j:configuration>
1.3 +3 -3 jakarta-log4j/org/apache/log4j/performance/xml/logging300.xml
Index: logging300.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/performance/xml/logging300.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logging300.xml 2000/12/26 23:39:10 1.2
+++ logging300.xml 2001/01/17 14:26:55 1.3
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<configuration>
+<log4j:configuration>
<appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
<appender-ref ref="TEMP" />
</appender>
@@ -23,4 +23,4 @@
<appender-ref ref="ASYNC" />
</root>
-</configuration>
+</log4j:configuration>
1.3 +3 -3 jakarta-log4j/org/apache/log4j/performance/xml/logging301.xml
Index: logging301.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/performance/xml/logging301.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logging301.xml 2000/12/26 23:39:10 1.2
+++ logging301.xml 2001/01/17 14:26:55 1.3
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<configuration>
+<log4j:configuration>
<appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
<appender-ref ref="TEMP" />
</appender>
@@ -25,4 +25,4 @@
<appender-ref ref="ASYNC" />
</root>
-</configuration>
+</log4j:configuration>
1.3 +3 -3 jakarta-log4j/org/apache/log4j/performance/xml/logging302.xml
Index: logging302.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/performance/xml/logging302.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logging302.xml 2000/12/26 23:39:10 1.2
+++ logging302.xml 2001/01/17 14:26:55 1.3
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<configuration>
+<log4j:configuration>
<appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
<appender-ref ref="TEMP" />
</appender>
@@ -23,4 +23,4 @@
<appender-ref ref="ASYNC" />
</root>
-</configuration>
+</log4j:configuration>
1.3 +3 -3 jakarta-log4j/org/apache/log4j/performance/xml/logging303.xml
Index: logging303.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/performance/xml/logging303.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logging303.xml 2000/12/26 23:39:10 1.2
+++ logging303.xml 2001/01/17 14:26:55 1.3
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<configuration>
+<log4j:configuration>
<appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
<appender-ref ref="TEMP" />
</appender>
@@ -25,4 +25,4 @@
<appender-ref ref="ASYNC" />
</root>
-</configuration>
+</log4j:configuration>
1.3 +3 -3 jakarta-log4j/org/apache/log4j/performance/xml/logging304.xml
Index: logging304.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/performance/xml/logging304.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logging304.xml 2000/12/26 23:39:10 1.2
+++ logging304.xml 2001/01/17 14:26:55 1.3
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<configuration>
+<log4j:configuration>
<appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
<appender-ref ref="TEMP" />
</appender>
@@ -25,4 +25,4 @@
<appender-ref ref="ASYNC" />
</root>
-</configuration>
+</log4j:configuration>
1.3 +3 -3 jakarta-log4j/org/apache/log4j/performance/xml/logging305.xml
Index: logging305.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/performance/xml/logging305.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logging305.xml 2000/12/26 23:39:10 1.2
+++ logging305.xml 2001/01/17 14:26:55 1.3
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<configuration>
+<log4j:configuration>
<appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
<appender-ref ref="TEMP" />
</appender>
@@ -25,4 +25,4 @@
<appender-ref ref="ASYNC" />
</root>
-</configuration>
+</log4j:configuration>
1.3 +3 -3 jakarta-log4j/org/apache/log4j/performance/xml/logging306.xml
Index: logging306.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/performance/xml/logging306.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logging306.xml 2000/12/26 23:39:10 1.2
+++ logging306.xml 2001/01/17 14:26:55 1.3
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<configuration>
+<log4j:configuration>
<appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
<appender-ref ref="TEMP" />
@@ -26,4 +26,4 @@
<appender-ref ref="ASYNC" />
</root>
-</configuration>
+</log4j:configuration>
1.3 +3 -3 jakarta-log4j/org/apache/log4j/performance/xml/logging307.xml
Index: logging307.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/performance/xml/logging307.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logging307.xml 2000/12/26 23:39:10 1.2
+++ logging307.xml 2001/01/17 14:26:55 1.3
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<configuration>
+<log4j:configuration>
<appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
<appender-ref ref="TEMP" />
</appender>
@@ -25,4 +25,4 @@
<appender-ref ref="ASYNC" />
</root>
-</configuration>
+</log4j:configuration>
1.3 +3 -3 jakarta-log4j/org/apache/log4j/performance/xml/logging4.xml
Index: logging4.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/performance/xml/logging4.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logging4.xml 2000/12/26 23:39:10 1.2
+++ logging4.xml 2001/01/17 14:26:55 1.3
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<configuration>
+<log4j:configuration>
<appender name="NULL" class="org.apache.log4j.performance.NullAppender">
<layout class="org.apache.log4j.TTCCLayout">
@@ -18,4 +18,4 @@
<appender-ref ref="NULL" />
</root>
-</configuration>
+</log4j:configuration>
1.3 +3 -3 jakarta-log4j/org/apache/log4j/performance/xml/logging5.xml
Index: logging5.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/performance/xml/logging5.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logging5.xml 2000/12/26 23:39:10 1.2
+++ logging5.xml 2001/01/17 14:26:55 1.3
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<!-- PropertyConfigurator equivalent:
log4j.rootCategory=, NULL
@@ -8,7 +8,7 @@
log4j.appender.NULL.layout=org.apache.log4j.PatternLayout
log4j.appender.NULL.layout.ConversionPattern=%r [%t] %-5p %c{2} %x - %m%n
-->
-<configuration>
+<log4j:configuration>
<appender name="NULL" class="org.apache.log4j.performance.NullAppender">
<layout class="org.apache.log4j.PatternLayout">
@@ -26,4 +26,4 @@
<appender-ref ref="NULL" />
</root>
-</configuration>
+</log4j:configuration>
1.3 +3 -3 jakarta-log4j/org/apache/log4j/performance/xml/logging6.xml
Index: logging6.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/performance/xml/logging6.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logging6.xml 2000/12/26 23:39:11 1.2
+++ logging6.xml 2001/01/17 14:26:55 1.3
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<!-- PropertyConfigurator equivalent:
log4j.rootCategory=, NULL
@@ -8,7 +8,7 @@
log4j.appender.NULL.layout=org.apache.log4j.PatternLayout
log4j.appender.NULL.layout.ConversionPattern=%r [%t] %-5p %.10c %x - %m%n
-->
-<configuration>
+<log4j:configuration>
<appender name="NULL" class="org.apache.log4j.performance.NullAppender">
<layout class="org.apache.log4j.PatternLayout">
@@ -26,4 +26,4 @@
<appender-ref ref="NULL" />
</root>
-</configuration>
+</log4j:configuration>
1.3 +3 -3 jakarta-log4j/org/apache/log4j/performance/xml/logging7.xml
Index: logging7.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/performance/xml/logging7.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logging7.xml 2000/12/26 23:39:11 1.2
+++ logging7.xml 2001/01/17 14:26:55 1.3
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<!-- PropertyConfigurator equivalent:
log4j.rootCategory=, NULL
@@ -8,7 +8,7 @@
log4j.appender.NULL.layout=org.apache.log4j.PatternLayout
log4j.appender.NULL.layout.ConversionPattern=%r [%t] %-5p %.20c %x - %m%n
-->
-<configuration>
+<log4j:configuration>
<appender name="NULL" class="org.apache.log4j.performance.NullAppender">
<layout class="org.apache.log4j.PatternLayout">
@@ -26,4 +26,4 @@
<appender-ref ref="NULL" />
</root>
-</configuration>
+</log4j:configuration>
1.3 +3 -3 jakarta-log4j/org/apache/log4j/performance/xml/logging8.xml
Index: logging8.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/performance/xml/logging8.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logging8.xml 2000/12/26 23:39:11 1.2
+++ logging8.xml 2001/01/17 14:26:55 1.3
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<!-- PropertyConfigurator equivalent:
log4j.rootCategory=, NULL
@@ -8,7 +8,7 @@
log4j.appender.NULL.layout=org.apache.log4j.PatternLayout
log4j.appender.NULL.layout.ConversionPattern=%r [%t] %-5p %c - %m%n
-->
-<configuration>
+<log4j:configuration>
<appender name="NULL" class="org.apache.log4j.performance.NullAppender">
<layout class="org.apache.log4j.PatternLayout">
@@ -26,4 +26,4 @@
<appender-ref ref="NULL" />
</root>
-</configuration>
+</log4j:configuration>
1.3 +3 -3 jakarta-log4j/org/apache/log4j/performance/xml/logging9.xml
Index: logging9.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/performance/xml/logging9.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- logging9.xml 2000/12/26 23:39:11 1.2
+++ logging9.xml 2001/01/17 14:26:55 1.3
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<!-- PropertyConfigurator equivalent:
log4j.rootCategory=, NULL
@@ -8,7 +8,7 @@
log4j.appender.NULL.layout=org.apache.log4j.TTCCLayout
log4j.appender.NULL.layout.DateFormat=RELATIVE
-->
-<configuration>
+<log4j:configuration>
<appender name="NULL" class="org.apache.log4j.performance.NullAppender">
<layout class="org.apache.log4j.TTCCLayout">
@@ -25,4 +25,4 @@
<appender-ref ref="NULL" />
</root>
-</configuration>
+</log4j:configuration>
1.8 +3 -4 jakarta-log4j/org/apache/log4j/xml/DOMConfigurator.java
Index: DOMConfigurator.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/xml/DOMConfigurator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DOMConfigurator.java 2001/01/17 09:28:58 1.7
+++ DOMConfigurator.java 2001/01/17 14:26:58 1.8
@@ -55,7 +55,7 @@
@since 0.8.3 */
public class DOMConfigurator extends BasicConfigurator implements Configurator {
- static final String CONFIGURATION_TAG = "configuration";
+ static final String CONFIGURATION_TAG = "log4j:configuration";
static final String RENDERER_TAG = "renderer";
static final String APPENDER_TAG = "appender";
static final String APPENDER_REF_TAG = "appender-ref";
@@ -249,8 +249,7 @@
void parseFilters(Element element, Appender appender) {
String clazz = element.getAttribute(CLASS_ATTR);
Filter filter = (Filter) OptionConverter.instantiateByClassName(clazz,
- org.apache.log4j.spi.Filter.class,
- null);
+ Filter.class, null);
if(filter != null) {
NodeList children = element.getChildNodes();
@@ -593,7 +592,7 @@
void parse(Element element, Hierarchy hierarchy) {
if (!element.getTagName().equals(CONFIGURATION_TAG)) {
- LogLog.error("DOM element is not a <configuration> element");
+ LogLog.error("DOM element is not a <"+CONFIGURATION_TAG+"> element.");
return;
}
1.3 +2 -2 jakarta-log4j/org/apache/log4j/xml/log4j.dtd
Index: log4j.dtd
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/xml/log4j.dtd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- log4j.dtd 2000/12/26 23:39:15 1.2
+++ log4j.dtd 2001/01/17 14:26:58 1.3
@@ -6,7 +6,7 @@
elements,appender elements, categories and an optional root
element. -->
-<!ELEMENT configuration (renderer*, appender*,category*,root?)>
+<!ELEMENT logj:configuration (renderer*, appender*,category*,root?)>
<!-- The disableOverride attribute allows the user to override any
BasicConfigurator.disable invocations made from within the
@@ -22,7 +22,7 @@
configDebug variable.
-->
-<!ATTLIST configuration
+<!ATTLIST log4j:configuration
disableOverride (true|false|null) "null"
configDebug (true|false|null) "null"
>
1.4 +3 -3 jakarta-log4j/org/apache/log4j/xml/test/do1.xml
Index: do1.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/xml/test/do1.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- do1.xml 2000/12/19 13:14:07 1.3
+++ do1.xml 2001/01/17 14:26:58 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<!-- Test DOMConfigurator for
@@ -8,7 +8,7 @@
with a specifed DTD
-->
-<configuration>
+<log4j:configuration>
<appender name="A1" class="org.apache.log4j.FileAppender">
<param name="File" value="System.out" />
<layout class="org.apache.log4j.PatternLayout">
@@ -22,4 +22,4 @@
<appender-ref ref="A1" />
</root>
-</configuration>
+</log4j:configuration>
1.4 +3 -3 jakarta-log4j/org/apache/log4j/xml/test/do10.xml
Index: do10.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/xml/test/do10.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- do10.xml 2000/12/19 13:23:40 1.3
+++ do10.xml 2001/01/17 14:26:58 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<!-- Test DOMConfigurator for
@@ -8,7 +8,7 @@
no DTD
-->
-<configuration>
+<log4j:configuration>
<appender name="A1" class="org.apache.log4j.FileAppender">
<param name="File" value="System.out" />
@@ -23,4 +23,4 @@
<appender-ref ref="A1" />
</root>
-</configuration>
+</log4j:configuration>
1.4 +3 -3 jakarta-log4j/org/apache/log4j/xml/test/do11.xml
Index: do11.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/xml/test/do11.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- do11.xml 2000/12/19 13:23:41 1.3
+++ do11.xml 2001/01/17 14:26:58 1.4
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<!-- Test DOMConfigurator for
with disableOverride=true
with undefined configDebug param element
-->
-<configuration disableOverride="true">
+<log4j:configuration disableOverride="true">
<appender name="A1" class="org.apache.log4j.FileAppender">
<param name="File" value="System.out" />
@@ -20,4 +20,4 @@
<appender-ref ref="A1" />
</root>
-</configuration>
+</log4j:configuration>
1.3 +2 -2 jakarta-log4j/org/apache/log4j/xml/test/do12.xml
Index: do12.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/xml/test/do12.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- do12.xml 2000/12/14 21:08:43 1.2
+++ do12.xml 2001/01/17 14:26:58 1.3
@@ -6,7 +6,7 @@
with undefined configDebug param element
no DTD
-->
-<configuration disableOverride="false">
+<log4j:configuration disableOverride="false">
<appender name="A1" class="org.apache.log4j.FileAppender">
<param name="File" value="System.out" />
@@ -22,4 +22,4 @@
<appender-ref ref="A1" />
</root>
-</configuration>
+</log4j:configuration>
1.4 +3 -3 jakarta-log4j/org/apache/log4j/xml/test/do2.xml
Index: do2.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/xml/test/do2.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- do2.xml 2000/12/19 13:23:41 1.3
+++ do2.xml 2001/01/17 14:26:58 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<!-- Test DOMConfigurator for
@@ -8,7 +8,7 @@
with a specifed DTD
-->
-<configuration disableOverride="true">
+<log4j:configuration disableOverride="true">
<appender name="A1" class="org.apache.log4j.FileAppender">
<param name="File" value="System.out" />
@@ -23,4 +23,4 @@
<appender-ref ref="A1" />
</root>
-</configuration>
\ No newline at end of file
+</log4j:configuration>
\ No newline at end of file
1.4 +3 -3 jakarta-log4j/org/apache/log4j/xml/test/do3.xml
Index: do3.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/xml/test/do3.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- do3.xml 2000/12/19 13:23:41 1.3
+++ do3.xml 2001/01/17 14:26:58 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<!-- Test DOMConfigurator for
@@ -8,7 +8,7 @@
with a specifed DTD
-->
-<configuration disableOverride="false">
+<log4j:configuration disableOverride="false">
<appender name="A1" class="org.apache.log4j.FileAppender">
<param name="File" value="System.out" />
@@ -24,4 +24,4 @@
<appender-ref ref="A1" />
</root>
-</configuration>
\ No newline at end of file
+</log4j:configuration>
\ No newline at end of file
1.4 +3 -3 jakarta-log4j/org/apache/log4j/xml/test/do4.xml
Index: do4.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/xml/test/do4.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- do4.xml 2000/12/19 13:23:42 1.3
+++ do4.xml 2001/01/17 14:26:58 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<!-- Test DOMConfigurator for
@@ -8,7 +8,7 @@
with a specifed DTD
-->
-<configuration>
+<log4j:configuration>
<appender name="A1" class="org.apache.log4j.FileAppender">
<param name="File" value="System.out" />
@@ -23,4 +23,4 @@
<appender-ref ref="A1" />
</root>
-</configuration>
+</log4j:configuration>
1.4 +3 -3 jakarta-log4j/org/apache/log4j/xml/test/do5.xml
Index: do5.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/xml/test/do5.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- do5.xml 2000/12/19 13:23:42 1.3
+++ do5.xml 2001/01/17 14:26:58 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<!-- Test DOMConfigurator for
@@ -8,7 +8,7 @@
with a specifed DTD
-->
-<configuration disableOverride="true">
+<log4j:configuration disableOverride="true">
<appender name="A1" class="org.apache.log4j.FileAppender">
<param name="File" value="System.out" />
@@ -23,4 +23,4 @@
<appender-ref ref="A1" />
</root>
-</configuration>
+</log4j:configuration>
1.4 +3 -3 jakarta-log4j/org/apache/log4j/xml/test/do6.xml
Index: do6.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/xml/test/do6.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- do6.xml 2000/12/19 13:23:42 1.3
+++ do6.xml 2001/01/17 14:26:58 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<!-- Test DOMConfigurator for
@@ -8,7 +8,7 @@
with a specifed DTD
-->
-<configuration disableOverride="false">
+<log4j:configuration disableOverride="false">
<appender name="A1" class="org.apache.log4j.FileAppender">
<param name="File" value="System.out" />
@@ -24,4 +24,4 @@
<appender-ref ref="A1" />
</root>
-</configuration>
+</log4j:configuration>
1.4 +3 -3 jakarta-log4j/org/apache/log4j/xml/test/do7.xml
Index: do7.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/xml/test/do7.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- do7.xml 2000/12/19 13:23:43 1.3
+++ do7.xml 2001/01/17 14:26:58 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<!-- Test DOMConfigurator for
@@ -8,7 +8,7 @@
without a DTD
-->
-<configuration>
+<log4j:configuration>
<appender name="A1" class="org.apache.log4j.FileAppender">
<param name="File" value="System.out" />
@@ -23,4 +23,4 @@
<appender-ref ref="A1" />
</root>
-</configuration>
+</log4j:configuration>
1.4 +3 -3 jakarta-log4j/org/apache/log4j/xml/test/do8.xml
Index: do8.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/xml/test/do8.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- do8.xml 2000/12/19 13:23:43 1.3
+++ do8.xml 2001/01/17 14:26:58 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<!-- Test DOMConfigurator for
@@ -8,7 +8,7 @@
without DTD
-->
-<configuration disableOverride="true">
+<log4j:configuration disableOverride="true">
<appender name="A1" class="org.apache.log4j.FileAppender">
<param name="File" value="System.out" />
@@ -23,4 +23,4 @@
<appender-ref ref="A1" />
</root>
-</configuration>
+</log4j:configuration>
1.4 +3 -3 jakarta-log4j/org/apache/log4j/xml/test/do9.xml
Index: do9.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/xml/test/do9.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- do9.xml 2000/12/19 13:23:43 1.3
+++ do9.xml 2001/01/17 14:26:58 1.4
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<!-- Test DOMConfigurator for
@@ -9,7 +9,7 @@
without DTD
-->
-<configuration disableOverride="false">
+<log4j:configuration disableOverride="false">
<appender name="A1" class="org.apache.log4j.FileAppender">
<param name="File" value="System.out" />
@@ -25,4 +25,4 @@
<appender-ref ref="A1" />
</root>
-</configuration>
+</log4j:configuration>
1.4 +3 -3 jakarta-log4j/org/apache/log4j/xml/test/test1.xml
Index: test1.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/xml/test/test1.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- test1.xml 2000/12/19 13:14:07 1.3
+++ test1.xml 2001/01/17 14:26:58 1.4
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<configuration>
+<log4j:configuration>
<appender name="A1" class="org.apache.log4j.FileAppender">
<param name="File" value="temp.A1" />
@@ -31,4 +31,4 @@
<appender-ref ref="A2" />
</root>
-</configuration>
+</log4j:configuration>
1.4 +3 -3 jakarta-log4j/org/apache/log4j/xml/test/test10.xml
Index: test10.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/xml/test/test10.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- test10.xml 2000/12/19 13:14:07 1.3
+++ test10.xml 2001/01/17 14:26:58 1.4
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<configuration>
+<log4j:configuration>
<appender name="A1" class="org.apache.log4j.FileAppender">
<param name="Append" value="false" />
@@ -28,4 +28,4 @@
<root>
<appender-ref ref="A1" />
</root>
-</configuration>
+</log4j:configuration>
1.4 +3 -3 jakarta-log4j/org/apache/log4j/xml/test/test11.xml
Index: test11.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/xml/test/test11.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- test11.xml 2000/12/19 13:14:07 1.3
+++ test11.xml 2001/01/17 14:26:58 1.4
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<configuration configDebug="true">
+<log4j:configuration configDebug="true">
<appender name="TEMP" class="org.apache.log4j.FileAppender">
<param name="Append" value="false" />
@@ -22,4 +22,4 @@
<root>
<appender-ref ref="TEMP" />
</root>
-</configuration>
+</log4j:configuration>
1.4 +3 -3 jakarta-log4j/org/apache/log4j/xml/test/test12.xml
Index: test12.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/xml/test/test12.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- test12.xml 2000/12/19 13:14:07 1.3
+++ test12.xml 2001/01/17 14:26:58 1.4
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<configuration configDebug="true">
+<log4j:configuration configDebug="true">
<appender name="TEMP" class="org.apache.log4j.FileAppender">
<param name="Append" value="false" />
@@ -21,4 +21,4 @@
<root>
<appender-ref ref="TEMP" />
</root>
-</configuration>
+</log4j:configuration>
1.4 +3 -3 jakarta-log4j/org/apache/log4j/xml/test/test2.xml
Index: test2.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/xml/test/test2.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- test2.xml 2000/12/19 13:14:09 1.3
+++ test2.xml 2001/01/17 14:26:58 1.4
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<!-- This test XML file
- references an INEXISTENT appender in root
- has no appender set for root
- appender A1 has no output target
-->
-<configuration>
+<log4j:configuration>
<appender name="A1" class="org.apache.log4j.FileAppender">
<param name="Append" value="false" />
@@ -23,4 +23,4 @@
<priority value="error"/>
<appender-ref ref="INEXISTENT" />
</root>
-</configuration>
+</log4j:configuration>
1.4 +3 -3 jakarta-log4j/org/apache/log4j/xml/test/test3.xml
Index: test3.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/xml/test/test3.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- test3.xml 2000/12/19 13:14:09 1.3
+++ test3.xml 2001/01/17 14:26:58 1.4
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<configuration >
+<log4j:configuration >
<appender name="A1" class="org.apache.log4j.RollingFileAppender">
<param name="File" value="temp.A1" />
@@ -38,4 +38,4 @@
<appender-ref ref="A2" />
</root>
-</configuration>
+</log4j:configuration>
1.4 +3 -3 jakarta-log4j/org/apache/log4j/xml/test/test4.xml
Index: test4.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/xml/test/test4.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- test4.xml 2000/12/19 13:14:09 1.3
+++ test4.xml 2001/01/17 14:26:58 1.4
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<configuration>
+<log4j:configuration>
<appender name="A1" class="org.apache.log4j.FileAppender">
<param name="Append" value="false" />
@@ -18,4 +18,4 @@
<priority value="error"/>
<appender-ref ref="A1" />
</root>
-</configuration>
+</log4j:configuration>
1.4 +3 -3 jakarta-log4j/org/apache/log4j/xml/test/test5.xml
Index: test5.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/xml/test/test5.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- test5.xml 2000/12/19 13:14:09 1.3
+++ test5.xml 2001/01/17 14:26:58 1.4
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<configuration>
+<log4j:configuration>
<appender name="A1" class="org.apache.log4j.FileAppender">
<param name="Append" value="false" />
@@ -15,4 +15,4 @@
<root>
<appender-ref ref="A1" />
</root>
-</configuration>
+</log4j:configuration>
1.4 +3 -3 jakarta-log4j/org/apache/log4j/xml/test/test6.xml
Index: test6.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/xml/test/test6.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- test6.xml 2000/12/19 13:14:09 1.3
+++ test6.xml 2001/01/17 14:26:58 1.4
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<configuration>
+<log4j:configuration>
<appender name="A1" class="org.apache.log4j.FileAppender">
<param name="Append" value="false" />
@@ -27,4 +27,4 @@
<root>
<appender-ref ref="A1" />
</root>
-</configuration>
+</log4j:configuration>
1.4 +3 -3 jakarta-log4j/org/apache/log4j/xml/test/test7.xml
Index: test7.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/xml/test/test7.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- test7.xml 2000/12/19 13:14:10 1.3
+++ test7.xml 2001/01/17 14:26:58 1.4
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<configuration>
+<log4j:configuration>
<appender name="A1" class="org.apache.log4j.FileAppender">
<param name="Append" value="false" />
@@ -21,4 +21,4 @@
<root>
<appender-ref ref="A1" />
</root>
-</configuration>
+</log4j:configuration>
1.4 +3 -3 jakarta-log4j/org/apache/log4j/xml/test/test8.xml
Index: test8.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/xml/test/test8.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- test8.xml 2000/12/19 13:14:10 1.3
+++ test8.xml 2001/01/17 14:26:58 1.4
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<configuration>
+<log4j:configuration>
<appender name="A1" class="org.apache.log4j.FileAppender">
<param name="Append" value="false" />
@@ -39,4 +39,4 @@
<root>
<appender-ref ref="A1" />
</root>
-</configuration>
+</log4j:configuration>
1.4 +3 -3 jakarta-log4j/org/apache/log4j/xml/test/test9.xml
Index: test9.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/xml/test/test9.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- test9.xml 2000/12/19 13:14:10 1.3
+++ test9.xml 2001/01/17 14:26:59 1.4
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<configuration>
+<log4j:configuration>
<appender name="A1" class="org.apache.log4j.FileAppender">
<param name="Append" value="false" />
@@ -29,4 +29,4 @@
<root>
<appender-ref ref="A1" />
</root>
-</configuration>
+</log4j:configuration>