Improve Eclipse security

[lgpl/argeo-commons.git] / security / eclipse / plugins / org.argeo.security.equinox / src / main / java / org / argeo / security / equinox / EquinoxSecurity.java

diff --git a/security/eclipse/plugins/org.argeo.security.equinox/src/main/java/org/argeo/security/equinox/EquinoxSecurity.java b/security/eclipse/plugins/org.argeo.security.equinox/src/main/java/org/argeo/security/equinox/EquinoxSecurity.java
index e1a72b14ffd0f8f674ad276c5630f979e25350e9..61c5e796e03693930a1f9890ff29efd0c0d7755f 100644 (file)
--- a/security/eclipse/plugins/org.argeo.security.equinox/src/main/java/org/argeo/security/equinox/EquinoxSecurity.java
+++ b/security/eclipse/plugins/org.argeo.security.equinox/src/main/java/org/argeo/security/equinox/EquinoxSecurity.java
@@ -11,28 +11,20 @@ public class EquinoxSecurity implements BundleActivator {
        public final static String CONTEXT_SPRING = "SPRING";
        private static final String JAAS_CONFIG_FILE = "jaas/jaas_default.txt";
 
-       private static BundleContext bundleContext;
-
-       public void start(BundleContext context) throws Exception {
-               bundleContext = context;
-               // URL url = new URL(
-               // "file:////home/mbaudier/dev/src/commons/security/eclipse/plugins/org.argeo.security.ui.rcp/jaas_config.txt");
-               // // URL url = new URL(
-               // //
-               // "file:////home/mbaudier/dev/src/commons/security/eclipse/plugins/org.argeo.security.ui.rcp/jaas_config.txt");
-               // ILoginContext secureContext = LoginContextFactory.createContext(
-               // configName, url);
-               getLoginContext();
+       private static ILoginContext loginContext = null;
+
+       public void start(BundleContext bundleContext) throws Exception {
+               // getLoginContext();
+               URL configUrl = bundleContext.getBundle().getEntry(JAAS_CONFIG_FILE);
+               loginContext = LoginContextFactory.createContext(CONTEXT_SPRING,
+                               configUrl);
        }
 
        public void stop(BundleContext context) throws Exception {
-               bundleContext = null;
        }
 
        static ILoginContext getLoginContext() {
-               String configName = CONTEXT_SPRING;
-               URL configUrl = bundleContext.getBundle().getEntry(JAAS_CONFIG_FILE);
-               return LoginContextFactory.createContext(configName, configUrl);
+               return loginContext;
        }
 
 }