Introduce CMS event bus and use it in UI.

[lgpl/argeo-commons.git] / org.argeo.cms.lib.jetty / src / org / argeo / cms / jetty / CmsJettyServer.java

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 7f33beeb695d45110be5dd6550fe7a952ad02f7a..3d4a57b9e7ff113d38095e2da4541516349e1a66 100644 (file)
--- 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
@@ -4,20 +4,10 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
-import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
-import javax.websocket.DeploymentException;
-import javax.websocket.server.ServerContainer;
-import javax.websocket.server.ServerEndpointConfig;
-
-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.eclipse.jetty.server.session.SessionHandler;
 import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer;
-import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer.Configurator;
 
 public class CmsJettyServer extends JettyHttpServer {
        private static final String CONTEXT_TEMPDIR = "javax.servlet.context.tempdir";
@@ -33,10 +23,10 @@ public class CmsJettyServer extends JettyHttpServer {
        private Path tempDir;
 
        // WebSocket
-       private ServerContainer wsServerContainer;
-       private ServerEndpointConfig.Configurator wsEndpointConfigurator;
+//     private ServerContainer wsServerContainer;
+//     private ServerEndpointConfig.Configurator wsEndpointConfigurator;
 
-       private CmsState cmsState;
+//     private Authenticator defaultAuthenticator;
 
        protected void addServlets(ServletContextHandler servletContextHandler) throws ServletException {
        }
@@ -69,42 +59,45 @@ public class CmsJettyServer extends JettyHttpServer {
        @Override
        protected void configureRootContextHandler(ServletContextHandler servletContextHandler) throws ServletException {
                addServlets(servletContextHandler);
-               enableWebSocket(servletContextHandler);
-
-       }
+//             enableWebSocket(servletContextHandler);
 
-       protected void enableWebSocket(ServletContextHandler servletContextHandler) {
-               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);
-                                       }
-                               }
-                       });
-               }
        }
 
-       protected String getDeployProperty(CmsDeployProperty deployProperty) {
-               return cmsState.getDeployProperty(deployProperty.getProperty());
-       }
-
-       public void setCmsState(CmsState cmsState) {
-               this.cmsState = cmsState;
-       }
+//     @Override
+//     public synchronized HttpContext createContext(String path) {
+//             HttpContext httpContext = super.createContext(path);
+//             httpContext.setAuthenticator(defaultAuthenticator);
+//             return httpContext;
+//     }
+
+//     protected void enableWebSocket(ServletContextHandler servletContextHandler) {
+//             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;
+////
+////                                   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);
+////                                   }
+////                           }
+////                   });
+//             }
+//     }
+
+//     public void setDefaultAuthenticator(Authenticator defaultAuthenticator) {
+//             this.defaultAuthenticator = defaultAuthenticator;
+//     }
 
 }