Move various CMS extensions to Argeo SLC.

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / internal / kernel / DeployConfig.java

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 4db887606a419fa483e834f2a52022e51c9efe33..0a7d26584d96b14538c2f69309a51f30cc80e498 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/DeployConfig.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/DeployConfig.java
@@ -19,12 +19,13 @@ import javax.naming.ldap.Rdn;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.argeo.api.NodeConstants;
 import org.argeo.cms.CmsException;
 import org.argeo.naming.AttributesDictionary;
 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;
@@ -32,6 +33,7 @@ import org.osgi.service.cm.ConfigurationAdmin;
 import org.osgi.service.cm.ConfigurationEvent;
 import org.osgi.service.cm.ConfigurationListener;
 
+/** Manages the LDIF-based deployment configuration. */
 class DeployConfig implements ConfigurationListener {
        private final Log log = LogFactory.getLog(getClass());
        private final BundleContext bc = FrameworkUtil.getBundle(getClass()).getBundleContext();
@@ -83,7 +85,7 @@ class DeployConfig implements ConfigurationListener {
 
                // additional repositories
                dataModels: for (DataModels.DataModel dataModel : dataModels.getNonAbstractDataModels()) {
-                       if (NodeConstants.NODE.equals(dataModel.getName()))
+                       if (NodeConstants.NODE_REPOSITORY.equals(dataModel.getName()))
                                continue dataModels;
                        Dictionary<String, Object> config = InitUtils.getRepositoryConfig(dataModel.getName(),
                                        getProps(NodeConstants.NODE_REPOS_FACTORY_PID, dataModel.getName()));
@@ -120,13 +122,62 @@ 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));
-               webServerConfig.put("customizer.class", "org.argeo.equinox.jetty.WebSocketJettyCustomizer");
-               if (!webServerConfig.isEmpty())
-                       putFactoryDeployConfig(KernelConstants.JETTY_FACTORY_PID, webServerConfig);
+//             if (!webServerConfig.isEmpty()) {
+//                     webServerConfig.put("customizer.class", KernelConstants.CMS_JETTY_CUSTOMIZER_CLASS);
+//
+//                     // TODO centralise with Jetty extender
+//                     Object webSocketEnabled = webServerConfig.get(InternalHttpConstants.WEBSOCKET_ENABLED);
+//                     if (webSocketEnabled != null && webSocketEnabled.toString().equals("true")) {
+//                             bc.registerService(ServerEndpointConfig.Configurator.class, new CmsWebSocketConfigurator(), null);
+//                             webServerConfig.put(InternalHttpConstants.WEBSOCKET_ENABLED, "true");
+//                     }
+//             }
+
+               int tryCount = 60;
+               try {
+                       tryGettyJetty: while (tryCount > 0) {
+                               try {
+                                       JettyConfigurator.startServer(KernelConstants.DEFAULT_JETTY_SERVER, webServerConfig);
+                                       // Explicitly starts Jetty OSGi HTTP bundle, so that it gets triggered if OSGi
+                                       // configuration is not cleaned
+                                       FrameworkUtil.getBundle(JettyConfigurator.class).start();
+                                       break tryGettyJetty;
+                               } catch (IllegalStateException e) {
+                                       // Jetty may not be ready
+                                       try {
+                                               Thread.sleep(1000);
+                                       } catch (Exception e1) {
+                                               // silent
+                                       }
+                                       tryCount--;
+                               }
+                       }
+               } catch (Exception e) {
+                       log.error("Cannot start default Jetty server with config " + webServerConfig, e);
+               }
 
-               save();
        }
 
        private void init(ConfigurationAdmin configurationAdmin, boolean isClean, boolean isFirstInit) throws IOException {
@@ -135,6 +186,8 @@ class DeployConfig implements ConfigurationListener {
                        deployConfigs = new LdifParser().read(in);
                }
                if (isClean) {
+                       if(log.isDebugEnabled())
+                               log.debug("Clean state, loading from framework properties...");
                        setFromFrameworkProperties(isFirstInit);
                        for (LdapName dn : deployConfigs.keySet()) {
                                Rdn lastRdn = dn.getRdn(dn.size() - 1);