[WIP] Upgrade ONOS to karaf version 4.2.1
Change-Id: I7cd40c995bdf1c80f94b1895fb3344e32404c7fa
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/UiWebSocketServlet.java b/web/gui/src/main/java/org/onosproject/ui/impl/UiWebSocketServlet.java
index 650f727..4faae28 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/UiWebSocketServlet.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/UiWebSocketServlet.java
@@ -18,13 +18,15 @@
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
-import org.eclipse.jetty.websocket.WebSocket;
-import org.eclipse.jetty.websocket.WebSocketServlet;
+import org.eclipse.jetty.websocket.servlet.WebSocketServlet;
+import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory;
import org.onlab.osgi.DefaultServiceDirectory;
import org.onlab.osgi.ServiceDirectory;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import java.security.Principal;
import java.util.Set;
import java.util.Timer;
@@ -47,6 +49,11 @@
private final TimerTask pruner = new Pruner();
private static boolean isStopped = false;
+ @Override
+ public void configure(WebSocketServletFactory webSocketServletFactory) {
+
+ }
+
/**
* Closes all currently open UI web-sockets.
*/
@@ -72,9 +79,11 @@
}
@Override
- public WebSocket doWebSocketConnect(HttpServletRequest request, String protocol) {
+ public void service(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException {
+ super.service(request, response);
if (isStopped) {
- return null;
+ return;
}
// FIXME: Replace this with globally shared opaque token to allow secure failover
@@ -83,7 +92,6 @@
UiWebSocket socket = new UiWebSocket(directory, userName);
sockets.add(socket);
- return socket;
}
// FIXME: This should not be necessary