From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 21 Oct 2019 14:52:26 +0000 (+0200)
Subject: Automatically remove old Jetty configs.
X-Git-Tag: argeo-commons-2.1.81~11
X-Git-Url: http://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=facf9c513af61cf249039123c6b1ad1d817bbf98

Automatically remove old Jetty configs.
---

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 ffb79b202..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
@@ -128,9 +128,18 @@ class DeployConfig implements ConfigurationListener {
 //			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 configure Jetty so that the default server is not started by the
+		// 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));