Improve logging

[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 ecd36476facdd5cbc7e187cb87dd0c01d84b840e..e5930303a076ade9b77a4301ceccd0e8f8699b43 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,5 +1,6 @@
 package org.argeo.cms.internal.kernel;
 
+import java.awt.image.Kernel;
 import java.io.IOException;
 import java.net.URL;
 import java.nio.file.Files;
@@ -8,6 +9,8 @@ import java.util.Dictionary;
 import java.util.List;
 import java.util.Locale;
 
+import javax.security.auth.login.Configuration;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.CmsException;
@@ -17,24 +20,25 @@ 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;
 import org.osgi.framework.ServiceReference;
-import org.osgi.service.condpermadmin.ConditionalPermissionAdmin;
 import org.osgi.service.log.LogReaderService;
+import org.osgi.service.useradmin.UserAdmin;
 
 /**
  * Activates the {@link Kernel} from the provided {@link BundleContext}. Gives
  * access to kernel information for the rest of the bundle (and only it)
  */
 public class Activator implements BundleActivator {
-       private final Log log = LogFactory.getLog(Activator.class);
+       private final static Log log = LogFactory.getLog(Activator.class);
 
        private static Activator instance;
 
        private BundleContext bc;
-       private ConditionalPermissionAdmin permissionAdmin;
+       // private CmsSecurity nodeSecurity;
        private LogReaderService logReaderService;
        // private ConfigurationAdmin configurationAdmin;
 
@@ -47,23 +51,28 @@ public class Activator implements BundleActivator {
        public void start(BundleContext bundleContext) throws Exception {
                instance = this;
                this.bc = bundleContext;
-               this.permissionAdmin = getService(ConditionalPermissionAdmin.class);
                this.logReaderService = getService(LogReaderService.class);
                // this.configurationAdmin = getService(ConfigurationAdmin.class);
 
-               initSecurity();// must be first
-               initArgeoLogger();
                try {
+                       // nodeSecurity = new CmsSecurity();
+                       initSecurity();
+                       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());
+               if (System.getProperty(KernelConstants.JAAS_CONFIG_PROP) == null) {
+                       String jaasConfig = KernelConstants.JAAS_CONFIG;
+                       URL url = getClass().getClassLoader().getResource(jaasConfig);
+                       System.setProperty(KernelConstants.JAAS_CONFIG_PROP, url.toExternalForm());
+               }
+               // explicitly load JAAS configuration
+               Configuration.getConfiguration();
        }
 
        private void initArgeoLogger() {
@@ -82,24 +91,7 @@ public class Activator implements BundleActivator {
                        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);
+               Dictionary<String, Object> regProps = LangUtils.dico(Constants.SERVICE_PID, NodeConstants.NODE_STATE_PID);
                regProps.put(NodeConstants.CN, stateUuid);
                bc.registerService(NodeState.class, nodeState, regProps);
 
@@ -120,7 +112,6 @@ public class Activator implements BundleActivator {
 
                instance = null;
                this.bc = null;
-               this.permissionAdmin = null;
                this.logReaderService = null;
                // this.configurationAdmin = null;
        }
@@ -136,6 +127,16 @@ public class Activator implements BundleActivator {
                return instance.nodeState;
        }
 
+       public static GSSCredential getAcceptorCredentials() {
+               ServiceReference<UserAdmin> sr = instance.bc.getServiceReference(UserAdmin.class);
+               NodeUserAdmin userAdmin = (NodeUserAdmin) instance.bc.getService(sr);
+               return userAdmin.getAcceptorCredentials();
+       }
+
+       // static CmsSecurity getCmsSecurity() {
+       // return instance.nodeSecurity;
+       // }
+
        public String[] getLocales() {
                // TODO optimize?
                List<Locale> locales = getNodeState().getLocales();