X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.lib.equinox%2Fsrc%2Forg%2Fargeo%2Fcms%2Fservlet%2Finternal%2Fjetty%2FJettyConfig.java;h=50be8b7a79cd9d2da2179c9ae3acd4f849de9eaf;hb=eabc24d98b287d3292cd6e5b678bbbd7d22a0f24;hp=97321915ac29f7e7aaa65d480fe1683566f97ecf;hpb=4e548693acc16f97b74eaaa95d6841054a172b85;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.lib.equinox/src/org/argeo/cms/servlet/internal/jetty/JettyConfig.java b/org.argeo.cms.lib.equinox/src/org/argeo/cms/servlet/internal/jetty/JettyConfig.java
index 97321915a..50be8b7a7 100644
--- a/org.argeo.cms.lib.equinox/src/org/argeo/cms/servlet/internal/jetty/JettyConfig.java
+++ b/org.argeo.cms.lib.equinox/src/org/argeo/cms/servlet/internal/jetty/JettyConfig.java
@@ -1,5 +1,6 @@
 package org.argeo.cms.servlet.internal.jetty;
 
+import java.io.File;
 import java.util.Dictionary;
 import java.util.Hashtable;
 import java.util.Map;
@@ -13,11 +14,12 @@ import org.argeo.api.cms.CmsConstants;
 import org.argeo.api.cms.CmsLog;
 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.argeo.util.LangUtils;
 import org.eclipse.equinox.http.jetty.JettyConfigurator;
 import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.ServiceReference;
 import org.osgi.util.tracker.ServiceTracker;
@@ -38,7 +40,7 @@ public class JettyConfig {
 		// We need to start asynchronously so that Jetty bundle get started by lazy init
 		// due to the non-configurable behaviour of its activator
 		ForkJoinPool.commonPool().execute(() -> {
-			Dictionary<String, ?> properties = getHttpServerConfig();
+			Dictionary<String, Object> properties = getHttpServerConfig();
 			startServer(properties);
 		});
 
@@ -90,7 +92,7 @@ public class JettyConfig {
 
 	}
 
-	public void startServer(Dictionary<String, ?> properties) {
+	public void startServer(Dictionary<String, Object> properties) {
 		// Explicitly configures Jetty so that the default server is not started by the
 		// activator of the Equinox Jetty bundle.
 		Map<String, String> config = LangUtils.dictToStringMap(properties);
@@ -105,38 +107,53 @@ public class JettyConfig {
 			}
 		}
 
-		long begin = System.currentTimeMillis();
-		int tryCount = 60;
-		try {
-			while (tryCount > 0) {
-				try {
-					// FIXME deal with multiple ids
-					JettyConfigurator.startServer(CmsConstants.DEFAULT, new Hashtable<>(config));
-
-					Object httpPort = config.get(JettyHttpConstants.HTTP_PORT);
-					Object httpsPort = config.get(JettyHttpConstants.HTTPS_PORT);
-					log.info(httpPortsMsg(httpPort, httpsPort));
-
-					// Explicitly starts Jetty OSGi HTTP bundle, so that it gets triggered if OSGi
-					// configuration is not cleaned
-					FrameworkUtil.getBundle(JettyConfigurator.class).start();
-					return;
-				} catch (IllegalStateException e) {
-					// e.printStackTrace();
-					// Jetty may not be ready
-					try {
-						Thread.sleep(1000);
-					} catch (Exception e1) {
-						// silent
-					}
-					tryCount--;
-				}
-			}
-			long duration = System.currentTimeMillis() - begin;
-			log.error("Gave up with starting Jetty server after " + (duration / 1000) + " s");
-		} catch (Exception e) {
-			log.error("Cannot start default Jetty server with config " + properties, e);
-		}
+		properties.put(Constants.SERVICE_PID, "default");
+		File jettyWorkDir = new File(bc.getDataFile(""), "jettywork"); //$NON-NLS-1$
+		jettyWorkDir.mkdir();
+
+//		HttpServerManager serverManager = new HttpServerManager(jettyWorkDir);
+//		try {
+//			serverManager.updated("default", properties);
+//		} catch (ConfigurationException e) {
+//			// TODO Auto-generated catch block
+//			e.printStackTrace();
+//		}
+		Object httpPort = config.get(JettyHttpConstants.HTTP_PORT);
+		Object httpsPort = config.get(JettyHttpConstants.HTTPS_PORT);
+		log.info(httpPortsMsg(httpPort, httpsPort));
+
+//		long begin = System.currentTimeMillis();
+//		int tryCount = 60;
+//		try {
+//			while (tryCount > 0) {
+//				try {
+//					// FIXME deal with multiple ids
+//					JettyConfigurator.startServer(CmsConstants.DEFAULT, new Hashtable<>(config));
+//
+//					Object httpPort = config.get(JettyHttpConstants.HTTP_PORT);
+//					Object httpsPort = config.get(JettyHttpConstants.HTTPS_PORT);
+//					log.info(httpPortsMsg(httpPort, httpsPort));
+//
+//					// Explicitly starts Jetty OSGi HTTP bundle, so that it gets triggered if OSGi
+//					// configuration is not cleaned
+//					FrameworkUtil.getBundle(JettyConfigurator.class).start();
+//					return;
+//				} catch (IllegalStateException e) {
+//					// e.printStackTrace();
+//					// Jetty may not be ready
+//					try {
+//						Thread.sleep(1000);
+//					} catch (Exception e1) {
+//						// silent
+//					}
+//					tryCount--;
+//				}
+//			}
+//			long duration = System.currentTimeMillis() - begin;
+//			log.error("Gave up with starting Jetty server after " + (duration / 1000) + " s");
+//		} catch (Exception e) {
+//			log.error("Cannot start default Jetty server with config " + properties, e);
+//		}
 
 	}