Clean up Jetty HTTP server

[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 3d4a57b9e7ff113d38095e2da4541516349e1a66..90a800f7eff894cbfde502d956da8e6aadec77b0 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
@@ -9,25 +9,13 @@ import javax.servlet.ServletException;
 import org.eclipse.jetty.server.session.SessionHandler;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 
+/** A {@link JettyHttpServer} which is compatible with Equinox servlets. */
 public class CmsJettyServer extends JettyHttpServer {
        private static final String CONTEXT_TEMPDIR = "javax.servlet.context.tempdir";
        // Equinox compatibility
        private static final String INTERNAL_CONTEXT_CLASSLOADER = "org.eclipse.equinox.http.jetty.internal.ContextClassLoader";
-//     private static final CmsLog log = CmsLog.getLog(CmsJettyServer.class);
-
-//     private Server server;
-//     private Path tempDir;
-//
-//     private ServerConnector httpConnector;
-//     private ServerConnector httpsConnector;
        private Path tempDir;
 
-       // WebSocket
-//     private ServerContainer wsServerContainer;
-//     private ServerEndpointConfig.Configurator wsEndpointConfigurator;
-
-//     private Authenticator defaultAuthenticator;
-
        protected void addServlets(ServletContextHandler servletContextHandler) throws ServletException {
        }
 
@@ -59,45 +47,5 @@ public class CmsJettyServer extends JettyHttpServer {
        @Override
        protected void configureRootContextHandler(ServletContextHandler servletContextHandler) throws ServletException {
                addServlets(servletContextHandler);
-//             enableWebSocket(servletContextHandler);
-
        }
-
-//     @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;
-//     }
-
 }