Author: carnold
Date: Fri Aug 17 08:30:56 2007
New Revision: 567068
URL: http://svn.apache.org/viewvc?view=rev&rev=567068
Log:
Bug 43151: Change UTC to GMT, fix comments in test configuration files
Modified:
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/filter/TimeFilterTest.java
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/filter/timeFilter1.xml
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/filter/timeFilter2.xml
Modified:
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/filter/TimeFilterTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/filter/TimeFilterTest.java?view=diff&rev=567068&r1=567067&r2=567068
==============================================================================
---
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/filter/TimeFilterTest.java
(original)
+++
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/filter/TimeFilterTest.java
Fri Aug 17 08:30:56 2007
@@ -202,17 +202,17 @@
}
/**
- * Test 2 AM UTC today event against 2 AM - 3 AM UTC filter.
+ * Test 2 AM UTC today event against 2 AM - 3 AM GMT filter.
*/
- public void test2AMUTC() {
- common2AM("UTC", 0);
+ public void test2AMGMT() {
+ common2AM("GMT", 0);
}
/**
- * Test 3 AM UTC today event against 2 AM - 3 AM UTC filter.
+ * Test 3 AM UTC today event against 2 AM - 3 AM GMT filter.
*/
- public void test3AMUTC() {
- common3AM("UTC", 0);
+ public void test3AMGMT() {
+ common3AM("GMT", 0);
}
/**
@@ -257,7 +257,7 @@
*/
public void testConfig2() throws Exception {
configure("timeFilter2.xml");
- common(Calendar.getInstance(TimeZone.getTimeZone("UTC")));
+ common(Calendar.getInstance(TimeZone.getTimeZone("GMT")));
assertTrue(Compare.compare(TimeFilterTest.class,
"timeFilter.2", "timeFilter2.log"));
Modified:
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/filter/timeFilter1.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/filter/timeFilter1.xml?view=diff&rev=567068&r1=567067&r2=567068
==============================================================================
---
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/filter/timeFilter1.xml
(original)
+++
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/filter/timeFilter1.xml
Fri Aug 17 08:30:56 2007
@@ -26,8 +26,7 @@
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d{HH:mm:ss} - %m\n"/>
</layout>
- <!-- Accept all LoggingEvents containing the string
- "1" in the message field. -->
+ <!-- Accept messages between 2 AM and 3 AM local time. -->
<filter class="org.apache.log4j.filter.TimeFilter">
<param name="start" value="02:00:00"/>
<param name="end" value="03:00:00"/>
Modified:
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/filter/timeFilter2.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/filter/timeFilter2.xml?view=diff&rev=567068&r1=567067&r2=567068
==============================================================================
---
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/filter/timeFilter2.xml
(original)
+++
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/filter/timeFilter2.xml
Fri Aug 17 08:30:56 2007
@@ -24,14 +24,13 @@
<param name="File" value="timeFilter.2" />
<layout class="org.apache.log4j.EnhancedPatternLayout">
- <param name="ConversionPattern" value="%d{HH:mm:ss}{UTC} - %m\n"/>
+ <param name="ConversionPattern" value="%d{HH:mm:ss}{GMT} - %m\n"/>
</layout>
- <!-- Accept all LoggingEvents containing the string
- "1" in the message field. -->
+ <!-- deny all messages between 2 AM and 3 AM GMT -->
<filter class="org.apache.log4j.filter.TimeFilter">
<param name="start" value="02:00:00"/>
<param name="end" value="03:00:00"/>
- <param name="timeZone" value="UTC-6"/>
+ <param name="timeZone" value="GMT"/>
<param name="acceptOnMatch" value="false"/>
</filter>
</appender>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
