X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fruntime%2FCmsDeploymentImpl.java;h=4ffa03a63fffe2ff37d4f18db8494b849275c97a;hb=33920c58e7946ff85b72c2ff513eb8ee4d2e1aa8;hp=83f688a6a89c0e6ec89bd2b4bfceabcc1e391512;hpb=9bf9c0c17d8131c46dea9ee3ebad394720f3f344;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsDeploymentImpl.java b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsDeploymentImpl.java index 83f688a6a..4ffa03a63 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsDeploymentImpl.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsDeploymentImpl.java @@ -8,7 +8,6 @@ import org.argeo.api.cms.CmsDeployment; import org.argeo.api.cms.CmsLog; import org.argeo.api.cms.CmsState; import org.argeo.cms.internal.osgi.DeployConfig; -import org.eclipse.equinox.http.jetty.JettyConfigurator; import org.osgi.service.http.HttpService; /** Implementation of a CMS deployment. */ @@ -111,7 +110,7 @@ public class CmsDeploymentImpl implements CmsDeployment { // KernelUtils.asyncOpen(confAdminSt); } - public void init() { + public void start() { httpExpected = deployConfig.getProps(KernelConstants.JETTY_FACTORY_PID, "default") != null; if (deployConfig.hasDomain()) { loadIpaJaasConfiguration(); @@ -177,18 +176,19 @@ public class CmsDeploymentImpl implements CmsDeployment { } } - public void destroy() { + public void stop() { // if (nodeHttp != null) // nodeHttp.destroy(); - try { - JettyConfigurator.stopServer(KernelConstants.DEFAULT_JETTY_SERVER); - } catch (Exception e) { - log.error("Cannot stop default Jetty server.", e); - } +// try { +// JettyConfigurator.stopServer(KernelConstants.DEFAULT_JETTY_SERVER); +// } catch (Exception e) { +// log.error("Cannot stop default Jetty server.", e); +// } if (deployConfig != null) { - new Thread(() -> deployConfig.save(), "Save Argeo Deploy Config").start(); + deployConfig.save(); + // new Thread(() -> deployConfig.save(), "Save Argeo Deploy Config").start(); } }