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

Emmanuel Bourg ebourg-guest at alioth.debian.org
Fri May 17 16:05:24 UTC 2013


Author: ebourg-guest
Date: 2013-05-17 16:05:24 +0000 (Fri, 17 May 2013)
New Revision: 16692

Removed:
   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/patches/mx4j-build.patch
   trunk/libmx4j-java/debian/patches/series
   trunk/libmx4j-java/debian/rules
Log:
Removed the dependency on the Activation Framework (libgnujaf-java)
Transition to the Servlet API 3.0
Removed Michael Koch from the Uploaders list (Closes: #654087)
Updated Standards-Version to 3.9.4 (no changes)
Removed the patch disabling IIOP build



Modified: trunk/libmx4j-java/debian/README.Debian
===================================================================
--- trunk/libmx4j-java/debian/README.Debian	2013-05-17 15:01:38 UTC (rev 16691)
+++ trunk/libmx4j-java/debian/README.Debian	2013-05-17 16:05:24 UTC (rev 16692)
@@ -3,10 +3,6 @@
 
 Difference to binary upstream release:
 
-[Remote] 
-No support of RMI over IIOP protocol due to missing
-iiop generation in free rmic compilers.
-
 No SSLAdaptorServerSocketFactory available due to 
 hardcoded dependencies to SUN VM's (won't even run
 with the IBM Java Runtimes).

