X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Facr%2FCmsContentRepository.java;h=3e01aee8b235ff9d1d0a94d30174d1afa6d6e6f4;hb=a61a938100ef882c56104e4eb4ea18f7c786c3bc;hp=c2d6b21e406f61a5930e43f235de6fa8e7c2e42b;hpb=eb4cc3db3bf141c229f0f7ff929daff108bee6d2;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/acr/CmsContentRepository.java b/org.argeo.cms/src/org/argeo/cms/acr/CmsContentRepository.java
index c2d6b21e4..3e01aee8b 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/CmsContentRepository.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/CmsContentRepository.java
@@ -12,6 +12,8 @@ import org.argeo.api.acr.ContentSession;
 import org.argeo.api.acr.spi.ProvidedRepository;
 import org.argeo.api.cms.CmsAuth;
 import org.argeo.api.cms.CmsSession;
+import org.argeo.api.cms.CmsState;
+import org.argeo.api.uuid.UuidFactory;
 import org.argeo.cms.auth.CurrentUser;
 import org.argeo.cms.internal.runtime.CmsContextImpl;
 
@@ -19,9 +21,14 @@ import org.argeo.cms.internal.runtime.CmsContextImpl;
  * Multi-session {@link ProvidedRepository}, integrated with a CMS.
  */
 public class CmsContentRepository extends AbstractContentRepository {
+	public final static String RUN_BASE = "/run";
+	public final static String DIRECTORY_BASE = "/directory";
 
 	private Map<CmsSession, CmsContentSession> userSessions = Collections.synchronizedMap(new HashMap<>());
 
+	private CmsState cmsState;
+	private UuidFactory uuidFactory;
+
 	/*
 	 * REPOSITORY
 	 */
@@ -37,7 +44,8 @@ public class CmsContentRepository extends AbstractContentRepository {
 		CmsSession cmsSession = CurrentUser.getCmsSession();
 		CmsContentSession contentSession = userSessions.get(cmsSession);
 		if (contentSession == null) {
-			final CmsContentSession newContentSession = new CmsContentSession(this, cmsSession.getSubject(), locale);
+			final CmsContentSession newContentSession = new CmsContentSession(this, cmsSession.getUuid(),
+					cmsSession.getSubject(), locale);
 			cmsSession.addOnCloseCallback((c) -> {
 				newContentSession.close();
 				userSessions.remove(cmsSession);
@@ -57,7 +65,20 @@ public class CmsContentRepository extends AbstractContentRepository {
 			throw new RuntimeException("Could not login as data admin", e1);
 		} finally {
 		}
-		return new CmsContentSession(this, loginContext.getSubject(), Locale.getDefault());
+		return new CmsContentSession(this, getCmsState().getUuid(), loginContext.getSubject(),
+				Locale.getDefault());
+	}
+
+	protected CmsState getCmsState() {
+		return cmsState;
+	}
+
+	public void setCmsState(CmsState cmsState) {
+		this.cmsState = cmsState;
+	}
+
+	public void setUuidFactory(UuidFactory uuidFactory) {
+		this.uuidFactory = uuidFactory;
 	}
 
 }