Improve logical backups.

[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 450b9dba42d1dcfb8ca1d3f21332c166b45ecb9a..228ccbb4a172d2bacae5af3e3ea385064c68de92 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,10 @@ 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;
@@ -45,19 +41,20 @@ class DeployConfig implements ConfigurationListener {
        private SortedMap<LdapName, Attributes> deployConfigs = new TreeMap<>();
        private final DataModels dataModels;
 
+       private boolean isFirstInit = false;
+
        public DeployConfig(ConfigurationAdmin configurationAdmin, DataModels dataModels, boolean isClean) {
                this.dataModels = dataModels;
                // ConfigurationAdmin configurationAdmin =
                // bc.getService(bc.getServiceReference(ConfigurationAdmin.class));
                try {
-                       boolean isFirstInit = false;
                        if (!isInitialized()) { // first init
                                isFirstInit = true;
                                firstInit();
                        }
                        init(configurationAdmin, isClean, isFirstInit);
                } catch (IOException e) {
-                       throw new CmsException("Could not init deploy configs", e);
+                       throw new RuntimeException("Could not init deploy configs", e);
                }
                // FIXME check race conditions during initialization
                // bc.registerService(ConfigurationListener.class, this, null);
@@ -111,15 +108,15 @@ class DeployConfig implements ConfigurationListener {
                        LdapName userAdminFactoryName = serviceFactoryDn(NodeConstants.NODE_USER_ADMIN_PID);
                        for (LdapName name : deployConfigs.keySet()) {
                                if (name.startsWith(userAdminFactoryName) && !name.equals(userAdminFactoryName)) {
-                                       try {
-                                               Attributes attrs = deployConfigs.get(name);
-                                               String cn = name.getRdn(name.size() - 1).getValue().toString();
-                                               if (!activeCns.contains(cn)) {
-                                                       attrs.put(UserAdminConf.disabled.name(), "true");
-                                               }
-                                       } catch (Exception e) {
-                                               throw new CmsException("Cannot disable user directory " + name, e);
+//                                     try {
+                                       Attributes attrs = deployConfigs.get(name);
+                                       String cn = name.getRdn(name.size() - 1).getValue().toString();
+                                       if (!activeCns.contains(cn)) {
+                                               attrs.put(UserAdminConf.disabled.name(), "true");
                                        }
+//                                     } catch (Exception e) {
+//                                             throw new CmsException("Cannot disable user directory " + name, e);
+//                                     }
                                }
                        }
                }
@@ -147,16 +144,16 @@ class DeployConfig implements ConfigurationListener {
                // activator of the Equinox Jetty bundle.
                Dictionary<String, Object> webServerConfig = InitUtils
                                .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");
-                       }
-               }
+//             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 {
@@ -174,6 +171,7 @@ class DeployConfig implements ConfigurationListener {
                                        } catch (Exception e1) {
                                                // silent
                                        }
+                                       tryCount--;
                                }
                        }
                } catch (Exception e) {
@@ -188,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);
@@ -343,8 +343,12 @@ class DeployConfig implements ConfigurationListener {
                        return null;
        }
 
-       static boolean isInitialized() {
+       private static boolean isInitialized() {
                return Files.exists(deployConfigPath);
        }
 
+       public boolean isFirstInit() {
+               return isFirstInit;
+       }
+
 }