From: Mathieu Baudier Date: Fri, 14 Jan 2022 07:08:01 +0000 (+0100) Subject: Make it work after refactoring X-Git-Tag: argeo-suite-2.3.3~30 X-Git-Url: http://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=aa4afde74ec89cb64ab4c87ebf37c13f1740cce3 Make it work after refactoring --- 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.core/OSGI-INF/dbk4Converter.xml b/org.argeo.app.core/OSGI-INF/dbk4Converter.xml new file mode 100644 index 0000000..ccad605 --- /dev/null +++ b/org.argeo.app.core/OSGI-INF/dbk4Converter.xml @@ -0,0 +1,7 @@ + + + + + + + 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/OSGI-INF/dbk4Converter.xml b/org.argeo.app.servlet.publish/OSGI-INF/dbk4Converter.xml deleted file mode 100644 index ccad605..0000000 --- a/org.argeo.app.servlet.publish/OSGI-INF/dbk4Converter.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/org.argeo.app.servlet.publish/OSGI-INF/documentUiProvider.xml b/org.argeo.app.servlet.publish/OSGI-INF/documentUiProvider.xml deleted file mode 100644 index 3711fd5..0000000 --- a/org.argeo.app.servlet.publish/OSGI-INF/documentUiProvider.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/org.argeo.app.servlet.publish/OSGI-INF/wwwLayer.xml b/org.argeo.app.servlet.publish/OSGI-INF/wwwLayer.xml deleted file mode 100644 index 0fc0edb..0000000 --- a/org.argeo.app.servlet.publish/OSGI-INF/wwwLayer.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - 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/config/documentUiProvider.properties b/org.argeo.app.servlet.publish/config/documentUiProvider.properties deleted file mode 100644 index 855735d..0000000 --- a/org.argeo.app.servlet.publish/config/documentUiProvider.properties +++ /dev/null @@ -1,3 +0,0 @@ -service.pid=argeo.publishing.ui.documentUiProvider - -entity.type=entity:document,nt:file \ No newline at end of file diff --git a/org.argeo.app.servlet.publish/config/wwwLayer.properties b/org.argeo.app.servlet.publish/config/wwwLayer.properties deleted file mode 100644 index d29fa5b..0000000 --- a/org.argeo.app.servlet.publish/config/wwwLayer.properties +++ /dev/null @@ -1,4 +0,0 @@ -service.pid=argeo.publishing.ui.wwwLayer - -title=Web -icon=map \ No newline at end of file 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.app.ui/OSGI-INF/contentEntryArea.xml b/org.argeo.app.ui/OSGI-INF/contentEntryArea.xml new file mode 100644 index 0000000..ecc37c7 --- /dev/null +++ b/org.argeo.app.ui/OSGI-INF/contentEntryArea.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/org.argeo.app.ui/OSGI-INF/contentLayer.xml b/org.argeo.app.ui/OSGI-INF/contentLayer.xml new file mode 100644 index 0000000..35c4c3a --- /dev/null +++ b/org.argeo.app.ui/OSGI-INF/contentLayer.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/org.argeo.app.ui/OSGI-INF/documentUiProvider.xml b/org.argeo.app.ui/OSGI-INF/documentUiProvider.xml new file mode 100644 index 0000000..3711fd5 --- /dev/null +++ b/org.argeo.app.ui/OSGI-INF/documentUiProvider.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/org.argeo.app.ui/OSGI-INF/documentsFolder.xml b/org.argeo.app.ui/OSGI-INF/documentsFolder.xml new file mode 100644 index 0000000..fef4582 --- /dev/null +++ b/org.argeo.app.ui/OSGI-INF/documentsFolder.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/org.argeo.app.ui/OSGI-INF/fsEntryArea.xml b/org.argeo.app.ui/OSGI-INF/fsEntryArea.xml new file mode 100644 index 0000000..e7190db --- /dev/null +++ b/org.argeo.app.ui/OSGI-INF/fsEntryArea.xml @@ -0,0 +1,10 @@ + + + + + + + + + + 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.app.ui/OSGI-INF/mapLayer.xml b/org.argeo.app.ui/OSGI-INF/mapLayer.xml new file mode 100644 index 0000000..f90cd78 --- /dev/null +++ b/org.argeo.app.ui/OSGI-INF/mapLayer.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/org.argeo.app.ui/OSGI-INF/overviewMap.xml b/org.argeo.app.ui/OSGI-INF/overviewMap.xml new file mode 100644 index 0000000..662cbe8 --- /dev/null +++ b/org.argeo.app.ui/OSGI-INF/overviewMap.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/org.argeo.app.ui/OSGI-INF/peopleEntryArea.xml b/org.argeo.app.ui/OSGI-INF/peopleEntryArea.xml new file mode 100644 index 0000000..c68a753 --- /dev/null +++ b/org.argeo.app.ui/OSGI-INF/peopleEntryArea.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/org.argeo.app.ui/OSGI-INF/peopleLayer.xml b/org.argeo.app.ui/OSGI-INF/peopleLayer.xml new file mode 100644 index 0000000..159da12 --- /dev/null +++ b/org.argeo.app.ui/OSGI-INF/peopleLayer.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/org.argeo.app.ui/OSGI-INF/personUiProvider.xml b/org.argeo.app.ui/OSGI-INF/personUiProvider.xml new file mode 100644 index 0000000..4bcfef1 --- /dev/null +++ b/org.argeo.app.ui/OSGI-INF/personUiProvider.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/org.argeo.app.ui/OSGI-INF/wwwLayer.xml b/org.argeo.app.ui/OSGI-INF/wwwLayer.xml new file mode 100644 index 0000000..0fc0edb --- /dev/null +++ b/org.argeo.app.ui/OSGI-INF/wwwLayer.xml @@ -0,0 +1,9 @@ + + + + + + + + + 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.app.ui/config/contentEntryArea.properties b/org.argeo.app.ui/config/contentEntryArea.properties new file mode 100644 index 0000000..855fe97 --- /dev/null +++ b/org.argeo.app.ui/config/contentEntryArea.properties @@ -0,0 +1 @@ +service.pid=argeo.library.ui.contentEntryArea diff --git a/org.argeo.app.ui/config/contentLayer.properties b/org.argeo.app.ui/config/contentLayer.properties new file mode 100644 index 0000000..c1ca8e3 --- /dev/null +++ b/org.argeo.app.ui/config/contentLayer.properties @@ -0,0 +1,6 @@ +service.pid=argeo.library.ui.contentLayer + +title=%content +icon=documents + +entity.type=nt:folder,nt:file,entity:space,entity:document diff --git a/org.argeo.app.ui/config/documentUiProvider.properties b/org.argeo.app.ui/config/documentUiProvider.properties new file mode 100644 index 0000000..855735d --- /dev/null +++ b/org.argeo.app.ui/config/documentUiProvider.properties @@ -0,0 +1,3 @@ +service.pid=argeo.publishing.ui.documentUiProvider + +entity.type=entity:document,nt:file \ No newline at end of file diff --git a/org.argeo.app.ui/config/documentsFolder.properties b/org.argeo.app.ui/config/documentsFolder.properties new file mode 100644 index 0000000..349e930 --- /dev/null +++ b/org.argeo.app.ui/config/documentsFolder.properties @@ -0,0 +1 @@ +entity.type=nt:folder \ No newline at end of file diff --git a/org.argeo.app.ui/config/fsEntryArea.properties b/org.argeo.app.ui/config/fsEntryArea.properties new file mode 100644 index 0000000..0bceaf0 --- /dev/null +++ b/org.argeo.app.ui/config/fsEntryArea.properties @@ -0,0 +1 @@ +service.pid=argeo.library.ui.fsEntryArea diff --git a/org.argeo.app.ui/config/mapLayer.properties b/org.argeo.app.ui/config/mapLayer.properties new file mode 100644 index 0000000..37bf3c7 --- /dev/null +++ b/org.argeo.app.ui/config/mapLayer.properties @@ -0,0 +1,6 @@ +service.pid=argeo.geo.ui.mapLayer + +title=%map +icon=map + +entity.type=entity:geopoint diff --git a/org.argeo.app.ui/config/overviewMap.properties b/org.argeo.app.ui/config/overviewMap.properties new file mode 100644 index 0000000..d842c98 --- /dev/null +++ b/org.argeo.app.ui/config/overviewMap.properties @@ -0,0 +1 @@ +service.pid=argeo.geo.ui.overviewMap diff --git a/org.argeo.app.ui/config/peopleEntryArea.properties b/org.argeo.app.ui/config/peopleEntryArea.properties new file mode 100644 index 0000000..37b28f9 --- /dev/null +++ b/org.argeo.app.ui/config/peopleEntryArea.properties @@ -0,0 +1 @@ +service.pid=argeo.people.ui.peopleEntryArea diff --git a/org.argeo.app.ui/config/peopleLayer.properties b/org.argeo.app.ui/config/peopleLayer.properties new file mode 100644 index 0000000..adadb7b --- /dev/null +++ b/org.argeo.app.ui/config/peopleLayer.properties @@ -0,0 +1,7 @@ +service.pid=argeo.people.ui.peopleLayer + +icon=people +weights=5000,5000 +title=%people + +entity.type=entity:person \ No newline at end of file diff --git a/org.argeo.app.ui/config/personUiProvider.properties b/org.argeo.app.ui/config/personUiProvider.properties new file mode 100644 index 0000000..8c40c7d --- /dev/null +++ b/org.argeo.app.ui/config/personUiProvider.properties @@ -0,0 +1,3 @@ +service.pid=argeo.people.ui.personUiProvider + +entity.type=entity:person \ No newline at end of file diff --git a/org.argeo.app.ui/config/wwwLayer.properties b/org.argeo.app.ui/config/wwwLayer.properties new file mode 100644 index 0000000..d29fa5b --- /dev/null +++ b/org.argeo.app.ui/config/wwwLayer.properties @@ -0,0 +1,4 @@ +service.pid=argeo.publishing.ui.wwwLayer + +title=Web +icon=map \ No newline at end of file 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/org.argeo.geo.ui/OSGI-INF/mapLayer.xml b/org.argeo.geo.ui/OSGI-INF/mapLayer.xml deleted file mode 100644 index 7cf8487..0000000 --- a/org.argeo.geo.ui/OSGI-INF/mapLayer.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/org.argeo.geo.ui/OSGI-INF/overviewMap.xml b/org.argeo.geo.ui/OSGI-INF/overviewMap.xml deleted file mode 100644 index c75200a..0000000 --- a/org.argeo.geo.ui/OSGI-INF/overviewMap.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/org.argeo.geo.ui/config/mapLayer.properties b/org.argeo.geo.ui/config/mapLayer.properties deleted file mode 100644 index 37bf3c7..0000000 --- a/org.argeo.geo.ui/config/mapLayer.properties +++ /dev/null @@ -1,6 +0,0 @@ -service.pid=argeo.geo.ui.mapLayer - -title=%map -icon=map - -entity.type=entity:geopoint diff --git a/org.argeo.geo.ui/config/overviewMap.properties b/org.argeo.geo.ui/config/overviewMap.properties deleted file mode 100644 index d842c98..0000000 --- a/org.argeo.geo.ui/config/overviewMap.properties +++ /dev/null @@ -1 +0,0 @@ -service.pid=argeo.geo.ui.overviewMap diff --git a/org.argeo.library.ui/OSGI-INF/contentEntryArea.xml b/org.argeo.library.ui/OSGI-INF/contentEntryArea.xml deleted file mode 100644 index 0b5646e..0000000 --- a/org.argeo.library.ui/OSGI-INF/contentEntryArea.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/org.argeo.library.ui/OSGI-INF/contentLayer.xml b/org.argeo.library.ui/OSGI-INF/contentLayer.xml deleted file mode 100644 index 0dae1af..0000000 --- a/org.argeo.library.ui/OSGI-INF/contentLayer.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/org.argeo.library.ui/OSGI-INF/documentsFolder.xml b/org.argeo.library.ui/OSGI-INF/documentsFolder.xml deleted file mode 100644 index d7d71f0..0000000 --- a/org.argeo.library.ui/OSGI-INF/documentsFolder.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/org.argeo.library.ui/OSGI-INF/fsEntryArea.xml b/org.argeo.library.ui/OSGI-INF/fsEntryArea.xml deleted file mode 100644 index 540f4ff..0000000 --- a/org.argeo.library.ui/OSGI-INF/fsEntryArea.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/org.argeo.library.ui/config/contentEntryArea.properties b/org.argeo.library.ui/config/contentEntryArea.properties deleted file mode 100644 index 855fe97..0000000 --- a/org.argeo.library.ui/config/contentEntryArea.properties +++ /dev/null @@ -1 +0,0 @@ -service.pid=argeo.library.ui.contentEntryArea diff --git a/org.argeo.library.ui/config/contentLayer.properties b/org.argeo.library.ui/config/contentLayer.properties deleted file mode 100644 index c1ca8e3..0000000 --- a/org.argeo.library.ui/config/contentLayer.properties +++ /dev/null @@ -1,6 +0,0 @@ -service.pid=argeo.library.ui.contentLayer - -title=%content -icon=documents - -entity.type=nt:folder,nt:file,entity:space,entity:document diff --git a/org.argeo.library.ui/config/documentsFolder.properties b/org.argeo.library.ui/config/documentsFolder.properties deleted file mode 100644 index 349e930..0000000 --- a/org.argeo.library.ui/config/documentsFolder.properties +++ /dev/null @@ -1 +0,0 @@ -entity.type=nt:folder \ No newline at end of file diff --git a/org.argeo.library.ui/config/fsEntryArea.properties b/org.argeo.library.ui/config/fsEntryArea.properties deleted file mode 100644 index 0bceaf0..0000000 --- a/org.argeo.library.ui/config/fsEntryArea.properties +++ /dev/null @@ -1 +0,0 @@ -service.pid=argeo.library.ui.fsEntryArea diff --git a/org.argeo.people.ui/OSGI-INF/peopleEntryArea.xml b/org.argeo.people.ui/OSGI-INF/peopleEntryArea.xml deleted file mode 100644 index 9601294..0000000 --- a/org.argeo.people.ui/OSGI-INF/peopleEntryArea.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/org.argeo.people.ui/OSGI-INF/peopleLayer.xml b/org.argeo.people.ui/OSGI-INF/peopleLayer.xml deleted file mode 100644 index 09392aa..0000000 --- a/org.argeo.people.ui/OSGI-INF/peopleLayer.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/org.argeo.people.ui/OSGI-INF/personUiProvider.xml b/org.argeo.people.ui/OSGI-INF/personUiProvider.xml deleted file mode 100644 index abd2d8d..0000000 --- a/org.argeo.people.ui/OSGI-INF/personUiProvider.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/org.argeo.people.ui/config/peopleEntryArea.properties b/org.argeo.people.ui/config/peopleEntryArea.properties deleted file mode 100644 index 37b28f9..0000000 --- a/org.argeo.people.ui/config/peopleEntryArea.properties +++ /dev/null @@ -1 +0,0 @@ -service.pid=argeo.people.ui.peopleEntryArea diff --git a/org.argeo.people.ui/config/peopleLayer.properties b/org.argeo.people.ui/config/peopleLayer.properties deleted file mode 100644 index adadb7b..0000000 --- a/org.argeo.people.ui/config/peopleLayer.properties +++ /dev/null @@ -1,7 +0,0 @@ -service.pid=argeo.people.ui.peopleLayer - -icon=people -weights=5000,5000 -title=%people - -entity.type=entity:person \ No newline at end of file diff --git a/org.argeo.people.ui/config/personUiProvider.properties b/org.argeo.people.ui/config/personUiProvider.properties deleted file mode 100644 index 8c40c7d..0000000 --- a/org.argeo.people.ui/config/personUiProvider.properties +++ /dev/null @@ -1,3 +0,0 @@ -service.pid=argeo.people.ui.personUiProvider - -entity.type=entity:person \ No newline at end of file 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