X-Git-Url: http://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=blobdiff_plain;f=org.argeo.suite.e4.rap%2Fsrc%2Forg%2Fargeo%2Fsuite%2Fe4%2Frap%2Fsettings%2FAppDeployer.java;fp=org.argeo.suite.e4.rap%2Fsrc%2Forg%2Fargeo%2Fsuite%2Fe4%2Frap%2Fsettings%2FAppDeployer.java;h=bb3248838fe71b58baf27703eaa592133f62571a;hp=c1588119efd1a8a8ef178c8c94f5e55eec59ac1c;hb=a548c15bfb23ed0120a6558b40d8b0362c9ba956;hpb=d6463016cbcd660c72cc74ebaa2a6e8247ccfa4f

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 c158811..bb32488 100644
--- 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
@@ -19,9 +19,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;
 
@@ -49,11 +46,11 @@ 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);
+		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, DEFAULT_CMS_THEME_BUNDLE);
+			cmsTheme = new CmsTheme(bundleContext, CmsTheme.DEFAULT_CMS_THEME_BUNDLE);
 		}
 
 		ArgeoRapApp app = new ArgeoRapApp(bundleContext, bundle, cmsTheme);