Improve and simplify OSGi Boot

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

diff --git a/org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/SecureRapActivator.java b/org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/SecureRapActivator.java
index 4cbb441e7a0d4e1492e781d760922325ecdab21e..b3d7c23378e412be98de5e462320943bf60c3c9b 100644 (file)
--- a/org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/SecureRapActivator.java
+++ b/org.argeo.security.ui.rap/src/org/argeo/security/ui/rap/SecureRapActivator.java
@@ -15,45 +15,24 @@
  */
 package org.argeo.security.ui.rap;
 
-import java.net.URL;
-
-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";
-       public final static String CONTEXT_SPRING_ANONYMOUS = "SPRING_ANONYMOUS";
-       private static final String JAAS_CONFIG_FILE = "/META-INF/jaas_default.txt";
 
-       private BundleContext bundleContext;
-       private static SecureRapActivator activator = null;
+       private static BundleContext bundleContext;
 
-       public void start(BundleContext bundleContext) throws Exception {
-               activator = this;
-               this.bundleContext = bundleContext;
+       public void start(BundleContext bc) throws Exception {
+               bundleContext = bc;
        }
 
        public void stop(BundleContext context) throws Exception {
                bundleContext = null;
-               activator = null;
        }
 
-       public BundleContext getBundleContext() {
+       public static BundleContext getBundleContext() {
                return bundleContext;
        }
-
-       public static SecureRapActivator getActivator() {
-               return activator;
-       }
-
-       static ILoginContext createLoginContext(String contextName) {
-               URL configUrl = getActivator().getBundleContext().getBundle()
-                               .getEntry(JAAS_CONFIG_FILE);
-               return LoginContextFactory.createContext(contextName, configUrl);
-       }
 }