X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=jcr%2Forg.argeo.cms.jcr%2Fsrc%2Forg%2Fargeo%2Fcms%2Fjcr%2Facr%2FJcrContentProvider.java;h=fc4a61bf9e61a72c316f5b5f5f8bf50a291932fb;hb=c615307d7b87bcb260d8a9f402c6e0a880862f38;hp=ef8e375d012731972b4597114aae57d4f5d2dbab;hpb=da848d7b6bcf3e509890bdd42c3c59fba1adbe14;p=lgpl%2Fargeo-commons.git

diff --git a/jcr/org.argeo.cms.jcr/src/org/argeo/cms/jcr/acr/JcrContentProvider.java b/jcr/org.argeo.cms.jcr/src/org/argeo/cms/jcr/acr/JcrContentProvider.java
index ef8e375d0..fc4a61bf9 100644
--- a/jcr/org.argeo.cms.jcr/src/org/argeo/cms/jcr/acr/JcrContentProvider.java
+++ b/jcr/org.argeo.cms.jcr/src/org/argeo/cms/jcr/acr/JcrContentProvider.java
@@ -1,29 +1,37 @@
 package org.argeo.cms.jcr.acr;
 
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Map;
 
+import javax.jcr.Node;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.xml.namespace.NamespaceContext;
 
 import org.argeo.api.acr.Content;
+import org.argeo.api.acr.ContentUtils;
 import org.argeo.api.acr.spi.ContentProvider;
 import org.argeo.api.acr.spi.ProvidedSession;
 import org.argeo.cms.jcr.CmsJcrUtils;
 import org.argeo.jcr.JcrException;
 import org.argeo.jcr.JcrUtils;
 
+/** A JCR workspace accessed as an {@link ContentProvider}. */
 public class JcrContentProvider implements ContentProvider, NamespaceContext {
 	private Repository jcrRepository;
 	private Session adminSession;
 
-	public void init() {
+	private Map<ProvidedSession, JcrSessionAdapter> sessionAdapters = Collections.synchronizedMap(new HashMap<>());
+
+	public void start() {
 		adminSession = CmsJcrUtils.openDataAdminSession(jcrRepository, null);
 	}
 
-	public void destroy() {
+	public void stop() {
 		JcrUtils.logoutQuietly(adminSession);
 	}
 
@@ -32,9 +40,26 @@ public class JcrContentProvider implements ContentProvider, NamespaceContext {
 	}
 
 	@Override
-	public Content get(ProvidedSession session, String mountPath, String relativePath) {
-		// TODO Auto-generated method stub
-		return null;
+	public Content get(ProvidedSession contentSession, String mountPath, String relativePath) {
+		String workspace = ContentUtils.getParentPath(mountPath)[1];
+		JcrSessionAdapter sessionAdapter = sessionAdapters.get(contentSession);
+		if (sessionAdapter == null) {
+			final JcrSessionAdapter newSessionAdapter = new JcrSessionAdapter(jcrRepository,
+					contentSession.getSubject());
+			sessionAdapters.put(contentSession, newSessionAdapter);
+			contentSession.onClose().thenAccept((s) -> newSessionAdapter.close());
+			sessionAdapter = newSessionAdapter;
+		}
+
+		Session jcrSession = sessionAdapter.getSession(workspace);
+		String jcrPath = "/" + relativePath;
+		try {
+			Node node = jcrSession.getNode(jcrPath);
+			return new JcrContent(contentSession, this, node);
+		} catch (RepositoryException e) {
+			throw new JcrException("Cannot get JCR content '" + jcrPath + ", mounted from '" + mountPath
+					+ "' with JCR session " + jcrSession, e);
+		}
 	}
 
 	/*