Improve workgroups and JCR file system.

[lgpl/argeo-commons.git] / org.argeo.jcr / src / org / argeo / jcr / fs / JcrFileSystemProvider.java

diff --git a/org.argeo.jcr/src/org/argeo/jcr/fs/JcrFileSystemProvider.java b/org.argeo.jcr/src/org/argeo/jcr/fs/JcrFileSystemProvider.java
index 3e07697dc5c2699661a982af278731d544f82076..1e2864d248a8b9d998a34f874a773710f7a63ca0 100644 (file)
--- a/org.argeo.jcr/src/org/argeo/jcr/fs/JcrFileSystemProvider.java
+++ b/org.argeo.jcr/src/org/argeo/jcr/fs/JcrFileSystemProvider.java
@@ -40,13 +40,16 @@ public abstract class JcrFileSystemProvider extends FileSystemProvider {
                try {
                        Node node = toNode(path);
                        if (node == null) {
-                               Node parentNode = toNode(path.getParent());
-                               if (parentNode == null)
+                               Node parent = toNode(path.getParent());
+                               if (parent == null)
                                        throw new JcrFsException("No parent directory for " + path);
-                               if (!(parentNode.getPath().equals("/") || parentNode.isNodeType(NodeType.NT_FOLDER)))
-                                       throw new JcrFsException("Parent of " + path + " is not a directory");
+                               if (parent.getPrimaryNodeType().isNodeType(NodeType.NT_FILE)
+                                               || parent.getPrimaryNodeType().isNodeType(NodeType.NT_LINKED_FILE))
+                                       throw new JcrFsException(path + " parent is a file");
 
-                               node = parentNode.addNode(path.getFileName().toString(), NodeType.NT_FILE);
+                               String fileName = path.getFileName().toString();
+                               fileName = Text.escapeIllegalJcrChars(fileName);
+                               node = parent.addNode(fileName, NodeType.NT_FILE);
                                node.addMixin(NodeType.MIX_CREATED);
                                node.addMixin(NodeType.MIX_LAST_MODIFIED);
                        }
@@ -76,9 +79,12 @@ public abstract class JcrFileSystemProvider extends FileSystemProvider {
                                Node parent = toNode(dir.getParent());
                                if (parent == null)
                                        throw new IOException("Parent of " + dir + " does not exist");
-                               if (!(parent.getPath().equals("/") || parent.getPrimaryNodeType().isNodeType(NodeType.NT_FOLDER)))
-                                       throw new JcrFsException(dir + " parent is not a directory");
-                               node = parent.addNode(dir.getFileName().toString(), NodeType.NT_FOLDER);
+                               if (parent.getPrimaryNodeType().isNodeType(NodeType.NT_FILE)
+                                               || parent.getPrimaryNodeType().isNodeType(NodeType.NT_LINKED_FILE))
+                                       throw new JcrFsException(dir + " parent is a file");
+                               String fileName = dir.getFileName().toString();
+                               fileName = Text.escapeIllegalJcrChars(fileName);
+                               node = parent.addNode(fileName, NodeType.NT_FOLDER);
                                node.addMixin(NodeType.MIX_CREATED);
                                node.addMixin(NodeType.MIX_LAST_MODIFIED);
                                node.getSession().save();
@@ -191,6 +197,9 @@ public abstract class JcrFileSystemProvider extends FileSystemProvider {
                try {
                        // TODO check if assignable
                        Node node = toNode(path);
+                       if(node==null) {
+                               throw new JcrFsException("JCR node not found for "+path);
+                       }
                        return (A) new JcrBasicfileAttributes(node);
                } catch (RepositoryException e) {
                        throw new JcrFsException("Cannot read basic attributes of " + path, e);
@@ -258,4 +267,13 @@ public abstract class JcrFileSystemProvider extends FileSystemProvider {
                return ((JcrPath) path).getNode();
        }
 
+       /**
+        * To be overriden in order to support the ~ path, with an implementation
+        * specific concept of user home.
+        * 
+        * @return null by default
+        */
+       public Node getUserHome(Session session) {
+               return null;
+       }
 }