All default UX services with service rank -1000

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 fec8972e3443ff386858c068f8f10d4b59010713..fab42d7ea6401ad878eec8ee255ed7eae37b8d72 100644 (file)
--- 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 0a2818af89e71f816c000f4280b9c4296520138a..8d69ead19963c6d6e70c099b9b3004b2d40623f4 100644 (file)
--- 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 cbd78eb162cbfc88da045ebc78a57b6492f69491..88f19eaff959ce6420add8bd463f87f8d0365a1d 100644 (file)
--- 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 8aad52c9e041e56cc4435b3fbba4fbd573351509..d8579b0d12697b37aece968bb19452e0541dbf5a 100644 (file)
--- 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 4bf447461f0365dc011855f86c516dbd30cf7a80..7e56e4790f1e8086884927ab09db48e9f972c315 100644 (file)
--- 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 9ee58572b1dacf9e61f3647cbe2576fa2216e568..8ee65b3662054bb967e732a2e95ddbc35ac3ddb7 100644 (file)
--- 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 7a12d7121d638fc32ee22c527ef4eb76a30af75f..c8c6ac99ce8cbac057fc5531385877891e1aadbb 100644 (file)
--- 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 3711fd5d93009df7cc418c6ac1a789e7ae7bfcdb..97cb529c750aad8c0946446bf5a5a76f182dde7e 100644 (file)
--- 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 fef458225f8745a6c763ffa5083ea740ec2f6cf3..f1dc0fda9f2dc965ec14a37956575ec4a0015d22 100644 (file)
--- 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 5e9a857a860e12b2224f20287dc526df10116c14..8d202315b3f0201523f22cd5c4ecefa2d20330ec 100644 (file)
--- 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 189a12a25e5ba96a5d796180fbdc7eb5757bb265..beb8cf239304b3afca4dbc1ca81930483b4363b7 100644 (file)
--- 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 8e1ef053e1726cdfa9ba39532b1c4f152c47b677..bb57f8d611b50ec95d90cd7fa522fccb68448952 100644 (file)
--- 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 0c83dc667b742f83660293cba64e3cb32ca51187..cb792e521813937541e053a8c9de452ed5910958 100644 (file)
--- 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 7e93eb54a192f30d8bb84e4059a17c2dd72ab13b..64f49c00e7c32d0ce908b226611dc5f91497af49 100644 (file)
--- 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 c2c21041166ba42a3e9ab47c96018101e1ae3315..7583aa198c40b3c7a8cbf62ece51fa21439896df 100644 (file)
--- 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 f79396f626daa40d3ab2cc683ca6dc881cc6ba9a..eab7592c9dcc61190c09d113aa956c514c358b48 100644 (file)
--- 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 f90cd787c8a2819623568723e75eef8b5695acef..1e72041b570052359b078e6360a904471b2c5bc9 100644 (file)
--- 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 f378f059b4e70178c76bd3e76d33a491f03ab2eb..f459a58ba2f3cc79af82299dce2ba6fe8fcf1296 100644 (file)
--- 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 868fa841e646457c728553c54edf67639c46fa2a..4073704d840d62392439072a1db26bea9ead08e5 100644 (file)
--- 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 4715f1c5d4e3c97c7aa264d8b31b0e0e684de478..95bc27dd30235b03a1a58879a1d3d6ffccc527bf 100644 (file)
--- 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 d5a6862f32eeab82de273d583ae80662b85060dd..45dae41b2b462e6995fc1f68d460acd74fd6ed3a 100644 (file)
--- 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 350a00ced390622088bb21398b97f20b79109d38..0c10d34c0ee107d8d2ba8e01211752b20075a4c0 100644 (file)
--- 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 793fc348c20eec3602256b5e566f1e99c2f174f9..148da1468ac797a39652f1aab97a2c3cca6502e4 100644 (file)
--- 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 21c23e3f3684022ceaaa842eec703d2f8ef1f22f..8656e843b64b71ae6e335444b196628f0e0022e4 100644 (file)
--- 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 0435f6947d2c19c60bd43b747c68be194a1fafe1..6387f1a32fd6399901448449ada5e19a4f08bf45 100644 (file)
--- 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 9483e05e7d7c647d1e41780d751a25e673393a8c..a3ffef3dfb9fc75b4d20497c93621cd96790b3e8 100644 (file)
--- 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 0fc0edb756d4b019517c0d3ac9dd69266770a59e..dc316bd00d265d55640c386209a1a4d41ed535f1 100644 (file)
--- 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>