[pkg-java] r12579 - in trunk/libmx4j-java/debian: . patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Wed Jun 16 22:44:30 UTC 2010
Author: drazzib
Date: 2010-06-16 22:44:30 +0000 (Wed, 16 Jun 2010)
New Revision: 12579
Added:
trunk/libmx4j-java/debian/patches/hessian.patch
trunk/libmx4j-java/debian/patches/jetty.patch
Removed:
trunk/libmx4j-java/debian/README.source
trunk/libmx4j-java/debian/dirs
trunk/libmx4j-java/debian/patches/mx4j-caucho-build.patch
Modified:
trunk/libmx4j-java/debian/README.Debian
trunk/libmx4j-java/debian/changelog
trunk/libmx4j-java/debian/control
trunk/libmx4j-java/debian/patches/series
trunk/libmx4j-java/debian/rules
Log:
* FIXME Test Hessian and Jetty support.
* d/README.source: really drop as we now use 3.0 (quilt) format.
* d/README.Debian: SOAP and Hessian are now supported
* d/control: as per new Debian Java Policy, Depends on a Java Runtime is not
needed anymore for Java libraries.
This should remove circular dependency hell between default-jre-headless
and libmx4j-java for JMX support (Closes: #576738).
* d/dirs: remove (handled by jh_installlibs)
* d/control, d/rules: enable Jetty support (Closes: #427489).
* d/control, d/rules: enable Hessian support.
Modified: trunk/libmx4j-java/debian/README.Debian
===================================================================
--- trunk/libmx4j-java/debian/README.Debian 2010-06-16 19:26:10 UTC (rev 12578)
+++ trunk/libmx4j-java/debian/README.Debian 2010-06-16 22:44:30 UTC (rev 12579)
@@ -7,10 +7,6 @@
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).
-
No SSLAdaptorServerSocketFactory available due to
hardcoded dependencies to SUN VM's (won't even run
with the IBM Java Runtimes).
Deleted: trunk/libmx4j-java/debian/README.source
===================================================================
--- trunk/libmx4j-java/debian/README.source 2010-06-16 19:26:10 UTC (rev 12578)
+++ trunk/libmx4j-java/debian/README.source 2010-06-16 22:44:30 UTC (rev 12579)
@@ -1,9 +0,0 @@
-Patch System
-============
-
-This package uses quilt to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-See /usr/share/doc/quilt/README.source for a detailed explanation.
-
Modified: trunk/libmx4j-java/debian/changelog
===================================================================
--- trunk/libmx4j-java/debian/changelog 2010-06-16 19:26:10 UTC (rev 12578)
+++ trunk/libmx4j-java/debian/changelog 2010-06-16 22:44:30 UTC (rev 12579)
@@ -1,3 +1,19 @@
+libmx4j-java (3.0.2-10) UNRELEASED; urgency=low
+
+ * FIXME Test Hessian and Jetty support.
+
+ * d/README.source: really drop as we now use 3.0 (quilt) format.
+ * d/README.Debian: SOAP and Hessian are now supported
+ * d/control: as per new Debian Java Policy, Depends on a Java Runtime is not
+ needed anymore for Java libraries.
+ This should remove circular dependency hell between default-jre-headless
+ and libmx4j-java for JMX support (Closes: #576738).
+ * d/dirs: remove (handled by jh_installlibs)
+ * d/control, d/rules: enable Jetty support (Closes: #427489).
+ * d/control, d/rules: enable Hessian support.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Thu, 17 Jun 2010 00:43:09 +0200
+
libmx4j-java (3.0.2-9) unstable; urgency=low
* Team upload.
Modified: trunk/libmx4j-java/debian/control
===================================================================
--- trunk/libmx4j-java/debian/control 2010-06-16 19:26:10 UTC (rev 12578)
+++ trunk/libmx4j-java/debian/control 2010-06-16 22:44:30 UTC (rev 12579)
@@ -7,7 +7,7 @@
Build-Depends: cdbs, debhelper (>= 7), default-jdk-builddep, ant,
liblog4j1.2-java, libcommons-logging-java, libbcel-java (>=5.0),
libgnujaf-java, libgnumail-java, libservlet2.5-java, jython,
- libaxis-java, javahelper
+ libaxis-java, javahelper, libjetty-java, libhessian-java
Standards-Version: 3.8.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/
@@ -15,12 +15,10 @@
Package: libmx4j-java
Architecture: all
-Depends: default-jre-headless | java6-runtime-headless |
- java5-runtime-headless | java2-runtime-headless,
- libbcel-java (>=5.0),
+Depends: libbcel-java (>=5.0),
liblog4j1.2-java,
${misc:Depends}
-Suggests: libservlet2.4-java, libgnumail-java, jython
+Suggests: libservlet2.4-java, libgnumail-java, jython, libjetty-java, libhessian-java
Description: An 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
Deleted: trunk/libmx4j-java/debian/dirs
===================================================================
--- trunk/libmx4j-java/debian/dirs 2010-06-16 19:26:10 UTC (rev 12578)
+++ trunk/libmx4j-java/debian/dirs 2010-06-16 22:44:30 UTC (rev 12579)
@@ -1 +0,0 @@
-usr/share/java
Added: trunk/libmx4j-java/debian/patches/hessian.patch
===================================================================
--- trunk/libmx4j-java/debian/patches/hessian.patch (rev 0)
+++ trunk/libmx4j-java/debian/patches/hessian.patch 2010-06-16 22:44:30 UTC (rev 12579)
@@ -0,0 +1,38 @@
+Description: Compatibility patch for Hessian 4.x support
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2010-06-17
+Forwarded: no
+--- a/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java
++++ b/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java
+@@ -13,12 +13,12 @@
+ import java.io.ObjectInputStream;
+
+ import com.caucho.hessian.io.AbstractHessianInput;
+-import com.caucho.hessian.io.Deserializer;
++import com.caucho.hessian.io.AbstractDeserializer;
+
+ /**
+ * @version $
+ */
+-class JMXDeserializer extends Deserializer
++class JMXDeserializer extends AbstractDeserializer
+ {
+ private Class type;
+
+--- a/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java
++++ b/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java
+@@ -13,12 +13,12 @@
+ import java.io.ObjectOutputStream;
+
+ import com.caucho.hessian.io.AbstractHessianOutput;
+-import com.caucho.hessian.io.Serializer;
++import com.caucho.hessian.io.AbstractSerializer;
+
+ /**
+ * @version $Revision: 1.3 $
+ */
+-class JMXSerializer extends Serializer
++class JMXSerializer extends AbstractSerializer
+ {
+ public void writeObject(Object obj, AbstractHessianOutput out) throws IOException
+ {
Added: trunk/libmx4j-java/debian/patches/jetty.patch
===================================================================
--- trunk/libmx4j-java/debian/patches/jetty.patch (rev 0)
+++ trunk/libmx4j-java/debian/patches/jetty.patch 2010-06-16 22:44:30 UTC (rev 12579)
@@ -0,0 +1,93 @@
+Description: Compatibility patch for Jetty 6.x support
+ <http://docs.codehaus.org/display/JETTY/Porting+to+jetty6>
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2010-06-17
+Forwarded: no
+--- a/src/tools/mx4j/tools/remote/http/jetty/JettyWebContainer.java
++++ b/src/tools/mx4j/tools/remote/http/jetty/JettyWebContainer.java
+@@ -17,10 +17,13 @@
+ import mx4j.log.Logger;
+ import mx4j.tools.remote.http.HTTPConnectorServer;
+ import mx4j.tools.remote.http.WebContainer;
+-import org.mortbay.http.HttpListener;
++import org.mortbay.jetty.Connector;
+ import org.mortbay.jetty.Server;
+ import org.mortbay.jetty.servlet.ServletHandler;
+-import org.mortbay.jetty.servlet.ServletHttpContext;
++import org.mortbay.jetty.nio.SelectChannelConnector;
++import org.mortbay.xml.XmlConfiguration;
++import org.mortbay.jetty.servlet.Context;
++import java.io.File;
+
+ /**
+ * Jetty's implementation of WebContainer interface
+@@ -73,16 +76,19 @@
+ if (config instanceof String)
+ {
+ if (logger.isEnabledFor(Logger.DEBUG)) logger.debug("Configuring Jetty with configuration " + config);
+- getServer().configure((String)config);
++ try {
++ XmlConfiguration configuration = new XmlConfiguration(new File((String)config).toURL());
++ configuration.configure(getServer());
++ } catch (Exception e) { e.printStackTrace(); }
+
+ // Be sure there is at least one listener on the port specified by the JMXServiceURL
+- HttpListener[] listeners = getServer().getListeners();
++ Connector[] listeners = getServer().getConnectors();
+ if (listeners != null)
+ {
+ boolean found = false;
+ for (int i = 0; i < listeners.length; ++i)
+ {
+- HttpListener listener = listeners[i];
++ Connector listener = listeners[i];
+ if (listener.getPort() == url.getPort())
+ {
+ found = true;
+@@ -113,7 +119,10 @@
+ if (logger.isEnabledFor(Logger.DEBUG)) logger.debug("Configuring Jetty with a default listener on port " + url.getPort());
+ String host = url.getHost();
+ if (host == null) host = "";
+- getServer().addListener(host + ":" + url.getPort());
++ SelectChannelConnector connector = new SelectChannelConnector();
++ connector.setPort(url.getPort());
++ connector.setHost(host);
++ server.addConnector(connector);
+ }
+
+ public void stop() throws IOException
+@@ -122,7 +131,7 @@
+ {
+ getServer().stop();
+ }
+- catch (InterruptedException x)
++ catch (Exception e)
+ {
+ Thread.currentThread().interrupt();
+ }
+@@ -133,10 +142,7 @@
+ try
+ {
+ String urlPattern = resolveServletMapping(url);
+- ServletHttpContext context = (ServletHttpContext)getServer().getContext("/");
+- context.addServlet(urlPattern, servletClassName);
+- // TODO: be sure an undeployed url is not restarted !
+- if (!context.isStarted()) context.start();
++ ((Context) getServer().getHandler()).getServletHandler().addServletWithMapping(servletClassName, urlPattern);
+ }
+ catch (Exception x)
+ {
+@@ -146,10 +152,9 @@
+
+ public void undeploy(String servletName, JMXServiceURL url, Map environment)
+ {
+- String urlPattern = resolveServletMapping(url);
+- ServletHttpContext context = (ServletHttpContext)getServer().getContext("/");
+- ServletHandler handler = context.getServletHandler();
+- handler.getServletMap().remove(urlPattern);
++ // String urlPattern = resolveServletMapping(url);
++ // rvletHandler handler = ((ServletContextHandler) getServer().getHandler()).getServletHandler();
++ // TODO handler.getServletMap().remove(urlPattern);
+ }
+
+ private String resolveServletMapping(JMXServiceURL url)
Deleted: trunk/libmx4j-java/debian/patches/mx4j-caucho-build.patch
===================================================================
--- trunk/libmx4j-java/debian/patches/mx4j-caucho-build.patch 2010-06-16 19:26:10 UTC (rev 12578)
+++ trunk/libmx4j-java/debian/patches/mx4j-caucho-build.patch 2010-06-16 22:44:30 UTC (rev 12579)
@@ -1,45 +0,0 @@
-Description: Exclude some providers from build:
- - caucho
- - hessian
- - burlap
-Index: mx4j-3.0.2/src/etc/JMXConnectorProvider-tools.provider
-===================================================================
---- mx4j-3.0.2.orig/src/etc/JMXConnectorProvider-tools.provider 2010-01-24 20:58:38.694282555 +0100
-+++ mx4j-3.0.2/src/etc/JMXConnectorProvider-tools.provider 2010-01-24 20:58:49.741284458 +0100
-@@ -1,7 +1,3 @@
--mx4j.tools.remote.provider.burlap.ClientProvider
--mx4j.tools.remote.provider.burlap.ssl.ClientProvider
--mx4j.tools.remote.provider.hessian.ClientProvider
--mx4j.tools.remote.provider.hessian.ssl.ClientProvider
- mx4j.tools.remote.provider.local.ClientProvider
- mx4j.tools.remote.provider.soap.ClientProvider
- mx4j.tools.remote.provider.soap.ssl.ClientProvider
-Index: mx4j-3.0.2/src/etc/JMXConnectorServerProvider-tools.provider
-===================================================================
---- mx4j-3.0.2.orig/src/etc/JMXConnectorServerProvider-tools.provider 2010-01-24 20:58:38.726282127 +0100
-+++ mx4j-3.0.2/src/etc/JMXConnectorServerProvider-tools.provider 2010-01-24 20:58:49.741284458 +0100
-@@ -1,7 +1,3 @@
--mx4j.tools.remote.provider.burlap.ServerProvider
--mx4j.tools.remote.provider.burlap.ssl.ServerProvider
--mx4j.tools.remote.provider.hessian.ServerProvider
--mx4j.tools.remote.provider.hessian.ssl.ServerProvider
- mx4j.tools.remote.provider.local.ServerProvider
- mx4j.tools.remote.provider.soap.ServerProvider
- mx4j.tools.remote.provider.soap.ssl.ServerProvider
-Index: mx4j-3.0.2/build/build.xml
-===================================================================
---- mx4j-3.0.2.orig/build/build.xml 2010-01-24 20:58:48.406283597 +0100
-+++ mx4j-3.0.2/build/build.xml 2010-01-24 20:58:49.749304797 +0100
-@@ -302,9 +302,9 @@
- <exclude name="mx4j/tools/remote/**" unless="jaas.present"/>
- <exclude name="mx4j/tools/remote/rmi/SSL*" unless="jdk14.present"/>
- <exclude name="mx4j/tools/remote/http/jetty/**" unless="jetty.present"/>
-- <exclude name="mx4j/tools/remote/caucho/**" unless="jdk14.present"/>
-- <exclude name="mx4j/tools/remote/**/hessian/**" unless="jdk14.present"/>
-- <exclude name="mx4j/tools/remote/**/burlap/**" unless="jdk14.present"/>
-+ <exclude name="mx4j/tools/remote/caucho/**"/>
-+ <exclude name="mx4j/tools/remote/**/hessian/**"/>
-+ <exclude name="mx4j/tools/remote/**/burlap/**"/>
- <classpath>
- <path refid="classpath"/>
- <pathelement location="${core.classes.dir}"/>
Modified: trunk/libmx4j-java/debian/patches/series
===================================================================
--- trunk/libmx4j-java/debian/patches/series 2010-06-16 19:26:10 UTC (rev 12578)
+++ trunk/libmx4j-java/debian/patches/series 2010-06-16 22:44:30 UTC (rev 12579)
@@ -1,5 +1,6 @@
mx4j-no-iiop.patch
01-mx4j-javaxssl.patch
mx4j-build.patch
-mx4j-caucho-build.patch
mx4j-docbook.patch
+jetty.patch
+hessian.patch
Modified: trunk/libmx4j-java/debian/rules
===================================================================
--- trunk/libmx4j-java/debian/rules 2010-06-16 19:26:10 UTC (rev 12578)
+++ trunk/libmx4j-java/debian/rules 2010-06-16 22:44:30 UTC (rev 12579)
@@ -13,7 +13,7 @@
with_gcj_native := yes
endif
-DEB_JARS := log4j-1.2 commons-logging servlet-api-2.5 bcel jython gnumail activation axis jaxrpc saaj
+DEB_JARS := log4j-1.2 commons-logging servlet-api-2.5 bcel jython gnumail activation axis jaxrpc saaj jetty jetty-util hessian
DEB_ANT_BUILDFILE := build/build.xml
DEB_ANT_BUILD_TARGET := compile.tools
More information about the pkg-java-commits
mailing list