Fix issues with multi session

[lgpl/argeo-commons.git] / security / plugins / org.argeo.security.ui.rap / src / main / java / org / argeo / security / ui / rap / SecureRapActivator.java

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 b8c66cda35b92964d0c8ffbc3c4487d95ca7de16..2a29ba7e0e480420266da5c7e2814b592cdbcb25 100644 (file)
--- 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,7 +2,6 @@ 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;
@@ -14,21 +13,29 @@ public class SecureRapActivator implements BundleActivator {
        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 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;
+//             URL configUrl = bundleContext.getBundle().getEntry(JAAS_CONFIG_FILE);
+//             loginContext = LoginContextFactory.createContext(CONTEXT_SPRING,
+//                             configUrl);
        }
 
        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 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);
        }
 }