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 ca...@apache.org on 2005/08/19 09:10:23 UTC
cvs commit: logging-log4j/tests/src/java/org/apache/log4j/xml DOMTestCase.java
carnold 2005/08/19 00:10:23
Modified: tests Tag: v1_2-branch build.properties.sample build.xml
tests/src/java/org/apache/log4j Tag: v1_2-branch
MinimumTestCase.java PatternLayoutTestCase.java
tests/src/java/org/apache/log4j/net Tag: v1_2-branch
SocketServerTestCase.java
tests/src/java/org/apache/log4j/util Tag: v1_2-branch
LineNumberFilter.java
tests/src/java/org/apache/log4j/xml Tag: v1_2-branch
DOMTestCase.java
Log:
Bug 35519: Expanded stack trace patterns for JDK 1.2
Revision Changes Path
No revision
No revision
1.3.2.3 +11 -1 logging-log4j/tests/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/logging-log4j/tests/build.properties.sample,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -r1.3.2.2 -r1.3.2.3
--- build.properties.sample 1 Jul 2005 04:38:34 -0000 1.3.2.2
+++ build.properties.sample 19 Aug 2005 07:10:22 -0000 1.3.2.3
@@ -2,7 +2,17 @@
# by default assume that all necessary dependencies
# are relative to the user's home directory
#
-lib.home.dir=${user.home}
+lib.home.dir=/java
+
+# The jaxp interface and a jaxp parser are required
+# to build the DOMConfigurator.
+#
+# modern equivalents are xml-commons-apis.jar
+# and xercesImpl.jar
+jaxp.home=${lib.home.dir}/crimson-1.1.3
+jaxp.jaxp.jar=${jaxp.home}/crimson.jar
+jaxp.parser.jar=${jaxp.home}/crimson.jar
+
jakarta.oro.jar=${lib.home.dir}/jakarta-oro-2.0.8/jakarta-oro-2.0.8.jar
clover.jar="${lib.home.dir}/clover-1.3.8/lib/clover.jar
deprecation=on
1.16.2.13 +2 -2 logging-log4j/tests/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/logging-log4j/tests/build.xml,v
retrieving revision 1.16.2.12
retrieving revision 1.16.2.13
diff -u -r1.16.2.12 -r1.16.2.13
--- build.xml 19 Aug 2005 00:26:51 -0000 1.16.2.12
+++ build.xml 19 Aug 2005 07:10:22 -0000 1.16.2.13
@@ -34,8 +34,8 @@
<pathelement location="./classes"/>
<pathelement location="./resources"/>
<pathelement location="${jakarta.oro.jar}"/>
- <pathelement location="${xml-api.jar}"/>
- <pathelement location="${xml-impl.jar}"/>
+ <pathelement location="${jaxp.jaxp.jar}"/>
+ <pathelement location="${jaxp.parser.jar}"/>
<pathelement location="${clover.jar}"/>
</path>
No revision
No revision
1.5.2.3 +2 -1 logging-log4j/tests/src/java/org/apache/log4j/Attic/MinimumTestCase.java
Index: MinimumTestCase.java
===================================================================
RCS file: /home/cvs/logging-log4j/tests/src/java/org/apache/log4j/Attic/MinimumTestCase.java,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -r1.5.2.2 -r1.5.2.3
--- MinimumTestCase.java 27 Jun 2005 19:40:18 -0000 1.5.2.2
+++ MinimumTestCase.java 19 Aug 2005 07:10:22 -0000 1.5.2.3
@@ -34,6 +34,7 @@
static String EXCEPTION1 = "java.lang.Exception: Just testing";
static String EXCEPTION2 = "\\s*at .*\\(.*:\\d{1,4}\\)";
static String EXCEPTION3 = "\\s*at .*\\(Native Method\\)";
+ static String EXCEPTION4 = "\\s*at .*\\(.*, Compiled Code\\)";
//18 fevr. 2002 20:02:41,551 [main] FATAL ERR - Message 0
@@ -84,7 +85,7 @@
common();
ControlFilter cf1 = new ControlFilter(new String[]{TTCC_PAT, TTCC2_PAT, EXCEPTION1,
- EXCEPTION2, EXCEPTION3});
+ EXCEPTION2, EXCEPTION3, EXCEPTION4});
Transformer.transform(
"output/ttcc", FILTERED,
1.4.2.3 +14 -13 logging-log4j/tests/src/java/org/apache/log4j/Attic/PatternLayoutTestCase.java
Index: PatternLayoutTestCase.java
===================================================================
RCS file: /home/cvs/logging-log4j/tests/src/java/org/apache/log4j/Attic/PatternLayoutTestCase.java,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- PatternLayoutTestCase.java 27 Jun 2005 19:40:18 -0000 1.4.2.2
+++ PatternLayoutTestCase.java 19 Aug 2005 07:10:23 -0000 1.4.2.3
@@ -48,6 +48,7 @@
static String EXCEPTION1 = "java.lang.Exception: Just testing";
static String EXCEPTION2 = "\\s*at .*\\(.*:\\d{1,4}\\)";
static String EXCEPTION3 = "\\s*at .*\\(Native Method\\)";
+ static String EXCEPTION4 = "\\s*at .*\\(.*, Compiled Code\\)";
static String PAT0 = "\\[main]\\ (DEBUG|INFO|WARN|ERROR|FATAL) .* - Message \\d{1,2}";
static String PAT1 = Filter.ISO8601_PAT + " " + PAT0;
@@ -100,7 +101,7 @@
PropertyConfigurator.configure("input/patternLayout2.properties");
common();
ControlFilter cf1 = new ControlFilter(new String[]{PAT1, EXCEPTION1,
- EXCEPTION2, EXCEPTION3});
+ EXCEPTION2, EXCEPTION3, EXCEPTION4});
Transformer.transform(
TEMP, FILTERED,
new Filter[] {
@@ -114,7 +115,7 @@
PropertyConfigurator.configure("input/patternLayout3.properties");
common();
ControlFilter cf1 = new ControlFilter(new String[]{PAT1, EXCEPTION1,
- EXCEPTION2, EXCEPTION3});
+ EXCEPTION2, EXCEPTION3, EXCEPTION4});
Transformer.transform(
TEMP, FILTERED,
new Filter[] {
@@ -130,7 +131,7 @@
PropertyConfigurator.configure("input/patternLayout4.properties");
common();
ControlFilter cf1 = new ControlFilter(new String[]{PAT2, EXCEPTION1,
- EXCEPTION2, EXCEPTION3});
+ EXCEPTION2, EXCEPTION3, EXCEPTION4});
Transformer.transform(
TEMP, FILTERED,
new Filter[] {
@@ -144,7 +145,7 @@
PropertyConfigurator.configure("input/patternLayout5.properties");
common();
ControlFilter cf1 = new ControlFilter(new String[]{PAT2, EXCEPTION1,
- EXCEPTION2, EXCEPTION3});
+ EXCEPTION2, EXCEPTION3, EXCEPTION4});
Transformer.transform(
TEMP, FILTERED,
new Filter[] {
@@ -159,7 +160,7 @@
PropertyConfigurator.configure("input/patternLayout6.properties");
common();
ControlFilter cf1 = new ControlFilter(new String[]{PAT3, EXCEPTION1,
- EXCEPTION2, EXCEPTION3});
+ EXCEPTION2, EXCEPTION3, EXCEPTION4});
Transformer.transform(
TEMP, FILTERED,
new Filter[] {
@@ -174,7 +175,7 @@
PropertyConfigurator.configure("input/patternLayout7.properties");
common();
ControlFilter cf1 = new ControlFilter(new String[]{PAT3, EXCEPTION1,
- EXCEPTION2, EXCEPTION3});
+ EXCEPTION2, EXCEPTION3, EXCEPTION4});
Transformer.transform(
TEMP, FILTERED,
new Filter[] {
@@ -188,7 +189,7 @@
PropertyConfigurator.configure("input/patternLayout8.properties");
common();
ControlFilter cf1 = new ControlFilter(new String[]{PAT4, EXCEPTION1,
- EXCEPTION2, EXCEPTION3});
+ EXCEPTION2, EXCEPTION3, EXCEPTION4});
Transformer.transform(
TEMP, FILTERED,
new Filter[] {
@@ -202,7 +203,7 @@
PropertyConfigurator.configure("input/patternLayout9.properties");
common();
ControlFilter cf1 = new ControlFilter(new String[]{PAT5, EXCEPTION1,
- EXCEPTION2, EXCEPTION3});
+ EXCEPTION2, EXCEPTION3, EXCEPTION4});
Transformer.transform(
TEMP, FILTERED,
new Filter[] {
@@ -216,7 +217,7 @@
PropertyConfigurator.configure("input/patternLayout10.properties");
common();
ControlFilter cf1 = new ControlFilter(new String[]{PAT6, EXCEPTION1,
- EXCEPTION2, EXCEPTION3});
+ EXCEPTION2, EXCEPTION3, EXCEPTION4});
Transformer.transform(
TEMP, FILTERED,
new Filter[] {
@@ -230,7 +231,7 @@
PropertyConfigurator.configure("input/patternLayout11.properties");
common();
ControlFilter cf1 = new ControlFilter(new String[]{PAT11a, PAT11b, EXCEPTION1,
- EXCEPTION2, EXCEPTION3});
+ EXCEPTION2, EXCEPTION3, EXCEPTION4});
Transformer.transform(
TEMP, FILTERED,
new Filter[] {
@@ -244,7 +245,7 @@
PropertyConfigurator.configure("input/patternLayout12.properties");
common();
ControlFilter cf1 = new ControlFilter(new String[]{PAT12, EXCEPTION1,
- EXCEPTION2, EXCEPTION3});
+ EXCEPTION2, EXCEPTION3, EXCEPTION4});
Transformer.transform(
TEMP, FILTERED,
new Filter[] {
@@ -258,7 +259,7 @@
PropertyConfigurator.configure("input/patternLayout13.properties");
common();
ControlFilter cf1 = new ControlFilter(new String[]{PAT13, EXCEPTION1,
- EXCEPTION2, EXCEPTION3});
+ EXCEPTION2, EXCEPTION3, EXCEPTION4});
Transformer.transform(
TEMP, FILTERED,
new Filter[] {
@@ -272,7 +273,7 @@
PropertyConfigurator.configure("input/patternLayout14.properties");
common();
ControlFilter cf1 = new ControlFilter(new String[]{PAT14, EXCEPTION1,
- EXCEPTION2, EXCEPTION3});
+ EXCEPTION2, EXCEPTION3, EXCEPTION4});
Transformer.transform(
TEMP, FILTERED,
new Filter[] {
No revision
No revision
1.2.2.5 +9 -8 logging-log4j/tests/src/java/org/apache/log4j/net/SocketServerTestCase.java
Index: SocketServerTestCase.java
===================================================================
RCS file: /home/cvs/logging-log4j/tests/src/java/org/apache/log4j/net/SocketServerTestCase.java,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.5
diff -u -r1.2.2.4 -r1.2.2.5
--- SocketServerTestCase.java 27 Jun 2005 19:40:18 -0000 1.2.2.4
+++ SocketServerTestCase.java 19 Aug 2005 07:10:23 -0000 1.2.2.5
@@ -82,6 +82,7 @@
static String EXCEPTION1 = "java.lang.Exception: Just testing";
static String EXCEPTION2 = "\\s*at .*\\(.*:\\d{1,4}\\)";
static String EXCEPTION3 = "\\s*at .*\\(Native Method\\)";
+ static String EXCEPTION4 = "\\s*at .*\\(.*, Compiled Code\\)";
static Logger logger = Logger.getLogger(SocketServerTestCase.class);
@@ -114,7 +115,7 @@
common("T1", "key1", "MDC-TEST1");
delay(1);
ControlFilter cf = new ControlFilter(new String[]{PAT1, EXCEPTION1,
- EXCEPTION2, EXCEPTION3});
+ EXCEPTION2, EXCEPTION3, EXCEPTION4});
Transformer.transform(
TEMP, FILTERED,
@@ -138,7 +139,7 @@
common("T2", "key2", "MDC-TEST2");
delay(1);
ControlFilter cf = new ControlFilter(new String[]{PAT2, EXCEPTION1,
- EXCEPTION2, EXCEPTION3});
+ EXCEPTION2, EXCEPTION3, EXCEPTION4});
Transformer.transform(
TEMP, FILTERED,
@@ -161,7 +162,7 @@
common("T3", "key3", "MDC-TEST3");
delay(1);
ControlFilter cf = new ControlFilter(new String[]{PAT3, EXCEPTION1,
- EXCEPTION2, EXCEPTION3});
+ EXCEPTION2, EXCEPTION3, EXCEPTION4});
Transformer.transform(
TEMP, FILTERED,
@@ -187,7 +188,7 @@
NDC.pop();
delay(1);
ControlFilter cf = new ControlFilter(new String[]{PAT4, EXCEPTION1,
- EXCEPTION2, EXCEPTION3});
+ EXCEPTION2, EXCEPTION3, EXCEPTION4});
Transformer.transform(
TEMP, FILTERED,
@@ -225,7 +226,7 @@
NDC.pop();
delay(2);
ControlFilter cf = new ControlFilter(new String[]{PAT5, EXCEPTION1,
- EXCEPTION2, EXCEPTION3});
+ EXCEPTION2, EXCEPTION3, EXCEPTION4});
Transformer.transform(
TEMP, FILTERED,
@@ -257,7 +258,7 @@
MDC.remove("hostID");
delay(2);
ControlFilter cf = new ControlFilter(new String[]{PAT6, EXCEPTION1,
- EXCEPTION2, EXCEPTION3});
+ EXCEPTION2, EXCEPTION3, EXCEPTION4});
Transformer.transform(
TEMP, FILTERED,
@@ -285,7 +286,7 @@
MDC.remove("hostID");
delay(2);
ControlFilter cf = new ControlFilter(new String[]{PAT7, EXCEPTION1,
- EXCEPTION2, EXCEPTION3});
+ EXCEPTION2, EXCEPTION3, EXCEPTION4});
Transformer.transform(
TEMP, FILTERED,
@@ -310,7 +311,7 @@
NDC.pop();
delay(2);
ControlFilter cf = new ControlFilter(new String[]{PAT8, EXCEPTION1,
- EXCEPTION2, EXCEPTION3});
+ EXCEPTION2, EXCEPTION3, EXCEPTION4});
Transformer.transform(
TEMP, FILTERED,
No revision
No revision
1.2.2.2 +3 -2 logging-log4j/tests/src/java/org/apache/log4j/util/LineNumberFilter.java
Index: LineNumberFilter.java
===================================================================
RCS file: /home/cvs/logging-log4j/tests/src/java/org/apache/log4j/util/LineNumberFilter.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- LineNumberFilter.java 24 May 2005 05:06:25 -0000 1.2.2.1
+++ LineNumberFilter.java 19 Aug 2005 07:10:23 -0000 1.2.2.2
@@ -16,8 +16,6 @@
package org.apache.log4j.util;
-import java.io.*;
-
import org.apache.oro.text.perl.Perl5Util;
public class LineNumberFilter implements Filter {
@@ -29,6 +27,9 @@
if(util.match("/\\(.*:\\d{1,4}\\)/", in)) {
return util.substitute("s/:\\d{1,4}\\)/:XXX)/", in);
} else {
+ if(in.indexOf(", Compiled Code") >= 0) {
+ return util.substitute("s/, Compiled Code/:XXX/", in);
+ }
return in;
}
}
No revision
No revision
1.5.2.4 +5 -4 logging-log4j/tests/src/java/org/apache/log4j/xml/Attic/DOMTestCase.java
Index: DOMTestCase.java
===================================================================
RCS file: /home/cvs/logging-log4j/tests/src/java/org/apache/log4j/xml/Attic/DOMTestCase.java,v
retrieving revision 1.5.2.3
retrieving revision 1.5.2.4
diff -u -r1.5.2.3 -r1.5.2.4
--- DOMTestCase.java 14 Jul 2005 21:23:54 -0000 1.5.2.3
+++ DOMTestCase.java 19 Aug 2005 07:10:23 -0000 1.5.2.4
@@ -42,6 +42,7 @@
static String EXCEPTION1 = "java.lang.Exception: Just testing";
static String EXCEPTION2 = "\\s*at .*\\(.*:\\d{1,4}\\)";
static String EXCEPTION3 = "\\s*at .*\\(Native Method\\)";
+ static String EXCEPTION4 = "\\s*at .*\\(.*, Compiled Code\\)";
static String TEST1_1A_PAT =
"(DEBUG|INFO |WARN |ERROR|FATAL) \\w*\\.\\w* - Message \\d";
@@ -74,10 +75,10 @@
common();
ControlFilter cf1 = new ControlFilter(new String[]{TEST1_1A_PAT, TEST1_1B_PAT,
- EXCEPTION1, EXCEPTION2, EXCEPTION3});
+ EXCEPTION1, EXCEPTION2, EXCEPTION3, EXCEPTION4});
ControlFilter cf2 = new ControlFilter(new String[]{TEST1_2_PAT,
- EXCEPTION1, EXCEPTION2, EXCEPTION3});
+ EXCEPTION1, EXCEPTION2, EXCEPTION3, EXCEPTION4});
Transformer.transform(
TEMP_A1, FILTERED_A1,
@@ -105,10 +106,10 @@
common();
ControlFilter cf1 = new ControlFilter(new String[]{TEST1_1A_PAT, TEST1_1B_PAT,
- EXCEPTION1, EXCEPTION2, EXCEPTION3});
+ EXCEPTION1, EXCEPTION2, EXCEPTION3, EXCEPTION4});
ControlFilter cf2 = new ControlFilter(new String[]{TEST1_2_PAT,
- EXCEPTION1, EXCEPTION2, EXCEPTION3});
+ EXCEPTION1, EXCEPTION2, EXCEPTION3, EXCEPTION4});
Transformer.transform(
TEMP_A1 + ".4", FILTERED_A1 + ".4",
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org