Bug 569804 - Update to Jetty 10.0.1
Adapt to to Jetty 10.x
Change-Id: I2b70d59963075cfa5676428700bc3d2e5e86732e
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/bundles/org.eclipse.equinox.http.jetty/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.http.jetty/META-INF/MANIFEST.MF
index 4846eb8..669c51c 100644
--- a/bundles/org.eclipse.equinox.http.jetty/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.http.jetty/META-INF/MANIFEST.MF
@@ -9,17 +9,16 @@
Import-Package: javax.servlet;version="[3.1.0,5.0.0)",
javax.servlet.http;version="[3.1.0,5.0.0)",
org.eclipse.equinox.http.servlet;version="[1.2.0,2.0.0)",
- org.eclipse.jetty.http;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.server;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.server.handler;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.server.nio;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.server.session;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.servlet;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.util;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.util.component;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.util.log;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.util.ssl;version="[9.4.0,10.0.0)",
- org.eclipse.jetty.util.thread;version="[9.4.0,10.0.0)",
+ org.eclipse.jetty.http;version="[10.0.1,11.0.0)",
+ org.eclipse.jetty.server;version="[10.0.1,11.0.0)",
+ org.eclipse.jetty.server.handler;version="[10.0.1,11.0.0)",
+ org.eclipse.jetty.server.session;version="[10.0.1,11.0.0)",
+ org.eclipse.jetty.servlet;version="[10.0.1,11.0.0)",
+ org.eclipse.jetty.util;version="[10.0.1,11.0.0)",
+ org.eclipse.jetty.util.component;version="[10.0.1,11.0.0)",
+ org.eclipse.jetty.util.log;version="[10.0.1,11.0.0)",
+ org.eclipse.jetty.util.ssl;version="[10.0.1,11.0.0)",
+ org.eclipse.jetty.util.thread;version="[10.0.1,11.0.0)",
org.osgi.framework;version="1.3.0",
org.osgi.framework.startlevel;version="1.0.0",
org.osgi.framework.wiring;version="1.2.0",
diff --git a/bundles/org.eclipse.equinox.http.jetty/src/org/eclipse/equinox/http/jetty/internal/EquinoxStdErrLog.java b/bundles/org.eclipse.equinox.http.jetty/src/org/eclipse/equinox/http/jetty/internal/EquinoxStdErrLog.java
index c429f0e..c49bbe5 100644
--- a/bundles/org.eclipse.equinox.http.jetty/src/org/eclipse/equinox/http/jetty/internal/EquinoxStdErrLog.java
+++ b/bundles/org.eclipse.equinox.http.jetty/src/org/eclipse/equinox/http/jetty/internal/EquinoxStdErrLog.java
@@ -13,7 +13,8 @@
*******************************************************************************/
package org.eclipse.equinox.http.jetty.internal;
-import org.eclipse.jetty.util.log.*;
+import org.eclipse.jetty.util.log.Log;
+import org.eclipse.jetty.util.log.Logger;
// NOTE: This class simply allows us to override the StdErrLog built into jetty
public class EquinoxStdErrLog implements Logger {
@@ -42,7 +43,7 @@
threshold = parseThresholdProperty(property);
// this is a hack to make sure the built-in jetty StdErrLog is not being used
org.eclipse.jetty.util.log.Logger rootLogger = Log.getRootLogger();
- if (rootLogger == null || (rootLogger instanceof StdErrLog)) {
+ if (rootLogger == null || (rootLogger instanceof Log)) {
// The built-in jetty StdErrLog is be used; replace with ours.
Log.setLog(getRootLogger());
}
@@ -73,7 +74,7 @@
public EquinoxStdErrLog(String name, Logger realLogger) {
this.localName = name;
- this.realLogger = realLogger == null ? new StdErrLog(name) : realLogger;
+ this.realLogger = realLogger;
if (threshold == DEBUG)
this.realLogger.setDebugEnabled(true);
}
diff --git a/bundles/org.eclipse.equinox.http.jetty/src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java b/bundles/org.eclipse.equinox.http.jetty/src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java
index 0b8bad6..7d0eaf7 100644
--- a/bundles/org.eclipse.equinox.http.jetty/src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java
+++ b/bundles/org.eclipse.equinox.http.jetty/src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java
@@ -182,9 +182,10 @@
// HTTPS Configuration
HttpConfiguration https_config = new HttpConfiguration(http_config);
https_config.addCustomizer(new SecureRequestCustomizer());
+ https_config.setHttpCompliance(HttpCompliance.LEGACY);
// HTTPS connector
- httpsConnector = new ServerConnector(server, new SslConnectionFactory(sslContextFactory, "http/1.1"), new HttpConnectionFactory(https_config, HttpCompliance.LEGACY)); //$NON-NLS-1$
+ httpsConnector = new ServerConnector(server, new SslConnectionFactory(sslContextFactory, "http/1.1"), new HttpConnectionFactory(https_config)); //$NON-NLS-1$
httpsConnector.setPort(Details.getInt(dictionary, JettyConstants.HTTPS_PORT, 443));
httpsConnector.setHost(Details.getString(dictionary, JettyConstants.HTTPS_HOST, null));
}
@@ -199,8 +200,9 @@
http_config.setSecureScheme("https"); //$NON-NLS-1$
http_config.setSecurePort(Details.getInt(dictionary, JettyConstants.HTTPS_PORT, 443));
}
+ http_config.setHttpCompliance(HttpCompliance.LEGACY);
// HTTP connector
- httpConnector = new ServerConnector(server, new HttpConnectionFactory(http_config, HttpCompliance.LEGACY));
+ httpConnector = new ServerConnector(server, new HttpConnectionFactory(http_config));
httpConnector.setPort(Details.getInt(dictionary, JettyConstants.HTTP_PORT, 80));
httpConnector.setHost(Details.getString(dictionary, JettyConstants.HTTP_HOST, null));
httpConnector.setIdleTimeout(DEFAULT_IDLE_TIMEOUT);
diff --git a/features/org.eclipse.equinox.server.jetty/feature.xml b/features/org.eclipse.equinox.server.jetty/feature.xml
index 2282c6f..37e3a21 100644
--- a/features/org.eclipse.equinox.server.jetty/feature.xml
+++ b/features/org.eclipse.equinox.server.jetty/feature.xml
@@ -16,7 +16,7 @@
</license>
<plugin
- id="javax.servlet"
+ id="jakarta.servlet-api"
download-size="0"
install-size="0"
version="0.0.0"
@@ -37,13 +37,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.jetty.continuation"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.jetty.http"
download-size="0"
install-size="0"
diff --git a/features/org.eclipse.equinox.server.simple/feature.xml b/features/org.eclipse.equinox.server.simple/feature.xml
index 2d5d27c..063fb09 100644
--- a/features/org.eclipse.equinox.server.simple/feature.xml
+++ b/features/org.eclipse.equinox.server.simple/feature.xml
@@ -16,7 +16,7 @@
</license>
<plugin
- id="javax.servlet"
+ id="jakarta.servlet-api"
download-size="0"
install-size="0"
version="0.0.0"
diff --git a/features/org.eclipse.equinox.serverside.sdk/feature.xml b/features/org.eclipse.equinox.serverside.sdk/feature.xml
index f8aa6bf..5c646ab 100644
--- a/features/org.eclipse.equinox.serverside.sdk/feature.xml
+++ b/features/org.eclipse.equinox.serverside.sdk/feature.xml
@@ -32,7 +32,7 @@
version="0.0.0"/>
<plugin
- id="javax.servlet"
+ id="jakarta.servlet-api"
download-size="0"
install-size="0"
version="0.0.0"
@@ -53,7 +53,7 @@
unpack="false"/>
<plugin
- id="javax.servlet.source"
+ id="jakarta.servlet-api.source"
download-size="0"
install-size="0"
version="0.0.0"
@@ -158,20 +158,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.jetty.continuation"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jetty.continuation.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.jetty.http"
download-size="0"
install-size="0"