Merge branch 'master' of https://code.argeo.org/git/apache2/argeo-commons

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

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/Activator.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/Activator.java
index 7dd668c3829a0c71a3b991b0316de8713e660bcc..73c530c82d63d1e0ec31e32cb88da7b47a80157a 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/Activator.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/Activator.java
@@ -1,13 +1,14 @@
 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.List;
 import java.util.Locale;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.CmsException;
 import org.argeo.node.ArgeoLogger;
 import org.argeo.node.NodeConstants;
@@ -15,6 +16,7 @@ import org.argeo.node.NodeDeployment;
 import org.argeo.node.NodeInstance;
 import org.argeo.node.NodeState;
 import org.argeo.util.LangUtils;
+import org.ietf.jgss.GSSCredential;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
@@ -26,9 +28,12 @@ import org.osgi.service.log.LogReaderService;
  * access to kernel information for the rest of the bundle (and only it)
  */
 public class Activator implements BundleActivator {
+       private final static Log log = LogFactory.getLog(Activator.class);
+
        private static Activator instance;
 
        private BundleContext bc;
+       private CmsSecurity nodeSecurity;
        private LogReaderService logReaderService;
        // private ConfigurationAdmin configurationAdmin;
 
@@ -44,23 +49,16 @@ public class Activator implements BundleActivator {
                this.logReaderService = getService(LogReaderService.class);
                // this.configurationAdmin = getService(ConfigurationAdmin.class);
 
-               initSecurity();// must be first
-               initArgeoLogger();
                try {
+                       nodeSecurity = new CmsSecurity();
+                       initArgeoLogger();
                        initNode();
                } catch (Exception e) {
-                       e.printStackTrace();
-                       throw new CmsException("Cannot initialize node", e);
+                       log.error("## FATAL: CMS activator failed", e);
+                       // throw new CmsException("Cannot initialize node", e);
                }
        }
 
-       private void initSecurity() {
-               URL url = getClass().getClassLoader().getResource(
-                               KernelConstants.JAAS_CONFIG);
-               System.setProperty("java.security.auth.login.config",
-                               url.toExternalForm());
-       }
-
        private void initArgeoLogger() {
                logger = new NodeLogger(logReaderService);
                bc.registerService(ArgeoLogger.class, logger, null);
@@ -77,8 +75,7 @@ public class Activator implements BundleActivator {
                        Files.write(stateUuidPath, stateUuid.getBytes());
                }
                nodeState = new CmsState(stateUuid);
-               Dictionary<String, Object> regProps = LangUtils.dico(
-                               Constants.SERVICE_PID, NodeConstants.NODE_STATE_PID);
+               Dictionary<String, Object> regProps = LangUtils.dico(Constants.SERVICE_PID, NodeConstants.NODE_STATE_PID);
                regProps.put(NodeConstants.CN, stateUuid);
                bc.registerService(NodeState.class, nodeState, regProps);
 
@@ -114,6 +111,14 @@ public class Activator implements BundleActivator {
                return instance.nodeState;
        }
 
+       public static GSSCredential getAcceptorCredentials() {
+               return getCmsSecurity().getServerCredentials();
+       }
+
+       static CmsSecurity getCmsSecurity() {
+               return instance.nodeSecurity;
+       }
+
        public String[] getLocales() {
                // TODO optimize?
                List<Locale> locales = getNodeState().getLocales();