Modified: trunk/libmx4j-java/debian/changelog
===================================================================
--- trunk/libmx4j-java/debian/changelog	2013-05-17 15:01:38 UTC (rev 16691)
+++ trunk/libmx4j-java/debian/changelog	2013-05-17 16:05:24 UTC (rev 16692)
@@ -1,3 +1,13 @@
+libmx4j-java (3.0.2-13) unstable; urgency=low
+
+  * Removed the dependency on the Activation Framework (libgnujaf-java)
+  * Transition to the Servlet API 3.0
+  * Removed Michael Koch from the Uploaders list (Closes: #654087)
+  * Updated Standards-Version to 3.9.4 (no changes)
+  * Removed the patch disabling IIOP build
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 17 May 2013 18:04:47 +0200
+
 libmx4j-java (3.0.2-12) unstable; urgency=low
 
   * Team upload.

Modified: trunk/libmx4j-java/debian/control
===================================================================
--- trunk/libmx4j-java/debian/control	2013-05-17 15:01:38 UTC (rev 16691)
+++ trunk/libmx4j-java/debian/control	2013-05-17 16:05:24 UTC (rev 16692)
@@ -2,13 +2,13 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Michael Koch <konqueror at gmx.de>, Damien Raude-Morvan <drazzib at debian.org>,
+Uploaders: Damien Raude-Morvan <drazzib at debian.org>, Emmanuel Bourg <ebourg at apache.org>,
  Niels Thykier <niels at thykier.net>
 Build-Depends: cdbs, debhelper (>= 7), default-jdk, ant,
                liblog4j1.2-java, libcommons-logging-java, libbcel-java (>=5.0),
-               libgnujaf-java, libgnumail-java, libservlet2.5-java, jython, 
+               libgnumail-java, libservlet3.0-java, jython, 
                libaxis-java, javahelper, libhessian-java
-Standards-Version: 3.9.2
+Standards-Version: 3.9.4
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libmx4j-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libmx4j-java/
 Homepage: http://mx4j.sourceforge.net/
@@ -18,7 +18,7 @@
 Depends: libbcel-java (>=5.0),
          liblog4j1.2-java,
          ${misc:Depends}
-Suggests: libservlet2.5-java, libgnumail-java, jython, libjetty-java, libhessian-java
+Suggests: libservlet3.0-java, libgnumail-java, jython, libjetty-java, libhessian-java
 Description: Open Source implementation of the JMX(TM) technology
  JMX defines the architecture, the patterns , the API and services to 
  build manageable Java applications. It provide flexible framework to

Modified: trunk/libmx4j-java/debian/patches/mx4j-build.patch
===================================================================
--- trunk/libmx4j-java/debian/patches/mx4j-build.patch	2013-05-17 15:01:38 UTC (rev 16691)
+++ trunk/libmx4j-java/debian/patches/mx4j-build.patch	2013-05-17 16:05:24 UTC (rev 16692)
@@ -11,15 +11,7 @@
  
        <javac srcdir="${core.src.dir}" destdir="${core.classes.dir}" debug="on" deprecation="on" encoding="US-ASCII" target="1.3" source="1.3">
           <patternset refid="mx4j.classes"/>
-@@ -265,6 +266,7 @@
-       <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"/>
- -->
-+
-       <antcall target="rmic.iiop"/>
- 
-       <jar jarfile="${rjmx.jar.file}" manifest="${etc.dir}/MANIFEST.MF">
-@@ -417,8 +419,7 @@
+@@ -413,8 +414,7 @@
           author="true"
           version="true"
           use="true"
@@ -29,7 +21,7 @@
           <package name="mx4j.*"/>
  
           <bottom><![CDATA[<center><small>Copyright © 2001-2005 The MX4J Contributors. All Rights Reserved.</small></center>]]></bottom>
-@@ -431,8 +432,6 @@
+@@ -427,8 +427,6 @@
     </target>
  
     <target name="docs" description="Builds the MX4J documentation">
@@ -38,7 +30,7 @@
        <mkdir dir="${dist.docs.dir}"/>
  
        <style processor="trax"
-@@ -444,9 +443,6 @@
+@@ -440,9 +438,6 @@
           classpathref="lib.classpath"
           />
  

Deleted: trunk/libmx4j-java/debian/patches/mx4j-no-iiop.patch
===================================================================
--- trunk/libmx4j-java/debian/patches/mx4j-no-iiop.patch	2013-05-17 15:01:38 UTC (rev 16691)
+++ trunk/libmx4j-java/debian/patches/mx4j-no-iiop.patch	2013-05-17 16:05:24 UTC (rev 16692)
@@ -1,26 +0,0 @@
-Description: Remove rmic compiling
-Last-Update: 2009-07-16
---- a/build/build.xml
-+++ b/build/build.xml
-@@ -250,8 +250,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">
-@@ -259,8 +261,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"/>
-+-->
-       <antcall target="rmic.iiop"/>
- 
-       <jar jarfile="${rjmx.jar.file}" manifest="${etc.dir}/MANIFEST.MF">

Modified: trunk/libmx4j-java/debian/patches/series
===================================================================
--- trunk/libmx4j-java/debian/patches/series	2013-05-17 15:01:38 UTC (rev 16691)
+++ trunk/libmx4j-java/debian/patches/series	2013-05-17 16:05:24 UTC (rev 16692)
@@ -1,4 +1,3 @@
-mx4j-no-iiop.patch
 01-mx4j-javaxssl.patch
 mx4j-build.patch
 mx4j-docbook.patch

Modified: trunk/libmx4j-java/debian/rules
===================================================================
--- trunk/libmx4j-java/debian/rules	2013-05-17 15:01:38 UTC (rev 16691)
+++ trunk/libmx4j-java/debian/rules	2013-05-17 16:05:24 UTC (rev 16692)
@@ -8,7 +8,7 @@
 
 JAVA_HOME := /usr/lib/jvm/default-java
 
-DEB_JARS := log4j-1.2 commons-logging servlet-api-2.5 bcel jython gnumail activation axis jaxrpc saaj hessian
+DEB_JARS := log4j-1.2 commons-logging servlet-api-3.0 bcel jython gnumail axis jaxrpc saaj hessian
 
 DEB_ANT_BUILDFILE := build/build.xml
 DEB_ANT_BUILD_TARGET := compile.tools




More information about the pkg-java-commits mailing list