X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.jcr%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjcr%2FJcrUtils.java;h=e51ac40cce522efb908827153b3b14d04c9e141c;hb=394d49c6ca688a96478a9eaad005f0041787cd76;hp=fdc69214942fde0a57b9ffd679b789097fc78ca9;hpb=7c4ea2803d8dd912e7751b85be4eeb1861905bde;p=lgpl%2Fargeo-commons.git

diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrUtils.java b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrUtils.java
index fdc692149..e51ac40cc 100644
--- a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrUtils.java
+++ b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/JcrUtils.java
@@ -42,6 +42,7 @@ import javax.jcr.NamespaceRegistry;
 import javax.jcr.NoSuchWorkspaceException;
 import javax.jcr.Node;
 import javax.jcr.NodeIterator;
+import javax.jcr.PathNotFoundException;
 import javax.jcr.Property;
 import javax.jcr.PropertyIterator;
 import javax.jcr.PropertyType;
@@ -50,6 +51,7 @@ import javax.jcr.RepositoryException;
 import javax.jcr.RepositoryFactory;
 import javax.jcr.Session;
 import javax.jcr.Value;
+import javax.jcr.ValueFormatException;
 import javax.jcr.Workspace;
 import javax.jcr.nodetype.NodeType;
 import javax.jcr.observation.EventListener;
@@ -293,6 +295,49 @@ public class JcrUtils implements ArgeoJcrConstants {
 				.addNode(childName);
 	}
 
+	/** Convert a {@link NodeIterator} to a list of {@link Node} */
+	public static List<Node> nodeIteratorToList(NodeIterator nodeIterator) {
+		List<Node> nodes = new ArrayList<Node>();
+		while (nodeIterator.hasNext()) {
+			nodes.add(nodeIterator.nextNode());
+		}
+		return nodes;
+	}
+
+	/*
+	 * PROPERTIES
+	 */
+
+	/** Concisely get the string value of a property */
+	public static String get(Node node, String propertyName) {
+		try {
+			return node.getProperty(propertyName).getString();
+		} catch (RepositoryException e) {
+			throw new ArgeoException("Cannot get property " + propertyName
+					+ " of " + node, e);
+		}
+	}
+
+	/** Concisely get the boolean value of a property */
+	public static Boolean check(Node node, String propertyName) {
+		try {
+			return node.getProperty(propertyName).getBoolean();
+		} catch (RepositoryException e) {
+			throw new ArgeoException("Cannot get property " + propertyName
+					+ " of " + node, e);
+		}
+	}
+
+	/** Concisely get the bytes array value of a property */
+	public static byte[] getBytes(Node node, String propertyName) {
+		try {
+			return getBinaryAsBytes(node.getProperty(propertyName));
+		} catch (RepositoryException e) {
+			throw new ArgeoException("Cannot get property " + propertyName
+					+ " of " + node, e);
+		}
+	}
+
 	/** Creates the nodes making path, if they don't exist. */
 	public static Node mkdirs(Session session, String path) {
 		return mkdirs(session, path, null, null, false);
@@ -340,6 +385,14 @@ public class JcrUtils implements ArgeoJcrConstants {
 		return mkdirsSafe(session, path, null);
 	}
 
+	/**
+	 * Creates the nodes making the path as {@link NodeType#NT_FOLDER}
+	 */
+	public static Node mkfolders(Session session, String path) {
+		return mkdirs(session, path, NodeType.NT_FOLDER, NodeType.NT_FOLDER,
+				false);
+	}
+
 	/**
 	 * Creates the nodes making path, if they don't exist. This is up to the
 	 * caller to save the session. Use with caution since it can create
@@ -354,7 +407,8 @@ public class JcrUtils implements ArgeoJcrConstants {
 			if (session.itemExists(path)) {
 				Node node = session.getNode(path);
 				// check type
-				if (type != null && !node.isNodeType(type))
+				if (type != null && !node.isNodeType(type)
+						&& !node.getPath().equals("/"))
 					throw new ArgeoException("Node " + node
 							+ " exists but is of type "
 							+ node.getPrimaryNodeType().getName()