You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-dev@logging.apache.org by ce...@apache.org on 2004/12/18 18:56:03 UTC
cvs commit: logging-log4j/tests/witness/filter simpleFilter.1
ceki 2004/12/18 09:56:03
Modified: tests build.xml
Added: tests/input/filter simpleFilter1.xml simpleFilter5.xml
simpleFilter6.xml simpleFilter2.xml
simpleFilter3.xml simpleFilter4.xml
simpleFilter7.xml
tests/witness/filter simpleFilter.1
Removed: tests/input/filter filter2.xml filter5.xml filter6.xml
filter1.xml filter7.xml filter4.xml filter3.xml
Log:
Input files for new filter tests
Revision Changes Path
1.1 logging-log4j/tests/input/filter/simpleFilter1.xml
Index: simpleFilter1.xml
===================================================================
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE configuration >
<configuration xmlns='http://logging.apache.org/'>
<appender name="A1" class="org.apache.log4j.FileAppender">
<param name="Append" value="false" />
<param name="File" value="output/temp" />
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%p - %m\n"/>
</layout>
<!-- Accept all LoggingEvents containing the string
"1" in the message field. -->
<filter class="org.apache.log4j.varia.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">
<param name="StringToMatch" value="2" />
</filter>
<!-- Deny (filter out) everything else. -->
<filter class="org.apache.log4j.varia.DenyAllFilter"/>
</appender>
<!-- Prevent internal log4j DEBUG messages from polluting the output. -->
<logger name="org.apache.log4j.joran.action"><level value="INFO" /></logger>
<logger name="org.apache.log4j.joran.JoranConfigurator"><level value="INFO" /></logger>
<logger name="org.apache.log4j.config"><level value="INFO" /></logger>
<logger name="org.apache.log4j.FileAppender"><level value="INFO" /></logger>
<root>
<appender-ref ref="A1" />
</root>
</configuration>
1.1 logging-log4j/tests/input/filter/simpleFilter5.xml
Index: simpleFilter5.xml
===================================================================
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE configuration >
<configuration xmlns='http://logging.apache.org/'>
<appender name="A1" class="org.apache.log4j.FileAppender">
<param name="Append" value="false" />
<param name="File" value="temp" />
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%-5p %c{2} - %m\n"/>
</layout>
<!-- Accept all LoggingEvents containing the string
"1" in its message field. -->
<filter class="org.apache.log4j.varia.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">
<param name="StringToMatch" value="Message" />
<param name="AcceptOnMatch" value="false" />
</filter>
</appender>
<root>
<appender-ref ref="A1" />
</root>
</configuration>
1.1 logging-log4j/tests/input/filter/simpleFilter6.xml
Index: simpleFilter6.xml
===================================================================
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE configuration >
<configuration xmlns='http://logging.apache.org/' debug="true">
<appender name="TEMP" class="org.apache.log4j.FileAppender">
<param name="Append" value="false" />
<param name="File" value="temp" />
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%-5p %c{2} - %m\n"/>
</layout>
<filter class="org.apache.log4j.varia.LevelMatchFilter">
<param name="LevelToMatch" value="WARN" />
<param name="AcceptOnMatch" value="true" />
</filter>
<filter class="org.apache.log4j.varia.DenyAllFilter"/>
</appender>
<root>
<appender-ref ref="TEMP" />
</root>
</configuration>
1.1 logging-log4j/tests/input/filter/simpleFilter2.xml
Index: simpleFilter2.xml
===================================================================
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE configuration >
<configuration xmlns='http://logging.apache.org/'>
<appender name="A1" class="org.apache.log4j.FileAppender">
<param name="Append" value="false" />
<param name="File" value="temp" />
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern"
value="%-5p %c{2} - %m\n"/>
</layout>
<!-- Reject all LoggingEvents containing the string
"1" in the message field. -->
<filter class="org.apache.log4j.varia.StringMatchFilter">
<param name="StringToMatch" value="1" />
<param name="AcceptOnMatch" value="false" />
</filter>
</appender>
<root>
<appender-ref ref="A1" />
</root>
</configuration>
1.1 logging-log4j/tests/input/filter/simpleFilter3.xml
Index: simpleFilter3.xml
===================================================================
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE configuration >
<configuration xmlns='http://logging.apache.org/'>
<appender name="A1" class="org.apache.log4j.FileAppender">
<param name="Append" value="false" />
<param name="File" value="temp" />
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%-5p %c{2} - %m\n"/>
</layout>
<!-- Reject all LoggingEvents containing the string "0" in
the message field. -->
<filter class="org.apache.log4j.varia.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">
<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">
<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">
<param name="StringToMatch" value="6" />
<param name="AcceptOnMatch" value="false" />
</filter>
</appender>
<root>
<appender-ref ref="A1" />
</root>
</configuration>
1.1 logging-log4j/tests/input/filter/simpleFilter4.xml
Index: simpleFilter4.xml
===================================================================
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE configuration >
<configuration xmlns='http://logging.apache.org/'>
<appender name="A1" class="org.apache.log4j.FileAppender">
<param name="Append" value="false" />
<param name="File" value="temp" />
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%-5p %c{2} - %m\n"/>
</layout>
<!-- Reject all LoggingEvents containing the string
"Message" in the message field. -->
<filter class="org.apache.log4j.varia.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">
<param name="StringToMatch" value="1" />
<param name="AcceptOnMatch" value="true" />
</filter>
</appender>
<root>
<appender-ref ref="A1" />
</root>
</configuration>
1.1 logging-log4j/tests/input/filter/simpleFilter7.xml
Index: simpleFilter7.xml
===================================================================
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE log4j:configuration >
<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'
configDebug="true">
<appender name="TEMP" class="org.apache.log4j.FileAppender">
<param name="Append" value="false" />
<param name="File" value="temp" />
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern"
value="%-5p %c{2} - %m\n"/>
</layout>
<filter class="org.apache.log4j.varia.LevelMatchFilter">
<param name="LevelToMatch" value="WARN" />
<param name="AcceptOnMatch" value="false" />
</filter>
</appender>
<root>
<appender-ref ref="TEMP" />
</root>
</log4j:configuration>
1.76 +13 -3 logging-log4j/tests/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/logging-log4j/tests/build.xml,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- build.xml 18 Dec 2004 16:54:18 -0000 1.75
+++ build.xml 18 Dec 2004 17:56:03 -0000 1.76
@@ -155,10 +155,12 @@
LevelOptionConverterTest,
BoundedFIFO,
Joran,
- Scheduler,
+ SimpleFilter,
+ Scheduler,
ThrowableInformation,
LocationInfo,
- CyclicBuffer, OR, VariaLevelMatchFilter,
+ CyclicBuffer, OR,
+ VariaLevelMatchFilter,
VariaLevelRangeFilter, PatternParser,
LevelMatchFilter, DRFA,
Rolling,
@@ -378,7 +380,15 @@
<test name="org.apache.log4j.varia.LevelMatchFilterTestCase" />
</junit>
</target>
-
+
+ <target name="SimpleFilter" depends="check, build, cleanOutputDir">
+ <junit printsummary="yes" fork="yes" haltonfailure="yes">
+ <classpath refid="tests.classpath"/>
+ <formatter type="plain" usefile="false"/>
+ <test name="org.apache.log4j.filter.SimpleFilterTest" />
+ </junit>
+ </target>
+
<target name="ErrorHandler" depends="check, build, cleanOutputDir">
<junit printsummary="yes" fork="yes" haltonfailure="yes">
<classpath refid="tests.classpath"/>
1.1 logging-log4j/tests/witness/filter/simpleFilter.1
Index: simpleFilter.1
===================================================================
INFO - Message 1
INFO - Message 1
WARN - Message 2
WARN - Message 2
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org