From d03e38085381f025093fba112e290acd16d272d2 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 23 Sep 2022 08:59:05 +0200
Subject: [PATCH] All default UX services with service rank -1000

---
 .../src/org/argeo/app/api/RankedObject.java      | 16 ++++++++--------
 org.argeo.app.ui/OSGI-INF/adminLeadPane.xml      |  3 ++-
 org.argeo.app.ui/OSGI-INF/cmsApp.xml             |  3 +--
 org.argeo.app.ui/OSGI-INF/contentEntryArea.xml   |  1 +
 org.argeo.app.ui/OSGI-INF/contentLayer.xml       |  1 +
 org.argeo.app.ui/OSGI-INF/dashboard.xml          |  3 ++-
 org.argeo.app.ui/OSGI-INF/dashboardLayer.xml     |  1 +
 org.argeo.app.ui/OSGI-INF/documentUiProvider.xml |  3 ++-
 org.argeo.app.ui/OSGI-INF/documentsFolder.xml    |  3 ++-
 org.argeo.app.ui/OSGI-INF/footer.xml             |  3 ++-
 org.argeo.app.ui/OSGI-INF/fsEntryArea.xml        |  3 ++-
 org.argeo.app.ui/OSGI-INF/groupUiProvider.xml    |  1 +
 org.argeo.app.ui/OSGI-INF/header.xml             |  3 ++-
 .../OSGI-INF/hierarchyUnitUiProvider.xml         |  1 +
 org.argeo.app.ui/OSGI-INF/leadPane.xml           |  3 ++-
 org.argeo.app.ui/OSGI-INF/loginScreen.xml        |  3 ++-
 org.argeo.app.ui/OSGI-INF/mapLayer.xml           |  3 ++-
 org.argeo.app.ui/OSGI-INF/overviewMap.xml        |  3 ++-
 org.argeo.app.ui/OSGI-INF/peopleEntryArea.xml    |  1 +
 org.argeo.app.ui/OSGI-INF/peopleLayer.xml        |  1 +
 org.argeo.app.ui/OSGI-INF/personUiProvider.xml   |  3 ++-
 org.argeo.app.ui/OSGI-INF/publishEntryArea.xml   |  1 +
 org.argeo.app.ui/OSGI-INF/publishUiProvider.xml  |  1 +
 org.argeo.app.ui/OSGI-INF/recentItems.xml        |  3 ++-
 org.argeo.app.ui/OSGI-INF/termsEntryArea.xml     |  3 ++-
 org.argeo.app.ui/OSGI-INF/termsLayer.xml         |  3 ++-
 org.argeo.app.ui/OSGI-INF/wwwLayer.xml           |  3 ++-
 27 files changed, 50 insertions(+), 26 deletions(-)

