X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FActivator.java;h=44922aced77eccb4a26f4d84623c3a23d07c2c98;hb=3fc22751d5f0023316497dcc321d470936dcd9fb;hp=7dd668c3829a0c71a3b991b0316de8713e660bcc;hpb=029a84fb1a01e9877736db2693b8a3013b1e72a1;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 7dd668c38..44922aced 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
@@ -8,6 +8,8 @@ import java.util.Dictionary;
 import java.util.List;
 import java.util.Locale;
 
+import javax.security.auth.login.Configuration;
+
 import org.argeo.cms.CmsException;
 import org.argeo.node.ArgeoLogger;
 import org.argeo.node.NodeConstants;
@@ -44,9 +46,9 @@ public class Activator implements BundleActivator {
 		this.logReaderService = getService(LogReaderService.class);
 		// this.configurationAdmin = getService(ConfigurationAdmin.class);
 
-		initSecurity();// must be first
-		initArgeoLogger();
 		try {
+			initSecurity();// must be first
+			initArgeoLogger();
 			initNode();
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -55,10 +57,13 @@ public class Activator implements BundleActivator {
 	}
 
 	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) {
+			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();
 	}
 
 	private void initArgeoLogger() {
@@ -77,8 +82,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);