From aa4afde74ec89cb64ab4c87ebf37c13f1740cce3 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 14 Jan 2022 08:08:01 +0100 Subject: [PATCH] Make it work after refactoring --- dep/org.argeo.suite.dep.ui.rap/pom.xml | 2 +- org.argeo.app.api/bnd.bnd | 2 +- .../OSGI-INF/dbk4Converter.xml | 0 org.argeo.app.core/bnd.bnd | 13 +++++++++++-- org.argeo.app.servlet.odk/bnd.bnd | 6 ++---- org.argeo.app.servlet.publish/bnd.bnd | 8 +++----- .../org/argeo/app/servlet/publish/DbkServlet.java | 15 ++++++++++----- .../OSGI-INF/contentEntryArea.xml | 2 +- .../OSGI-INF/contentLayer.xml | 6 +++--- .../OSGI-INF/documentUiProvider.xml | 0 .../OSGI-INF/documentsFolder.xml | 2 +- .../OSGI-INF/fsEntryArea.xml | 2 +- org.argeo.app.ui/OSGI-INF/l10n/bundle.properties | 10 ++++++++++ .../OSGI-INF/mapLayer.xml | 6 +++--- .../OSGI-INF/overviewMap.xml | 2 +- .../OSGI-INF/peopleEntryArea.xml | 2 +- .../OSGI-INF/peopleLayer.xml | 6 +++--- .../OSGI-INF/personUiProvider.xml | 2 +- .../OSGI-INF/wwwLayer.xml | 0 org.argeo.app.ui/bnd.bnd | 15 ++++++++++++++- .../config/contentEntryArea.properties | 0 .../config/contentLayer.properties | 0 .../config/documentUiProvider.properties | 0 .../config/documentsFolder.properties | 0 .../config/fsEntryArea.properties | 0 .../config/mapLayer.properties | 0 .../config/overviewMap.properties | 0 .../config/peopleEntryArea.properties | 0 .../config/peopleLayer.properties | 0 .../config/personUiProvider.properties | 0 .../config/wwwLayer.properties | 0 .../src/org/argeo/app/ui/SuiteApp.java | 4 ++-- pom.xml | 2 +- 33 files changed, 70 insertions(+), 37 deletions(-) rename {org.argeo.app.servlet.publish => org.argeo.app.core}/OSGI-INF/dbk4Converter.xml (100%) rename {org.argeo.library.ui => org.argeo.app.ui}/OSGI-INF/contentEntryArea.xml (79%) rename {org.argeo.library.ui => org.argeo.app.ui}/OSGI-INF/contentLayer.xml (61%) rename {org.argeo.app.servlet.publish => org.argeo.app.ui}/OSGI-INF/documentUiProvider.xml (100%) rename {org.argeo.library.ui => org.argeo.app.ui}/OSGI-INF/documentsFolder.xml (86%) rename {org.argeo.library.ui => org.argeo.app.ui}/OSGI-INF/fsEntryArea.xml (88%) rename {org.argeo.geo.ui => org.argeo.app.ui}/OSGI-INF/mapLayer.xml (68%) rename {org.argeo.geo.ui => org.argeo.app.ui}/OSGI-INF/overviewMap.xml (78%) rename {org.argeo.people.ui => org.argeo.app.ui}/OSGI-INF/peopleEntryArea.xml (85%) rename {org.argeo.people.ui => org.argeo.app.ui}/OSGI-INF/peopleLayer.xml (68%) rename {org.argeo.people.ui => org.argeo.app.ui}/OSGI-INF/personUiProvider.xml (87%) rename {org.argeo.app.servlet.publish => org.argeo.app.ui}/OSGI-INF/wwwLayer.xml (100%) rename {org.argeo.library.ui => org.argeo.app.ui}/config/contentEntryArea.properties (100%) rename {org.argeo.library.ui => org.argeo.app.ui}/config/contentLayer.properties (100%) rename {org.argeo.app.servlet.publish => org.argeo.app.ui}/config/documentUiProvider.properties (100%) rename {org.argeo.library.ui => org.argeo.app.ui}/config/documentsFolder.properties (100%) rename {org.argeo.library.ui => org.argeo.app.ui}/config/fsEntryArea.properties (100%) rename {org.argeo.geo.ui => org.argeo.app.ui}/config/mapLayer.properties (100%) rename {org.argeo.geo.ui => org.argeo.app.ui}/config/overviewMap.properties (100%) rename {org.argeo.people.ui => org.argeo.app.ui}/config/peopleEntryArea.properties (100%) rename {org.argeo.people.ui => org.argeo.app.ui}/config/peopleLayer.properties (100%) rename {org.argeo.people.ui => org.argeo.app.ui}/config/personUiProvider.properties (100%) rename {org.argeo.app.servlet.publish => org.argeo.app.ui}/config/wwwLayer.properties (100%) diff --git a/dep/org.argeo.suite.dep.ui.rap/pom.xml b/dep/org.argeo.suite.dep.ui.rap/pom.xml index b4a6e61..82dba5b 100644 --- a/dep/org.argeo.suite.dep.ui.rap/pom.xml +++ b/dep/org.argeo.suite.dep.ui.rap/pom.xml @@ -45,7 +45,7 @@ org.argeo.suite.icons - org.argeo.suite.icons.default + org.argeo.app.icons.default ${version.argeo-suite-icons} diff --git a/org.argeo.app.api/bnd.bnd b/org.argeo.app.api/bnd.bnd index ab46172..bfacd6e 100644 --- a/org.argeo.app.api/bnd.bnd +++ b/org.argeo.app.api/bnd.bnd @@ -2,4 +2,4 @@ Require-Capability:\ cms.datamodel;filter:="(name=jcrx)" Provide-Capability:\ -cms.datamodel; name=entity; cnd=/org/argeo/entity/entity.cnd +cms.datamodel; name=entity; cnd=/org/argeo/app/api/entity.cnd diff --git a/org.argeo.app.servlet.publish/OSGI-INF/dbk4Converter.xml b/org.argeo.app.core/OSGI-INF/dbk4Converter.xml similarity index 100% rename from org.argeo.app.servlet.publish/OSGI-INF/dbk4Converter.xml rename to org.argeo.app.core/OSGI-INF/dbk4Converter.xml diff --git a/org.argeo.app.core/bnd.bnd b/org.argeo.app.core/bnd.bnd index f7a9e0d..b6aad84 100644 --- a/org.argeo.app.core/bnd.bnd +++ b/org.argeo.app.core/bnd.bnd @@ -2,7 +2,8 @@ Bundle-ActivationPolicy: lazy Service-Component:\ OSGI-INF/termsManager.xml,\ -OSGI-INF/maintenanceService.xml +OSGI-INF/maintenanceService.xml,\ +OSGI-INF/dbk4Converter.xml,\ Import-Package:\ javax.transaction,\ @@ -10,4 +11,12 @@ org.osgi.service.useradmin,\ javax.jcr.nodetype,\ javax.jcr.security,\ com.fasterxml.jackson.core,\ -* \ No newline at end of file +* + +Require-Capability:\ +cms.datamodel;filter:="(name=entity)" + +Provide-Capability:\ +cms.datamodel; name=xforms; cnd=/org/argeo/app/xforms/xforms.cnd; abstract=true,\ +cms.datamodel; name=odk; cnd=/org/argeo/app/odk/odk.cnd; abstract=true,\ +cms.datamodel; name=docbook; cnd=/org/argeo/app/docbook/docbook.cnd; abstract=true,\ diff --git a/org.argeo.app.servlet.odk/bnd.bnd b/org.argeo.app.servlet.odk/bnd.bnd index 3de9158..2be1b60 100644 --- a/org.argeo.app.servlet.odk/bnd.bnd +++ b/org.argeo.app.servlet.odk/bnd.bnd @@ -1,9 +1,7 @@ Require-Capability:\ cms.datamodel;filter:="(name=entity)",\ -cms.datamodel;filter:="(name=xforms)" - -Provide-Capability:\ -cms.datamodel; name=odk; cnd=/org/argeo/support/odk/odk.cnd +cms.datamodel;filter:="(name=xforms)",\ +cms.datamodel;filter:="(name=odk)",\ Service-Component:\ OSGI-INF/odkServletContext.xml,\ diff --git a/org.argeo.app.servlet.publish/bnd.bnd b/org.argeo.app.servlet.publish/bnd.bnd index b8c62f9..e0916f3 100644 --- a/org.argeo.app.servlet.publish/bnd.bnd +++ b/org.argeo.app.servlet.publish/bnd.bnd @@ -10,13 +10,11 @@ org.eclipse.rap.rwt,\ org.argeo.app.api,\ * -Provide-Capability:\ -cms.datamodel; name=docbook; cnd=/org/argeo/docbook/docbook.cnd; abstract=true +Require-Capability:\ +cms.datamodel;filter:="(name=entity)",\ +cms.datamodel;filter:="(name=docbook)",\ Service-Component:\ OSGI-INF/fontsServlet.xml,\ OSGI-INF/htmlServletContext.xml,\ OSGI-INF/dbkServlet.xml,\ -OSGI-INF/documentUiProvider.xml,\ -OSGI-INF/wwwLayer.xml,\ -OSGI-INF/dbk4Converter.xml diff --git a/org.argeo.app.servlet.publish/src/org/argeo/app/servlet/publish/DbkServlet.java b/org.argeo.app.servlet.publish/src/org/argeo/app/servlet/publish/DbkServlet.java index 51f2332..b84905c 100644 --- a/org.argeo.app.servlet.publish/src/org/argeo/app/servlet/publish/DbkServlet.java +++ b/org.argeo.app.servlet.publish/src/org/argeo/app/servlet/publish/DbkServlet.java @@ -183,13 +183,18 @@ public class DbkServlet extends HttpServlet { // TODO improve configuration and provisioning of DocBook XSL String xslBase = System.getProperty("argeo.docbook.xsl"); if (xslBase == null) { - String defaultXslBase = "/opt/docbook-xsl"; + // We need namespace aware XSL! + // Fedora (sudo dnf install docbook5-style-xsl) + String defaultXslBase = "/usr/share/sgml/docbook/xsl-ns-stylesheets"; if (!Files.exists(Paths.get(defaultXslBase))) { - throw new ServletException("System property argeo.docbook.xsl is not set and default location " - + defaultXslBase + " does not exist."); - } else { - xslBase = defaultXslBase; + defaultXslBase = "/opt/docbook-xsl"; + if (!Files.exists(Paths.get(defaultXslBase))) { + throw new ServletException("System property argeo.docbook.xsl is not set and default location " + + defaultXslBase + " does not exist."); + } } + xslBase = defaultXslBase; + } String xsl = xslBase + "/html/docbook.xsl"; diff --git a/org.argeo.library.ui/OSGI-INF/contentEntryArea.xml b/org.argeo.app.ui/OSGI-INF/contentEntryArea.xml similarity index 79% rename from org.argeo.library.ui/OSGI-INF/contentEntryArea.xml rename to org.argeo.app.ui/OSGI-INF/contentEntryArea.xml index 0b5646e..ecc37c7 100644 --- a/org.argeo.library.ui/OSGI-INF/contentEntryArea.xml +++ b/org.argeo.app.ui/OSGI-INF/contentEntryArea.xml @@ -1,6 +1,6 @@ - + diff --git a/org.argeo.library.ui/OSGI-INF/contentLayer.xml b/org.argeo.app.ui/OSGI-INF/contentLayer.xml similarity index 61% rename from org.argeo.library.ui/OSGI-INF/contentLayer.xml rename to org.argeo.app.ui/OSGI-INF/contentLayer.xml index 0dae1af..35c4c3a 100644 --- a/org.argeo.library.ui/OSGI-INF/contentLayer.xml +++ b/org.argeo.app.ui/OSGI-INF/contentLayer.xml @@ -1,8 +1,8 @@ - - + + - + diff --git a/org.argeo.app.servlet.publish/OSGI-INF/documentUiProvider.xml b/org.argeo.app.ui/OSGI-INF/documentUiProvider.xml similarity index 100% rename from org.argeo.app.servlet.publish/OSGI-INF/documentUiProvider.xml rename to org.argeo.app.ui/OSGI-INF/documentUiProvider.xml diff --git a/org.argeo.library.ui/OSGI-INF/documentsFolder.xml b/org.argeo.app.ui/OSGI-INF/documentsFolder.xml similarity index 86% rename from org.argeo.library.ui/OSGI-INF/documentsFolder.xml rename to org.argeo.app.ui/OSGI-INF/documentsFolder.xml index d7d71f0..fef4582 100644 --- a/org.argeo.library.ui/OSGI-INF/documentsFolder.xml +++ b/org.argeo.app.ui/OSGI-INF/documentsFolder.xml @@ -1,6 +1,6 @@ - + diff --git a/org.argeo.library.ui/OSGI-INF/fsEntryArea.xml b/org.argeo.app.ui/OSGI-INF/fsEntryArea.xml similarity index 88% rename from org.argeo.library.ui/OSGI-INF/fsEntryArea.xml rename to org.argeo.app.ui/OSGI-INF/fsEntryArea.xml index 540f4ff..e7190db 100644 --- a/org.argeo.library.ui/OSGI-INF/fsEntryArea.xml +++ b/org.argeo.app.ui/OSGI-INF/fsEntryArea.xml @@ -1,6 +1,6 @@ - + diff --git a/org.argeo.app.ui/OSGI-INF/l10n/bundle.properties b/org.argeo.app.ui/OSGI-INF/l10n/bundle.properties index 5716780..8b76a47 100644 --- a/org.argeo.app.ui/OSGI-INF/l10n/bundle.properties +++ b/org.argeo.app.ui/OSGI-INF/l10n/bundle.properties @@ -96,3 +96,13 @@ pickUp=Pick up # Tags confirmNewTag=Tag #{0} is not yet registered. Are you sure you want to create it? cannotCreateTag=Tag #{0} is not yet registered and you don't have enough rights to create it. + +# People +people=people + +# Library +content=content + +# Geo +map=map + diff --git a/org.argeo.geo.ui/OSGI-INF/mapLayer.xml b/org.argeo.app.ui/OSGI-INF/mapLayer.xml similarity index 68% rename from org.argeo.geo.ui/OSGI-INF/mapLayer.xml rename to org.argeo.app.ui/OSGI-INF/mapLayer.xml index 7cf8487..f90cd78 100644 --- a/org.argeo.geo.ui/OSGI-INF/mapLayer.xml +++ b/org.argeo.app.ui/OSGI-INF/mapLayer.xml @@ -1,9 +1,9 @@ - - + + - + diff --git a/org.argeo.geo.ui/OSGI-INF/overviewMap.xml b/org.argeo.app.ui/OSGI-INF/overviewMap.xml similarity index 78% rename from org.argeo.geo.ui/OSGI-INF/overviewMap.xml rename to org.argeo.app.ui/OSGI-INF/overviewMap.xml index c75200a..662cbe8 100644 --- a/org.argeo.geo.ui/OSGI-INF/overviewMap.xml +++ b/org.argeo.app.ui/OSGI-INF/overviewMap.xml @@ -1,6 +1,6 @@ - + diff --git a/org.argeo.people.ui/OSGI-INF/peopleEntryArea.xml b/org.argeo.app.ui/OSGI-INF/peopleEntryArea.xml similarity index 85% rename from org.argeo.people.ui/OSGI-INF/peopleEntryArea.xml rename to org.argeo.app.ui/OSGI-INF/peopleEntryArea.xml index 9601294..c68a753 100644 --- a/org.argeo.people.ui/OSGI-INF/peopleEntryArea.xml +++ b/org.argeo.app.ui/OSGI-INF/peopleEntryArea.xml @@ -1,6 +1,6 @@ - + diff --git a/org.argeo.people.ui/OSGI-INF/peopleLayer.xml b/org.argeo.app.ui/OSGI-INF/peopleLayer.xml similarity index 68% rename from org.argeo.people.ui/OSGI-INF/peopleLayer.xml rename to org.argeo.app.ui/OSGI-INF/peopleLayer.xml index 09392aa..159da12 100644 --- a/org.argeo.people.ui/OSGI-INF/peopleLayer.xml +++ b/org.argeo.app.ui/OSGI-INF/peopleLayer.xml @@ -1,9 +1,9 @@ - - + + - + diff --git a/org.argeo.people.ui/OSGI-INF/personUiProvider.xml b/org.argeo.app.ui/OSGI-INF/personUiProvider.xml similarity index 87% rename from org.argeo.people.ui/OSGI-INF/personUiProvider.xml rename to org.argeo.app.ui/OSGI-INF/personUiProvider.xml index abd2d8d..4bcfef1 100644 --- a/org.argeo.people.ui/OSGI-INF/personUiProvider.xml +++ b/org.argeo.app.ui/OSGI-INF/personUiProvider.xml @@ -1,6 +1,6 @@ - + diff --git a/org.argeo.app.servlet.publish/OSGI-INF/wwwLayer.xml b/org.argeo.app.ui/OSGI-INF/wwwLayer.xml similarity index 100% rename from org.argeo.app.servlet.publish/OSGI-INF/wwwLayer.xml rename to org.argeo.app.ui/OSGI-INF/wwwLayer.xml diff --git a/org.argeo.app.ui/bnd.bnd b/org.argeo.app.ui/bnd.bnd index b21f479..dd7c25e 100644 --- a/org.argeo.app.ui/bnd.bnd +++ b/org.argeo.app.ui/bnd.bnd @@ -10,7 +10,20 @@ OSGI-INF/adminLeadPane.xml,\ OSGI-INF/termsEntryArea.xml,\ OSGI-INF/termsLayer.xml,\ OSGI-INF/dashboard.xml,\ -OSGI-INF/dashboardLayer.xml +OSGI-INF/dashboardLayer.xml,\ +OSGI-INF/peopleEntryArea.xml,\ +OSGI-INF/peopleLayer.xml,\ +OSGI-INF/personUiProvider.xml,\ +OSGI-INF/contentEntryArea.xml,\ +OSGI-INF/contentLayer.xml,\ +OSGI-INF/documentsFolder.xml,\ +OSGI-INF/fsEntryArea.xml,\ +OSGI-INF/mapLayer.xml,\ +OSGI-INF/overviewMap.xml,\ +OSGI-INF/wwwLayer.xml,\ +OSGI-INF/documentUiProvider.xml,\ + + Import-Package:\ org.argeo.cms.ui.widgets,\ diff --git a/org.argeo.library.ui/config/contentEntryArea.properties b/org.argeo.app.ui/config/contentEntryArea.properties similarity index 100% rename from org.argeo.library.ui/config/contentEntryArea.properties rename to org.argeo.app.ui/config/contentEntryArea.properties diff --git a/org.argeo.library.ui/config/contentLayer.properties b/org.argeo.app.ui/config/contentLayer.properties similarity index 100% rename from org.argeo.library.ui/config/contentLayer.properties rename to org.argeo.app.ui/config/contentLayer.properties diff --git a/org.argeo.app.servlet.publish/config/documentUiProvider.properties b/org.argeo.app.ui/config/documentUiProvider.properties similarity index 100% rename from org.argeo.app.servlet.publish/config/documentUiProvider.properties rename to org.argeo.app.ui/config/documentUiProvider.properties diff --git a/org.argeo.library.ui/config/documentsFolder.properties b/org.argeo.app.ui/config/documentsFolder.properties similarity index 100% rename from org.argeo.library.ui/config/documentsFolder.properties rename to org.argeo.app.ui/config/documentsFolder.properties diff --git a/org.argeo.library.ui/config/fsEntryArea.properties b/org.argeo.app.ui/config/fsEntryArea.properties similarity index 100% rename from org.argeo.library.ui/config/fsEntryArea.properties rename to org.argeo.app.ui/config/fsEntryArea.properties diff --git a/org.argeo.geo.ui/config/mapLayer.properties b/org.argeo.app.ui/config/mapLayer.properties similarity index 100% rename from org.argeo.geo.ui/config/mapLayer.properties rename to org.argeo.app.ui/config/mapLayer.properties diff --git a/org.argeo.geo.ui/config/overviewMap.properties b/org.argeo.app.ui/config/overviewMap.properties similarity index 100% rename from org.argeo.geo.ui/config/overviewMap.properties rename to org.argeo.app.ui/config/overviewMap.properties diff --git a/org.argeo.people.ui/config/peopleEntryArea.properties b/org.argeo.app.ui/config/peopleEntryArea.properties similarity index 100% rename from org.argeo.people.ui/config/peopleEntryArea.properties rename to org.argeo.app.ui/config/peopleEntryArea.properties diff --git a/org.argeo.people.ui/config/peopleLayer.properties b/org.argeo.app.ui/config/peopleLayer.properties similarity index 100% rename from org.argeo.people.ui/config/peopleLayer.properties rename to org.argeo.app.ui/config/peopleLayer.properties diff --git a/org.argeo.people.ui/config/personUiProvider.properties b/org.argeo.app.ui/config/personUiProvider.properties similarity index 100% rename from org.argeo.people.ui/config/personUiProvider.properties rename to org.argeo.app.ui/config/personUiProvider.properties diff --git a/org.argeo.app.servlet.publish/config/wwwLayer.properties b/org.argeo.app.ui/config/wwwLayer.properties similarity index 100% rename from org.argeo.app.servlet.publish/config/wwwLayer.properties rename to org.argeo.app.ui/config/wwwLayer.properties 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 7070ed5..a8121ca 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,11 +70,11 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler { private String adminLeadPanePid; private String loginScreenPid; - private String defaultLayerPid = "argeo.suite.ui.dashboardLayer"; + private String defaultLayerPid = "argeo.app.ui.dashboardLayer"; private String defaultUiName = "app"; private String adminUiName = "admin"; - private String defaultThemeId = "org.argeo.suite.theme.default"; + private String defaultThemeId = "org.argeo.app.theme.default"; private Map> uiProvidersByPid = Collections.synchronizedMap(new HashMap<>()); private Map> uiProvidersByType = Collections.synchronizedMap(new HashMap<>()); diff --git a/pom.xml b/pom.xml index f8f36c5..3e6d7c4 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ 2.1.27 2.3-SNAPSHOT - 2.3.1 + 2.3-SNAPSHOT -- 2.30.2