Improve integration.

[lgpl/argeo-commons.git] / org.argeo.ext.equinox.jetty / src / org / argeo / equinox / jetty / CmsJettyCustomizer.java

diff --git a/org.argeo.ext.equinox.jetty/src/org/argeo/equinox/jetty/CmsJettyCustomizer.java b/org.argeo.ext.equinox.jetty/src/org/argeo/equinox/jetty/CmsJettyCustomizer.java
index e6d6c697074cd45909880d4fc8ce858d75726313..46f0280bd103a06370431fa370b3978c489f1e92 100644 (file)
--- a/org.argeo.ext.equinox.jetty/src/org/argeo/equinox/jetty/CmsJettyCustomizer.java
+++ b/org.argeo.ext.equinox.jetty/src/org/argeo/equinox/jetty/CmsJettyCustomizer.java
@@ -17,13 +17,12 @@ import org.osgi.framework.FrameworkUtil;
 public class CmsJettyCustomizer extends JettyCustomizer {
        private BundleContext bc = FrameworkUtil.getBundle(CmsJettyCustomizer.class).getBundleContext();
 
+       public final static String WEBSOCKET_ENABLED = "websocket.enabled";
+
        @Override
        public Object customizeContext(Object context, Dictionary<String, ?> settings) {
                // WebSocket
-               Object webSocketEnabled = settings.get("websocket.enabled");
-               if (webSocketEnabled == null) {
-                       webSocketEnabled = bc.getProperty("org.eclipse.equinox.http.jetty.websocket.enabled");
-               }
+               Object webSocketEnabled = settings.get(WEBSOCKET_ENABLED);
                if (webSocketEnabled != null && webSocketEnabled.toString().equals("true")) {
                        ServletContextHandler servletContextHandler = (ServletContextHandler) context;
                        WebSocketServerContainerInitializer.configure(servletContextHandler, new Configurator() {