Fix after changes in Argeo Commons

diff --git a/org.argeo.app.core/OSGI-INF/termsManager.xml b/org.argeo.app.core/OSGI-INF/termsManager.xml
index 8430b7aba9e90c3e30b64ab939e10e4f70f44d26..797c5a399144b614732d6ff70fe73c54da1d8154 100644 (file)
--- a/org.argeo.app.core/OSGI-INF/termsManager.xml
+++ b/org.argeo.app.core/OSGI-INF/termsManager.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="init" deactivate="destroy" immediate="true" name="Suite Terms Manager">
    <implementation class="org.argeo.app.core.SuiteTermsManager"/>
-   <reference bind="setRepository" cardinality="1..1" interface="javax.jcr.Repository" name="Repository" policy="static" target="(cn=entity)"/>
+   <reference bind="setRepository" cardinality="1..1" interface="javax.jcr.Repository" name="Repository" policy="static" target="(cn=ego)"/>
    <service>
       <provide interface="org.argeo.app.api.TermsManager"/>
    </service>

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 50a7f80a82f90bc14fe622aadfbe1f8769fd027f..d59edd59969ba9e79a27bd2f91809d47159ec240 100644 (file)
--- a/org.argeo.app.ui/src/org/argeo/app/ui/SuiteApp.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/SuiteApp.java
@@ -224,7 +224,8 @@ public class SuiteApp extends AbstractCmsApp implements CmsEventSubscriber {
                                        // FIXME NPE on CMSSession when logging in from anonymous
                                        if (cmsSession == null || cmsView.isAnonymous()) {
                                                assert publicBasePath != null;
-                                               Content userDir = contentSession.get(CmsConstants.SYS_WORKSPACE + publicBasePath);
+                                               Content userDir = contentSession
+                                                               .get(ContentUtils.SLASH + CmsConstants.SYS_WORKSPACE + publicBasePath);
                                                ui.setUserDir(userDir);
 //                                             ui.initSessions(getRepository(), publicBasePath);
                                        } else {