X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FDeployConfig.java;h=41b064c9c0daee89a83b5ffafe271ce0409491d1;hb=a07d415f007b9eb33b68f7c266e729105d214add;hp=b1e36633a1da9cd704d0e787e4fa8673a40d5c9d;hpb=d9ff37f84e799028a1a0300850eccae77ced2024;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/DeployConfig.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/DeployConfig.java
index b1e36633a..41b064c9c 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/DeployConfig.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/DeployConfig.java
@@ -25,6 +25,7 @@ import org.argeo.naming.LdifParser;
 import org.argeo.naming.LdifWriter;
 import org.argeo.node.NodeConstants;
 import org.argeo.osgi.useradmin.UserAdminConf;
+import org.eclipse.equinox.http.jetty.JettyConfigurator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.service.cm.Configuration;
@@ -120,14 +121,37 @@ class DeployConfig implements ConfigurationListener {
 		}
 
 		// http server
+//		Dictionary<String, Object> webServerConfig = InitUtils
+//				.getHttpServerConfig(getProps(KernelConstants.JETTY_FACTORY_PID, NodeConstants.DEFAULT));
+//		if (!webServerConfig.isEmpty()) {
+//			// TODO check for other customizers
+//			webServerConfig.put("customizer.class", "org.argeo.equinox.jetty.CmsJettyCustomizer");
+//			putFactoryDeployConfig(KernelConstants.JETTY_FACTORY_PID, webServerConfig);
+//		}
+		LdapName defaultHttpServiceDn = serviceDn(KernelConstants.JETTY_FACTORY_PID, NodeConstants.DEFAULT);
+		if (deployConfigs.containsKey(defaultHttpServiceDn)) {
+			// remove old default configs since we have now to start Jetty servlet bridge
+			// indirectly
+			deployConfigs.remove(defaultHttpServiceDn);
+		}
+
+		// SAVE
+		save();
+		//
+
+		// Explicitly configures Jetty so that the default server is not started by the
+		// activator of the Equinox Jetty bundle.
 		Dictionary<String, Object> webServerConfig = InitUtils
 				.getHttpServerConfig(getProps(KernelConstants.JETTY_FACTORY_PID, NodeConstants.DEFAULT));
 		if (!webServerConfig.isEmpty()) {
-			// TODO chekc for other customizers
-			webServerConfig.put("customizer.class", "org.argeo.equinox.jetty.CmsJettyCustomizer");
-			putFactoryDeployConfig(KernelConstants.JETTY_FACTORY_PID, webServerConfig);
+			webServerConfig.put("customizer.class", KernelConstants.CMS_JETTY_CUSTOMIZER_CLASS);
 		}
-		save();
+		try {
+			JettyConfigurator.startServer(KernelConstants.DEFAULT_JETTY_SERVER, webServerConfig);
+		} catch (Exception e) {
+			log.error("Cannot start default Jetty server with config " + webServerConfig, e);
+		}
+
 	}
 
 	private void init(ConfigurationAdmin configurationAdmin, boolean isClean, boolean isFirstInit) throws IOException {