diff --git a/org.argeo.app.api/src/org/argeo/app/api/RankedObject.java b/org.argeo.app.api/src/org/argeo/app/api/RankedObject.java
index fec8972..fab42d7 100644
--- a/org.argeo.app.api/src/org/argeo/app/api/RankedObject.java
+++ b/org.argeo.app.api/src/org/argeo/app/api/RankedObject.java
@@ -16,28 +16,28 @@ public class RankedObject<T> {
 
 	private T object;
 	private Map<String, Object> properties;
-	private final Long rank;
+	private final int rank;
 
 	public RankedObject(T object, Map<String, Object> properties) {
 		this(object, properties, extractRanking(properties));
 	}
 
-	public RankedObject(T object, Map<String, Object> properties, Long rank) {
+	public RankedObject(T object, Map<String, Object> properties, int rank) {
 		super();
 		this.object = object;
 		this.properties = properties;
 		this.rank = rank;
 	}
 
-	private static Long extractRanking(Map<String, Object> properties) {
+	private static int extractRanking(Map<String, Object> properties) {
 		if (properties == null)
-			return 0l;
+			return 0;
 		if (properties.containsKey(SERVICE_RANKING))
-			return Long.valueOf(properties.get(SERVICE_RANKING).toString());
+			return (Integer) properties.get(SERVICE_RANKING);
 //		else if (properties.containsKey(SERVICE_ID))
 //			return (Long) properties.get(SERVICE_ID);
 		else
-			return 0l;
+			return 0;
 	}
 
 	public T get() {
@@ -48,7 +48,7 @@ public class RankedObject<T> {
 		return properties;
 	}
 
-	public Long getRank() {
+	public int getRank() {
 		return rank;
 	}
 
@@ -62,7 +62,7 @@ public class RankedObject<T> {
 		if (!(obj instanceof RankedObject))
 			return false;
 		RankedObject<?> other = (RankedObject<?>) obj;
-		return rank.equals(other.rank) && object.equals(other.object);
+		return rank == other.rank && object.equals(other.object);
 	}
 
 	@Override
diff --git a/org.argeo.app.ui/OSGI-INF/adminLeadPane.xml b/org.argeo.app.ui/OSGI-INF/adminLeadPane.xml
index 0a2818a..8d69ead 100644
--- a/org.argeo.app.ui/OSGI-INF/adminLeadPane.xml
+++ b/org.argeo.app.ui/OSGI-INF/adminLeadPane.xml
@@ -2,9 +2,10 @@
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="init" deactivate="destroy" immediate="false" name="Admin Lead Pane">
    <implementation class="org.argeo.app.ui.DefaultLeadPane"/>
    <service>
-      <provide interface="org.argeo.cms.ui.CmsUiProvider"/>
+      <provide interface="org.argeo.cms.swt.acr.SwtUiProvider"/>
    </service>
    <properties entry="config/adminLeadPane.properties"/>
+   <property name="service.ranking" type="Integer" value="-1000"/>
    <property name="defaultLayers" type="String">argeo.suite.ui.termsLayer
    </property>
    <reference bind="addLayer" cardinality="1..n" interface="org.argeo.app.ui.SuiteLayer" name="SuiteLayer" policy="dynamic" unbind="removeLayer"/>
diff --git a/org.argeo.app.ui/OSGI-INF/cmsApp.xml b/org.argeo.app.ui/OSGI-INF/cmsApp.xml
index cbd78eb..88f19ea 100644
--- a/org.argeo.app.ui/OSGI-INF/cmsApp.xml
+++ b/org.argeo.app.ui/OSGI-INF/cmsApp.xml
@@ -5,8 +5,7 @@
       <provide interface="org.argeo.api.cms.CmsApp"/>
    </service>
    <properties entry="config/cmsApp.properties"/>
-   <reference bind="addUiProvider" cardinality="0..n" interface="org.argeo.cms.ui.CmsUiProvider" policy="dynamic" unbind="removeUiProvider"/>
-  <reference bind="addUiProvider" cardinality="0..n" interface="org.argeo.cms.swt.acr.SwtUiProvider" policy="dynamic" unbind="removeUiProvider"/>
+   <reference bind="addUiProvider" cardinality="0..n" interface="org.argeo.cms.swt.acr.SwtUiProvider" policy="dynamic" unbind="removeUiProvider"/>
    <reference bind="addTheme" cardinality="1..n" interface="org.argeo.api.cms.ux.CmsTheme" name="CmsTheme" policy="dynamic" unbind="removeTheme"/>
    <reference bind="addLayer" cardinality="1..n" interface="org.argeo.app.ui.SuiteLayer" name="SuiteLayer" policy="dynamic" unbind="removeLayer"/>
    <reference bind="setCmsUserManager" cardinality="1..1" interface="org.argeo.cms.CmsUserManager" name="CmsUserManager" policy="static"/>
diff --git a/org.argeo.app.ui/OSGI-INF/contentEntryArea.xml b/org.argeo.app.ui/OSGI-INF/contentEntryArea.xml
index 8aad52c..d8579b0 100644
--- a/org.argeo.app.ui/OSGI-INF/contentEntryArea.xml
+++ b/org.argeo.app.ui/OSGI-INF/contentEntryArea.xml
@@ -4,5 +4,6 @@
    <service>
       <provide interface="org.argeo.cms.swt.acr.SwtUiProvider"/>
    </service>
+   <property name="service.ranking" type="Integer" value="-1000"/>
    <properties entry="config/contentEntryArea.properties"/>
 </scr:component>
diff --git a/org.argeo.app.ui/OSGI-INF/contentLayer.xml b/org.argeo.app.ui/OSGI-INF/contentLayer.xml
index 4bf4474..7e56e47 100644
--- a/org.argeo.app.ui/OSGI-INF/contentLayer.xml
+++ b/org.argeo.app.ui/OSGI-INF/contentLayer.xml
@@ -5,5 +5,6 @@
       <provide interface="org.argeo.app.ui.SuiteLayer"/>
    </service>
    <reference bind="setEntryArea" cardinality="1..1" interface="org.argeo.cms.swt.acr.SwtUiProvider" policy="dynamic" target="(service.pid=argeo.library.ui.contentEntryArea)"/>
+   <property name="service.ranking" type="Integer" value="-1000"/>
    <properties entry="config/contentLayer.properties"/>
 </scr:component>
diff --git a/org.argeo.app.ui/OSGI-INF/dashboard.xml b/org.argeo.app.ui/OSGI-INF/dashboard.xml
index 9ee5857..8ee65b3 100644
--- a/org.argeo.app.ui/OSGI-INF/dashboard.xml
+++ b/org.argeo.app.ui/OSGI-INF/dashboard.xml
@@ -2,7 +2,8 @@
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="Default Dashboard">
    <implementation class="org.argeo.app.ui.DefaultDashboard"/>
    <service>
-      <provide interface="org.argeo.cms.ui.CmsUiProvider"/>
+      <provide interface="org.argeo.cms.swt.acr.SwtUiProvider"/>
    </service>
+   <property name="service.ranking" type="Integer" value="-1000"/>
    <properties entry="config/dashboard.properties"/>
 </scr:component>
diff --git a/org.argeo.app.ui/OSGI-INF/dashboardLayer.xml b/org.argeo.app.ui/OSGI-INF/dashboardLayer.xml
index 7a12d71..c8c6ac9 100644
--- a/org.argeo.app.ui/OSGI-INF/dashboardLayer.xml
+++ b/org.argeo.app.ui/OSGI-INF/dashboardLayer.xml
@@ -4,5 +4,6 @@
    <service>
       <provide interface="org.argeo.app.ui.SuiteLayer"/>
    </service>
+   <property name="service.ranking" type="Integer" value="-1000"/>
    <properties entry="config/dashboardLayer.properties"/>
 </scr:component>
diff --git a/org.argeo.app.ui/OSGI-INF/documentUiProvider.xml b/org.argeo.app.ui/OSGI-INF/documentUiProvider.xml
index 3711fd5..97cb529 100644
--- a/org.argeo.app.ui/OSGI-INF/documentUiProvider.xml
+++ b/org.argeo.app.ui/OSGI-INF/documentUiProvider.xml
@@ -2,7 +2,8 @@
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0">
    <implementation class="org.argeo.app.ui.publish.DocumentUiProvider"/>
    <service>
-      <provide interface="org.argeo.cms.ui.CmsUiProvider"/>
+      <provide interface="org.argeo.cms.swt.acr.SwtUiProvider"/>
    </service>
+   <property name="service.ranking" type="Integer" value="-1000"/>
    <properties entry="config/documentUiProvider.properties"/>
 </scr:component>
diff --git a/org.argeo.app.ui/OSGI-INF/documentsFolder.xml b/org.argeo.app.ui/OSGI-INF/documentsFolder.xml
index fef4582..f1dc0fd 100644
--- a/org.argeo.app.ui/OSGI-INF/documentsFolder.xml
+++ b/org.argeo.app.ui/OSGI-INF/documentsFolder.xml
@@ -2,8 +2,9 @@
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="Documents Folder">
    <implementation class="org.argeo.app.ui.library.DocumentsFolderUiProvider"/>
    <service>
-      <provide interface="org.argeo.cms.ui.CmsUiProvider"/>
+      <provide interface="org.argeo.cms.swt.acr.SwtUiProvider"/>
    </service>
+   <property name="service.ranking" type="Integer" value="-1000"/>
    <properties entry="config/documentsFolder.properties"/>
    <reference bind="setNodeFileSystemProvider" cardinality="1..1" interface="java.nio.file.spi.FileSystemProvider" name="FileSystemProvider" policy="dynamic" target="(service.pid=org.argeo.api.fsProvider)"/>
 </scr:component>
diff --git a/org.argeo.app.ui/OSGI-INF/footer.xml b/org.argeo.app.ui/OSGI-INF/footer.xml
index 5e9a857..8d20231 100644
--- a/org.argeo.app.ui/OSGI-INF/footer.xml
+++ b/org.argeo.app.ui/OSGI-INF/footer.xml
@@ -2,7 +2,8 @@
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="init" deactivate="destroy" immediate="false" name="Default Suite Footer">
    <implementation class="org.argeo.app.ui.DefaultFooter"/>
    <service>
-      <provide interface="org.argeo.cms.ui.CmsUiProvider"/>
+      <provide interface="org.argeo.cms.swt.acr.SwtUiProvider"/>
    </service>
+   <property name="service.ranking" type="Integer" value="-1000"/>
    <properties entry="config/footer.properties"/>
 </scr:component>
diff --git a/org.argeo.app.ui/OSGI-INF/fsEntryArea.xml b/org.argeo.app.ui/OSGI-INF/fsEntryArea.xml
index 189a12a..beb8cf2 100644
--- a/org.argeo.app.ui/OSGI-INF/fsEntryArea.xml
+++ b/org.argeo.app.ui/OSGI-INF/fsEntryArea.xml
@@ -2,8 +2,9 @@
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0">
    <implementation class="org.argeo.app.ui.library.DocumentsTreeUiProvider"/>
    <service>
-      <provide interface="org.argeo.cms.ui.CmsUiProvider"/>
+      <provide interface="org.argeo.cms.swt.acr.SwtUiProvider"/>
    </service>
+   <property name="service.ranking" type="Integer" value="-1000"/>
    <properties entry="config/fsEntryArea.properties"/>
    <reference bind="setNodeFileSystemProvider" cardinality="1..1" interface="java.nio.file.spi.FileSystemProvider" name="FileSystemProvider" policy="dynamic" target="(service.pid=org.argeo.api.fsProvider)"/>
    <reference bind="setRepository" cardinality="1..1" interface="javax.jcr.Repository" name="Repository" policy="static" target="(cn=ego)"/>
diff --git a/org.argeo.app.ui/OSGI-INF/groupUiProvider.xml b/org.argeo.app.ui/OSGI-INF/groupUiProvider.xml
index 8e1ef05..bb57f8d 100644
--- a/org.argeo.app.ui/OSGI-INF/groupUiProvider.xml
+++ b/org.argeo.app.ui/OSGI-INF/groupUiProvider.xml
@@ -4,6 +4,7 @@
    <service>
       <provide interface="org.argeo.cms.swt.acr.SwtUiProvider"/>
    </service>
+   <property name="service.ranking" type="Integer" value="-1000"/>
    <properties entry="config/groupUiProvider.properties"/>
    <reference bind="setCmsUserManager" cardinality="1..1" interface="org.argeo.cms.CmsUserManager" name="CmsUserManager" policy="static"/>
 </scr:component>
diff --git a/org.argeo.app.ui/OSGI-INF/header.xml b/org.argeo.app.ui/OSGI-INF/header.xml
index 0c83dc6..cb792e5 100644
--- a/org.argeo.app.ui/OSGI-INF/header.xml
+++ b/org.argeo.app.ui/OSGI-INF/header.xml
@@ -2,7 +2,8 @@
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="init" deactivate="destroy" immediate="false" name="Default Suite Header">
    <implementation class="org.argeo.app.ui.DefaultHeader"/>
    <service>
-      <provide interface="org.argeo.cms.ui.CmsUiProvider"/>
+      <provide interface="org.argeo.cms.swt.acr.SwtUiProvider"/>
    </service>
+   <property name="service.ranking" type="Integer" value="-1000"/>
    <properties entry="config/header.properties"/>
 </scr:component>
diff --git a/org.argeo.app.ui/OSGI-INF/hierarchyUnitUiProvider.xml b/org.argeo.app.ui/OSGI-INF/hierarchyUnitUiProvider.xml
index 7e93eb5..64f49c0 100644
--- a/org.argeo.app.ui/OSGI-INF/hierarchyUnitUiProvider.xml
+++ b/org.argeo.app.ui/OSGI-INF/hierarchyUnitUiProvider.xml
@@ -4,6 +4,7 @@
    <service>
       <provide interface="org.argeo.cms.swt.acr.SwtUiProvider"/>
    </service>
+   <property name="service.ranking" type="Integer" value="-1000"/>
    <properties entry="config/hierarchyUnitUiProvider.properties"/>
    <reference bind="setCmsUserManager" cardinality="1..1" interface="org.argeo.cms.CmsUserManager" name="CmsUserManager" policy="static"/>
 </scr:component>
diff --git a/org.argeo.app.ui/OSGI-INF/leadPane.xml b/org.argeo.app.ui/OSGI-INF/leadPane.xml
index c2c2104..7583aa1 100644
--- a/org.argeo.app.ui/OSGI-INF/leadPane.xml
+++ b/org.argeo.app.ui/OSGI-INF/leadPane.xml
@@ -2,8 +2,9 @@
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="init" deactivate="destroy" immediate="false" name="Default Lead Pane">
    <implementation class="org.argeo.app.ui.DefaultLeadPane"/>
    <service>
-      <provide interface="org.argeo.cms.ui.CmsUiProvider"/>
+      <provide interface="org.argeo.cms.swt.acr.SwtUiProvider"/>
    </service>
+   <property name="service.ranking" type="Integer" value="-1000"/>
    <properties entry="config/leadPane.properties"/>
    <property name="defaultLayers" type="String">argeo.suite.ui.dashboardLayer
 argeo.library.ui.contentLayer
diff --git a/org.argeo.app.ui/OSGI-INF/loginScreen.xml b/org.argeo.app.ui/OSGI-INF/loginScreen.xml
index f79396f..eab7592 100644
--- a/org.argeo.app.ui/OSGI-INF/loginScreen.xml
+++ b/org.argeo.app.ui/OSGI-INF/loginScreen.xml
@@ -3,7 +3,8 @@
    <implementation class="org.argeo.app.ui.DefaultLoginScreen"/>
    <properties entry="config/loginScreen.properties"/>
    <service>
-      <provide interface="org.argeo.cms.ui.CmsUiProvider"/>
+      <provide interface="org.argeo.cms.swt.acr.SwtUiProvider"/>
    </service>
+   <property name="service.ranking" type="Integer" value="-1000"/>
    <reference bind="setCmsContext" cardinality="1..1" interface="org.argeo.api.cms.CmsContext" name="CmsContext" policy="static"/>
 </scr:component>
diff --git a/org.argeo.app.ui/OSGI-INF/mapLayer.xml b/org.argeo.app.ui/OSGI-INF/mapLayer.xml
index f90cd78..1e72041 100644
--- a/org.argeo.app.ui/OSGI-INF/mapLayer.xml
+++ b/org.argeo.app.ui/OSGI-INF/mapLayer.xml
@@ -5,5 +5,6 @@
    <service>
       <provide interface="org.argeo.app.ui.SuiteLayer"/>
    </service>
-   <reference bind="setWorkArea" cardinality="1..1" interface="org.argeo.cms.ui.CmsUiProvider" name="CmsUiProvider" policy="dynamic" target="(service.pid=argeo.geo.ui.overviewMap)"/>
+   <property name="service.ranking" type="Integer" value="-1000"/>
+   <reference bind="setWorkArea" cardinality="1..1" interface="org.argeo.cms.swt.acr.SwtUiProvider" name="CmsUiProvider" policy="dynamic" target="(service.pid=argeo.geo.ui.overviewMap)"/>
 </scr:component>
diff --git a/org.argeo.app.ui/OSGI-INF/overviewMap.xml b/org.argeo.app.ui/OSGI-INF/overviewMap.xml
index f378f05..f459a58 100644
--- a/org.argeo.app.ui/OSGI-INF/overviewMap.xml
+++ b/org.argeo.app.ui/OSGI-INF/overviewMap.xml
@@ -3,7 +3,8 @@
    <implementation class="org.argeo.app.ui.openlayers.OverviewMap"/>
    <properties entry="config/overviewMap.properties"/>
    <service>
-      <provide interface="org.argeo.cms.ui.CmsUiProvider"/>
+      <provide interface="org.argeo.cms.swt.acr.SwtUiProvider"/>
    </service>
+   <property name="service.ranking" type="Integer" value="-1000"/>
    <reference bind="setJcrContentProvider" cardinality="1..1" interface="org.argeo.cms.jcr.acr.JcrContentProvider" name="JcrContentProvider" policy="static"/>
 </scr:component>
diff --git a/org.argeo.app.ui/OSGI-INF/peopleEntryArea.xml b/org.argeo.app.ui/OSGI-INF/peopleEntryArea.xml
index 868fa84..4073704 100644
--- a/org.argeo.app.ui/OSGI-INF/peopleEntryArea.xml
+++ b/org.argeo.app.ui/OSGI-INF/peopleEntryArea.xml
@@ -5,6 +5,7 @@
       <provide interface="org.argeo.cms.swt.acr.SwtUiProvider"/>
    </service>
    <properties entry="config/peopleEntryArea.properties"/>
+   <property name="service.ranking" type="Integer" value="-1000"/>
    <reference bind="setCmsUserManager" cardinality="1..1" interface="org.argeo.cms.CmsUserManager" name="CmsUserManager" policy="static"/>
    <reference bind="setContentRepository" cardinality="1..1" interface="org.argeo.api.acr.ContentRepository" name="ContentRepository" policy="static"/>
 </scr:component>
diff --git a/org.argeo.app.ui/OSGI-INF/peopleLayer.xml b/org.argeo.app.ui/OSGI-INF/peopleLayer.xml
index 4715f1c..95bc27d 100644
--- a/org.argeo.app.ui/OSGI-INF/peopleLayer.xml
+++ b/org.argeo.app.ui/OSGI-INF/peopleLayer.xml
@@ -5,5 +5,6 @@
    <service>
       <provide interface="org.argeo.app.ui.SuiteLayer"/>
    </service>
+   <property name="service.ranking" type="Integer" value="-1000"/>
    <reference bind="setEntryArea" cardinality="1..1" interface="org.argeo.cms.swt.acr.SwtUiProvider" name="CmsUiProvider" policy="dynamic" target="(service.pid=argeo.people.ui.peopleEntryArea)"/>
 </scr:component>
diff --git a/org.argeo.app.ui/OSGI-INF/personUiProvider.xml b/org.argeo.app.ui/OSGI-INF/personUiProvider.xml
index d5a6862..45dae41 100644
--- a/org.argeo.app.ui/OSGI-INF/personUiProvider.xml
+++ b/org.argeo.app.ui/OSGI-INF/personUiProvider.xml
@@ -4,8 +4,9 @@
    <service>
       <provide interface="org.argeo.cms.swt.acr.SwtUiProvider"/>
    </service>
-   <properties entry="config/personUiProvider.properties"/>
+   <property name="service.ranking" type="Integer" value="-1000"/>
    <property name="availableRoles" type="String">
    </property>
+   <properties entry="config/personUiProvider.properties"/>
    <reference bind="setCmsUserManager" cardinality="1..1" interface="org.argeo.cms.CmsUserManager" name="CmsUserManager" policy="static"/>
 </scr:component>
diff --git a/org.argeo.app.ui/OSGI-INF/publishEntryArea.xml b/org.argeo.app.ui/OSGI-INF/publishEntryArea.xml
index 350a00c..0c10d34 100644
--- a/org.argeo.app.ui/OSGI-INF/publishEntryArea.xml
+++ b/org.argeo.app.ui/OSGI-INF/publishEntryArea.xml
@@ -4,5 +4,6 @@
    <service>
       <provide interface="org.argeo.cms.swt.acr.SwtUiProvider"/>
    </service>
+   <property name="service.ranking" type="Integer" value="-1000"/>
    <properties entry="config/publishEntryArea.properties"/>
 </scr:component>
\ No newline at end of file
diff --git a/org.argeo.app.ui/OSGI-INF/publishUiProvider.xml b/org.argeo.app.ui/OSGI-INF/publishUiProvider.xml
index 793fc34..148da14 100644
--- a/org.argeo.app.ui/OSGI-INF/publishUiProvider.xml
+++ b/org.argeo.app.ui/OSGI-INF/publishUiProvider.xml
@@ -4,5 +4,6 @@
    <service>
       <provide interface="org.argeo.cms.swt.acr.SwtUiProvider"/>
    </service>
+   <property name="service.ranking" type="Integer" value="-1000"/>
    <properties entry="config/publishUiProvider.properties"/>
 </scr:component>
diff --git a/org.argeo.app.ui/OSGI-INF/recentItems.xml b/org.argeo.app.ui/OSGI-INF/recentItems.xml
index 21c23e3..8656e84 100644
--- a/org.argeo.app.ui/OSGI-INF/recentItems.xml
+++ b/org.argeo.app.ui/OSGI-INF/recentItems.xml
@@ -2,7 +2,8 @@
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="init" name="Default Recent Items">
    <implementation class="org.argeo.app.ui.RecentItems"/>
    <service>
-      <provide interface="org.argeo.cms.ui.CmsUiProvider"/>
+      <provide interface="org.argeo.cms.swt.acr.SwtUiProvider"/>
    </service>
+   <property name="service.ranking" type="Integer" value="-1000"/>
    <properties entry="config/recentItems.properties"/>
 </scr:component>
diff --git a/org.argeo.app.ui/OSGI-INF/termsEntryArea.xml b/org.argeo.app.ui/OSGI-INF/termsEntryArea.xml
index 0435f69..6387f1a 100644
--- a/org.argeo.app.ui/OSGI-INF/termsEntryArea.xml
+++ b/org.argeo.app.ui/OSGI-INF/termsEntryArea.xml
@@ -2,7 +2,8 @@
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="Terms Entry Area">
    <implementation class="org.argeo.app.ui.TermsEntryArea"/>
    <service>
-      <provide interface="org.argeo.cms.ui.CmsUiProvider"/>
+      <provide interface="org.argeo.cms.swt.acr.SwtUiProvider"/>
    </service>
+   <property name="service.ranking" type="Integer" value="-1000"/>
    <properties entry="config/termsEntryArea.properties"/>
 </scr:component>
diff --git a/org.argeo.app.ui/OSGI-INF/termsLayer.xml b/org.argeo.app.ui/OSGI-INF/termsLayer.xml
index 9483e05..a3ffef3 100644
--- a/org.argeo.app.ui/OSGI-INF/termsLayer.xml
+++ b/org.argeo.app.ui/OSGI-INF/termsLayer.xml
@@ -4,6 +4,7 @@
    <service>
       <provide interface="org.argeo.app.ui.SuiteLayer"/>
    </service>
+   <property name="service.ranking" type="Integer" value="-1000"/>
    <properties entry="config/termsLayer.properties"/>
-   <reference bind="setEntryArea" cardinality="1..1" interface="org.argeo.cms.ui.CmsUiProvider" name="CmsUiProvider" policy="dynamic" target="(service.pid=argeo.suite.ui.termsEntryArea)"/>
+   <reference bind="setEntryArea" cardinality="1..1" interface="org.argeo.cms.swt.acr.SwtUiProvider" name="CmsUiProvider" policy="dynamic" target="(service.pid=argeo.suite.ui.termsEntryArea)"/>
 </scr:component>
diff --git a/org.argeo.app.ui/OSGI-INF/wwwLayer.xml b/org.argeo.app.ui/OSGI-INF/wwwLayer.xml
index 0fc0edb..dc316bd 100644
--- a/org.argeo.app.ui/OSGI-INF/wwwLayer.xml
+++ b/org.argeo.app.ui/OSGI-INF/wwwLayer.xml
@@ -5,5 +5,6 @@
    <service>
       <provide interface="org.argeo.app.ui.SuiteLayer"/>
    </service>
-   <reference bind="setWorkArea" cardinality="1..1" interface="org.argeo.cms.ui.CmsUiProvider" name="CmsUiProvider" policy="dynamic" target="(service.pid=argeo.publishing.ui.documentUiProvider)"/>
+   <property name="service.ranking" type="Integer" value="-1000"/>
+   <reference bind="setWorkArea" cardinality="1..1" interface="org.argeo.cms.swt.acr.SwtUiProvider" name="CmsUiProvider" policy="dynamic" target="(service.pid=argeo.publishing.ui.documentUiProvider)"/>
 </scr:component>
-- 
2.30.2