QPID-5527: Upgrade to Jetty 8

Applied patch from Emmanuel Bourg.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1563153 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 12 insertions, 12 deletions

diff --git a/qpid/java/broker-plugins/management-http/pom.xml b/qpid/java/broker-plugins/management-http/pom.xml
index abc754902a..57b2dd863b 100644
--- a/qpid/java/broker-plugins/management-http/pom.xml
+++ b/qpid/java/broker-plugins/management-http/pom.xml
@@ -50,15 +50,15 @@
 
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-servlet_2.5_spec</artifactId>
-      <version>1.2</version>
+      <artifactId>geronimo-servlet_3.0_spec</artifactId>
+      <version>1.0</version>
       <scope>compile</scope>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-server</artifactId>
-      <version>7.6.10.v20130312</version>
+      <version>8.1.14.v20131031</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
@@ -79,14 +79,14 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-continuation</artifactId>
-      <version>7.6.10.v20130312</version>
+      <version>8.1.14.v20131031</version>
       <scope>compile</scope>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-security</artifactId>
-      <version>7.6.10.v20130312</version>
+      <version>8.1.14.v20131031</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
@@ -99,7 +99,7 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-http</artifactId>
-      <version>7.6.10.v20130312</version>
+      <version>8.1.14.v20131031</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
@@ -112,7 +112,7 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-io</artifactId>
-      <version>7.6.10.v20130312</version>
+      <version>8.1.14.v20131031</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
@@ -125,7 +125,7 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-servlet</artifactId>
-      <version>7.6.10.v20130312</version>
+      <version>8.1.14.v20131031</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
@@ -138,14 +138,14 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-util</artifactId>
-      <version>7.6.10.v20130312</version>
+      <version>8.1.14.v20131031</version>
       <scope>compile</scope>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-websocket</artifactId>
-      <version>7.6.10.v20130312</version>
+      <version>8.1.14.v20131031</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
index 039114056f..3375a784ea 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
@@ -29,6 +29,7 @@ import javax.net.ssl.KeyManager;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
+import javax.servlet.DispatcherType;
 
 import org.apache.log4j.Logger;
 import org.apache.qpid.server.configuration.IllegalConfigurationException;
@@ -77,7 +78,6 @@ import org.apache.qpid.server.plugin.PluginFactory;
 import org.apache.qpid.server.util.MapValueConverter;
 import org.apache.qpid.transport.network.security.ssl.QpidMultipleTrustManager;
 import org.eclipse.jetty.server.Connector;
-import org.eclipse.jetty.server.DispatcherType;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.SessionManager;
 import org.eclipse.jetty.server.nio.SelectChannelConnector;
@@ -396,7 +396,7 @@ public class HttpManagement extends AbstractPluginAdapter implements HttpManagem
         root.addServlet(new ServletHolder(new LogFileServlet()), "/rest/logfile");
 
         final SessionManager sessionManager = root.getSessionHandler().getSessionManager();
-        sessionManager.setSessionCookie(JSESSIONID_COOKIE_PREFIX + lastPort);
+        sessionManager.getSessionCookieConfig().setName(JSESSIONID_COOKIE_PREFIX + lastPort);
         sessionManager.setMaxInactiveInterval((Integer)getAttribute(TIME_OUT));
 
         return server;