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...@locus.apache.org on 2000/12/27 00:39:15 UTC

cvs commit: jakarta-log4j/org/apache/log4j/xml/examples sample1.xml sample2.xml sample3.xml sample4.xml

ceki        00/12/26 15:39:15

  Modified:    org/apache/log4j/examples factor.lcf mycat.bad mycat.good
               org/apache/log4j/net/test logging.lcf loop.lcf
                        socketServer.lcf syslogMin
               org/apache/log4j/nt nteventlog.cpp
               org/apache/log4j/or package.html
               org/apache/log4j/performance logging
               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/varia/test doRoll externalRoll resiliency
               org/apache/log4j/xml log4j.dtd
               org/apache/log4j/xml/examples sample1.xml sample2.xml
                        sample3.xml sample4.xml
  Log:
  Replaced org.log4j by org.log4j.apache in xml files and other varia.
  
  Revision  Changes    Path
  1.2       +3 -3      jakarta-log4j/org/apache/log4j/examples/factor.lcf
  
  Index: factor.lcf
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/examples/factor.lcf,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- factor.lcf	2000/12/14 10:13:25	1.1
  +++ factor.lcf	2000/12/26 23:39:07	1.2
  @@ -1,5 +1,5 @@
   # For the general syntax of propperty based caonfiguration files see
  -# the documenation of org.log4j.PropertyConfigurator.
  +# the documenation of org.apache.log4j.PropertyConfigurator.
   
   # The root category uses the appender called A1. Since no priority is
   # specified, the root category assumes the default priority for root
  @@ -18,9 +18,9 @@
   # of these requests can still be distinguished given their distinct
   # nested diagnostic contexts.
     
  -log4j.appender.A1=org.log4j.FileAppender
  +log4j.appender.A1=org.apache.log4j.FileAppender
   log4j.appender.A1.File=factor.log
  -log4j.appender.A1.layout=org.log4j.PatternLayout
  +log4j.appender.A1.layout=org.apache.log4j.PatternLayout
   
   # Note the %x conversion specifier for NDC printing.
   log4j.appender.A1.layout.ConversionPattern=%-4r %-5p [%t] (%x) - %m\n
  
  
  
  1.2       +2 -2      jakarta-log4j/org/apache/log4j/examples/mycat.bad
  
  Index: mycat.bad
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/examples/mycat.bad,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- mycat.bad	2000/12/14 10:13:25	1.1
  +++ mycat.bad	2000/12/26 23:39:07	1.2
  @@ -1,9 +1,9 @@
   
   # The usual stuff. Note that A1 is configured in root not in "some.cat"
   log4j.rootCategory=DEBUG, A1
  -log4j.appender.A1=org.log4j.FileAppender
  +log4j.appender.A1=org.apache.log4j.FileAppender
   log4j.appender.A1.File=System.out
  -log4j.appender.A1.layout=org.log4j.PatternLayout
  +log4j.appender.A1.layout=org.apache.log4j.PatternLayout
   log4j.appender.A1.layout.ConversionPattern=%c - %m%n
   
   
  
  
  
  1.2       +3 -3      jakarta-log4j/org/apache/log4j/examples/mycat.good
  
  Index: mycat.good
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/examples/mycat.good,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- mycat.good	2000/12/14 10:13:25	1.1
  +++ mycat.good	2000/12/26 23:39:07	1.2
  @@ -2,15 +2,15 @@
   # ClassCastException problem encountered with the "mycat.bad"
   # configuration file.
   
  -log4j.categoryFactory=org.log4j.examples.MyCategoryFactory
  +log4j.categoryFactory=org.apache.log4j.examples.MyCategoryFactory
   
   
   # The usual stuff. Note that A1 is configured in root not in "some.cat"
   
   log4j.rootCategory=DEBUG, A1
  -log4j.appender.A1=org.log4j.FileAppender
  +log4j.appender.A1=org.apache.log4j.FileAppender
   log4j.appender.A1.File=System.out
  -log4j.appender.A1.layout=org.log4j.PatternLayout
  +log4j.appender.A1.layout=org.apache.log4j.PatternLayout
   log4j.appender.A1.layout.ConversionPattern=[%t] %c - %m%n
   
   
  
  
  
  1.2       +2 -2      jakarta-log4j/org/apache/log4j/net/test/logging.lcf
  
  Index: logging.lcf
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/net/test/logging.lcf,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- logging.lcf	2000/12/14 09:31:30	1.1
  +++ logging.lcf	2000/12/26 23:39:07	1.2
  @@ -1,9 +1,9 @@
   log4j.rootCategory=  , testAppender
   log4j.configDebug=true
  -log4j.appender.testAppender=org.log4j.net.SyslogAppender
  +log4j.appender.testAppender=org.apache.log4j.net.SyslogAppender
   log4j.appender.testAppender.SyslogHost=localhost
   log4j.appender.testAppender.Facility=LOCAL0
   log4j.appender.testAppender.FacilityPrinting=
  -log4j.appender.testAppender.layout=org.log4j.TTCCLayout
  +log4j.appender.testAppender.layout=org.apache.log4j.TTCCLayout
   log4j.appender.testAppender.layout.DateFormat=NULL
   log4j.appender.testAppender.layout.TimeZone=
  
  
  
  1.2       +2 -2      jakarta-log4j/org/apache/log4j/net/test/loop.lcf
  
  Index: loop.lcf
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/net/test/loop.lcf,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- loop.lcf	2000/12/14 09:31:30	1.1
  +++ loop.lcf	2000/12/26 23:39:07	1.2
  @@ -1,9 +1,9 @@
   log4j.rootCategory=  , A1
   log4j.configDebug=true
  -log4j.appender.A1=org.log4j.RollingFileAppender
  +log4j.appender.A1=org.apache.log4j.RollingFileAppender
   log4j.appender.A1.Append=true
   log4j.appender.A1.File=loop.log
   log4j.appender.A1.MaxFileSize=100KB
  -log4j.appender.A1.layout=org.log4j.PatternLayout
  +log4j.appender.A1.layout=org.apache.log4j.PatternLayout
   log4j.appender.A1.layout.ConversionPattern=%p [%t] - %m\n
   
  
  
  
  1.2       +4 -4      jakarta-log4j/org/apache/log4j/net/test/socketServer.lcf
  
  Index: socketServer.lcf
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/net/test/socketServer.lcf,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- socketServer.lcf	2000/12/14 09:31:30	1.1
  +++ socketServer.lcf	2000/12/26 23:39:07	1.2
  @@ -1,11 +1,11 @@
   
   log4j.rootCategory=, R
  -log4j.appender.R=org.log4j.performance.NullAppender
  +log4j.appender.R=org.apache.log4j.performance.NullAppender
   
   
  -log4j.category.org.log4j.net.SocketServer=, A1
  -log4j.appender.A1=org.log4j.FileAppender
  +log4j.category.org.apache.log4j.net.SocketServer=, A1
  +log4j.appender.A1=org.apache.log4j.FileAppender
   log4j.appender.A1.File=System.out
  -log4j.appender.A1.layout=org.log4j.PatternLayout
  +log4j.appender.A1.layout=org.apache.log4j.PatternLayout
   log4j.appender.A1.layout.ConversionPattern=%-5r %-5p [%-8t] %c{2} %x - %m\n
   
  
  
  
  1.2       +3 -3      jakarta-log4j/org/apache/log4j/net/test/syslogMin
  
  Index: syslogMin
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/net/test/syslogMin,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- syslogMin	2000/12/14 09:31:30	1.1
  +++ syslogMin	2000/12/26 23:39:07	1.2
  @@ -10,12 +10,12 @@
   
     echo  "log4j.rootCategory=  , testAppender" > $LCF
     lecho "log4j.configDebug=true"
  -  lecho "log4j.appender.testAppender=org.log4j.net.SyslogAppender"
  +  lecho "log4j.appender.testAppender=org.apache.log4j.net.SyslogAppender"
     lecho "log4j.appender.testAppender.SyslogHost=localhost"
     lecho "log4j.appender.testAppender.Facility=LOCAL0"
     lecho "log4j.appender.testAppender.FacilityPrinting="
  -  lecho "log4j.appender.testAppender.layout=org.log4j.TTCCLayout"
  +  lecho "log4j.appender.testAppender.layout=org.apache.log4j.TTCCLayout"
     lecho "log4j.appender.testAppender.layout.DateFormat=NULL"
     lecho "log4j.appender.testAppender.layout.TimeZone="
   
  -  java org.log4j.net.test.SyslogMin $LCF
  +  java org.apache.log4j.net.test.SyslogMin $LCF
  
  
  
  1.3       +2 -2      jakarta-log4j/org/apache/log4j/nt/nteventlog.cpp
  
  Index: nteventlog.cpp
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/nt/nteventlog.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- nteventlog.cpp	2000/12/20 15:57:28	1.2
  +++ nteventlog.cpp	2000/12/26 23:39:08	1.3
  @@ -147,7 +147,7 @@
   }
   
   /*
  - * Class:     org_log4j_nt_NTEventLogAppender
  + * Class:     org.apache.log4j.nt.NTEventLogAppender
    * Method:    registerEventSource
    * Signature: (Ljava/lang/String;Ljava/lang/String;)I
    */
  @@ -208,7 +208,7 @@
   }
   
   /*
  - * Class:     org_log4j_nt_NTEventLogAppender
  + * Class:     org_apache_log4j_nt_NTEventLogAppender
    * Method:    deregisterEventSource
    * Signature: (I)V
    */
  
  
  
  1.2       +1 -1      jakarta-log4j/org/apache/log4j/or/package.html
  
  Index: package.html
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/or/package.html,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- package.html	2000/12/14 09:31:32	1.1
  +++ package.html	2000/12/26 23:39:08	1.2
  @@ -1,7 +1,7 @@
   <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
   <html>
    <head>
  -<title>org.log4j.or package</title>
  +<title>org.apache.log4j.or package</title>
   </head>
   
   <body>
  
  
  
  1.2       +2 -2      jakarta-log4j/org/apache/log4j/performance/logging
  
  Index: logging
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/performance/logging,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- logging	2000/12/14 09:31:33	1.1
  +++ logging	2000/12/26 23:39:08	1.2
  @@ -39,7 +39,7 @@
     while [ $i -lt $loopLength ]
     do
       i=$i+1
  -    x=$(java $D org.log4j.performance.Logging  $lcf $runLength $5)
  +    x=$(java $D org.apache.log4j.performance.Logging  $lcf $runLength $5)
       if [ $x -lt 100 ]; then
         echo -n " "
       fi  
  @@ -307,7 +307,7 @@
   # ===============================================================
   TEST=1000
   if [ $TEST -ge $start ]; then
  -   java org.log4j.performance.Logging xml/logging$TEST.xml 10000 100 100
  +   java org.apache.log4j.performance.Logging xml/logging$TEST.xml 10000 100 100
      #multiRun 4 "SocketAppender" $SHORTRUN $DELAY
   fi
   
  
  
  
  1.2       +4 -4      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- logging1.xml	2000/12/14 09:31:34	1.1
  +++ logging1.xml	2000/12/26 23:39:09	1.2
  @@ -4,14 +4,14 @@
   <!-- PropertyConfigurator equivalent:
   log4j.rootCategory=, NULL
   log4j.category.A0123456789=INFO
  -log4j.appender.NULL=org.log4j.performance.NullAppender
  -log4j.appender.NULL.layout=org.log4j.SimpleLayout
  +log4j.appender.NULL=org.apache.log4j.performance.NullAppender
  +log4j.appender.NULL.layout=org.apache.log4j.SimpleLayout
   -->
   
   <configuration>
   
  -	<appender name="NULL" class="org.log4j.performance.NullAppender">
  -           <layout class="org.log4j.SimpleLayout"/>
  +	<appender name="NULL" class="org.apache.log4j.performance.NullAppender">
  +           <layout class="org.apache.log4j.SimpleLayout"/>
   	</appender>
   	
   	<root>
  
  
  
  1.2       +4 -4      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- logging10.xml	2000/12/14 09:31:34	1.1
  +++ logging10.xml	2000/12/26 23:39:09	1.2
  @@ -4,13 +4,13 @@
   <!-- PropertyConfigurator equivalent:
   log4j.rootCategory=, NULL
   log4j.category.A0123456789=INFO
  -log4j.appender.NULL=org.log4j.performance.NullAppender
  -log4j.appender.NULL.layout=org.log4j.PatternLayout
  +log4j.appender.NULL=org.apache.log4j.performance.NullAppender
  +log4j.appender.NULL.layout=org.apache.log4j.PatternLayout
   log4j.appender.NULL.layout.ConversionPattern=%d{ISO8601} [%t] %-5p %c %x - %m%n
   -->
   <configuration>
  -        <appender name="NULL" class="org.log4j.performance.NullAppender">
  -           <layout class="org.log4j.PatternLayout">
  +        <appender name="NULL" class="org.apache.log4j.performance.NullAppender">
  +           <layout class="org.apache.log4j.PatternLayout">
                 <param name="ConversionPattern" 
                        value="%d{ISO8601} [%t] %-5p %c %x - %m%n"/>
   	   </layout>
  
  
  
  1.2       +2 -2      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- logging100.xml	2000/12/14 09:31:34	1.1
  +++ logging100.xml	2000/12/26 23:39:09	1.2
  @@ -2,11 +2,11 @@
   <!DOCTYPE configuration SYSTEM "log4j.dtd">
   
   <configuration>
  -        <appender name="NULL" class="org.log4j.FileAppender">
  +        <appender name="NULL" class="org.apache.log4j.FileAppender">
              <param name="File" value="test"/>
              <param name="Append" value="false"/>
   
  -           <layout class="org.log4j.SimpleLayout">
  +           <layout class="org.apache.log4j.SimpleLayout">
   	   </layout>
   	</appender>
    
  
  
  
  1.2       +1 -1      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- logging1000.xml	2000/12/14 09:31:34	1.1
  +++ logging1000.xml	2000/12/26 23:39:09	1.2
  @@ -2,7 +2,7 @@
   <!DOCTYPE configuration SYSTEM "log4j.dtd">
   
   <configuration>
  -        <appender name="NULL" class="org.log4j.net.SocketAppender">
  +        <appender name="NULL" class="org.apache.log4j.net.SocketAppender">
              <param name="RemoteHost" value="localhost"/>
              <param name="Port" value="1000"/>
              <param name="ReconnectionDelay" value="1000"/>
  
  
  
  1.2       +2 -2      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- logging101.xml	2000/12/14 09:31:34	1.1
  +++ logging101.xml	2000/12/26 23:39:09	1.2
  @@ -2,11 +2,11 @@
   <!DOCTYPE configuration SYSTEM "log4j.dtd">
   
   <configuration>
  -        <appender name="NULL" class="org.log4j.FileAppender">
  +        <appender name="NULL" class="org.apache.log4j.FileAppender">
              <param name="File" value="temp"/>
              <param name="Append" value="false"/>
   
  -           <layout class="org.log4j.PatternLayout">
  +           <layout class="org.apache.log4j.PatternLayout">
                 <param name="ConversionPattern" 
                        value="%p - %m%n"/>
   	   </layout>
  
  
  
  1.2       +2 -2      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- logging102.xml	2000/12/14 09:31:34	1.1
  +++ logging102.xml	2000/12/26 23:39:09	1.2
  @@ -2,11 +2,11 @@
   <!DOCTYPE configuration SYSTEM "log4j.dtd">
   
   <configuration>
  -        <appender name="NULL" class="org.log4j.FileAppender">
  +        <appender name="NULL" class="org.apache.log4j.FileAppender">
              <param name="File" value="temp"/>
              <param name="Append" value="false"/>
   
  -           <layout class="org.log4j.TTCCLayout">
  +           <layout class="org.apache.log4j.TTCCLayout">
                 <param name="DateFormat" value="RELATIVE"/>
   	   </layout>
   	</appender>
  
  
  
  1.2       +2 -2      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- logging103.xml	2000/12/14 09:31:34	1.1
  +++ logging103.xml	2000/12/26 23:39:09	1.2
  @@ -2,11 +2,11 @@
   <!DOCTYPE configuration SYSTEM "log4j.dtd">
   
   <configuration>
  -        <appender name="TEMP" class="org.log4j.FileAppender">
  +        <appender name="TEMP" class="org.apache.log4j.FileAppender">
              <param name="File" value="temp"/>
              <param name="Append" value="false"/>
   
  -           <layout class="org.log4j.PatternLayout">
  +           <layout class="org.apache.log4j.PatternLayout">
                 <param name="ConversionPattern" 
                        value="%r [%t] %-5p %c - %m%n"/>
   	   </layout>
  
  
  
  1.2       +2 -2      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- logging104.xml	2000/12/14 09:31:34	1.1
  +++ logging104.xml	2000/12/26 23:39:09	1.2
  @@ -2,11 +2,11 @@
   <!DOCTYPE configuration SYSTEM "log4j.dtd">
   
   <configuration>
  -        <appender name="NULL" class="org.log4j.FileAppender">
  +        <appender name="NULL" class="org.apache.log4j.FileAppender">
              <param name="File" value="temp"/>
              <param name="Append" value="false"/>
   
  -           <layout class="org.log4j.TTCCLayout">
  +           <layout class="org.apache.log4j.TTCCLayout">
                 <param name="DateFormat" 
                        value="ISO8601"/>
   	   </layout>
  
  
  
  1.2       +2 -2      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- logging105.xml	2000/12/14 09:31:34	1.1
  +++ logging105.xml	2000/12/26 23:39:09	1.2
  @@ -2,11 +2,11 @@
   <!DOCTYPE configuration SYSTEM "log4j.dtd">
   
   <configuration>
  -        <appender name="NULL" class="org.log4j.FileAppender">
  +        <appender name="NULL" class="org.apache.log4j.FileAppender">
              <param name="File" value="temp"/>
              <param name="Append" value="false"/>
   
  -           <layout class="org.log4j.PatternLayout">
  +           <layout class="org.apache.log4j.PatternLayout">
                 <param name="ConversionPattern" 
                        value="%d{ISO8601} [%t] %-5p %c %x - %m%n"/>
   	   </layout>
  
  
  
  1.2       +2 -2      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- logging106.xml	2000/12/14 09:31:34	1.1
  +++ logging106.xml	2000/12/26 23:39:09	1.2
  @@ -2,11 +2,11 @@
   <!DOCTYPE configuration SYSTEM "log4j.dtd">
   
   <configuration>
  -        <appender name="NULL" class="org.log4j.FileAppender">
  +        <appender name="NULL" class="org.apache.log4j.FileAppender">
              <param name="File" value="temp"/>
              <param name="Append" value="false"/>
   
  -           <layout class="org.log4j.PatternLayout">
  +           <layout class="org.apache.log4j.PatternLayout">
                 <param name="ConversionPattern" 
                        value="%d{yyyy-MM-dd HH:mm:ss,SSS} [%t] %-5p %c %x - %m%n"/>
   	   </layout>
  
  
  
  1.2       +2 -2      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- logging107.xml	2000/12/14 09:31:34	1.1
  +++ logging107.xml	2000/12/26 23:39:09	1.2
  @@ -2,11 +2,11 @@
   <!DOCTYPE configuration SYSTEM "log4j.dtd">
   
   <configuration>
  -        <appender name="NULL" class="org.log4j.FileAppender">
  +        <appender name="NULL" class="org.apache.log4j.FileAppender">
              <param name="File" value="temp"/>
              <param name="Append" value="false"/>
   
  -           <layout class="org.log4j.PatternLayout">
  +           <layout class="org.apache.log4j.PatternLayout">
                 <param name="ConversionPattern" 
                        value="%l - %m%n"/>
   	   </layout>
  
  
  
  1.2       +4 -4      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- logging11.xml	2000/12/14 09:31:34	1.1
  +++ logging11.xml	2000/12/26 23:39:09	1.2
  @@ -4,13 +4,13 @@
   <!-- PropertyConfigurator equivalent:
   log4j.rootCategory=, NULL
   log4j.category.A0123456789=INFO
  -log4j.appender.NULL=org.log4j.performance.NullAppender
  -log4j.appender.NULL.layout=org.log4j.PatternLayout
  +log4j.appender.NULL=org.apache.log4j.performance.NullAppender
  +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>
  -        <appender name="NULL" class="org.log4j.performance.NullAppender">
  -           <layout class="org.log4j.PatternLayout">
  +        <appender name="NULL" class="org.apache.log4j.performance.NullAppender">
  +           <layout class="org.apache.log4j.PatternLayout">
                 <param name="ConversionPattern" 
                        value="%d{yyyy-MM-dd HH:mm:ss,SSS} [%t] %-5p %c %x - %m%n"/>
   	   </layout>
  
  
  
  1.2       +4 -4      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- logging12.xml	2000/12/14 09:31:34	1.1
  +++ logging12.xml	2000/12/26 23:39:09	1.2
  @@ -4,13 +4,13 @@
   <!-- PropertyConfigurator equivalent:
   log4j.rootCategory=, NULL
   log4j.category.A0123456789=INFO
  -log4j.appender.NULL=org.log4j.performance.NullAppender
  -log4j.appender.NULL.layout=org.log4j.PatternLayout
  +log4j.appender.NULL=org.apache.log4j.performance.NullAppender
  +log4j.appender.NULL.layout=org.apache.log4j.PatternLayout
   log4j.appender.NULL.layout.ConversionPattern=%l - %m%n
   -->
   <configuration>
  -        <appender name="NULL" class="org.log4j.performance.NullAppender">
  -           <layout class="org.log4j.PatternLayout">
  +        <appender name="NULL" class="org.apache.log4j.performance.NullAppender">
  +           <layout class="org.apache.log4j.PatternLayout">
                 <param name="ConversionPattern" 
                        value="%l - %m%n"/>
   	   </layout>
  
  
  
  1.2       +4 -4      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- logging13.xml	2000/12/14 09:31:34	1.1
  +++ logging13.xml	2000/12/26 23:39:09	1.2
  @@ -4,13 +4,13 @@
   <!-- PropertyConfigurator equivalent:
   log4j.rootCategory=, NULL
   log4j.category.A0123456789=INFO
  -log4j.appender.NULL=org.log4j.performance.NullAppender
  -log4j.appender.NULL.layout=org.log4j.PatternLayout
  +log4j.appender.NULL=org.apache.log4j.performance.NullAppender
  +log4j.appender.NULL.layout=org.apache.log4j.PatternLayout
   log4j.appender.NULL.layout.ConversionPattern=%C.%M.%L - %m%n
   -->
   <configuration>
  -        <appender name="NULL" class="org.log4j.performance.NullAppender">
  -           <layout class="org.log4j.PatternLayout">
  +        <appender name="NULL" class="org.apache.log4j.performance.NullAppender">
  +           <layout class="org.apache.log4j.PatternLayout">
                 <param name="ConversionPattern" 
                        value="%C.%M.%L - %m%n"/>
   	   </layout>
  
  
  
  1.2       +4 -4      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- logging2.xml	2000/12/14 09:31:34	1.1
  +++ logging2.xml	2000/12/26 23:39:09	1.2
  @@ -4,14 +4,14 @@
   <!-- PropertyConfigurator equivalent:
   log4j.rootCategory=, NULL
   log4j.category.A0123456789=INFO
  -log4j.appender.NULL=org.log4j.performance.NullAppender
  -log4j.appender.NULL.layout=org.log4j.PatternLayout
  +log4j.appender.NULL=org.apache.log4j.performance.NullAppender
  +log4j.appender.NULL.layout=org.apache.log4j.PatternLayout
   log4j.appender.NULL.layout.ConversionPattern=%p - %m%n
   -->
   <configuration>
   
  -        <appender name="NULL" class="org.log4j.performance.NullAppender">
  -           <layout class="org.log4j.PatternLayout">
  +        <appender name="NULL" class="org.apache.log4j.performance.NullAppender">
  +           <layout class="org.apache.log4j.PatternLayout">
                 <param name="ConversionPattern" value="%p - %m%n"/>
   	   </layout>
   	</appender>
  
  
  
  1.2       +2 -2      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- logging200.xml	2000/12/14 09:31:34	1.1
  +++ logging200.xml	2000/12/26 23:39:09	1.2
  @@ -2,11 +2,11 @@
   <!DOCTYPE configuration SYSTEM "log4j.dtd">
   
   <configuration>
  -        <appender name="NULL" class="org.log4j.FileAppender">
  +        <appender name="NULL" class="org.apache.log4j.FileAppender">
              <param name="File" value="test"/>
              <param name="Append" value="false"/>
              <param name="ImmediateFlush" value="false"/>
  -           <layout class="org.log4j.SimpleLayout">
  +           <layout class="org.apache.log4j.SimpleLayout">
   	   </layout>
   	</appender>
    
  
  
  
  1.2       +2 -2      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- logging201.xml	2000/12/14 09:31:34	1.1
  +++ logging201.xml	2000/12/26 23:39:10	1.2
  @@ -2,11 +2,11 @@
   <!DOCTYPE configuration SYSTEM "log4j.dtd">
   
   <configuration>
  -        <appender name="NULL" class="org.log4j.FileAppender">
  +        <appender name="NULL" class="org.apache.log4j.FileAppender">
              <param name="File" value="temp"/>
              <param name="Append" value="false"/>
              <param name="ImmediateFlush" value="false"/>
  -           <layout class="org.log4j.PatternLayout">
  +           <layout class="org.apache.log4j.PatternLayout">
                 <param name="ConversionPattern" 
                        value="%p - %m%n"/>
   	   </layout>
  
  
  
  1.2       +2 -2      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- logging202.xml	2000/12/14 09:31:34	1.1
  +++ logging202.xml	2000/12/26 23:39:10	1.2
  @@ -2,11 +2,11 @@
   <!DOCTYPE configuration SYSTEM "log4j.dtd">
   
   <configuration>
  -        <appender name="NULL" class="org.log4j.FileAppender">
  +        <appender name="NULL" class="org.apache.log4j.FileAppender">
              <param name="File" value="temp"/>
              <param name="Append" value="false"/>
              <param name="ImmediateFlush" value="false"/>
  -           <layout class="org.log4j.TTCCLayout">
  +           <layout class="org.apache.log4j.TTCCLayout">
                 <param name="DateFormat" value="RELATIVE"/>
   	   </layout>
   	</appender>
  
  
  
  1.2       +2 -2      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- logging203.xml	2000/12/14 09:31:34	1.1
  +++ logging203.xml	2000/12/26 23:39:10	1.2
  @@ -2,11 +2,11 @@
   <!DOCTYPE configuration SYSTEM "log4j.dtd">
   
   <configuration>
  -        <appender name="NULL" class="org.log4j.FileAppender">
  +        <appender name="NULL" class="org.apache.log4j.FileAppender">
              <param name="File" value="temp"/>
              <param name="Append" value="false"/>
              <param name="ImmediateFlush" value="false"/>
  -           <layout class="org.log4j.PatternLayout">
  +           <layout class="org.apache.log4j.PatternLayout">
                 <param name="ConversionPattern" 
                        value="%r [%t] %-5p %c - %m%n"/>
   	   </layout>
  
  
  
  1.2       +2 -2      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- logging204.xml	2000/12/14 09:31:34	1.1
  +++ logging204.xml	2000/12/26 23:39:10	1.2
  @@ -2,11 +2,11 @@
   <!DOCTYPE configuration SYSTEM "log4j.dtd">
   
   <configuration>
  -        <appender name="NULL" class="org.log4j.FileAppender">
  +        <appender name="NULL" class="org.apache.log4j.FileAppender">
              <param name="File" value="temp"/>
              <param name="Append" value="false"/>
              <param name="ImmediateFlush" value="false"/>
  -           <layout class="org.log4j.TTCCLayout">
  +           <layout class="org.apache.log4j.TTCCLayout">
                 <param name="DateFormat" 
                        value="ISO8601"/>
   	   </layout>
  
  
  
  1.2       +2 -2      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- logging205.xml	2000/12/14 09:31:35	1.1
  +++ logging205.xml	2000/12/26 23:39:10	1.2
  @@ -2,11 +2,11 @@
   <!DOCTYPE configuration SYSTEM "log4j.dtd">
   
   <configuration>
  -        <appender name="NULL" class="org.log4j.FileAppender">
  +        <appender name="NULL" class="org.apache.log4j.FileAppender">
              <param name="File" value="temp"/>
              <param name="Append" value="false"/>
              <param name="ImmediateFlush" value="false"/>
  -           <layout class="org.log4j.PatternLayout">
  +           <layout class="org.apache.log4j.PatternLayout">
                 <param name="ConversionPattern" 
                        value="%d{ISO8601} [%t] %-5p %c %x - %m%n"/>
   	   </layout>
  
  
  
  1.2       +2 -2      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- logging206.xml	2000/12/14 09:31:35	1.1
  +++ logging206.xml	2000/12/26 23:39:10	1.2
  @@ -2,11 +2,11 @@
   <!DOCTYPE configuration SYSTEM "log4j.dtd">
   
   <configuration>
  -        <appender name="NULL" class="org.log4j.FileAppender">
  +        <appender name="NULL" class="org.apache.log4j.FileAppender">
              <param name="File" value="temp"/>
              <param name="Append" value="false"/>
              <param name="ImmediateFlush" value="false"/>
  -           <layout class="org.log4j.PatternLayout">
  +           <layout class="org.apache.log4j.PatternLayout">
                 <param name="ConversionPattern" 
                        value="%d{yyyy-MM-dd HH:mm:ss,SSS} [%t] %-5p %c %x - %m%n"/>
   	   </layout>
  
  
  
  1.2       +2 -2      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- logging207.xml	2000/12/14 09:31:35	1.1
  +++ logging207.xml	2000/12/26 23:39:10	1.2
  @@ -2,11 +2,11 @@
   <!DOCTYPE configuration SYSTEM "log4j.dtd">
   
   <configuration>
  -        <appender name="NULL" class="org.log4j.FileAppender">
  +        <appender name="NULL" class="org.apache.log4j.FileAppender">
              <param name="File" value="temp"/>
              <param name="Append" value="false"/>
              <param name="ImmediateFlush" value="false"/>
  -           <layout class="org.log4j.PatternLayout">
  +           <layout class="org.apache.log4j.PatternLayout">
                 <param name="ConversionPattern" 
                        value="%l - %m%n"/>
   	   </layout>
  
  
  
  1.2       +4 -4      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- logging3.xml	2000/12/14 09:31:35	1.1
  +++ logging3.xml	2000/12/26 23:39:10	1.2
  @@ -4,14 +4,14 @@
   <!-- PropertyConfigurator equivalent:
   log4j.rootCategory=, NULL
   log4j.category.A0123456789=INFO
  -log4j.appender.NULL=org.log4j.performance.NullAppender
  -log4j.appender.NULL.layout=org.log4j.PatternLayout
  +log4j.appender.NULL=org.apache.log4j.performance.NullAppender
  +log4j.appender.NULL.layout=org.apache.log4j.PatternLayout
   log4j.appender.NULL.layout.ConversionPattern=%-5p - %m%n
   -->
   <configuration>
   
  -        <appender name="NULL" class="org.log4j.performance.NullAppender">
  -           <layout class="org.log4j.PatternLayout">
  +        <appender name="NULL" class="org.apache.log4j.performance.NullAppender">
  +           <layout class="org.apache.log4j.PatternLayout">
                 <param name="ConversionPattern" value="%-5p - %m%n"/>
   	   </layout>
   	</appender>
  
  
  
  1.2       +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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- logging300.xml	2000/12/14 09:31:35	1.1
  +++ logging300.xml	2000/12/26 23:39:10	1.2
  @@ -2,15 +2,15 @@
   <!DOCTYPE configuration SYSTEM "log4j.dtd">
   
   <configuration>
  -        <appender name="ASYNC" class="org.log4j.AsyncAppender">
  +        <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
      	   <appender-ref ref="TEMP" />
   	</appender>
   
  -        <appender name="TEMP" class="org.log4j.FileAppender">
  +        <appender name="TEMP" class="org.apache.log4j.FileAppender">
              <param name="File" value="test"/>
              <param name="Append" value="false"/>
              <param name="ImmediateFlush" value="false"/>
  -           <layout class="org.log4j.SimpleLayout">
  +           <layout class="org.apache.log4j.SimpleLayout">
   	   </layout>
   	</appender>
    
  
  
  
  1.2       +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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- logging301.xml	2000/12/14 09:31:35	1.1
  +++ logging301.xml	2000/12/26 23:39:10	1.2
  @@ -2,15 +2,15 @@
   <!DOCTYPE configuration SYSTEM "log4j.dtd">
   
   <configuration>
  -        <appender name="ASYNC" class="org.log4j.AsyncAppender">
  +        <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
      	   <appender-ref ref="TEMP" />
   	</appender>
   
  -        <appender name="TEMP" class="org.log4j.FileAppender">
  +        <appender name="TEMP" class="org.apache.log4j.FileAppender">
              <param name="File" value="temp"/>
              <param name="Append" value="false"/>
              <param name="ImmediateFlush" value="false"/>
  -           <layout class="org.log4j.PatternLayout">
  +           <layout class="org.apache.log4j.PatternLayout">
                 <param name="ConversionPattern" 
                        value="%p - %m%n"/>
   	   </layout>
  
  
  
  1.2       +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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- logging302.xml	2000/12/14 09:31:35	1.1
  +++ logging302.xml	2000/12/26 23:39:10	1.2
  @@ -2,14 +2,14 @@
   <!DOCTYPE configuration SYSTEM "log4j.dtd">
   
   <configuration>
  -        <appender name="ASYNC" class="org.log4j.AsyncAppender">
  +        <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
      	   <appender-ref ref="TEMP" />
   	</appender>
   
  -        <appender name="TEMP" class="org.log4j.FileAppender">
  +        <appender name="TEMP" class="org.apache.log4j.FileAppender">
              <param name="File" value="temp"/>
              <param name="Append" value="false"/>
  -           <layout class="org.log4j.TTCCLayout">
  +           <layout class="org.apache.log4j.TTCCLayout">
                 <param name="DateFormat" value="RELATIVE"/>
   	   </layout>
   	</appender>
  
  
  
  1.2       +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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- logging303.xml	2000/12/14 09:31:35	1.1
  +++ logging303.xml	2000/12/26 23:39:10	1.2
  @@ -2,15 +2,15 @@
   <!DOCTYPE configuration SYSTEM "log4j.dtd">
   
   <configuration>
  -        <appender name="ASYNC" class="org.log4j.AsyncAppender">
  +        <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
      	   <appender-ref ref="TEMP" />
   	</appender>
   
  -        <appender name="TEMP" class="org.log4j.FileAppender">
  +        <appender name="TEMP" class="org.apache.log4j.FileAppender">
              <param name="File" value="temp"/>
              <param name="Append" value="false"/>
              <param name="ImmediateFlush" value="false"/>
  -           <layout class="org.log4j.PatternLayout">
  +           <layout class="org.apache.log4j.PatternLayout">
                 <param name="ConversionPattern" 
                        value="%r [%t] %-5p %c - %m%n"/>
   	   </layout>
  
  
  
  1.2       +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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- logging304.xml	2000/12/14 09:31:35	1.1
  +++ logging304.xml	2000/12/26 23:39:10	1.2
  @@ -2,15 +2,15 @@
   <!DOCTYPE configuration SYSTEM "log4j.dtd">
   
   <configuration>
  -        <appender name="ASYNC" class="org.log4j.AsyncAppender">
  +        <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
      	   <appender-ref ref="TEMP" />
   	</appender>
   
  -        <appender name="TEMP" class="org.log4j.FileAppender">
  +        <appender name="TEMP" class="org.apache.log4j.FileAppender">
              <param name="File" value="temp"/>
              <param name="Append" value="false"/>
              <param name="ImmediateFlush" value="false"/>
  -           <layout class="org.log4j.TTCCLayout">
  +           <layout class="org.apache.log4j.TTCCLayout">
                 <param name="DateFormat" 
                        value="ISO8601"/>
   	   </layout>
  
  
  
  1.2       +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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- logging305.xml	2000/12/14 09:31:35	1.1
  +++ logging305.xml	2000/12/26 23:39:10	1.2
  @@ -2,15 +2,15 @@
   <!DOCTYPE configuration SYSTEM "log4j.dtd">
   
   <configuration>
  -        <appender name="ASYNC" class="org.log4j.AsyncAppender">
  +        <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
      	   <appender-ref ref="TEMP" />
   	</appender>
   
  -        <appender name="TEMP" class="org.log4j.FileAppender">
  +        <appender name="TEMP" class="org.apache.log4j.FileAppender">
              <param name="File" value="temp"/>
              <param name="Append" value="false"/>
              <param name="ImmediateFlush" value="false"/>
  -           <layout class="org.log4j.PatternLayout">
  +           <layout class="org.apache.log4j.PatternLayout">
                 <param name="ConversionPattern" 
                        value="%d{ISO8601} [%t] %-5p %c %x - %m%n"/>
   	   </layout>
  
  
  
  1.2       +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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- logging306.xml	2000/12/14 09:31:35	1.1
  +++ logging306.xml	2000/12/26 23:39:10	1.2
  @@ -3,15 +3,15 @@
   
   <configuration>
   
  -        <appender name="ASYNC" class="org.log4j.AsyncAppender">
  +        <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
      	   <appender-ref ref="TEMP" />
   	</appender>
   
  -        <appender name="TEMP" class="org.log4j.FileAppender">
  +        <appender name="TEMP" class="org.apache.log4j.FileAppender">
              <param name="File" value="temp"/>
              <param name="Append" value="false"/>
              <param name="ImmediateFlush" value="false"/>
  -           <layout class="org.log4j.PatternLayout">
  +           <layout class="org.apache.log4j.PatternLayout">
                 <param name="ConversionPattern" 
                        value="%d{yyyy-MM-dd HH:mm:ss,SSS} [%t] %-5p %c %x - %m%n"/>
   	   </layout>
  
  
  
  1.2       +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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- logging307.xml	2000/12/14 09:31:35	1.1
  +++ logging307.xml	2000/12/26 23:39:10	1.2
  @@ -2,15 +2,15 @@
   <!DOCTYPE configuration SYSTEM "log4j.dtd">
   
   <configuration>
  -        <appender name="ASYNC" class="org.log4j.AsyncAppender">
  +        <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
      	   <appender-ref ref="TEMP" />
   	</appender>
   
  -        <appender name="TEMP" class="org.log4j.FileAppender">
  +        <appender name="TEMP" class="org.apache.log4j.FileAppender">
              <param name="File" value="temp"/>
              <param name="Append" value="false"/>
              <param name="ImmediateFlush" value="false"/>
  -           <layout class="org.log4j.PatternLayout">
  +           <layout class="org.apache.log4j.PatternLayout">
                 <param name="ConversionPattern" 
                        value="%l - %m%n"/>
   	   </layout>
  
  
  
  1.2       +2 -2      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- logging4.xml	2000/12/14 09:31:35	1.1
  +++ logging4.xml	2000/12/26 23:39:10	1.2
  @@ -3,8 +3,8 @@
   
   <configuration>
   
  -        <appender name="NULL" class="org.log4j.performance.NullAppender">
  -           <layout class="org.log4j.TTCCLayout">
  +        <appender name="NULL" class="org.apache.log4j.performance.NullAppender">
  +           <layout class="org.apache.log4j.TTCCLayout">
                 <param name="DateFormat" value="RELATIVE"/>
   	   </layout>
   	</appender>
  
  
  
  1.2       +4 -4      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- logging5.xml	2000/12/14 09:31:35	1.1
  +++ logging5.xml	2000/12/26 23:39:10	1.2
  @@ -4,14 +4,14 @@
   <!-- PropertyConfigurator equivalent:
   log4j.rootCategory=, NULL
   log4j.category.A0123456789=INFO
  -log4j.appender.NULL=org.log4j.performance.NullAppender
  -log4j.appender.NULL.layout=org.log4j.PatternLayout
  +log4j.appender.NULL=org.apache.log4j.performance.NullAppender
  +log4j.appender.NULL.layout=org.apache.log4j.PatternLayout
   log4j.appender.NULL.layout.ConversionPattern=%r [%t] %-5p %c{2} %x - %m%n
   -->
   <configuration>
   
  -        <appender name="NULL" class="org.log4j.performance.NullAppender">
  -           <layout class="org.log4j.PatternLayout">
  +        <appender name="NULL" class="org.apache.log4j.performance.NullAppender">
  +           <layout class="org.apache.log4j.PatternLayout">
                 <param name="ConversionPattern" 
                        value="%r [%t] %-5p %c{2} %x - %m%n"/>
   	   </layout>
  
  
  
  1.2       +4 -4      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- logging6.xml	2000/12/14 09:31:35	1.1
  +++ logging6.xml	2000/12/26 23:39:11	1.2
  @@ -4,14 +4,14 @@
   <!-- PropertyConfigurator equivalent:
   log4j.rootCategory=, NULL
   log4j.category.A0123456789=INFO
  -log4j.appender.NULL=org.log4j.performance.NullAppender
  -log4j.appender.NULL.layout=org.log4j.PatternLayout
  +log4j.appender.NULL=org.apache.log4j.performance.NullAppender
  +log4j.appender.NULL.layout=org.apache.log4j.PatternLayout
   log4j.appender.NULL.layout.ConversionPattern=%r [%t] %-5p %.10c %x - %m%n
   -->
   <configuration>
   
  -        <appender name="NULL" class="org.log4j.performance.NullAppender">
  -           <layout class="org.log4j.PatternLayout">
  +        <appender name="NULL" class="org.apache.log4j.performance.NullAppender">
  +           <layout class="org.apache.log4j.PatternLayout">
                 <param name="ConversionPattern" 
                        value="%r [%t] %-5p %.10c %x - %m%n"/>
   	   </layout>
  
  
  
  1.2       +4 -4      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- logging7.xml	2000/12/14 09:31:35	1.1
  +++ logging7.xml	2000/12/26 23:39:11	1.2
  @@ -4,14 +4,14 @@
   <!-- PropertyConfigurator equivalent:
   log4j.rootCategory=, NULL
   log4j.category.A0123456789=INFO
  -log4j.appender.NULL=org.log4j.performance.NullAppender
  -log4j.appender.NULL.layout=org.log4j.PatternLayout
  +log4j.appender.NULL=org.apache.log4j.performance.NullAppender
  +log4j.appender.NULL.layout=org.apache.log4j.PatternLayout
   log4j.appender.NULL.layout.ConversionPattern=%r [%t] %-5p %.20c %x - %m%n
   -->
   <configuration>
   
  -        <appender name="NULL" class="org.log4j.performance.NullAppender">
  -           <layout class="org.log4j.PatternLayout">
  +        <appender name="NULL" class="org.apache.log4j.performance.NullAppender">
  +           <layout class="org.apache.log4j.PatternLayout">
                 <param name="ConversionPattern" 
                        value="%r [%t] %-5p %.20c %x - %m%n"/>
   	   </layout>
  
  
  
  1.2       +4 -4      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- logging8.xml	2000/12/14 09:31:35	1.1
  +++ logging8.xml	2000/12/26 23:39:11	1.2
  @@ -4,14 +4,14 @@
   <!-- PropertyConfigurator equivalent:
   log4j.rootCategory=, NULL
   log4j.category.A0123456789=INFO
  -log4j.appender.NULL=org.log4j.performance.NullAppender
  -log4j.appender.NULL.layout=org.log4j.PatternLayout
  +log4j.appender.NULL=org.apache.log4j.performance.NullAppender
  +log4j.appender.NULL.layout=org.apache.log4j.PatternLayout
   log4j.appender.NULL.layout.ConversionPattern=%r [%t] %-5p %c - %m%n
   -->
   <configuration>
   
  -        <appender name="NULL" class="org.log4j.performance.NullAppender">
  -           <layout class="org.log4j.PatternLayout">
  +        <appender name="NULL" class="org.apache.log4j.performance.NullAppender">
  +           <layout class="org.apache.log4j.PatternLayout">
                 <param name="ConversionPattern" 
                        value="%r [%t] %-5p %c - %m%n"/>
   	   </layout>
  
  
  
  1.2       +4 -4      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- logging9.xml	2000/12/14 09:31:35	1.1
  +++ logging9.xml	2000/12/26 23:39:11	1.2
  @@ -4,14 +4,14 @@
   <!-- PropertyConfigurator equivalent:
   log4j.rootCategory=, NULL
   log4j.category.A0123456789=INFO
  -log4j.appender.NULL=org.log4j.performance.NullAppender
  -log4j.appender.NULL.layout=org.log4j.TTCCLayout
  +log4j.appender.NULL=org.apache.log4j.performance.NullAppender
  +log4j.appender.NULL.layout=org.apache.log4j.TTCCLayout
   log4j.appender.NULL.layout.DateFormat=RELATIVE
   -->
   <configuration>
   
  -        <appender name="NULL" class="org.log4j.performance.NullAppender">
  -           <layout class="org.log4j.TTCCLayout">
  +        <appender name="NULL" class="org.apache.log4j.performance.NullAppender">
  +           <layout class="org.apache.log4j.TTCCLayout">
                 <param name="DateFormat" value="ISO8601"/>
   	   </layout>
   	</appender>
  
  
  
  1.2       +1 -1      jakarta-log4j/org/apache/log4j/varia/test/doRoll
  
  Index: doRoll
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/varia/test/doRoll,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- doRoll	2000/12/14 09:35:59	1.1
  +++ doRoll	2000/12/26 23:39:14	1.2
  @@ -14,7 +14,7 @@
   do
      sleep 1  
      i=$i+1
  -   java  -Dlog4j.configDebug org.log4j.varia.Roller $HOST $PORT	
  +   java  -Dlog4j.configDebug org.apache.log4j.varia.Roller $HOST $PORT	
   done  
   
   
  
  
  
  1.2       +3 -3      jakarta-log4j/org/apache/log4j/varia/test/externalRoll
  
  Index: externalRoll
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/varia/test/externalRoll,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- externalRoll	2000/12/14 09:35:59	1.1
  +++ externalRoll	2000/12/26 23:39:14	1.2
  @@ -15,12 +15,12 @@
   setPERL
   
   echo "log4j.rootCategory=DEBUG, testAppender" > $LCF
  -lecho "log4j.appender.testAppender=org.log4j.varia.ExternallyRolledFileAppender"
  +lecho "log4j.appender.testAppender=org.apache.log4j.varia.ExternallyRolledFileAppender"
   lecho "log4j.appender.testAppender.File=$TEMP"
   lecho "log4j.appender.testAppender.Append=false"
   lecho "log4j.appender.testAppender.Port=$PORT"
   lecho "log4j.appender.testAppender.MaxBackupIndex=$MAX_COUNTER" 
  -lecho "log4j.appender.testAppender.layout=org.log4j.PatternLayout"
  +lecho "log4j.appender.testAppender.layout=org.apache.log4j.PatternLayout"
   lecho "log4j.appender.testAppender.layout.ConversionPattern=%m%n"
   
   
  @@ -29,7 +29,7 @@
   
   
   ./doRoll $MAX_COUNTER localhost $PORT &
  -java -Dlog4j.configDebug org.log4j.varia.test.Loop $LCF $MAX_MESSAGES
  +java -Dlog4j.configDebug org.apache.log4j.varia.test.Loop $LCF $MAX_MESSAGES
   
   
   
  
  
  
  1.2       +3 -3      jakarta-log4j/org/apache/log4j/varia/test/resiliency
  
  Index: resiliency
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/varia/test/resiliency,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- resiliency	2000/12/14 09:35:59	1.1
  +++ resiliency	2000/12/26 23:39:14	1.2
  @@ -17,10 +17,10 @@
   setPERL
   
   echo "log4j.rootCategory=DEBUG, testAppender" > $LCF
  -lecho "log4j.appender.testAppender=org.log4j.ResilientFileAppender"
  +lecho "log4j.appender.testAppender=org.apache.log4j.ResilientFileAppender"
   lecho "log4j.appender.testAppender.File=$TEMP"
   lecho "log4j.appender.testAppender.Append=false"
  -lecho "log4j.appender.testAppender.layout=org.log4j.PatternLayout"
  +lecho "log4j.appender.testAppender.layout=org.apache.log4j.PatternLayout"
   lecho "log4j.appender.testAppender.layout.ConversionPattern=%m%n"
   
   
  @@ -30,7 +30,7 @@
   MAX_MESSAGES=50000
   
   perl elf.pl $TEMP $MAX_COUNTER&
  -java org.log4j.test.Loop $LCF $MAX_MESSAGES
  +java org.apache.log4j.test.Loop $LCF $MAX_MESSAGES
   
   if perl checkForHoles.pl $TEMP $MAX_COUNTER $MAX_MESSAGES 
   then
  
  
  
  1.2       +1 -1      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- log4j.dtd	2000/12/14 09:16:07	1.1
  +++ log4j.dtd	2000/12/26 23:39:15	1.2
  @@ -74,7 +74,7 @@
     value		CDATA	#REQUIRED
   >
   
  -<!-- The priority class is org.log4j.Priority by default -->
  +<!-- The priority class is org.apache.log4j.Priority by default -->
   <!ELEMENT priority (param*)>
   <!ATTLIST priority
     class   CDATA	#IMPLIED
  
  
  
  1.2       +3 -3      jakarta-log4j/org/apache/log4j/xml/examples/sample1.xml
  
  Index: sample1.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/xml/examples/sample1.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sample1.xml	2000/12/14 10:09:15	1.1
  +++ sample1.xml	2000/12/26 23:39:15	1.2
  @@ -3,15 +3,15 @@
   
   <configuration>
   
  -	<appender name="STDOUT" class="org.log4j.FileAppender">
  +	<appender name="STDOUT" class="org.apache.log4j.FileAppender">
              <param name="File" value="System.out" />	
  -           <layout class="org.log4j.PatternLayout">
  +           <layout class="org.apache.log4j.PatternLayout">
                <param name="ConversionPattern"
   		    value="%d %-5p [%t] %C{2} (%F:%L) - %m\n"/>
              </layout>	    
   	</appender>
   	
  -	<category name="org.log4j.xml">
  +	<category name="org.apache.log4j.xml">
   	  <priority value="info" />
   	</category>
   	
  
  
  
  1.2       +5 -5      jakarta-log4j/org/apache/log4j/xml/examples/sample2.xml
  
  Index: sample2.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/xml/examples/sample2.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sample2.xml	2000/12/14 10:09:15	1.1
  +++ sample2.xml	2000/12/26 23:39:15	1.2
  @@ -3,24 +3,24 @@
   
   <configuration>
   
  -	<appender name="A1" class="org.log4j.FileAppender">
  +	<appender name="A1" class="org.apache.log4j.FileAppender">
               <param name="File"   value="A1.log" />
               <param name="Append" value="false" />	    	
  -            <layout class="org.log4j.PatternLayout">
  +            <layout class="org.apache.log4j.PatternLayout">
   		<param name="ConversionPattern" value="%t %-5p %c{2} - %m\n"/>
               </layout>	    
   	</appender>
   	
  -	<appender name="STDOUT" class="org.log4j.FileAppender">
  +	<appender name="STDOUT" class="org.apache.log4j.FileAppender">
   		<param name="File" value="System.out" />
   		
  -		<layout class="org.log4j.PatternLayout">
  +		<layout class="org.apache.log4j.PatternLayout">
                      <param name="ConversionPattern"
   		          value="%d %-5p [%t] %C{2} (%F:%L) - %m\n"/>
   		</layout>		
   	</appender>
   	
  -	<category name="org.log4j.xml">
  +	<category name="org.apache.log4j.xml">
   	  <priority value="debug" />
     	  <appender-ref ref="A1" />
   	</category>
  
  
  
  1.2       +5 -5      jakarta-log4j/org/apache/log4j/xml/examples/sample3.xml
  
  Index: sample3.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/xml/examples/sample3.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sample3.xml	2000/12/14 10:09:15	1.1
  +++ sample3.xml	2000/12/26 23:39:15	1.2
  @@ -2,23 +2,23 @@
   <!DOCTYPE configuration SYSTEM "log4j.dtd">
   
   <configuration>
  -	<appender name="A1" class="org.log4j.net.SocketAppender">
  +	<appender name="A1" class="org.apache.log4j.net.SocketAppender">
   		<param name="RemoteHost" value="localhost"/>
   		<param name="Port" value="5000"/>
   		<param name="LocationInfo" value="true"/>
  -		<layout class="org.log4j.PatternLayout">
  +		<layout class="org.apache.log4j.PatternLayout">
     		   <param name="ConversionPattern" 
                             value="%t %-5p %c{2} - %m%n"/>
   		</layout>
   	</appender>
  -	<appender name="STDOUT" class="org.log4j.FileAppender">
  +	<appender name="STDOUT" class="org.apache.log4j.FileAppender">
   		<param name="File" value="System.out"/>
  -		<layout class="org.log4j.PatternLayout">
  +		<layout class="org.apache.log4j.PatternLayout">
     		     <param name="ConversionPattern" 
                               value="%d %-5p [%t] %C{2} (%F:%L) - %m\n"/>
   		</layout>
   	</appender>
  -	<category name="org.log4j.xml">
  +	<category name="org.apache.log4j.xml">
   		<priority value="debug"/>
   		<appender-ref ref="A1"/>
   	</category>
  
  
  
  1.2       +3 -3      jakarta-log4j/org/apache/log4j/xml/examples/sample4.xml
  
  Index: sample4.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/org/apache/log4j/xml/examples/sample4.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sample4.xml	2000/12/14 10:09:15	1.1
  +++ sample4.xml	2000/12/26 23:39:15	1.2
  @@ -3,13 +3,13 @@
   
   <configuration configDebug="true">
   
  -	<appender name="ASYNC" class="org.log4j.AsyncAppender">
  +	<appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
   	        <appender-ref ref="TEMP"/>
   	</appender>
   
  -	<appender name="TEMP" class="org.log4j.FileAppender">
  +	<appender name="TEMP" class="org.apache.log4j.FileAppender">
   		<param name="File" value="temp"/>
  -		<layout class="org.log4j.PatternLayout">
  +		<layout class="org.apache.log4j.2PatternLayout">
     		     <param name="ConversionPattern" 
                               value="%d %-5p [%t] %C{2} (%F:%L) - %m\n"/>
   		</layout>