X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FCmsFsProvider.java;h=7b3b8d9783f39588be5de067bf501062bbff262d;hb=eb3116df3624b3d32793548b79e137e2dad429cb;hp=f42646ec5907a6aa3a934448ae2b3a32fb9626c6;hpb=36c14000ab482f558a9679f75ac7bfb0953171f4;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsFsProvider.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsFsProvider.java
index f42646ec5..7b3b8d978 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsFsProvider.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsFsProvider.java
@@ -10,21 +10,25 @@ import java.util.Map;
 
 import javax.jcr.Node;
 import javax.jcr.Repository;
+import javax.jcr.RepositoryException;
+import javax.jcr.RepositoryFactory;
 import javax.jcr.Session;
+import javax.jcr.nodetype.NodeType;
 
 import org.argeo.cms.CmsException;
 import org.argeo.cms.auth.CurrentUser;
 import org.argeo.jackrabbit.fs.AbstractJackrabbitFsProvider;
 import org.argeo.jcr.fs.JcrFileSystem;
+import org.argeo.jcr.fs.JcrFileSystemProvider;
 import org.argeo.jcr.fs.JcrFsException;
 import org.argeo.node.NodeConstants;
+import org.argeo.node.NodeTypes;
 import org.argeo.node.NodeUtils;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 
 public class CmsFsProvider extends AbstractJackrabbitFsProvider {
-	private Map<String, JcrFileSystem> fileSystems = new HashMap<>();
-	private BundleContext bc = FrameworkUtil.getBundle(CmsFsProvider.class).getBundleContext();
+	private Map<String, CmsFileSystem> fileSystems = new HashMap<>();
 
 	@Override
 	public String getScheme() {
@@ -33,6 +37,7 @@ public class CmsFsProvider extends AbstractJackrabbitFsProvider {
 
 	@Override
 	public FileSystem newFileSystem(URI uri, Map<String, ?> env) throws IOException {
+		BundleContext bc = FrameworkUtil.getBundle(CmsFsProvider.class).getBundleContext();
 		String username = CurrentUser.getUsername();
 		if (username == null) {
 			// TODO deal with anonymous
@@ -42,12 +47,23 @@ public class CmsFsProvider extends AbstractJackrabbitFsProvider {
 			throw new FileSystemAlreadyExistsException("CMS file system already exists for user " + username);
 
 		try {
-			Repository repository = bc.getService(
-					bc.getServiceReferences(Repository.class, "(cn=" + NodeConstants.HOME + ")").iterator().next());
-			Session session = repository.login();
-			JcrFileSystem fileSystem = new JcrFileSystem(this, session);
-			fileSystems.put(username, fileSystem);
-			return fileSystem;
+			String host = uri.getHost();
+			if (host != null && !host.trim().equals("")) {
+				URI repoUri = new URI("http", uri.getUserInfo(), uri.getHost(), uri.getPort(), "/jcr/node", null, null);
+				RepositoryFactory repositoryFactory = bc.getService(bc.getServiceReference(RepositoryFactory.class));
+				Repository repository = NodeUtils.getRepositoryByUri(repositoryFactory, repoUri.toString());
+				Session session = repository.login("main");
+				CmsFileSystem fileSystem = new CmsFileSystem(this, session);
+				fileSystems.put(username, fileSystem);
+				return fileSystem;
+			} else {
+				Repository repository = bc.getService(
+						bc.getServiceReferences(Repository.class, "(cn=" + NodeConstants.HOME + ")").iterator().next());
+				Session session = repository.login();
+				CmsFileSystem fileSystem = new CmsFileSystem(this, session);
+				fileSystems.put(username, fileSystem);
+				return fileSystem;
+			}
 		} catch (Exception e) {
 			throw new CmsException("Cannot open file system " + uri + " for user " + username, e);
 		}
@@ -79,4 +95,18 @@ public class CmsFsProvider extends AbstractJackrabbitFsProvider {
 	public Node getUserHome(Session session) {
 		return NodeUtils.getUserHome(session);
 	}
+
+	static class CmsFileSystem extends JcrFileSystem {
+		public CmsFileSystem(JcrFileSystemProvider provider, Session session) throws IOException {
+			super(provider, session);
+		}
+
+		public boolean skipNode(Node node) throws RepositoryException {
+			if (node.isNodeType(NodeType.NT_HIERARCHY_NODE) || node.isNodeType(NodeTypes.NODE_USER_HOME)
+					|| node.isNodeType(NodeTypes.NODE_GROUP_HOME))
+				return false;
+			return true;
+		}
+
+	}
 }