X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FActivator.java;h=73c530c82d63d1e0ec31e32cb88da7b47a80157a;hb=9b91329a1c5d7e6b5fc4fae3c21d6019318acc8e;hp=24c2f6bccc7d1c7e9d8e004f94d56623e92513dc;hpb=255654a72d48b875d71cea637532784953d80499;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 24c2f6bcc..73c530c82 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
@@ -1,15 +1,12 @@
 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 javax.security.auth.login.Configuration;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.CmsException;
@@ -19,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;
@@ -35,6 +33,7 @@ public class Activator implements BundleActivator {
 	private static Activator instance;
 
 	private BundleContext bc;
+	private CmsSecurity nodeSecurity;
 	private LogReaderService logReaderService;
 	// private ConfigurationAdmin configurationAdmin;
 
@@ -51,7 +50,7 @@ public class Activator implements BundleActivator {
 		// this.configurationAdmin = getService(ConfigurationAdmin.class);
 
 		try {
-			initSecurity();// must be first
+			nodeSecurity = new CmsSecurity();
 			initArgeoLogger();
 			initNode();
 		} catch (Exception e) {
@@ -60,16 +59,6 @@ public class Activator implements BundleActivator {
 		}
 	}
 
-	private void initSecurity() {
-		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() {
 		logger = new NodeLogger(logReaderService);
 		bc.registerService(ArgeoLogger.class, logger, null);
@@ -122,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();