[pkg-java] r12733 - in trunk/libmx4j-java/debian: . patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Wed Jul 7 17:50:15 UTC 2010
Author: drazzib
Date: 2010-07-07 17:50:14 +0000 (Wed, 07 Jul 2010)
New Revision: 12733
Removed:
trunk/libmx4j-java/debian/patches/jetty.patch
Modified:
trunk/libmx4j-java/debian/changelog
trunk/libmx4j-java/debian/control
trunk/libmx4j-java/debian/patches/series
trunk/libmx4j-java/debian/rules
Log:
Remove Jetty support
Modified: trunk/libmx4j-java/debian/changelog
===================================================================
--- trunk/libmx4j-java/debian/changelog 2010-07-07 16:22:26 UTC (rev 12732)
+++ trunk/libmx4j-java/debian/changelog 2010-07-07 17:50:14 UTC (rev 12733)
@@ -1,8 +1,6 @@
-libmx4j-java (3.0.2-10) UNRELEASED; urgency=low
+libmx4j-java (3.0.2-10) unstable; urgency=low
[ Damien Raude-Morvan ]
- * 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
@@ -10,7 +8,6 @@
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.
[ Niels Thykier ]
@@ -18,7 +15,7 @@
default-jdk.
* Bumped Standards-Versions to 3.9.0 - no changes required.
- -- Damien Raude-Morvan <drazzib at debian.org> Thu, 17 Jun 2010 00:43:09 +0200
+ -- Damien Raude-Morvan <drazzib at debian.org> Wed, 07 Jul 2010 19:49:02 +0200
libmx4j-java (3.0.2-9) unstable; urgency=low
Modified: trunk/libmx4j-java/debian/control
===================================================================
--- trunk/libmx4j-java/debian/control 2010-07-07 16:22:26 UTC (rev 12732)
+++ trunk/libmx4j-java/debian/control 2010-07-07 17:50:14 UTC (rev 12733)
@@ -7,7 +7,7 @@
Build-Depends: cdbs, debhelper (>= 7), default-jdk, ant, gcj-native-helper,
liblog4j1.2-java, libcommons-logging-java, libbcel-java (>=5.0),
libgnujaf-java, libgnumail-java, libservlet2.5-java, jython,
- libaxis-java, javahelper, libjetty-java, libhessian-java
+ libaxis-java, javahelper, libhessian-java
Standards-Version: 3.9.0
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libmx4j-java
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libmx4j-java/
Deleted: trunk/libmx4j-java/debian/patches/jetty.patch
===================================================================
--- trunk/libmx4j-java/debian/patches/jetty.patch 2010-07-07 16:22:26 UTC (rev 12732)
+++ trunk/libmx4j-java/debian/patches/jetty.patch 2010-07-07 17:50:14 UTC (rev 12733)
@@ -1,93 +0,0 @@
-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)
Modified: trunk/libmx4j-java/debian/patches/series
===================================================================
--- trunk/libmx4j-java/debian/patches/series 2010-07-07 16:22:26 UTC (rev 12732)
+++ trunk/libmx4j-java/debian/patches/series 2010-07-07 17:50:14 UTC (rev 12733)
@@ -2,5 +2,4 @@
01-mx4j-javaxssl.patch
mx4j-build.patch
mx4j-docbook.patch
-jetty.patch
hessian.patch
Modified: trunk/libmx4j-java/debian/rules
===================================================================
--- trunk/libmx4j-java/debian/rules 2010-07-07 16:22:26 UTC (rev 12732)
+++ trunk/libmx4j-java/debian/rules 2010-07-07 17:50:14 UTC (rev 12733)
@@ -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 jetty jetty-util hessian
+DEB_JARS := log4j-1.2 commons-logging servlet-api-2.5 bcel jython gnumail activation 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