Author: carnold
Date: Sat Mar 20 18:12:14 2010
New Revision: 925646
URL: http://svn.apache.org/viewvc?rev=925646&view=rev
Log:
Bug 48927: Add EnhancedPatternLayout from extras companion
Added:
logging/log4j/trunk/src/main/java/org/apache/log4j/EnhancedPatternLayout.java
- copied unchanged from r925092,
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/EnhancedPatternLayout.java
logging/log4j/trunk/src/main/java/org/apache/log4j/helpers/MDCKeySetExtractor.java
- copied unchanged from r925092,
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/helpers/MDCKeySetExtractor.java
logging/log4j/trunk/src/main/java/org/apache/log4j/pattern/
- copied from r925092,
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/pattern/
logging/log4j/trunk/tests/input/pattern/
logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout.mdc.1.properties
- copied unchanged from r925092,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.mdc.1.properties
logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout1.properties
- copied unchanged from r925092,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout1.properties
logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout10.properties
- copied unchanged from r925092,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout10.properties
logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout11.properties
- copied unchanged from r925092,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout11.properties
logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout12.properties
- copied unchanged from r925092,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout12.properties
logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout13.properties
- copied unchanged from r925092,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout13.properties
logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout14.properties
- copied unchanged from r925092,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout14.properties
logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout15.properties
- copied unchanged from r925092,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout15.properties
logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout16.properties
- copied unchanged from r925092,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout16.properties
logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout2.properties
- copied unchanged from r925092,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout2.properties
logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout3.properties
- copied unchanged from r925092,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout3.properties
logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout4.properties
- copied unchanged from r925092,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout4.properties
logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout5.properties
- copied unchanged from r925092,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout5.properties
logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout6.properties
- copied unchanged from r925092,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout6.properties
logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout7.properties
- copied unchanged from r925092,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout7.properties
logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout8.properties
- copied unchanged from r925092,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout8.properties
logging/log4j/trunk/tests/input/pattern/enhancedPatternLayout9.properties
- copied unchanged from r925092,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout9.properties
logging/log4j/trunk/tests/src/java/org/apache/log4j/EnhancedMyPatternLayout.java
- copied unchanged from r925092,
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/EnhancedMyPatternLayout.java
logging/log4j/trunk/tests/src/java/org/apache/log4j/EnhancedPatternLayoutTest.java
- copied unchanged from r925092,
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/EnhancedPatternLayoutTest.java
logging/log4j/trunk/tests/src/java/org/apache/log4j/EnhancedPatternLayoutTestCase.java
- copied, changed from r925092,
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/EnhancedPatternLayoutTestCase.java
logging/log4j/trunk/tests/src/java/org/apache/log4j/MDCOrderFilter.java
- copied unchanged from r925092,
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/util/MDCOrderFilter.java
logging/log4j/trunk/tests/src/java/org/apache/log4j/pattern/
- copied from r925092,
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/pattern/
logging/log4j/trunk/tests/src/java/org/apache/log4j/util/EnhancedJunitTestRunnerFilter.java
- copied, changed from r925092,
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/util/JunitTestRunnerFilter.java
logging/log4j/trunk/tests/src/java/org/apache/log4j/util/EnhancedLineNumberFilter.java
- copied, changed from r925092,
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/util/LineNumberFilter.java
logging/log4j/trunk/tests/witness/pattern/
logging/log4j/trunk/tests/witness/pattern/enhancedPatternLayout.1
- copied unchanged from r925092,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.1
logging/log4j/trunk/tests/witness/pattern/enhancedPatternLayout.10
- copied unchanged from r925092,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.10
logging/log4j/trunk/tests/witness/pattern/enhancedPatternLayout.11
- copied unchanged from r925092,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.11
logging/log4j/trunk/tests/witness/pattern/enhancedPatternLayout.12
- copied unchanged from r925092,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.12
logging/log4j/trunk/tests/witness/pattern/enhancedPatternLayout.13
- copied unchanged from r925092,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.13
logging/log4j/trunk/tests/witness/pattern/enhancedPatternLayout.14
- copied unchanged from r925092,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.14
logging/log4j/trunk/tests/witness/pattern/enhancedPatternLayout.15
- copied unchanged from r925092,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.15
logging/log4j/trunk/tests/witness/pattern/enhancedPatternLayout.2
- copied unchanged from r925092,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.2
logging/log4j/trunk/tests/witness/pattern/enhancedPatternLayout.3
- copied unchanged from r925092,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.3
logging/log4j/trunk/tests/witness/pattern/enhancedPatternLayout.4
- copied unchanged from r925092,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.4
logging/log4j/trunk/tests/witness/pattern/enhancedPatternLayout.5
- copied unchanged from r925092,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.5
logging/log4j/trunk/tests/witness/pattern/enhancedPatternLayout.6
- copied unchanged from r925092,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.6
logging/log4j/trunk/tests/witness/pattern/enhancedPatternLayout.7
- copied unchanged from r925092,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.7
logging/log4j/trunk/tests/witness/pattern/enhancedPatternLayout.8
- copied unchanged from r925092,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.8
logging/log4j/trunk/tests/witness/pattern/enhancedPatternLayout.9
- copied unchanged from r925092,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.9
logging/log4j/trunk/tests/witness/pattern/enhancedPatternLayout.mdc.1
- copied unchanged from r925092,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.mdc.1
logging/log4j/trunk/tests/witness/pattern/enhancedPatternLayout.mdc.2
- copied unchanged from r925092,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.mdc.2
logging/log4j/trunk/tests/witness/pattern/enhancedPatternLayout.throwable
- copied unchanged from r925092,
logging/log4j/companions/extras/trunk/src/test/resources/org/apache/log4j/enhancedPatternLayout.throwable
Modified:
logging/log4j/trunk/src/changes/changes.xml
logging/log4j/trunk/tests/build.xml
logging/log4j/trunk/tests/src/java/org/apache/log4j/CoreTestSuite.java
Modified: logging/log4j/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/trunk/src/changes/changes.xml?rev=925646&r1=925645&r2=925646&view=diff
==============================================================================
--- logging/log4j/trunk/src/changes/changes.xml (original)
+++ logging/log4j/trunk/src/changes/changes.xml Sat Mar 20 18:12:14 2010
@@ -95,6 +95,7 @@
<action action="fix" issue="48531">Unit tests fail for system dates
after 2009-12-31</action>
<action action="fix" issue="48604">Download page does not have link to
KEYS file</action>
<action action="add" issue="49812">Add parameterized logging utility
classes LogMF and LogSF from extras companion.</action>
+ <action action="add" issue="48927">Add EnhancedPatternLayout from
extras companion.</action>
</release>
Modified: logging/log4j/trunk/tests/build.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/trunk/tests/build.xml?rev=925646&r1=925645&r2=925646&view=diff
==============================================================================
--- logging/log4j/trunk/tests/build.xml (original)
+++ logging/log4j/trunk/tests/build.xml Sat Mar 20 18:12:14 2010
@@ -217,6 +217,12 @@
<formatter type="plain" usefile="false"/>
<test name="org.apache.log4j.PatternLayoutTestCase" />
</junit>
+ <junit printsummary="yes" fork="yes"
+ haltonfailure="${haltonfailure}" dir="${basedir}">
+ <classpath refid="tests.classpath"/>
+ <formatter type="plain" usefile="false"/>
+ <test name="org.apache.log4j.EnhancedPatternLayoutTestCase" />
+ </junit>
</target>
<target name="HierarchyThreshold" depends="build">
Modified: logging/log4j/trunk/tests/src/java/org/apache/log4j/CoreTestSuite.java
URL:
http://svn.apache.org/viewvc/logging/log4j/trunk/tests/src/java/org/apache/log4j/CoreTestSuite.java?rev=925646&r1=925645&r2=925646&view=diff
==============================================================================
--- logging/log4j/trunk/tests/src/java/org/apache/log4j/CoreTestSuite.java
(original)
+++ logging/log4j/trunk/tests/src/java/org/apache/log4j/CoreTestSuite.java Sat
Mar 20 18:12:14 2010
@@ -56,6 +56,10 @@ public class CoreTestSuite {
s.addTestSuite(org.apache.log4j.TestLogXF.class);
s.addTestSuite(org.apache.log4j.TestLogMF.class);
s.addTestSuite(org.apache.log4j.TestLogSF.class);
+ s.addTestSuite(org.apache.log4j.pattern.CachedDateFormatTest.class);
+ s.addTestSuite(org.apache.log4j.pattern.FormattingInfoTest.class);
+ s.addTestSuite(org.apache.log4j.pattern.NameAbbreviatorTest.class);
+ s.addTestSuite(org.apache.log4j.pattern.PatternParserTest.class);
return s;
}
}
Copied:
logging/log4j/trunk/tests/src/java/org/apache/log4j/EnhancedPatternLayoutTestCase.java
(from r925092,
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/EnhancedPatternLayoutTestCase.java)
URL:
http://svn.apache.org/viewvc/logging/log4j/trunk/tests/src/java/org/apache/log4j/EnhancedPatternLayoutTestCase.java?p2=logging/log4j/trunk/tests/src/java/org/apache/log4j/EnhancedPatternLayoutTestCase.java&p1=logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/EnhancedPatternLayoutTestCase.java&r1=925092&r2=925646&rev=925646&view=diff
==============================================================================
---
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/EnhancedPatternLayoutTestCase.java
(original)
+++
logging/log4j/trunk/tests/src/java/org/apache/log4j/EnhancedPatternLayoutTestCase.java
Sat Mar 20 18:12:14 2010
@@ -24,8 +24,8 @@ import org.apache.log4j.util.Compare;
import org.apache.log4j.util.ControlFilter;
import org.apache.log4j.util.Filter;
import org.apache.log4j.util.ISO8601Filter;
-import org.apache.log4j.util.JunitTestRunnerFilter;
-import org.apache.log4j.util.LineNumberFilter;
+import org.apache.log4j.util.EnhancedJunitTestRunnerFilter;
+import org.apache.log4j.util.EnhancedLineNumberFilter;
import org.apache.log4j.util.RelativeTimeFilter;
import org.apache.log4j.util.SunReflectFilter;
import org.apache.log4j.util.Transformer;
@@ -37,6 +37,7 @@ import java.util.Date;
import java.util.TimeZone;
import java.io.*;
import java.util.Properties;
+import java.util.regex.Pattern;
public class EnhancedPatternLayoutTestCase extends TestCase {
@@ -74,6 +75,7 @@ public class EnhancedPatternLayoutTestCa
static String PAT_MDC_1 = "";
Logger root;
Logger logger;
+
public EnhancedPatternLayoutTestCase(final String name) {
super(name);
@@ -94,18 +96,7 @@ public class EnhancedPatternLayoutTestCa
* @throws IOException if resource not found or error reading resource.
*/
private static void configure(final String fileName) throws IOException {
- String resourceName = fileName;
- int lastSlash = resourceName.lastIndexOf("/");
- if (lastSlash >= 0) {
- resourceName = resourceName.substring(lastSlash + 1);
- }
- InputStream is =
EnhancedPatternLayoutTestCase.class.getResourceAsStream(resourceName);
- if (is == null) {
- throw new FileNotFoundException("Could not find resource " +
resourceName);
- }
- Properties props = new Properties();
- props.load(is);
- PropertyConfigurator.configure(props);
+ PropertyConfigurator.configure(fileName);
}
/**
@@ -117,7 +108,7 @@ public class EnhancedPatternLayoutTestCa
*/
private static boolean compare(final String actual,
final String expected) throws IOException {
- return Compare.compare(EnhancedPatternLayoutTestCase.class, actual,
expected);
+ return Compare.compare(actual, expected);
}
@@ -127,8 +118,8 @@ public class EnhancedPatternLayoutTestCa
Transformer.transform(
TEMP, FILTERED,
new Filter[] {
- new LineNumberFilter(), new SunReflectFilter(),
- new JunitTestRunnerFilter()
+ new EnhancedLineNumberFilter(), new SunReflectFilter(),
+ new EnhancedJunitTestRunnerFilter()
});
assertTrue(compare(FILTERED, "witness/pattern/enhancedPatternLayout.1"));
}
@@ -143,8 +134,8 @@ public class EnhancedPatternLayoutTestCa
Transformer.transform(
TEMP, FILTERED,
new Filter[] {
- cf1, new LineNumberFilter(), new ISO8601Filter(),
- new SunReflectFilter(), new JunitTestRunnerFilter()
+ cf1, new EnhancedLineNumberFilter(), new ISO8601Filter(),
+ new SunReflectFilter(), new EnhancedJunitTestRunnerFilter()
});
assertTrue(compare(FILTERED, "witness/pattern/enhancedPatternLayout.2"));
}
@@ -159,8 +150,8 @@ public class EnhancedPatternLayoutTestCa
Transformer.transform(
TEMP, FILTERED,
new Filter[] {
- cf1, new LineNumberFilter(), new ISO8601Filter(),
- new SunReflectFilter(), new JunitTestRunnerFilter()
+ cf1, new EnhancedLineNumberFilter(), new ISO8601Filter(),
+ new SunReflectFilter(), new EnhancedJunitTestRunnerFilter()
});
assertTrue(compare(FILTERED, "witness/pattern/enhancedPatternLayout.3"));
}
@@ -177,8 +168,8 @@ public class EnhancedPatternLayoutTestCa
Transformer.transform(
TEMP, FILTERED,
new Filter[] {
- cf1, new LineNumberFilter(), new AbsoluteDateAndTimeFilter(),
- new SunReflectFilter(), new JunitTestRunnerFilter()
+ cf1, new EnhancedLineNumberFilter(), new AbsoluteDateAndTimeFilter(),
+ new SunReflectFilter(), new EnhancedJunitTestRunnerFilter()
});
assertTrue(compare(FILTERED, "witness/pattern/enhancedPatternLayout.4"));
}
@@ -193,8 +184,8 @@ public class EnhancedPatternLayoutTestCa
Transformer.transform(
TEMP, FILTERED,
new Filter[] {
- cf1, new LineNumberFilter(), new AbsoluteDateAndTimeFilter(),
- new SunReflectFilter(), new JunitTestRunnerFilter()
+ cf1, new EnhancedLineNumberFilter(), new AbsoluteDateAndTimeFilter(),
+ new SunReflectFilter(), new EnhancedJunitTestRunnerFilter()
});
assertTrue(compare(FILTERED, "witness/pattern/enhancedPatternLayout.5"));
}
@@ -210,8 +201,8 @@ public class EnhancedPatternLayoutTestCa
Transformer.transform(
TEMP, FILTERED,
new Filter[] {
- cf1, new LineNumberFilter(), new AbsoluteTimeFilter(),
- new SunReflectFilter(), new JunitTestRunnerFilter()
+ cf1, new EnhancedLineNumberFilter(), new AbsoluteTimeFilter(),
+ new SunReflectFilter(), new EnhancedJunitTestRunnerFilter()
});
assertTrue(compare(FILTERED, "witness/pattern/enhancedPatternLayout.6"));
}
@@ -226,8 +217,8 @@ public class EnhancedPatternLayoutTestCa
Transformer.transform(
TEMP, FILTERED,
new Filter[] {
- cf1, new LineNumberFilter(), new AbsoluteTimeFilter(),
- new SunReflectFilter(), new JunitTestRunnerFilter()
+ cf1, new EnhancedLineNumberFilter(), new AbsoluteTimeFilter(),
+ new SunReflectFilter(), new EnhancedJunitTestRunnerFilter()
});
assertTrue(compare(FILTERED, "witness/pattern/enhancedPatternLayout.7"));
}
@@ -242,8 +233,8 @@ public class EnhancedPatternLayoutTestCa
Transformer.transform(
TEMP, FILTERED,
new Filter[] {
- cf1, new LineNumberFilter(), new RelativeTimeFilter(),
- new SunReflectFilter(), new JunitTestRunnerFilter()
+ cf1, new EnhancedLineNumberFilter(), new RelativeTimeFilter(),
+ new SunReflectFilter(), new EnhancedJunitTestRunnerFilter()
});
assertTrue(compare(FILTERED, "witness/pattern/enhancedPatternLayout.8"));
}
@@ -258,8 +249,8 @@ public class EnhancedPatternLayoutTestCa
Transformer.transform(
TEMP, FILTERED,
new Filter[] {
- cf1, new LineNumberFilter(), new SunReflectFilter(),
- new JunitTestRunnerFilter()
+ cf1, new EnhancedLineNumberFilter(), new SunReflectFilter(),
+ new EnhancedJunitTestRunnerFilter()
});
assertTrue(compare(FILTERED, "witness/pattern/enhancedPatternLayout.9"));
}
@@ -274,8 +265,8 @@ public class EnhancedPatternLayoutTestCa
Transformer.transform(
TEMP, FILTERED,
new Filter[] {
- cf1, new LineNumberFilter(), new SunReflectFilter(),
- new JunitTestRunnerFilter()
+ cf1, new EnhancedLineNumberFilter(), new SunReflectFilter(),
+ new EnhancedJunitTestRunnerFilter()
});
assertTrue(compare(FILTERED, "witness/pattern/enhancedPatternLayout.10"));
}
@@ -290,8 +281,8 @@ public class EnhancedPatternLayoutTestCa
Transformer.transform(
TEMP, FILTERED,
new Filter[] {
- cf1, new LineNumberFilter(), new SunReflectFilter(),
- new JunitTestRunnerFilter()
+ cf1, new EnhancedLineNumberFilter(), new SunReflectFilter(),
+ new EnhancedJunitTestRunnerFilter()
});
assertTrue(compare(FILTERED, "witness/pattern/enhancedPatternLayout.11"));
}
@@ -306,8 +297,8 @@ public class EnhancedPatternLayoutTestCa
Transformer.transform(
TEMP, FILTERED,
new Filter[] {
- cf1, new LineNumberFilter(), new SunReflectFilter(),
- new JunitTestRunnerFilter()
+ cf1, new EnhancedLineNumberFilter(), new SunReflectFilter(),
+ new EnhancedJunitTestRunnerFilter()
});
assertTrue(compare(FILTERED, "witness/pattern/enhancedPatternLayout.12"));
}
@@ -322,8 +313,8 @@ public class EnhancedPatternLayoutTestCa
Transformer.transform(
TEMP, FILTERED,
new Filter[] {
- cf1, new LineNumberFilter(), new SunReflectFilter(),
- new JunitTestRunnerFilter()
+ cf1, new EnhancedLineNumberFilter(), new SunReflectFilter(),
+ new EnhancedJunitTestRunnerFilter()
});
assertTrue(compare(FILTERED, "witness/pattern/enhancedPatternLayout.13"));
}
@@ -340,8 +331,8 @@ public class EnhancedPatternLayoutTestCa
Transformer.transform(
TEMP, FILTERED,
new Filter[] {
- new LineNumberFilter(), new SunReflectFilter(),
- new JunitTestRunnerFilter()
+ new EnhancedLineNumberFilter(), new SunReflectFilter(),
+ new EnhancedJunitTestRunnerFilter()
});
assertTrue(compare(FILTERED,
"witness/pattern/enhancedPatternLayout.14"));
}
@@ -366,8 +357,8 @@ public class EnhancedPatternLayoutTestCa
Transformer.transform(
TEMP, FILTERED,
new Filter[] {
- new LineNumberFilter(), new SunReflectFilter(),
- new JunitTestRunnerFilter(),
+ new EnhancedLineNumberFilter(), new SunReflectFilter(),
+ new EnhancedJunitTestRunnerFilter(),
new MDCOrderFilter()
});
assertTrue(compare(FILTERED,
"witness/pattern/enhancedPatternLayout.mdc.1"));
@@ -385,8 +376,8 @@ public class EnhancedPatternLayoutTestCa
Transformer.transform(
TEMP, FILTERED,
new Filter[] {
- cf1, new LineNumberFilter(), new SunReflectFilter(),
- new JunitTestRunnerFilter()
+ cf1, new EnhancedLineNumberFilter(), new SunReflectFilter(),
+ new EnhancedJunitTestRunnerFilter()
});
assertTrue(compare(FILTERED,
"witness/pattern/enhancedPatternLayout.15"));
}
@@ -520,8 +511,8 @@ public class EnhancedPatternLayoutTestCa
Transformer.transform(
OUTPUT_FILE, FILTERED,
new Filter[] {
- new LineNumberFilter(), new SunReflectFilter(),
- new JunitTestRunnerFilter(),
+ new EnhancedLineNumberFilter(), new SunReflectFilter(),
+ new EnhancedJunitTestRunnerFilter(),
new MDCOrderFilter()
});
@@ -566,8 +557,8 @@ public class EnhancedPatternLayoutTestCa
Transformer.transform(
OUTPUT_FILE, FILTERED,
new Filter[] {
- new LineNumberFilter(), new SunReflectFilter(),
- new JunitTestRunnerFilter(),
+ new EnhancedLineNumberFilter(), new SunReflectFilter(),
+ new EnhancedJunitTestRunnerFilter(),
new MDCOrderFilter()
});
Copied:
logging/log4j/trunk/tests/src/java/org/apache/log4j/util/EnhancedJunitTestRunnerFilter.java
(from r925092,
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/util/JunitTestRunnerFilter.java)
URL:
http://svn.apache.org/viewvc/logging/log4j/trunk/tests/src/java/org/apache/log4j/util/EnhancedJunitTestRunnerFilter.java?p2=logging/log4j/trunk/tests/src/java/org/apache/log4j/util/EnhancedJunitTestRunnerFilter.java&p1=logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/util/JunitTestRunnerFilter.java&r1=925092&r2=925646&rev=925646&view=diff
==============================================================================
---
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/util/JunitTestRunnerFilter.java
(original)
+++
logging/log4j/trunk/tests/src/java/org/apache/log4j/util/EnhancedJunitTestRunnerFilter.java
Sat Mar 20 18:12:14 2010
@@ -20,7 +20,7 @@ package org.apache.log4j.util;
import java.util.regex.Pattern;
-public class JunitTestRunnerFilter implements Filter {
+public class EnhancedJunitTestRunnerFilter implements Filter {
private static final String[] PATTERNS = {
"at org.eclipse.jdt.internal.junit.runner.RemoteTestRunner",
@@ -34,7 +34,7 @@ public class JunitTestRunnerFilter imple
};
private final Pattern[] patterns;
- public JunitTestRunnerFilter() {
+ public EnhancedJunitTestRunnerFilter() {
patterns = new Pattern[PATTERNS.length];
for (int i = 0; i < PATTERNS.length; i++) {
patterns[i] = Pattern.compile(PATTERNS[i]);
Copied:
logging/log4j/trunk/tests/src/java/org/apache/log4j/util/EnhancedLineNumberFilter.java
(from r925092,
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/util/LineNumberFilter.java)
URL:
http://svn.apache.org/viewvc/logging/log4j/trunk/tests/src/java/org/apache/log4j/util/EnhancedLineNumberFilter.java?p2=logging/log4j/trunk/tests/src/java/org/apache/log4j/util/EnhancedLineNumberFilter.java&p1=logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/util/LineNumberFilter.java&r1=925092&r2=925646&rev=925646&view=diff
==============================================================================
---
logging/log4j/companions/extras/trunk/src/test/java/org/apache/log4j/util/LineNumberFilter.java
(original)
+++
logging/log4j/trunk/tests/src/java/org/apache/log4j/util/EnhancedLineNumberFilter.java
Sat Mar 20 18:12:14 2010
@@ -20,11 +20,11 @@ package org.apache.log4j.util;
import java.util.regex.Pattern;
-public class LineNumberFilter implements Filter {
+public class EnhancedLineNumberFilter implements Filter {
private Pattern linePattern;
private Pattern nativePattern;
- public LineNumberFilter() {
+ public EnhancedLineNumberFilter() {
linePattern = Pattern.compile("\\(.*:\\d{1,4}\\)");
nativePattern = Pattern.compile("\\(Native Method\\)");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
