projects
/
gpl
/
argeo-suite.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move theme constants to Argeo Commons.
[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..bb3248838fe71b58baf27703eaa592133f62571a 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
@@
-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 {
* 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;
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;
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(C
msTheme.C
MS_THEME_BUNDLE_PROPERTY)) {
+ String cmsThemeBundle = properties.get(C
msTheme.C
MS_THEME_BUNDLE_PROPERTY);
cmsTheme = new CmsTheme(bundleContext, cmsThemeBundle);
} else {
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);
}
ArgeoRapApp app = new ArgeoRapApp(bundleContext, bundle, cmsTheme);