This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository eclipse-wtp.
commit 423cd649d0fe58ab9245848bb3b4f660c414b804 Author: Emmanuel Bourg <[email protected]> Date: Fri Nov 4 17:24:42 2016 +0100 Transition to Jetty 9 --- debian/changelog | 1 + debian/eclipse.orbitdeps | 4 +-- debian/patches/jetty-compatibility.patch | 54 ++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 58 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3abedd9..a6e957a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ eclipse-wtp (3.6.3-2) UNRELEASED; urgency=medium * Team upload. * Fixed the compatibility with the latest version of JFlex + * Transition to Jetty 9 * Standards-Version updated to 3.9.8 * Switch to debhelper level 10 * Use secure Vcs-* URLs diff --git a/debian/eclipse.orbitdeps b/debian/eclipse.orbitdeps index 42f9973..6e497bb 100644 --- a/debian/eclipse.orbitdeps +++ b/debian/eclipse.orbitdeps @@ -3,8 +3,8 @@ commons-discovery commons-logging gnumail jaxrpc -jetty8-webapp -jetty8-xml +jetty9-webapp +jetty9-xml js log4j-1.2 serializer diff --git a/debian/patches/jetty-compatibility.patch b/debian/patches/jetty-compatibility.patch new file mode 100644 index 0000000..759867b --- /dev/null +++ b/debian/patches/jetty-compatibility.patch @@ -0,0 +1,54 @@ +Description: Fixes the compatibility with the latest version of Jetty in Debian +Author: Emmanuel Bourg <[email protected]> +Forwarded: no +--- a/org.eclipse.wst.server.preview/META-INF/MANIFEST.MF ++++ b/org.eclipse.wst.server.preview/META-INF/MANIFEST.MF +@@ -8,13 +8,13 @@ + Bundle-Localization: plugin + Export-Package: org.eclipse.wst.server.preview.internal;x-internal:=true + Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", +- org.eclipse.jetty.http;bundle-version="[8.0.4,9.0.0)", +- org.eclipse.jetty.server;bundle-version="[8.0.4,9.0.0)", +- org.eclipse.jetty.util;bundle-version="[8.0.4,9.0.0)", ++ org.eclipse.jetty.http;bundle-version="[8.0.4,10.0.0)", ++ org.eclipse.jetty.server;bundle-version="[8.0.4,10.0.0)", ++ org.eclipse.jetty.util;bundle-version="[8.0.4,10.0.0)", + org.apache.commons.logging;bundle-version="[1.0.4,2.0.0)", +- javax.servlet;bundle-version="[2.6.0,3.1.0)", +- org.eclipse.jetty.webapp;bundle-version="[8.0.4,9.0.0)", +- org.eclipse.jetty.servlet;bundle-version="[8.0.4,9.0.0)", +- org.eclipse.jetty.xml;bundle-version="[8.0.4,9.0.0)" ++ javax.servlet;bundle-version="[2.6.0,4.0.0)", ++ org.eclipse.jetty.webapp;bundle-version="[8.0.4,10.0.0)", ++ org.eclipse.jetty.servlet;bundle-version="[8.0.4,10.0.0)", ++ org.eclipse.jetty.xml;bundle-version="[8.0.4,10.0.0)" + Bundle-ActivationPolicy: lazy + Bundle-RequiredExecutionEnvironment: J2SE-1.5 +--- a/org.eclipse.wst.server.preview/src/org/eclipse/wst/server/preview/internal/WTPDefaultHandler.java ++++ b/org.eclipse.wst.server.preview/src/org/eclipse/wst/server/preview/internal/WTPDefaultHandler.java +@@ -39,7 +39,7 @@ + baseRequest.setHandled(true); + + response.setStatus(HttpServletResponse.SC_NOT_FOUND); +- response.setContentType(MimeTypes.TEXT_HTML); ++ response.setContentType("text/html"); + + ByteArrayISO8859Writer writer = new ByteArrayISO8859Writer(1500); + +--- a/org.eclipse.wst.server.preview/src/org/eclipse/wst/server/preview/internal/WTPLogger.java ++++ b/org.eclipse.wst.server.preview/src/org/eclipse/wst/server/preview/internal/WTPLogger.java +@@ -37,6 +37,14 @@ + } + } + ++ public void debug(String msg, long value) { ++ if (debug) { ++ if (msg != null) { ++ System.out.println(msg + " " + value); ++ } ++ } ++ } ++ + public String getName() { + // TODO Auto-generated method stub + return "org.eclipse.wst.server.preview.internal.WTPLogger"; diff --git a/debian/patches/series b/debian/patches/series index 4da92cd..7732036 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -12,3 +12,4 @@ genmodel-customizations.patch dont-use-org.eclipse.equinox.bidi.patch unversioned-com.ibm.icu.patch jflex-compatibility.patch +jetty-compatibility.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse-wtp.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
