X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=security%2Fplugins%2Forg.argeo.security.ui.rap%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fui%2Frap%2FSecureRapActivator.java;h=97c1c579801dd3c3ae5d2c3f805673ea95897e7b;hb=136ef465ce4ddd217e550bbe598258b5a967e846;hp=2a29ba7e0e480420266da5c7e2814b592cdbcb25;hpb=2f1c0a952d1bbaafc243da2d5d4caa235f628777;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 2a29ba7e0..97c1c5798 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
@@ -7,35 +7,38 @@ 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";
+	public final static String CONTEXT_SPRING_ANONYMOUS = "SPRING_ANONYMOUS";
 	private static final String JAAS_CONFIG_FILE = "/META-INF/jaas_default.txt";
 
-	//private static ILoginContext loginContext = null;
-	
-	private static BundleContext bundleContext;
+	private BundleContext bundleContext;
+	private static SecureRapActivator activator = null;
 
 	public void start(BundleContext bundleContext) throws Exception {
-		SecureRapActivator.bundleContext = bundleContext;
-//		URL configUrl = bundleContext.getBundle().getEntry(JAAS_CONFIG_FILE);
-//		loginContext = LoginContextFactory.createContext(CONTEXT_SPRING,
-//				configUrl);
+		activator = this;
+		this.bundleContext = bundleContext;
 	}
 
 	public void stop(BundleContext context) throws Exception {
+		bundleContext = null;
+		activator = null;
 	}
 
-//	static ILoginContext getLoginContext() {
-//		if (loginContext == null)
-//			throw new ArgeoException(
-//					"No Equinox login context available, check your configuration");
-//		return loginContext;
-//	}
+	public BundleContext getBundleContext() {
+		return bundleContext;
+	}
+
+	public static SecureRapActivator getActivator() {
+		return activator;
+	}
 
-	static ILoginContext createLoginContext() {
-		URL configUrl = bundleContext.getBundle().getEntry(JAAS_CONFIG_FILE);
-		return LoginContextFactory.createContext(CONTEXT_SPRING, configUrl);
+	static ILoginContext createLoginContext(String contextName) {
+		URL configUrl = getActivator().getBundleContext().getBundle()
+				.getEntry(JAAS_CONFIG_FILE);
+		return LoginContextFactory.createContext(contextName, configUrl);
 	}
 }