X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.lib.jetty%2Fsrc%2Forg%2Fargeo%2Fcms%2Fjetty%2FCmsJettyServer.java;h=a18f4b495632f908c9be762ac1587c49af46b5b2;hb=60aa2e64061a09e938d9f6cba35ee3fd66a19828;hp=3b9783ef5bc016cacdad31dfb5a6a42885a22493;hpb=bfb5eb067a6796c0ee2a575b1e2431220352513a;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.lib.jetty/src/org/argeo/cms/jetty/CmsJettyServer.java b/org.argeo.cms.lib.jetty/src/org/argeo/cms/jetty/CmsJettyServer.java
index 3b9783ef5..a18f4b495 100644
--- a/org.argeo.cms.lib.jetty/src/org/argeo/cms/jetty/CmsJettyServer.java
+++ b/org.argeo.cms.lib.jetty/src/org/argeo/cms/jetty/CmsJettyServer.java
@@ -3,6 +3,7 @@ package org.argeo.cms.jetty;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Map;
 
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
@@ -14,8 +15,8 @@ import com.sun.net.httpserver.HttpContext;
 
 import org.argeo.api.cms.CmsState;
 import org.argeo.cms.CmsDeployProperty;
-import org.argeo.cms.websocket.javax.server.CmsWebSocketConfigurator;
-import org.argeo.cms.websocket.javax.server.TestEndpoint;
+import org.argeo.cms.websocket.server.CmsWebSocketConfigurator;
+import org.argeo.cms.websocket.server.TestEndpoint;
 import org.eclipse.jetty.server.session.SessionHandler;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer;
@@ -35,7 +36,7 @@ public class CmsJettyServer extends JettyHttpServer {
 	private Path tempDir;
 
 	// WebSocket
-	private ServerContainer wsServerContainer;
+//	private ServerContainer wsServerContainer;
 	private ServerEndpointConfig.Configurator wsEndpointConfigurator;
 
 	private CmsState cmsState;
@@ -88,25 +89,25 @@ public class CmsJettyServer extends JettyHttpServer {
 		String webSocketEnabled = getDeployProperty(CmsDeployProperty.WEBSOCKET_ENABLED);
 		// web socket
 		if (webSocketEnabled != null && webSocketEnabled.equals(Boolean.toString(true))) {
-			JavaxWebSocketServletContainerInitializer.configure(servletContextHandler, new Configurator() {
-
-				@Override
-				public void accept(ServletContext servletContext, ServerContainer serverContainer)
-						throws DeploymentException {
-					wsServerContainer = serverContainer;
-
-					wsEndpointConfigurator = new CmsWebSocketConfigurator();
-
-					ServerEndpointConfig config = ServerEndpointConfig.Builder
-							.create(TestEndpoint.class, "/ws/test/events/").configurator(wsEndpointConfigurator)
-							.build();
-					try {
-						wsServerContainer.addEndpoint(config);
-					} catch (DeploymentException e) {
-						throw new IllegalStateException("Cannot initalise the WebSocket server runtime.", e);
-					}
-				}
-			});
+//			JavaxWebSocketServletContainerInitializer.configure(servletContextHandler, new Configurator() {
+//
+//				@Override
+//				public void accept(ServletContext servletContext, ServerContainer serverContainer)
+//						throws DeploymentException {
+////					wsServerContainer = serverContainer;
+//
+//					CmsWebSocketConfigurator wsEndpointConfigurator = new CmsWebSocketConfigurator();
+//
+//					ServerEndpointConfig config = ServerEndpointConfig.Builder
+//							.create(TestEndpoint.class, "/ws/test/events/{topic}").configurator(wsEndpointConfigurator)
+//							.build();
+//					try {
+//						serverContainer.addEndpoint(config);
+//					} catch (DeploymentException e) {
+//						throw new IllegalStateException("Cannot initalise the WebSocket server runtime.", e);
+//					}
+//				}
+//			});
 		}
 	}