From 3d377ef981dd5a572e84e12e0b4f77973331c32b Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 14 Jan 2022 09:15:56 +0100 Subject: [PATCH] Finish stabilising Argeo Suite after refactoring --- .../OSGI-INF/maintenanceService.xml | 2 +- .../src/org/argeo/app/ui/SuiteApp.java | 6 ++- sdk/argeo-office-e4-rap.properties | 43 ------------------- sdk/argeo-suite-desktop.properties | 23 ---------- sdk/argeo-suite-rap.properties | 22 +++++----- sdk/argeo-wm.properties | 20 --------- sdk/log4j.properties | 22 ---------- 7 files changed, 18 insertions(+), 120 deletions(-) delete mode 100644 sdk/argeo-office-e4-rap.properties delete mode 100644 sdk/argeo-suite-desktop.properties delete mode 100644 sdk/argeo-wm.properties delete mode 100644 sdk/log4j.properties diff --git a/org.argeo.app.core/OSGI-INF/maintenanceService.xml b/org.argeo.app.core/OSGI-INF/maintenanceService.xml index 48a982f..b88d68c 100644 --- a/org.argeo.app.core/OSGI-INF/maintenanceService.xml +++ b/org.argeo.app.core/OSGI-INF/maintenanceService.xml @@ -2,6 +2,6 @@ - + diff --git a/org.argeo.app.ui/src/org/argeo/app/ui/SuiteApp.java b/org.argeo.app.ui/src/org/argeo/app/ui/SuiteApp.java index a8121ca..0d898f5 100644 --- a/org.argeo.app.ui/src/org/argeo/app/ui/SuiteApp.java +++ b/org.argeo.app.ui/src/org/argeo/app/ui/SuiteApp.java @@ -70,10 +70,14 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler { private String adminLeadPanePid; private String loginScreenPid; - private String defaultLayerPid = "argeo.app.ui.dashboardLayer"; private String defaultUiName = "app"; private String adminUiName = "admin"; + + // FIXME such default names make refactoring more dangerous + @Deprecated + private String defaultLayerPid = "argeo.suite.ui.dashboardLayer"; + @Deprecated private String defaultThemeId = "org.argeo.app.theme.default"; private Map> uiProvidersByPid = Collections.synchronizedMap(new HashMap<>()); diff --git a/sdk/argeo-office-e4-rap.properties b/sdk/argeo-office-e4-rap.properties deleted file mode 100644 index 0002618..0000000 --- a/sdk/argeo-office-e4-rap.properties +++ /dev/null @@ -1,43 +0,0 @@ -argeo.osgi.start.2.node=\ -org.eclipse.equinox.http.servlet,\ -org.eclipse.equinox.metatype,\ -org.eclipse.equinox.cm,\ -org.eclipse.rap.rwt.osgi - -argeo.osgi.start.2.suite=\ -org.apache.tika.parsers - -argeo.osgi.start.3.node=\ -org.argeo.cms - -argeo.osgi.start.5.suite=\ -org.argeo.suite.cms,\ -org.argeo.suite.e4.rap,\ -org.argeo.suite.standard,\ -org.argeo.suite.tracker - -# Local -argeo.node.repo.type=h2 -org.osgi.service.http.port=7070 -#org.osgi.service.http.port.secure=7073 - -#argeo.node.useradmin.uris=ldap://cn=Directory%20Manager:argeoargeo@localhost:10389/dc=example,dc=com - -argeo.node.init=../../init - -argeo.i18n.locales=en,fr,de,ar -argeo.i18n.defaultLocale=en - -#tika.config=/home/mbaudier/dev/git/gpl/argeo-suite/sdk/exec/argeo-office-e4-rap/data/indexes/node/tika-config.xml - -# Logging -log4j.configuration=file:../../log4j.properties - -# DON'T CHANGE BELOW -org.eclipse.equinox.http.jetty.autostart=false -org.osgi.framework.bootdelegation=com.sun.jndi.ldap,\ -com.sun.jndi.ldap.sasl,\ -com.sun.security.jgss,\ -com.sun.jndi.dns,\ -com.sun.nio.file,\ -com.sun.nio.sctp diff --git a/sdk/argeo-suite-desktop.properties b/sdk/argeo-suite-desktop.properties deleted file mode 100644 index 80d51c5..0000000 --- a/sdk/argeo-suite-desktop.properties +++ /dev/null @@ -1,23 +0,0 @@ -argeo.osgi.start.2.node=\ -org.eclipse.equinox.http.servlet,\ -org.eclipse.equinox.http.jetty,\ -org.eclipse.equinox.metatype,\ -org.eclipse.equinox.cm,\ - -argeo.osgi.start.3.node=\ -org.argeo.cms - -applicationXMI=org.argeo.suite.e4/e4xmi/argeo-office.e4xmi -#applicationXMI=org.argeo.cms.e4.rcp/argeo-companion.e4xmi - -lifeCycleURI=bundleclass://org.argeo.cms.e4.rcp/org.argeo.cms.e4.rcp.CmsRcpLifeCycle -clearPersistedState=true -#argeo.cms.desktop.inTray=true - -org.osgi.service.http.port=7070 - -log4j.configuration=file:../../log4j.properties -argeo.node.useradmin.uris=os:/// -eclipse.application=org.argeo.cms.e4.rcp.CmsE4Application -#eclipse.application=org.eclipse.e4.ui.workbench.swt.E4Application -org.eclipse.equinox.http.jetty.autostart=false diff --git a/sdk/argeo-suite-rap.properties b/sdk/argeo-suite-rap.properties index 60f0b9b..2b8edd3 100644 --- a/sdk/argeo-suite-rap.properties +++ b/sdk/argeo-suite-rap.properties @@ -2,24 +2,26 @@ argeo.osgi.start.2.node=\ org.eclipse.equinox.http.servlet,\ org.eclipse.equinox.metatype,\ org.eclipse.equinox.cm,\ -org.eclipse.rap.rwt.osgi +org.eclipse.rap.rwt.osgi,\ +org.argeo.init argeo.osgi.start.2.suite=\ org.apache.tika.parsers argeo.osgi.start.3.node=\ -org.argeo.cms +org.argeo.cms,\ +org.argeo.cms.jcr,\ +org.argeo.cms.servlet,\ argeo.osgi.start.5.suite=\ -org.argeo.suite.core,\ -org.argeo.suite.ui,\ -org.argeo.suite.theme.default,\ -org.argeo.suite.ui.rap +org.argeo.app.core,\ +org.argeo.app.ui,\ +org.argeo.app.theme.default,\ +org.argeo.app.ui.rap argeo.osgi.start.6.suite=\ -org.argeo.documents.ui,\ -org.argeo.people.ui,\ -org.argeo.geo.ui +org.argeo.app.servlet.publish,\ +org.argeo.app.servlet.odk # Local @@ -37,7 +39,7 @@ argeo.i18n.defaultLocale=en #tika.config=/home/mbaudier/dev/git/gpl/argeo-suite/sdk/exec/argeo-office-e4-rap/data/indexes/node/tika-config.xml # Logging -log4j.configuration=file:../../log4j.properties +log.org.argeo=DEBUG # DON'T CHANGE BELOW org.eclipse.equinox.http.jetty.autostart=false diff --git a/sdk/argeo-wm.properties b/sdk/argeo-wm.properties deleted file mode 100644 index ed4fc57..0000000 --- a/sdk/argeo-wm.properties +++ /dev/null @@ -1,20 +0,0 @@ -argeo.osgi.start.2.node=\ -org.eclipse.equinox.http.servlet,\ -org.eclipse.equinox.http.jetty,\ -org.eclipse.equinox.metatype,\ -org.eclipse.equinox.cm,\ - -argeo.osgi.start.3.node=\ -org.argeo.cms - -applicationXMI=org.argeo.suite.e4/e4xmi/argeo-wm.e4xmi -lifeCycleURI=bundleclass://org.argeo.cms.e4.rcp/org.argeo.cms.e4.rcp.CmsRcpLifeCycle -clearPersistedState=true -#argeo.cms.desktop.inTray=true - -org.osgi.service.http.port=7070 - -log4j.configuration=file:../../log4j.properties -argeo.node.useradmin.uris=os:/// -eclipse.application=org.argeo.cms.e4.rcp.CmsE4Application -org.eclipse.equinox.http.jetty.autostart=false diff --git a/sdk/log4j.properties b/sdk/log4j.properties deleted file mode 100644 index be8ae15..0000000 --- a/sdk/log4j.properties +++ /dev/null @@ -1,22 +0,0 @@ -#log4j.rootLogger=WARN, console -log4j.rootLogger=WARN, development - -## Levels -log4j.logger.org.argeo=DEBUG -#log4j.logger.org.argeo.cms.internal.kernel.CmsWorkspaceIndexer=TRACE -#log4j.logger.org.apache.tika=DEBUG -#log4j.logger.org.apache.lucene=DEBUG -#log4j.logger.org.apache.jackrabbit.core=DEBUG -#log4j.logger.org.apache.jackrabbit.core.session=DEBUG -#log4j.logger.org.apache.jackrabbit.core.observation=DEBUG - -## Appenders -# default appender -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{yyyyMMdd HH:mm:ss} %-5p %m [%t] %c%n - -# development appender -log4j.appender.development=org.apache.log4j.ConsoleAppender -log4j.appender.development.layout=org.apache.log4j.PatternLayout -log4j.appender.development.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%16.16t] %5p %m (%F:%L) %c%n -- 2.30.2