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 371cdaec3096a15c0c406373964ab93ca4e58e72..fec8972e3443ff386858c068f8f10d4b59010713 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
@@ -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 e7190db475cd88502773f979b218ea9535f25616..189a12a25e5ba96a5d796180fbdc7eb5757bb265 100644 (file)
--- 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 d702dc24166d48fd815166494541d409aace9813..868fa841e646457c728553c54edf67639c46fa2a 100644 (file)
--- 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"/>