[pkg-java] r8076 - in trunk/libmx4j-java/debian: . patches

[drazzib-guest at alioth.debian.org]

Author: drazzib-guest
Date: 2009-03-11 21:08:16 +0000 (Wed, 11 Mar 2009)
New Revision: 8076

Added:
   trunk/libmx4j-java/debian/patches/mx4j-no-iiop.patch
Modified:
   trunk/libmx4j-java/debian/README.Debian
   trunk/libmx4j-java/debian/changelog
   trunk/libmx4j-java/debian/control
   trunk/libmx4j-java/debian/rules
Log:
[libmx4j-java]

  * First "brown paper bag release"!
  * Revert usage of openjdk-6-jdk (not available on all arch)
    - reapply mx4j-no-iiop.patch to disable IIOP             
    - remove Depends on openjdk-6-jdk                        
    - use /usr/lib/jvm/default-java as JAVA_HOME             
    - restore previous README entry about IIOP               
  * Revert move of all java libraries to B-D-I               
    and restore usage of B-D:                                
    - we need to build JAR for architecture-dependent -gcj package



Modified: trunk/libmx4j-java/debian/README.Debian
===================================================================
--- trunk/libmx4j-java/debian/README.Debian	2009-03-10 22:30:10 UTC (rev 8075)
+++ trunk/libmx4j-java/debian/README.Debian	2009-03-11 21:08:16 UTC (rev 8076)
@@ -3,6 +3,10 @@
 
 Difference to binary upstream release:
 
+[Remote] 
+No support of RMI over IIOP protocol due to missing
+iiop generation in free rmic compilers.
+
 [Tools]
 No SOAP, Hessian or Burlap connectors due to missing
 packages in debian (axis, caucho libraries).

Modified: trunk/libmx4j-java/debian/changelog
===================================================================
--- trunk/libmx4j-java/debian/changelog	2009-03-10 22:30:10 UTC (rev 8075)
+++ trunk/libmx4j-java/debian/changelog	2009-03-11 21:08:16 UTC (rev 8076)
@@ -1,3 +1,17 @@
+libmx4j-java (3.0.2-6) unstable; urgency=low
+
+  * First "brown paper bag release"!
+  * Revert usage of openjdk-6-jdk (not available on all arch)
+    - reapply mx4j-no-iiop.patch to disable IIOP
+    - remove Depends on openjdk-6-jdk
+    - use /usr/lib/jvm/default-java as JAVA_HOME
+    - restore previous README entry about IIOP
+  * Revert move of all java libraries to B-D-I
+    and restore usage of B-D:
+    - we need to build JAR for architecture-dependent -gcj package
+
+ -- Damien Raude-Morvan <drazzib at drazzib.com>  Wed, 11 Mar 2009 21:54:29 +0100
+
 libmx4j-java (3.0.2-5) unstable; urgency=low
 
   * Apply patch mx4j-remove-invalids-providers.patch to remove invalid

Modified: trunk/libmx4j-java/debian/control
===================================================================
--- trunk/libmx4j-java/debian/control	2009-03-10 22:30:10 UTC (rev 8075)
+++ trunk/libmx4j-java/debian/control	2009-03-11 21:08:16 UTC (rev 8076)
@@ -5,8 +5,8 @@
 Uploaders: Arnaud Vandyck <avdyk at debian.org>, Stefan Gybas <sgybas at debian.org>,
            Michael Koch <konqueror at gmx.de>, Wolfgang Baer <WBaer at gmx.de>,
            Damien Raude-Morvan <drazzib at drazzib.com>
-Build-Depends: cdbs (>= 0.4.8), debhelper (>= 7), openjdk-6-jdk, java-gcj-compat-dev, ant
-Build-Depends-Indep: liblog4j1.2-java, libcommons-logging-java,
+Build-Depends: cdbs (>= 0.4.8), debhelper (>= 7), default-jdk-builddep, ant,
+  liblog4j1.2-java, libcommons-logging-java,
   libbcel-java (>=5.0), libgnujaf-java, libgnumail-java, libservlet2.4-java,
   jython, libaxis-java
 Standards-Version: 3.8.0

Copied: trunk/libmx4j-java/debian/patches/mx4j-no-iiop.patch (from rev 8072, trunk/libmx4j-java/debian/patches/mx4j-no-iiop.patch)
===================================================================
--- trunk/libmx4j-java/debian/patches/mx4j-no-iiop.patch	                        (rev 0)
+++ trunk/libmx4j-java/debian/patches/mx4j-no-iiop.patch	2009-03-11 21:08:16 UTC (rev 8076)
@@ -0,0 +1,24 @@
+--- build/build.xml.orig	2008-01-21 23:03:24.000000000 +0100
++++ build/build.xml	2008-01-21 23:05:02.000000000 +0100
+@@ -254,8 +254,10 @@
+    </target>
+ 
+    <target name="rmic.iiop" description="RMI compiles the remote JMX (JSR 160) classes">
++      <!--
+       <rmic base="${core.classes.dir}" classname="javax.management.remote.rmi.RMIServerImpl" classpathref="classpath" debug="yes" iiop="yes"/>
+       <rmic base="${core.classes.dir}" classname="javax.management.remote.rmi.RMIConnectionImpl" classpathref="classpath" debug="yes" iiop="yes"/>
++      -->
+    </target>
+ 
+    <target name="compile.rjmx" description="Compiles the Remote JMX (JSR 160) classes" depends="compile.jmx" if="jaas.present">
+@@ -263,8 +265,10 @@
+          <patternset refid="rmx4j.classes"/>
+          <classpath refid="lib.classpath"/>
+       </javac>
++      <!--
+       <rmic base="${core.classes.dir}" classname="javax.management.remote.rmi.RMIServerImpl" classpathref="classpath" debug="yes" stubversion="1.2"/>
+       <rmic base="${core.classes.dir}" classname="javax.management.remote.rmi.RMIConnectionImpl" classpathref="classpath" debug="yes" stubversion="1.2"/>
++      -->
+ 
+       <jar jarfile="${rjmx-boa.jar.file}" manifest="${etc.dir}/MANIFEST.MF">
+          <fileset dir="${core.classes.dir}">

Modified: trunk/libmx4j-java/debian/rules
===================================================================
--- trunk/libmx4j-java/debian/rules	2009-03-10 22:30:10 UTC (rev 8075)
+++ trunk/libmx4j-java/debian/rules	2009-03-11 21:08:16 UTC (rev 8076)
@@ -7,7 +7,7 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-JAVA_HOME := /usr/lib/jvm/java-6-openjdk/
+JAVA_HOME := /usr/lib/jvm/default-java
 
 include /usr/share/gcj/debian_defaults
 ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))