carnold 2005/07/22 13:09:23
Modified: . Tag: v1_2-branch build.xml
tests Tag: v1_2-branch build.xml
tests/src/java/org/apache/log4j/spi Tag: v1_2-branch
LoggingEventTest.java
Log:
Bug 35831 log4j 1.2 does not build with JDK 1.5
Revision Changes Path
No revision
No revision
1.34.2.24 +20 -5 logging-log4j/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/logging-log4j/build.xml,v
retrieving revision 1.34.2.23
retrieving revision 1.34.2.24
diff -u -r1.34.2.23 -r1.34.2.24
--- build.xml 14 Jul 2005 23:51:37 -0000 1.34.2.23
+++ build.xml 22 Jul 2005 20:09:23 -0000 1.34.2.24
@@ -124,11 +124,20 @@
<target name="jmxCheck">
- <available classname="javax.management.MBeanInfo" property="jmx-present">
- <classpath>
- <pathelement location="${jmx.jar}"/>
- </classpath>
- </available>
+ <condition property="jmx-present" value="true">
+ <and>
+ <available classname="javax.management.MBeanInfo">
+ <classpath>
+ <pathelement location="${jmx.jar}"/>
+ </classpath>
+ </available>
+ <available classname="com.sun.jdmk.comm.HtmlAdaptorServer">
+ <classpath>
+ <pathelement location="${jmx.jar}"/>
+ </classpath>
+ </available>
+ </and>
+ </condition>
</target>
<target name="jmx" depends="jmxCheck" if="jmx-present">
<echo message="JMX is present."/>
@@ -191,6 +200,7 @@
${stem}/jmx/*.java,
${stem}/or/jms/*.java"
target="1.1"
+ source="1.3"
deprecation="${deprecation}"
debug="on">
<classpath refid="compile.classpath"/>
@@ -211,6 +221,7 @@
classpath="${classpath}"
excludes="misc/*"
target="1.1"
+ source="1.3"
deprecation="${deprecation}"
debug="on"/>
<rmic base="${javac.dest}" classname="examples.NumberCruncherServer"/>
@@ -229,6 +240,7 @@
excludes="${stem}/xml/examples/doc-files/**.java,
${stem}/xml/Transform.java"
target="1.1"
+ source="1.3"
deprecation="${deprecation}"
classpath="${classpath}">
<classpath refid="compile.classpath"/>
@@ -242,6 +254,7 @@
destdir="${javac.dest}"
includes="${stem}/net/SMTPAppender.java"
target="1.1"
+ source="1.3"
deprecation="${deprecation}">
<classpath refid="compile.classpath"/>
</javac>
@@ -252,6 +265,7 @@
destdir="${javac.dest}"
includes="${stem}/net/JMS*.java, ${stem}/or/jms/*.java"
target="1.1"
+ source="1.3"
deprecation="${deprecation}">
<classpath refid="compile.classpath"/>
</javac>
@@ -263,6 +277,7 @@
includes="${stem}/jmx/*.java"
excludes="${stem}/jmx/T.java"
target="1.1"
+ source="1.3"
deprecation="${deprecation}">
<classpath refid="compile.classpath"/>
</javac>
No revision
No revision
1.16.2.10 +1 -0 logging-log4j/tests/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/logging-log4j/tests/build.xml,v
retrieving revision 1.16.2.9
retrieving revision 1.16.2.10
diff -u -r1.16.2.9 -r1.16.2.10
--- build.xml 18 Jul 2005 17:04:51 -0000 1.16.2.9
+++ build.xml 22 Jul 2005 20:09:23 -0000 1.16.2.10
@@ -91,6 +91,7 @@
destdir="./classes"
deprecation="${deprecation}"
target="1.1"
+ source="1.3"
debug="on"
excludes="${excludes}">
<classpath refid="tests.classpath"/>
No revision
No revision
1.5.2.2 +1 -1
logging-log4j/tests/src/java/org/apache/log4j/spi/LoggingEventTest.java
Index: LoggingEventTest.java
===================================================================
RCS file:
/home/cvs/logging-log4j/tests/src/java/org/apache/log4j/spi/LoggingEventTest.java,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- LoggingEventTest.java 18 Jul 2005 17:07:02 -0000 1.5.2.1
+++ LoggingEventTest.java 22 Jul 2005 20:09:23 -0000 1.5.2.2
@@ -75,7 +75,7 @@
int[] skip = new int[] { 352, 353, 354, 355, 356 };
SerializationTestHelper.assertSerializationEquals(
- "witness/serialization/exception.bin", event, skip, 1089);
+ "witness/serialization/exception.bin", event, skip, 945);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
