From 28d7676b542c74dd816a85a1a2f59d69713c4dfe Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 24 Oct 2019 09:58:39 +0200 Subject: [PATCH] Adapt to changes in Argeo Commons. --- dep/pom.xml | 5 ++ .../OSGI-INF/argeo-office-rap.xml | 4 +- org.argeo.suite.e4.rap/bnd.bnd | 4 +- .../org/argeo/suite/e4/rap/ArgeoOffice.java | 16 ------ .../suite/e4/rap/ArgeoOfficeRapE4App.java | 51 ++++++++++--------- .../suite/e4/rap/ArgeoSuiteEntryPoint.java | 11 ---- pom.xml | 2 +- sdk/argeo-office-e4-rap.properties | 1 - 8 files changed, 37 insertions(+), 57 deletions(-) delete mode 100644 org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/ArgeoOffice.java delete mode 100644 org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/ArgeoSuiteEntryPoint.java diff --git a/dep/pom.xml b/dep/pom.xml index 3516108..3d9925a 100644 --- a/dep/pom.xml +++ b/dep/pom.xml @@ -66,6 +66,11 @@ org.junit test + + org.argeo.tp.sdk + org.hamcrest + test + diff --git a/org.argeo.suite.e4.rap/OSGI-INF/argeo-office-rap.xml b/org.argeo.suite.e4.rap/OSGI-INF/argeo-office-rap.xml index 74b518f..d257e17 100644 --- a/org.argeo.suite.e4.rap/OSGI-INF/argeo-office-rap.xml +++ b/org.argeo.suite.e4.rap/OSGI-INF/argeo-office-rap.xml @@ -1,8 +1,10 @@ - + + + diff --git a/org.argeo.suite.e4.rap/bnd.bnd b/org.argeo.suite.e4.rap/bnd.bnd index 668bf31..d33d61d 100644 --- a/org.argeo.suite.e4.rap/bnd.bnd +++ b/org.argeo.suite.e4.rap/bnd.bnd @@ -1,7 +1,7 @@ Bundle-SymbolicName: org.argeo.suite.e4.rap;singleton:=true -Bundle-Activator: org.argeo.cms.script.ScriptAppActivator +Bundle-ActivationPolicy: lazy -#Service-Component: OSGI-INF/argeo-office-rap.xml +Service-Component: OSGI-INF/argeo-office-rap.xml Import-Package: org.argeo.node,\ org.eclipse.swt,\ diff --git a/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/ArgeoOffice.java b/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/ArgeoOffice.java deleted file mode 100644 index 3e13fe7..0000000 --- a/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/ArgeoOffice.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.argeo.suite.e4.rap; - -import org.argeo.cms.e4.rap.CmsE4EntryPointFactory; - -public class ArgeoOffice extends CmsE4EntryPointFactory { - - public ArgeoOffice(String e4Xmi, String lifeCycleUri) { - super(e4Xmi, lifeCycleUri); - } - - public ArgeoOffice() { - super("org.argeo.suite.e4/e4xmi/argeo-office.e4xmi", - "bundleclass://org.argeo.suite.e4.rap/org.argeo.suite.e4.rap.ArgeoSuiteLoginLifecycle"); - } - -} diff --git a/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/ArgeoOfficeRapE4App.java b/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/ArgeoOfficeRapE4App.java index f9180c7..3e732ef 100644 --- a/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/ArgeoOfficeRapE4App.java +++ b/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/ArgeoOfficeRapE4App.java @@ -1,45 +1,46 @@ package org.argeo.suite.e4.rap; -import java.util.Map; - import org.argeo.cms.e4.rap.AbstractRapE4App; -import org.argeo.cms.util.BundleResourceLoader; -import org.eclipse.rap.e4.E4ApplicationConfig; -import org.eclipse.rap.rwt.RWT; +import org.argeo.cms.util.CmsTheme; import org.eclipse.rap.rwt.application.Application; import org.eclipse.rap.rwt.client.WebClient; -import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; +/** Argeo Office RAP application. */ public class ArgeoOfficeRapE4App extends AbstractRapE4App { private BundleContext bc = FrameworkUtil.getBundle(getClass()).getBundleContext(); public ArgeoOfficeRapE4App() { - setPageTitle("Argeo Office"); - setE4Xmi("org.argeo.suite.e4/e4xmi/argeo-office.e4xmi"); - setPath("/office"); +// setPageTitle("Argeo Office"); +// setE4Xmi("org.argeo.suite.e4/e4xmi/argeo-office.e4xmi"); +// setPath("/office"); setLifeCycleUri("bundleclass://org.argeo.suite.e4.rap/org.argeo.suite.e4.rap.ArgeoSuiteLoginLifecycle"); } @Override - protected void addEntryPoint(Application application, E4ApplicationConfig config, Map properties) { - // String theme ="org.argeo.theme.argeo2.office"; - String theme = RWT.DEFAULT_THEME_ID; - Bundle themeBundle = findTheme("org.argeo.theme.argeo2"); - // application.addStyleSheet(theme, "rap/office-rwt.css", new - // BundleResourceLoader(themeBundle)); - application.addStyleSheet(theme, "rap/office.css", new BundleResourceLoader(themeBundle)); - properties.put(WebClient.THEME_ID, theme); + protected void addEntryPoints(Application application) { + CmsTheme cmsTheme = new CmsTheme(bc, "org.argeo.theme.argeo2"); + cmsTheme.apply(application); + String font = ""; - properties.put(WebClient.HEAD_HTML, font); - super.addEntryPoint(application, config, properties); - } + getBaseProperties().put(WebClient.HEAD_HTML, font); - Bundle findTheme(String symbolicName) { - for (Bundle b : bc.getBundles()) - if (symbolicName.equals(b.getSymbolicName())) - return b; - throw new RuntimeException("Theme bundle " + symbolicName + " not found"); + addE4EntryPoint(application, "/office", "org.argeo.suite.e4/e4xmi/argeo-office.e4xmi", customise("Office")); + addE4EntryPoint(application, "/docs", "org.argeo.suite.e4/e4xmi/argeo-docs.e4xmi", customise("Docs")); } + +// protected void addEntryPoint(Application application, E4ApplicationConfig config, Map properties) { +// // String theme ="org.argeo.theme.argeo2.office"; +// String theme = RWT.DEFAULT_THEME_ID; +// Bundle themeBundle = findTheme("org.argeo.theme.argeo2"); +// // application.addStyleSheet(theme, "rap/office-rwt.css", new +// // BundleResourceLoader(themeBundle)); +// application.addStyleSheet(theme, "rap/office.css", new BundleResourceLoader(themeBundle)); +// properties.put(WebClient.THEME_ID, theme); +// String font = ""; +// properties.put(WebClient.HEAD_HTML, font); +// //super.addEntryPoint(application, config, properties); +// } + } diff --git a/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/ArgeoSuiteEntryPoint.java b/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/ArgeoSuiteEntryPoint.java deleted file mode 100644 index 121937c..0000000 --- a/org.argeo.suite.e4.rap/src/org/argeo/suite/e4/rap/ArgeoSuiteEntryPoint.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.argeo.suite.e4.rap; - -import org.argeo.cms.e4.rap.CmsE4EntryPointFactory; - -public class ArgeoSuiteEntryPoint extends CmsE4EntryPointFactory { - - public ArgeoSuiteEntryPoint(String e4Xmi) { - super(e4Xmi, "bundleclass://org.argeo.suite.e4.rap/org.argeo.suite.e4.rap.ArgeoSuiteLoginLifecycle"); - } - -} diff --git a/pom.xml b/pom.xml index 5c4e697..fff5379 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.argeo.commons argeo-commons - 2.1.80-SNAPSHOT + 2.1.81-SNAPSHOT org.argeo.suite argeo-suite diff --git a/sdk/argeo-office-e4-rap.properties b/sdk/argeo-office-e4-rap.properties index 97d952c..bf5adc6 100644 --- a/sdk/argeo-office-e4-rap.properties +++ b/sdk/argeo-office-e4-rap.properties @@ -1,6 +1,5 @@ argeo.osgi.start.2.node=\ org.eclipse.equinox.http.servlet,\ -org.eclipse.equinox.http.jetty,\ org.eclipse.equinox.metatype,\ org.eclipse.equinox.cm,\ org.eclipse.rap.rwt.osgi,\ -- 2.30.2