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=614ff6c497ebda2ce6dd0554c4dd11f8cd64ad71;hpb=088c1b517a543e935d8ab65c3b2fd2d0269b551d;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 614ff6c49..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,23 +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.JcrUtils;
 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() {
@@ -35,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
@@ -50,14 +53,14 @@ public class CmsFsProvider extends AbstractJackrabbitFsProvider {
 				RepositoryFactory repositoryFactory = bc.getService(bc.getServiceReference(RepositoryFactory.class));
 				Repository repository = NodeUtils.getRepositoryByUri(repositoryFactory, repoUri.toString());
 				Session session = repository.login("main");
-				JcrFileSystem fileSystem = new JcrFileSystem(this, session);
+				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();
-				JcrFileSystem fileSystem = new JcrFileSystem(this, session);
+				CmsFileSystem fileSystem = new CmsFileSystem(this, session);
 				fileSystems.put(username, fileSystem);
 				return fileSystem;
 			}
@@ -92,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;
+		}
+
+	}
 }