Start simplifying and clarifying CMS initialisation. Remove Jackrabbit

[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 8bdf00ceb7ea9a818b74bb198d02237971b6f2de..2bbd8f21922623558fe222e3719e6c879f0ae0a1 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
@@ -16,14 +16,17 @@ import javax.naming.directory.Attributes;
 import javax.naming.directory.BasicAttributes;
 import javax.naming.ldap.LdapName;
 import javax.naming.ldap.Rdn;
+import javax.websocket.server.ServerEndpointConfig;
 
 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.cms.internal.http.InternalHttpConstants;
+import org.argeo.cms.websocket.CmsWebSocketConfigurator;
 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;
@@ -85,7 +88,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()));
@@ -146,6 +149,13 @@ class DeployConfig implements ConfigurationListener {
                                .getHttpServerConfig(getProps(KernelConstants.JETTY_FACTORY_PID, NodeConstants.DEFAULT));
                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;
@@ -164,6 +174,7 @@ class DeployConfig implements ConfigurationListener {
                                        } catch (Exception e1) {
                                                // silent
                                        }
+                                       tryCount--;
                                }
                        }
                } catch (Exception e) {
@@ -178,6 +189,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);