Clarify Eclipse 4 deployment.

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

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 322a1bff7d773cab3038598f7631a382d073d1ca..e575f5553da17b258ed501e8f76a477ea40948bf 100644 (file)
--- 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;
 
@@ -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,11 +38,11 @@ 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);
+               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(), DEFAULT_CMS_THEME_BUNDLE);
+                       cmsTheme = new CmsTheme(getBundleContext(), CmsTheme.DEFAULT_CMS_THEME_BUNDLE);
                }
                bundle = bundleContext.getBundle();
        }