Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Furnadjiev2011-12-15 13:48:55 +0000
committerIvan Furnadjiev2011-12-15 13:48:55 +0000
commit166dd69bffdd77a78bb11714f0131af35735f9c1 (patch)
tree1e1b92caae21bb658101a8817a2fd02db4fcd0b5 /bundles/org.eclipse.rap.jettycustomizer
parent2444d17d54f33e1c0f24b210db6f61bd744bb619 (diff)
downloadorg.eclipse.rap-166dd69bffdd77a78bb11714f0131af35735f9c1.tar.gz
org.eclipse.rap-166dd69bffdd77a78bb11714f0131af35735f9c1.tar.xz
org.eclipse.rap-166dd69bffdd77a78bb11714f0131af35735f9c1.zip
Updated to work with org.eclipse.equinox.http.jetty_3.0.0.v20111202-1436 - bug 361208: Update org.eclipse.rap.jettycustomizer
https://bugs.eclipse.org/bugs/show_bug.cgi?id=361208
Diffstat (limited to 'bundles/org.eclipse.rap.jettycustomizer')
-rw-r--r--bundles/org.eclipse.rap.jettycustomizer/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.rap.jettycustomizer/src/org/eclipse/rap/jettycustomizer/internal/SessionCookieCustomizer.java17
2 files changed, 9 insertions, 10 deletions
diff --git a/bundles/org.eclipse.rap.jettycustomizer/META-INF/MANIFEST.MF b/bundles/org.eclipse.rap.jettycustomizer/META-INF/MANIFEST.MF
index 54a92b6f11..a02f8693e7 100644
--- a/bundles/org.eclipse.rap.jettycustomizer/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.rap.jettycustomizer/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.rap.jettycustomizer
Bundle-Version: 1.5.0.qualifier
-Fragment-Host: org.eclipse.equinox.http.jetty;bundle-version="[2.0.0,3.0.0)"
+Fragment-Host: org.eclipse.equinox.http.jetty;bundle-version="[3.0.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: %Bundle-Vendor
Export-Package: org.eclipse.rap.jettycustomizer.internal;x-internal:=true
diff --git a/bundles/org.eclipse.rap.jettycustomizer/src/org/eclipse/rap/jettycustomizer/internal/SessionCookieCustomizer.java b/bundles/org.eclipse.rap.jettycustomizer/src/org/eclipse/rap/jettycustomizer/internal/SessionCookieCustomizer.java
index 74a1c916d2..0d84d2608b 100644
--- a/bundles/org.eclipse.rap.jettycustomizer/src/org/eclipse/rap/jettycustomizer/internal/SessionCookieCustomizer.java
+++ b/bundles/org.eclipse.rap.jettycustomizer/src/org/eclipse/rap/jettycustomizer/internal/SessionCookieCustomizer.java
@@ -13,10 +13,10 @@ package org.eclipse.rap.jettycustomizer.internal;
import java.util.Dictionary;
import org.eclipse.equinox.http.jetty.JettyCustomizer;
-import org.mortbay.jetty.SessionManager;
-import org.mortbay.jetty.servlet.AbstractSessionManager;
-import org.mortbay.jetty.servlet.Context;
-import org.mortbay.jetty.servlet.SessionHandler;
+import org.eclipse.jetty.server.SessionManager;
+import org.eclipse.jetty.server.session.AbstractSessionManager;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.server.session.SessionHandler;
/**
* Configure Jetty to not use cookies for session management. This allows RAP
@@ -24,17 +24,16 @@ import org.mortbay.jetty.servlet.SessionHandler;
*/
public final class SessionCookieCustomizer extends JettyCustomizer {
- public Object customizeContext( final Object context,
- final Dictionary settings )
- {
+ @SuppressWarnings("unchecked")
+ public Object customizeContext( Object context, Dictionary settings ) {
Object result = super.customizeContext( context, settings );
customizeSessionManager( result );
return result;
}
private static void customizeSessionManager( Object context ) {
- if( context instanceof Context ) {
- Context jettyContext = ( Context )context;
+ if( context instanceof ServletContextHandler ) {
+ ServletContextHandler jettyContext = ( ServletContextHandler )context;
SessionHandler sessionHandler = jettyContext.getSessionHandler();
if( sessionHandler != null ) {
SessionManager sessionManager = sessionHandler.getSessionManager();

Back to the top