From e2156d0cc52962cec52bf2bd57eca6093f7877bf Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 23 Aug 2022 11:47:02 +0200
Subject: [PATCH] Fix after changes in Argeo Commons

---
 org.argeo.app.core/OSGI-INF/termsManager.xml        | 2 +-
 org.argeo.app.ui/src/org/argeo/app/ui/SuiteApp.java | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/org.argeo.app.core/OSGI-INF/termsManager.xml b/org.argeo.app.core/OSGI-INF/termsManager.xml
index 8430b7a..797c5a3 100644
--- 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 50a7f80..d59edd5 100644
--- 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 {
-- 
2.30.2