[patch] log4j-1.2.11-java5

log4j-1.2.11_java15.patch (text/plain), 2.39 KB, created by Martin von Gagern on 2005-08-31 01:00:44 UTC

Java5 API, the presence of javax.management.MBeanInfo is detected even when
not all of the JMX API is available, also breaking the jmx USE flag.
Build then fails because com.sun.jdmk.comm.HtmlAdaptorServer is missing.
Checking for this class instead should provide the desired behaviour.
-- Martin von Gagern <[e-mail]>, 2005-08-31


--- build.xml
+++ build.xml
@@ -124,9 +124,10 @@
 
 
   <target name="jmxCheck">
-    <available classname="javax.management.MBeanInfo" property="jmx-present">
+    <available classname="com.sun.jdmk.comm.HtmlAdaptorServer" property="jmx-present">
       <classpath>
 	<pathelement location="${jmx.jar}"/>
+	<pathelement location="${jmx-extra.jar}"/>
       </classpath>
     </available>
   </target>
@@ -191,6 +192,7 @@
                     ${stem}/jmx/*.java,
                     ${stem}/or/jms/*.java"
            target="1.1"
+           source="1.2"
            deprecation="${deprecation}"
            debug="on">
       <classpath refid="compile.classpath"/>
@@ -211,6 +213,7 @@
            classpath="${classpath}"
            excludes="misc/*"
            target="1.1"
+           source="1.2"
            deprecation="${deprecation}"
            debug="on"/>
     <rmic base="${javac.dest}" classname="examples.NumberCruncherServer"/>
@@ -229,6 +232,7 @@
            excludes="${stem}/xml/examples/doc-files/**.java,
                      ${stem}/xml/Transform.java"
            target="1.1"
+           source="1.2"
            deprecation="${deprecation}"
            classpath="${classpath}">
       <classpath refid="compile.classpath"/>
@@ -242,6 +246,7 @@
            destdir="${javac.dest}"
            includes="${stem}/net/SMTPAppender.java"
            target="1.1"
+           source="1.2"
            deprecation="${deprecation}">
       <classpath refid="compile.classpath"/>
     </javac>
@@ -252,6 +257,7 @@
            destdir="${javac.dest}"
            includes="${stem}/net/JMS*.java, ${stem}/or/jms/*.java"
            target="1.1"
+           source="1.2"
            deprecation="${deprecation}">
       <classpath refid="compile.classpath"/>
     </javac>
@@ -263,6 +269,7 @@
            includes="${stem}/jmx/*.java"
            excludes="${stem}/jmx/T.java"
            target="1.1"
+           source="1.2"
            deprecation="${deprecation}">
       <classpath refid="compile.classpath"/>
     </javac>