Package: jakarta-log4j
Severity: normal

Hi,

I'm attaching a patch to build log4j with limited jmx support. It uses
libjboss-jmx-java and excludes ../jmx/Agent.java from the build due to a
dependency on proprietary SUN code.
I don't know how to build a source package from the SVN checkout so I
could only check that the package compiles with the patch. I'm starting
to test now, whether ZooKeeper will work with this patched version of
log4j. I already tested that it compiles w/o problems.

Best regards,

Thomas Koch

-- System Information:
Debian Release: squeeze/sid
  APT prefers stable
  APT policy: (1000, 'stable'), (990, 'unstable'), (700, 'testing')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.31-1-amd64 (SMP w/2 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Index: debian/control
===================================================================
--- debian/control	(Revision 11331)
+++ debian/control	(Arbeitskopie)
@@ -3,7 +3,8 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Kalle Kivimaa <kil...@debian.org>, Michael Koch <konque...@gmx.de>, Varun Hiremath <va...@debian.org>, Kumar Appaiah <aku...@debian.org>, Torsten Werner <twer...@debian.org>
-Build-Depends: debhelper (>= 5), cdbs, default-jdk-builddep, ant, libgnujaf-java, libgnumail-java, maven-repo-helper, openjdk-6-doc
+Build-Depends: debhelper (>= 5), cdbs, default-jdk-builddep, ant, libgnujaf-java,
+ libgnumail-java, maven-repo-helper, openjdk-6-doc, libjboss-jmx-java
 Standards-Version: 3.8.2
 Homepage: http://jakarta.apache.org/log4j
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jakarta-log4j
Index: debian/patches/01_build_fix.patch
===================================================================
--- debian/patches/01_build_fix.patch	(Revision 11331)
+++ debian/patches/01_build_fix.patch	(Arbeitskopie)
@@ -1,6 +1,5 @@
-diff -Nur jakarta-log4j-1.2.15/build.xml jakarta-log4j-1.2.15.new/build.xml
---- jakarta-log4j-1.2.15/build.xml	2007-08-25 09:39:43.000000000 +0530
-+++ jakarta-log4j-1.2.15.new/build.xml	2007-09-26 11:56:11.000000000 +0530
+--- jakarta-log4j-1.2.15/build.xml.orig	2010-01-07 20:14:49.000000000 +0100
++++ jakarta-log4j-1.2.15/build.xml	2010-01-08 15:35:21.000000000 +0100
 @@ -97,8 +97,8 @@
    <!-- Directory for temporary files. -->
    <property name="dist.tmp" value="${dist.dir}/tmp"/>
@@ -12,6 +11,31 @@
    
    <!--  destination for generated documentation on Apache web host  -->
    <property name="apache.javadoc_dest" value="/www/logging.apache.org/log4j/docs"/>
+@@ -166,13 +166,13 @@
+         <and>
+             <available classname="javax.management.MBeanInfo"
+                        classpath="${jmx.jar}"/>
+-            <available classname="com.sun.jdmk.comm.HtmlAdaptorServer">
++            <!--available classname="com.sun.jdmk.comm.HtmlAdaptorServer">
+                 <classpath>
+                     <pathelement location="${jmx.jar}"/>
+                     <pathelement location="${jmx-extra.jar}"/>
+ 					<pathelement location="${javaee-api.jar}"/>
+                 </classpath>
+-            </available>
++            </available-->
+         </and>
+     </condition>
+   </target>
+@@ -336,7 +336,7 @@
+     <javac srcdir="${java.source.dir}"
+            destdir="${javac.dest}"
+            includes="${stem}/jmx/*.java"
+-           excludes="${stem}/jmx/T.java"
++           excludes="${stem}/jmx/T.java,${stem}/jmx/Agent.java"
+            target="${javac.target}"
+            source="${javac.source}"
+            includeAntRuntime="${javac.includeAntRuntime}"
 @@ -497,7 +497,6 @@
               protected="true"
               author="true"
_______________________________________________
pkg-java-maintainers mailing list
pkg-java-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-maintainers

Reply via email to