You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-dev@logging.apache.org by ce...@apache.org on 2005/01/03 14:20:27 UTC

cvs commit: logging-log4j/tests/input/xml customLevel2.xml customLevel3.xml customLogger2.xml

ceki        2005/01/03 05:20:27

  Modified:    tests/input/filter simpleFilter4.xml simpleFilter7.xml
                        simpleFilter1.xml simpleFilter5.xml
                        simpleFilter6.xml simpleFilter2.xml
                        simpleFilter3.xml
               tests/input/xml customLevel2.xml customLevel3.xml
                        customLogger2.xml
  Log:
  Updates to config files as filters moved to o.a.l.filter from o.a.l.varia.
  
  Revision  Changes    Path
  1.2       +2 -2      logging-log4j/tests/input/filter/simpleFilter4.xml
  
  Index: simpleFilter4.xml
  ===================================================================
  RCS file: /home/cvs/logging-log4j/tests/input/filter/simpleFilter4.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- simpleFilter4.xml	18 Dec 2004 17:56:03 -0000	1.1
  +++ simpleFilter4.xml	3 Jan 2005 13:20:27 -0000	1.2
  @@ -11,14 +11,14 @@
       </layout>
       <!-- Reject all LoggingEvents containing the string
            "Message" in the message field. -->
  -    <filter class="org.apache.log4j.varia.StringMatchFilter">
  +    <filter class="org.apache.log4j.filter.StringMatchFilter">
         <param name="StringToMatch" value="Message" />
         <param name="AcceptOnMatch" value="false" />
       </filter>
       
       <!-- Accept all LoggingEvents containing the string
            "1" in the message field. -->
  -    <filter class="org.apache.log4j.varia.StringMatchFilter">
  +    <filter class="org.apache.log4j.filter.StringMatchFilter">
         <param name="StringToMatch" value="1" />
         <param name="AcceptOnMatch" value="true" />
       </filter>
  
  
  
  1.2       +1 -1      logging-log4j/tests/input/filter/simpleFilter7.xml
  
  Index: simpleFilter7.xml
  ===================================================================
  RCS file: /home/cvs/logging-log4j/tests/input/filter/simpleFilter7.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- simpleFilter7.xml	18 Dec 2004 17:56:03 -0000	1.1
  +++ simpleFilter7.xml	3 Jan 2005 13:20:27 -0000	1.2
  @@ -11,7 +11,7 @@
         <param name="ConversionPattern"
   	value="%-5p %c{2} - %m\n"/>
       </layout>
  -    <filter class="org.apache.log4j.varia.LevelMatchFilter">
  +    <filter class="org.apache.log4j.filter.LevelMatchFilter">
         <param name="LevelToMatch" value="WARN" />
         <param name="AcceptOnMatch" value="false" />
       </filter>
  
  
  
  1.2       +3 -3      logging-log4j/tests/input/filter/simpleFilter1.xml
  
  Index: simpleFilter1.xml
  ===================================================================
  RCS file: /home/cvs/logging-log4j/tests/input/filter/simpleFilter1.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- simpleFilter1.xml	18 Dec 2004 17:56:03 -0000	1.1
  +++ simpleFilter1.xml	3 Jan 2005 13:20:27 -0000	1.2
  @@ -13,16 +13,16 @@
       </layout>
       <!-- Accept all LoggingEvents containing the string
            "1" in the message field. -->
  -    <filter class="org.apache.log4j.varia.StringMatchFilter">
  +    <filter class="org.apache.log4j.filter.StringMatchFilter">
         <param name="StringToMatch" value="1" />
       </filter>
       <!-- Accept all LoggingEvents containing the string
            "2" in its message field. -->
  -    <filter class="org.apache.log4j.varia.StringMatchFilter">
  +    <filter class="org.apache.log4j.filter.StringMatchFilter">
         <param name="StringToMatch" value="2" />
       </filter>
       <!-- Deny (filter out) everything else. -->
  -    <filter class="org.apache.log4j.varia.DenyAllFilter"/>
  +    <filter class="org.apache.log4j.filter.DenyAllFilter"/>
     </appender>
           
     <!-- Prevent internal log4j DEBUG messages from polluting the output. -->
  
  
  
  1.2       +2 -2      logging-log4j/tests/input/filter/simpleFilter5.xml
  
  Index: simpleFilter5.xml
  ===================================================================
  RCS file: /home/cvs/logging-log4j/tests/input/filter/simpleFilter5.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- simpleFilter5.xml	18 Dec 2004 17:56:03 -0000	1.1
  +++ simpleFilter5.xml	3 Jan 2005 13:20:27 -0000	1.2
  @@ -11,13 +11,13 @@
       </layout>
       <!-- Accept all LoggingEvents containing the string
            "1" in its message field. -->
  -    <filter class="org.apache.log4j.varia.StringMatchFilter">
  +    <filter class="org.apache.log4j.filter.StringMatchFilter">
         <param name="StringToMatch" value="1" />
         <param name="AcceptOnMatch" value="true" />
       </filter>
       <!-- Reject all LoggingEvents containing the string
            "Message" in its message field. -->
  -    <filter class="org.apache.log4j.varia.StringMatchFilter">
  +    <filter class="org.apache.log4j.filter.StringMatchFilter">
         <param name="StringToMatch" value="Message" />
         <param name="AcceptOnMatch" value="false" />
       </filter>    
  
  
  
  1.2       +2 -2      logging-log4j/tests/input/filter/simpleFilter6.xml
  
  Index: simpleFilter6.xml
  ===================================================================
  RCS file: /home/cvs/logging-log4j/tests/input/filter/simpleFilter6.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- simpleFilter6.xml	18 Dec 2004 17:56:03 -0000	1.1
  +++ simpleFilter6.xml	3 Jan 2005 13:20:27 -0000	1.2
  @@ -10,13 +10,13 @@
         <param name="ConversionPattern" value="%-5p %c{2} - %m\n"/>
       </layout>
       
  -    <filter class="org.apache.log4j.varia.LevelMatchFilter">
  +    <filter class="org.apache.log4j.filter.LevelMatchFilter">
         <param name="LevelToMatch" value="WARN" />
         <param name="AcceptOnMatch" value="true" />
       </filter>
       
       
  -    <filter class="org.apache.log4j.varia.DenyAllFilter"/>
  +    <filter class="org.apache.log4j.filter.DenyAllFilter"/>
         
     </appender>
     
  
  
  
  1.2       +1 -1      logging-log4j/tests/input/filter/simpleFilter2.xml
  
  Index: simpleFilter2.xml
  ===================================================================
  RCS file: /home/cvs/logging-log4j/tests/input/filter/simpleFilter2.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- simpleFilter2.xml	18 Dec 2004 17:56:03 -0000	1.1
  +++ simpleFilter2.xml	3 Jan 2005 13:20:27 -0000	1.2
  @@ -12,7 +12,7 @@
       </layout>
       <!-- Reject all LoggingEvents containing the string
            "1" in the message field. -->
  -    <filter class="org.apache.log4j.varia.StringMatchFilter">
  +    <filter class="org.apache.log4j.filter.StringMatchFilter">
         <param name="StringToMatch" value="1" />
         <param name="AcceptOnMatch" value="false" />
       </filter>
  
  
  
  1.2       +4 -4      logging-log4j/tests/input/filter/simpleFilter3.xml
  
  Index: simpleFilter3.xml
  ===================================================================
  RCS file: /home/cvs/logging-log4j/tests/input/filter/simpleFilter3.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- simpleFilter3.xml	18 Dec 2004 17:56:03 -0000	1.1
  +++ simpleFilter3.xml	3 Jan 2005 13:20:27 -0000	1.2
  @@ -11,25 +11,25 @@
       </layout>
       <!-- Reject all LoggingEvents containing the string "0" in
            the message field. -->
  -    <filter class="org.apache.log4j.varia.StringMatchFilter">
  +    <filter class="org.apache.log4j.filter.StringMatchFilter">
         <param name="StringToMatch" value="0" />
         <param name="AcceptOnMatch" value="false" />
       </filter>
       <!-- Reject all LoggingEvents containing the string "1" in
            the message field. -->
  -    <filter class="org.apache.log4j.varia.StringMatchFilter">
  +    <filter class="org.apache.log4j.filter.StringMatchFilter">
         <param name="StringToMatch" value="1" />
         <param name="AcceptOnMatch" value="false" />
       </filter>
       <!-- Reject all LoggingEvents containing the string "5" in
            the message field. -->
  -    <filter class="org.apache.log4j.varia.StringMatchFilter">
  +    <filter class="org.apache.log4j.filter.StringMatchFilter">
         <param name="StringToMatch" value="5" />
         <param name="AcceptOnMatch" value="false" />
       </filter>
       <!-- Reject all LoggingEvents containing the string "6" in
            the message field. -->
  -    <filter class="org.apache.log4j.varia.StringMatchFilter">
  +    <filter class="org.apache.log4j.filter.StringMatchFilter">
         <param name="StringToMatch" value="6" />
         <param name="AcceptOnMatch" value="false" />
       </filter>
  
  
  
  1.6       +1 -1      logging-log4j/tests/input/xml/customLevel2.xml
  
  Index: customLevel2.xml
  ===================================================================
  RCS file: /home/cvs/logging-log4j/tests/input/xml/customLevel2.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- customLevel2.xml	29 Nov 2004 23:54:37 -0000	1.5
  +++ customLevel2.xml	3 Jan 2005 13:20:27 -0000	1.6
  @@ -12,7 +12,7 @@
   	value="%-5p %c{2} - %m\n"/>
       </layout>
       
  -    <filter class="org.apache.log4j.varia.LevelMatchFilter">
  +    <filter class="org.apache.log4j.filter.LevelMatchFilter">
         <param name="LevelToMatch" value="TRACE#org.apache.log4j.xml.XLevel" />
         <param name="AcceptOnMatch" value="true" />
       </filter>
  
  
  
  1.6       +2 -2      logging-log4j/tests/input/xml/customLevel3.xml
  
  Index: customLevel3.xml
  ===================================================================
  RCS file: /home/cvs/logging-log4j/tests/input/xml/customLevel3.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- customLevel3.xml	29 Nov 2004 23:54:37 -0000	1.5
  +++ customLevel3.xml	3 Jan 2005 13:20:27 -0000	1.6
  @@ -12,12 +12,12 @@
   	value="%-5p %c{2} - %m\n"/>
       </layout>
       
  -    <filter class="org.apache.log4j.varia.LevelMatchFilter">
  +    <filter class="org.apache.log4j.filter.LevelMatchFilter">
         <param name="LevelToMatch" value="TRACE#org.apache.log4j.xml.XLevel" />
         <param name="AcceptOnMatch" value="true" />
       </filter>
       
  -    <filter class="org.apache.log4j.varia.DenyAllFilter"/>
  +    <filter class="org.apache.log4j.filter.DenyAllFilter"/>
   
     </appender>
   
  
  
  
  1.6       +2 -2      logging-log4j/tests/input/xml/customLogger2.xml
  
  Index: customLogger2.xml
  ===================================================================
  RCS file: /home/cvs/logging-log4j/tests/input/xml/customLogger2.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- customLogger2.xml	29 Nov 2004 23:54:37 -0000	1.5
  +++ customLogger2.xml	3 Jan 2005 13:20:27 -0000	1.6
  @@ -12,13 +12,13 @@
   	value="%-5p %c{2} - %m%n"/>
       </layout>
       
  -    <filter class="org.apache.log4j.varia.LevelMatchFilter">
  +    <filter class="org.apache.log4j.filter.LevelMatchFilter">
         <param name="LevelToMatch"
     	     value="TRACE#org.apache.log4j.xml.XLevel" />
         <param name="AcceptOnMatch" value="true" />
       </filter>
       
  -    <filter class="org.apache.log4j.varia.DenyAllFilter"/>
  +    <filter class="org.apache.log4j.filter.DenyAllFilter"/>
     </appender>
     
     <!-- Prevent internal log4j DEBUG messages from polluting the output. -->
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org