X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.suite.e4.rap%2Fsrc%2Forg%2Fargeo%2Fsuite%2Fe4%2Frap%2Fsettings%2FArgeoRapApp.java;h=3bdc90265832549fa8a47afb9b41006d60af0169;hb=6dd21e8d47a1ecc92cf9f958af9ce1a97655fa68;hp=322a1bff7d773cab3038598f7631a382d073d1ca;hpb=53baf6f0165a51fd6b0f1067606816a7153de117;p=gpl%2Fargeo-suite.git

diff --git a/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/settings/ArgeoRapApp.java b/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/settings/ArgeoRapApp.java
index 322a1bf..3bdc902 100644
--- a/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/settings/ArgeoRapApp.java
+++ b/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/settings/ArgeoRapApp.java
@@ -1,8 +1,5 @@
 package org.argeo.suite.e4.rap.settings;
 
-import static org.argeo.suite.e4.rap.settings.AppDeployer.CMS_THEME_BUNDLE_PROPERTY;
-import static org.argeo.suite.e4.rap.settings.AppDeployer.DEFAULT_CMS_THEME_BUNDLE;
-
 import java.util.Enumeration;
 import java.util.Map;
 
@@ -10,7 +7,7 @@ import org.apache.commons.io.FilenameUtils;
 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.cms.ui.CmsTheme;
 import org.eclipse.rap.rwt.application.Application;
 import org.eclipse.rap.rwt.client.WebClient;
 import org.osgi.framework.Bundle;
@@ -29,7 +26,7 @@ public class ArgeoRapApp extends AbstractRapE4App {
 		this.cmsTheme = cmsTheme;
 		this.bundle = bundle;
 		setLifeCycleUri("bundleclass://org.argeo.suite.e4.rap/org.argeo.suite.e4.rap.ArgeoSuiteLoginLifecycle");
-		String contextName = "argeo/" + FilenameUtils.getExtension(bundle.getSymbolicName());
+		String contextName = "apps/" + FilenameUtils.getExtension(bundle.getSymbolicName());
 		setContextName(contextName);
 	}
 
@@ -41,19 +38,19 @@ public class ArgeoRapApp extends AbstractRapE4App {
 	public void init(BundleContext bundleContext, Map<String, Object> properties) {
 		super.init(bundleContext, properties);
 		// super must be first
-		if (getBaseProperties().containsKey(CMS_THEME_BUNDLE_PROPERTY)) {
-			String cmsThemeBundle = getBaseProperties().get(CMS_THEME_BUNDLE_PROPERTY);
-			cmsTheme = new CmsTheme(getBundleContext(), cmsThemeBundle);
-		} else {
-			cmsTheme = new CmsTheme(getBundleContext(), DEFAULT_CMS_THEME_BUNDLE);
-		}
+//		if (getBaseProperties().containsKey(CmsTheme.CMS_THEME_BUNDLE_PROPERTY)) {
+//			String cmsThemeBundle = getBaseProperties().get(CmsTheme.CMS_THEME_BUNDLE_PROPERTY);
+//			cmsTheme = new CmsTheme(getBundleContext(), cmsThemeBundle);
+//		} else {
+//			cmsTheme = new CmsTheme(getBundleContext(), CmsTheme.DEFAULT_CMS_THEME_BUNDLE);
+//		}
 		bundle = bundleContext.getBundle();
 	}
 
 	@Override
 	protected void addEntryPoints(Application application) {
-		if (cmsTheme != null)
-			cmsTheme.apply(application);
+//		if (cmsTheme != null)
+//			cmsTheme.apply(application);
 
 		String font = "<link rel='stylesheet' href='http://fonts.googleapis.com/css?family=Source+Sans+Pro'/>";
 		getBaseProperties().put(WebClient.HEAD_HTML, font);