Make E4 login lifecycle URI more robust

[lgpl/argeo-commons.git] / org.argeo.cms.e4.rap / src / org / argeo / cms / e4 / rap / AbstractRapE4App.java

diff --git a/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/AbstractRapE4App.java b/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/AbstractRapE4App.java
index 68415f31adbabc9479936c6349a9508423e75ce0..f79864a547cc52116469235437e1f5183f6bd4d9 100644 (file)
--- a/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/AbstractRapE4App.java
+++ b/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/AbstractRapE4App.java
@@ -3,8 +3,6 @@ package org.argeo.cms.e4.rap;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.security.auth.Subject;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.ui.dialogs.CmsFeedback;
@@ -37,14 +35,12 @@ public abstract class AbstractRapE4App implements ApplicationConfiguration {
                        }
                });
 
-               String lifeCycleUri = "bundleclass://" + bc.getBundle().getSymbolicName() + "/"
-                               + CmsLoginLifecycle.class.getName();
+               String lifeCycleUri = "bundleclass://org.argeo.cms.e4.rap/org.argeo.cms.e4.rap.CmsLoginLifecycle";
 
                Map<String, String> properties = new HashMap<String, String>();
                properties.put(WebClient.PAGE_TITLE, pageTitle);
                E4ApplicationConfig config = new E4ApplicationConfig(e4Xmi, lifeCycleUri, null, false, true, true);
-               Subject subject = new Subject();
-               addEntryPoint(application, subject, config, properties);
+               addEntryPoint(application, config, properties);
                // config.isClearPersistedState();
                // E4EntryPointFactory entryPointFactory = new E4EntryPointFactory(config) {
                //
@@ -76,9 +72,8 @@ public abstract class AbstractRapE4App implements ApplicationConfiguration {
                // };
        }
 
-       protected void addEntryPoint(Application application, Subject subject, E4ApplicationConfig config,
-                       Map<String, String> properties) {
-               CmsE4EntryPointFactory entryPointFactory = new CmsE4EntryPointFactory(subject, config);
+       protected void addEntryPoint(Application application, E4ApplicationConfig config, Map<String, String> properties) {
+               CmsE4EntryPointFactory entryPointFactory = new CmsE4EntryPointFactory(config);
                application.addEntryPoint(path, entryPointFactory, properties);
                application.setOperationMode(OperationMode.SWT_COMPATIBILITY);
        }