Stabilise deployment
[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / internal / kernel / Activator.java
index 6aacfd4931760f6e9c85f8d1724f35cfccf55dca..ecd36476facdd5cbc7e187cb87dd0c01d84b840e 100644 (file)
@@ -2,8 +2,9 @@ package org.argeo.cms.internal.kernel;
 
 import java.io.IOException;
 import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.Dictionary;
-import java.util.Hashtable;
 import java.util.List;
 import java.util.Locale;
 
@@ -13,15 +14,13 @@ import org.argeo.cms.CmsException;
 import org.argeo.node.ArgeoLogger;
 import org.argeo.node.NodeConstants;
 import org.argeo.node.NodeDeployment;
+import org.argeo.node.NodeInstance;
 import org.argeo.node.NodeState;
 import org.argeo.util.LangUtils;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceReference;
-import org.osgi.service.cm.Configuration;
-import org.osgi.service.cm.ConfigurationAdmin;
-import org.osgi.service.cm.ManagedService;
 import org.osgi.service.condpermadmin.ConditionalPermissionAdmin;
 import org.osgi.service.log.LogReaderService;
 
@@ -30,45 +29,36 @@ import org.osgi.service.log.LogReaderService;
  * access to kernel information for the rest of the bundle (and only it)
  */
 public class Activator implements BundleActivator {
-       // public final static String SYSTEM_KEY_PROPERTY =
-       // "argeo.security.systemKey";
        private final Log log = LogFactory.getLog(Activator.class);
 
-       // private final static String systemKey;
-       // static {
-       // System.setProperty(SYSTEM_KEY_PROPERTY, systemKey);
-       // }
-
-       // private static Kernel kernel;
        private static Activator instance;
 
        private BundleContext bc;
        private ConditionalPermissionAdmin permissionAdmin;
        private LogReaderService logReaderService;
-       private ConfigurationAdmin configurationAdmin;
+       // private ConfigurationAdmin configurationAdmin;
 
        private NodeLogger logger;
        private CmsState nodeState;
        private CmsDeployment nodeDeployment;
+       private CmsInstance nodeInstance;
 
        @Override
        public void start(BundleContext bundleContext) throws Exception {
-               // try {
-               // kernel = new Kernel();
-               // kernel.init();
-               // } catch (Exception e) {
-               // log.error("Cannot boot kernel", e);
-               // }
-
                instance = this;
                this.bc = bundleContext;
                this.permissionAdmin = getService(ConditionalPermissionAdmin.class);
                this.logReaderService = getService(LogReaderService.class);
-               this.configurationAdmin = getService(ConfigurationAdmin.class);
+               // this.configurationAdmin = getService(ConfigurationAdmin.class);
 
                initSecurity();// must be first
                initArgeoLogger();
-               initNodeState();
+               try {
+                       initNode();
+               } catch (Exception e) {
+                       e.printStackTrace();
+                       throw new CmsException("Cannot initialize node", e);
+               }
        }
 
        private void initSecurity() {
@@ -78,74 +68,61 @@ public class Activator implements BundleActivator {
 
        private void initArgeoLogger() {
                logger = new NodeLogger(logReaderService);
-
-               // register
                bc.registerService(ArgeoLogger.class, logger, null);
        }
 
-       private void initNodeState() throws IOException {
-               nodeState = new CmsState();
-
-               Object cn;
-               Configuration nodeConf = configurationAdmin.getConfiguration(NodeConstants.NODE_STATE_PID);
-               Dictionary<String, Object> props = nodeConf.getProperties();
-               if (props == null) {
-                       if (log.isDebugEnabled())
-                               log.debug("Clean node state");
-                       Dictionary<String, Object> envProps = new Hashtable<>();
-                       // Use the UUID of the first framework run as state UUID
-                       cn = bc.getProperty(Constants.FRAMEWORK_UUID);
-                       envProps.put(NodeConstants.CN, cn);
-                       nodeConf.update(envProps);
+       private void initNode() throws IOException {
+               // Node state
+               Path stateUuidPath = bc.getDataFile("stateUuid").toPath();
+               String stateUuid;
+               if (Files.exists(stateUuidPath)) {
+                       stateUuid = Files.readAllLines(stateUuidPath).get(0);
                } else {
-                       // Check if state is in line with environment
-                       // Dictionary<String, Object> envProps = new Hashtable<>();
-                       // for (String key : LangUtils.keys(envProps)) {
-                       // Object envValue = envProps.get(key);
-                       // Object storedValue = props.get(key);
-                       // if (storedValue == null)
-                       // throw new CmsException("No state value for env " + key + "=" +
-                       // envValue
-                       // + ", please clean the OSGi configuration.");
-                       // if (!storedValue.equals(envValue))
-                       // throw new CmsException("State value for " + key + "=" +
-                       // storedValue
-                       // + " is different from env value =" + envValue + ", please clean
-                       // the OSGi configuration.");
-                       // }
-                       cn = props.get(NodeConstants.CN);
-                       if (cn == null)
-                               throw new CmsException("No state UUID available");
+                       stateUuid = bc.getProperty(Constants.FRAMEWORK_UUID);
+                       Files.write(stateUuidPath, stateUuid.getBytes());
                }
-
+               nodeState = new CmsState(stateUuid);
+               // Object cn;
+               // Configuration nodeConf =
+               // configurationAdmin.getConfiguration(NodeConstants.NODE_STATE_PID);
+               // Dictionary<String, Object> props = nodeConf.getProperties();
+               // if (props == null) {
+               // if (log.isDebugEnabled())
+               // log.debug("Clean node state");
+               // Dictionary<String, Object> envProps = new Hashtable<>();
+               // // Use the UUID of the first framework run as state UUID
+               // cn = bc.getProperty(Constants.FRAMEWORK_UUID);
+               // envProps.put(NodeConstants.CN, cn);
+               // nodeConf.update(envProps);
+               // } else {
+               // cn = props.get(NodeConstants.CN);
+               // if (cn == null)
+               // throw new CmsException("No state UUID available");
+               // }
                Dictionary<String, Object> regProps = LangUtils.init(Constants.SERVICE_PID, NodeConstants.NODE_STATE_PID);
-               regProps.put(NodeConstants.CN, cn);
-               bc.registerService(LangUtils.names(NodeState.class, ManagedService.class), nodeState, regProps);
+               regProps.put(NodeConstants.CN, stateUuid);
+               bc.registerService(NodeState.class, nodeState, regProps);
 
-               try {
-                       nodeDeployment = new CmsDeployment();
-                       bc.registerService(LangUtils.names(NodeDeployment.class), nodeDeployment, null);
-               } catch (RuntimeException e) {
-                       e.printStackTrace();
-                       throw e;
-               }
+               // Node deployment
+               nodeDeployment = new CmsDeployment();
+               bc.registerService(NodeDeployment.class, nodeDeployment, null);
+
+               // Node instance
+               nodeInstance = new CmsInstance();
+               bc.registerService(NodeInstance.class, nodeInstance, null);
        }
 
        @Override
        public void stop(BundleContext bundleContext) throws Exception {
+               nodeInstance.shutdown();
+               nodeDeployment.shutdown();
                nodeState.shutdown();
 
                instance = null;
                this.bc = null;
                this.permissionAdmin = null;
                this.logReaderService = null;
-               this.configurationAdmin = null;
-
-               // if (kernel != null) {
-               // kernel.destroy();
-               // kernel = null;
-               // }
-
+               // this.configurationAdmin = null;
        }
 
        private <T> T getService(Class<T> clazz) {