X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FActivator.java;h=24c2f6bccc7d1c7e9d8e004f94d56623e92513dc;hb=18af628c072e386420f03261ab207a72341a0a1b;hp=51a4cc7a55834a42951bd71671fbcdac32ce96b7;hpb=a2ad417ed1d0219ac29d70ae985939764c13ce38;p=lgpl%2Fargeo-commons.git

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 51a4cc7a5..24c2f6bcc 100644
--- 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();
 	}