From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 20 Sep 2022 07:55:11 +0000 (+0200)
Subject: Fix typos leading to double registrations
X-Git-Tag: v2.3.8~40
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=84dffc3e1e2b16317533d13bf30d160f25ec7ced

Fix typos leading to double registrations
---

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 371cdae..fec8972 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
@@ -101,7 +101,7 @@ public class RankedObject<T> {
 				return rankedObject;
 			} else if (current.getRank() == rankedObject.getRank()) {
 				log.error("Already " + key + " by " + current.get().getClass().getName() + " with rank "
-						+ rankedObject.getRank() + ", ignoring " + rankedObject.getClass().getName());
+						+ rankedObject.getRank() + ", ignoring " + rankedObject.get().getClass().getName());
 				return null;
 			} else {
 				return null;
diff --git a/org.argeo.app.ui/OSGI-INF/fsEntryArea.xml b/org.argeo.app.ui/OSGI-INF/fsEntryArea.xml
index e7190db..189a12a 100644
--- a/org.argeo.app.ui/OSGI-INF/fsEntryArea.xml
+++ b/org.argeo.app.ui/OSGI-INF/fsEntryArea.xml
@@ -4,7 +4,7 @@
    <service>
       <provide interface="org.argeo.cms.ui.CmsUiProvider"/>
    </service>
-   <properties entry="config/contentEntryArea.properties"/>
+   <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)"/>
 </scr:component>
diff --git a/org.argeo.app.ui/OSGI-INF/peopleEntryArea.xml b/org.argeo.app.ui/OSGI-INF/peopleEntryArea.xml
index d702dc2..868fa84 100644
--- a/org.argeo.app.ui/OSGI-INF/peopleEntryArea.xml
+++ b/org.argeo.app.ui/OSGI-INF/peopleEntryArea.xml
@@ -2,9 +2,8 @@
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0">
    <implementation class="org.argeo.app.ui.people.PeopleEntryArea"/>
    <service>
-      <provide interface="org.argeo.cms.ui.CmsUiProvider"/>
-
-      <provide interface="org.argeo.cms.swt.acr.SwtUiProvider"/>   </service>
+      <provide interface="org.argeo.cms.swt.acr.SwtUiProvider"/>
+   </service>
    <properties entry="config/peopleEntryArea.properties"/>
    <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"/>