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;
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;
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);
}
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);