Login/logout working in new Argeo Suite.

[gpl/argeo-suite.git] / org.argeo.suite.e4.rap / src / org / argeo / suite / e4 / rap / settings / AppDeployer.java

diff --git a/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/settings/AppDeployer.java b/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/settings/AppDeployer.java
index c1588119efd1a8a8ef178c8c94f5e55eec59ac1c..978a8e2d337ea5a62d424df56620ab16b392e35d 100644 (file)
--- a/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/settings/AppDeployer.java
+++ b/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/settings/AppDeployer.java
@@ -7,7 +7,6 @@ import java.util.Map;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.e4.rap.AbstractRapE4App;
-import org.argeo.cms.ui.util.CmsTheme;
 import org.argeo.util.LangUtils;
 import org.eclipse.rap.rwt.application.ApplicationConfiguration;
 import org.osgi.framework.Bundle;
@@ -19,9 +18,6 @@ import org.osgi.service.cm.ManagedServiceFactory;
  * Managed service factory deploying Argeo RAP app based on OSGi configurations.
  */
 public class AppDeployer implements ManagedServiceFactory {
-       public final static String CMS_THEME_BUNDLE_PROPERTY = "argeo.cms.theme.bundle";
-       public final static String DEFAULT_CMS_THEME_BUNDLE = "org.argeo.theme.argeo2";
-
        private final static Log log = LogFactory.getLog(AppDeployer.class);
        private BundleContext bundleContext;
 
@@ -48,15 +44,15 @@ public class AppDeployer implements ManagedServiceFactory {
        }
 
        protected void deploy(Bundle bundle, Map<String, String> properties) {
-               CmsTheme cmsTheme;
-               if (properties.containsKey(CMS_THEME_BUNDLE_PROPERTY)) {
-                       String cmsThemeBundle = properties.get(CMS_THEME_BUNDLE_PROPERTY);
-                       cmsTheme = new CmsTheme(bundleContext, cmsThemeBundle);
-               } else {
-                       cmsTheme = new CmsTheme(bundleContext, DEFAULT_CMS_THEME_BUNDLE);
-               }
-
-               ArgeoRapApp app = new ArgeoRapApp(bundleContext, bundle, cmsTheme);
+//             CmsTheme cmsTheme;
+//             if (properties.containsKey(CmsTheme.CMS_THEME_BUNDLE_PROPERTY)) {
+//                     String cmsThemeBundle = properties.get(CmsTheme.CMS_THEME_BUNDLE_PROPERTY);
+//                     cmsTheme = new CmsTheme(bundleContext, cmsThemeBundle);
+//             } else {
+//                     cmsTheme = new CmsTheme(bundleContext, CmsTheme.DEFAULT_CMS_THEME_BUNDLE);
+//             }
+
+               ArgeoRapApp app = new ArgeoRapApp(bundleContext, bundle, null);
 
                Hashtable<String, String> props = new Hashtable<String, String>();
                props.put(AbstractRapE4App.CONTEXT_NAME_PROPERTY, app.getContextName());