Improve pseudo CA

[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 51a4cc7a55834a42951bd71671fbcdac32ce96b7..24c2f6bccc7d1c7e9d8e004f94d56623e92513dc 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
@@ -10,6 +10,8 @@ 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;
 import org.argeo.node.ArgeoLogger;
 import org.argeo.node.NodeConstants;
@@ -28,6 +30,8 @@ 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;
@@ -51,15 +55,18 @@ public class Activator implements BundleActivator {
                        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);
-//             URL url = getClass().getClassLoader().getResource(KernelConstants.JAAS_CONFIG_IPA);
-               System.setProperty("java.security.auth.login.config", url.toExternalForm());
+               if (System.getProperty(KernelConstants.JAAS_CONFIG_PROP) == null) {
+                       URL url = getClass().getClassLoader().getResource(KernelConstants.JAAS_CONFIG);
+                       // URL url =
+                       // getClass().getClassLoader().getResource(KernelConstants.JAAS_CONFIG_IPA);
+                       System.setProperty(KernelConstants.JAAS_CONFIG_PROP, url.toExternalForm());
+               }
                Configuration.getConfiguration();
        }