X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fplugins%2Forg.argeo.security.ui.rap%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fui%2Frap%2FSecureRapActivator.java;h=762b227830f1d5b120a461f6958560a1ff63371b;hb=8b8ee149b20e2578a55e17413fa5f7399ff7ba14;hp=b8c66cda35b92964d0c8ffbc3c4487d95ca7de16;hpb=5266ec50ddbf3247a5033d98a1dbceec6673a5b8;p=lgpl%2Fargeo-commons.git

diff --git a/security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/SecureRapActivator.java b/security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/SecureRapActivator.java
index b8c66cda3..762b22783 100644
--- a/security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/SecureRapActivator.java
+++ b/security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/SecureRapActivator.java
@@ -2,33 +2,29 @@ package org.argeo.security.ui.rap;
 
 import java.net.URL;
 
-import org.argeo.ArgeoException;
 import org.eclipse.equinox.security.auth.ILoginContext;
 import org.eclipse.equinox.security.auth.LoginContextFactory;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 
+/** Configure Equinox login context from the bundle context. */
 public class SecureRapActivator implements BundleActivator {
 
 	public final static String ID = "org.argeo.security.ui.rap";
 	public final static String CONTEXT_SPRING = "SPRING";
 	private static final String JAAS_CONFIG_FILE = "/META-INF/jaas_default.txt";
 
-	private static ILoginContext loginContext = null;
+	private static BundleContext bundleContext;
 
 	public void start(BundleContext bundleContext) throws Exception {
-		URL configUrl = bundleContext.getBundle().getEntry(JAAS_CONFIG_FILE);
-		loginContext = LoginContextFactory.createContext(CONTEXT_SPRING,
-				configUrl);
+		SecureRapActivator.bundleContext = bundleContext;
 	}
 
 	public void stop(BundleContext context) throws Exception {
 	}
 
-	static ILoginContext getLoginContext() {
-		if (loginContext == null)
-			throw new ArgeoException(
-					"No Equinox login context available, check your configuration");
-		return loginContext;
+	static ILoginContext createLoginContext() {
+		URL configUrl = bundleContext.getBundle().getEntry(JAAS_CONFIG_FILE);
+		return LoginContextFactory.createContext(CONTEXT_SPRING, configUrl);
 	}
 }