sdeboy 2003/07/09 00:35:49
Modified: tests/src/java/org/apache/log4j/xml XMLLayoutTestCase.java
tests build.xml
tests/witness xmlLayout.mdc.1
Log:
XMLLayoutTestCase: Modifications to match latest changes to XMLLayout (removed
support for CDATA-based attributes in MDC name/value pairs).
updated the witness to the xmllayout.mdc.1 file, renamed testMDCEscaped to
holdTestMDCEscaped and removed from suite in case this capability can be re-added in
the future.
build.xml: removed the env task - not supported on win98/winme and makes the parent
process unrecoverable
PR:
Obtained from:
Submitted by:
Reviewed by:
CVS: ----------------------------------------------------------------------
CVS: PR:
CVS: If this change addresses a PR in the problem report tracking
CVS: database, then enter the PR number(s) here.
CVS: Obtained from:
CVS: If this change has been taken from another system, such as NCSA,
CVS: then name the system in this line, otherwise delete it.
CVS: Submitted by:
CVS: If this code has been contributed to Apache by someone else; i.e.,
CVS: they sent us a patch or a new module, then include their name/email
CVS: address here. If this is your work then delete this line.
CVS: Reviewed by:
CVS: If we are doing pre-commit code reviews and someone else has
CVS: reviewed your changes, include their name(s) here.
CVS: If you have not had it reviewed then delete this line.
Revision Changes Path
1.8 +1 -2
jakarta-log4j/tests/src/java/org/apache/log4j/xml/XMLLayoutTestCase.java
Index: XMLLayoutTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/tests/src/java/org/apache/log4j/xml/XMLLayoutTestCase.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XMLLayoutTestCase.java 13 May 2003 16:33:15 -0000 1.7
+++ XMLLayoutTestCase.java 9 Jul 2003 07:35:49 -0000 1.8
@@ -163,7 +163,7 @@
assertTrue(Compare.compare(FILTERED, "witness/xmlLayout.mdc.1"));
}
- public void testMDCEscaped() throws Exception {
+ public void holdTestMDCEscaped() throws Exception {
XMLLayout xmlLayout = new XMLLayout();
root.addAppender(new FileAppender(xmlLayout, TEMP, false));
@@ -213,7 +213,6 @@
suite.addTest(new XMLLayoutTestCase("testCDATA"));
suite.addTest(new XMLLayoutTestCase("testNull"));
suite.addTest(new XMLLayoutTestCase("testMDC"));
- suite.addTest(new XMLLayoutTestCase("testMDCEscaped"));
return suite;
}
1.37 +0 -4 jakarta-log4j/tests/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-log4j/tests/build.xml,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- build.xml 25 Jun 2003 16:35:00 -0000 1.36
+++ build.xml 9 Jul 2003 07:35:49 -0000 1.37
@@ -10,10 +10,6 @@
<property file="build.properties"/>
- <!-- Read the system environment variables and stores them in properties, -->
- <!-- prefixed with "env". -->
- <property environment="env"/>
-
<!-- The base directory relative to which most targets are built -->
<property name="base" value="."/>
1.2 +2 -2 jakarta-log4j/tests/witness/xmlLayout.mdc.1
Index: xmlLayout.mdc.1
===================================================================
RCS file: /home/cvs/jakarta-log4j/tests/witness/xmlLayout.mdc.1,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xmlLayout.mdc.1 26 Mar 2003 06:26:48 -0000 1.1
+++ xmlLayout.mdc.1 9 Jul 2003 07:35:49 -0000 1.2
@@ -1,8 +1,8 @@
<log4j:event logger="org.apache.log4j.xml.XMLLayoutTestCase" timestamp="XXX"
level="DEBUG" thread="main">
<log4j:message><![CDATA[Hello]]></log4j:message>
<log4j:MDC>
- <log4j:data name="<![CDATA[key1]]>" value="<![CDATA[val1]]>"/>
- <log4j:data name="<![CDATA[key2]]>" value="<![CDATA[val2]]>"/>
+ <log4j:data name="key1" value="val1"/>
+ <log4j:data name="key2" value="val2"/>
</log4j:MDC>
</log4j:event>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
