X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=server%2Fruntime%2Forg.argeo.server.jcr%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjcr%2FJcrUtils.java;h=eeaff3a924f505cee38124e3ac85a090dbc5295e;hb=1c8303618e6865a4b3a8715ee217ed557736d9ae;hp=6dfb4a017f57da6870d9ad0a59c81ea11d3aae76;hpb=2d4dd736ab07b1ef3aaec0a9e5d29f30c551de9c;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 6dfb4a017..eeaff3a92 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
@@ -16,6 +16,9 @@
 
 package org.argeo.jcr;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.text.DateFormat;
@@ -36,6 +39,7 @@ import javax.jcr.Node;
 import javax.jcr.NodeIterator;
 import javax.jcr.Property;
 import javax.jcr.PropertyIterator;
+import javax.jcr.PropertyType;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.RepositoryFactory;
@@ -52,6 +56,7 @@ import javax.jcr.query.qom.QueryObjectModelFactory;
 import javax.jcr.query.qom.Selector;
 import javax.jcr.query.qom.StaticOperand;
 
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.ArgeoException;
@@ -219,6 +224,26 @@ public class JcrUtils implements ArgeoJcrConstants {
 		return path.substring(index + 1);
 	}
 
+	/**
+	 * Routine that get the child with this name, adding id it does not already
+	 * exist
+	 */
+	public static Node getOrAdd(Node parent, String childName,
+			String childPrimaryNodeType) throws RepositoryException {
+		return parent.hasNode(childName) ? parent.getNode(childName) : parent
+				.addNode(childName, childPrimaryNodeType);
+	}
+
+	/**
+	 * Routine that get the child with this name, adding id it does not already
+	 * exist
+	 */
+	public static Node getOrAdd(Node parent, String childName)
+			throws RepositoryException {
+		return parent.hasNode(childName) ? parent.getNode(childName) : parent
+				.addNode(childName);
+	}
+
 	/** 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);
@@ -355,15 +380,17 @@ public class JcrUtils implements ArgeoJcrConstants {
 			NodeIterator it = node.getNodes();
 			while (it.hasNext()) {
 				Node childNode = it.nextNode();
-				debug(childNode);
+				debug(childNode, log);
 			}
 
 			// Then output the properties
 			PropertyIterator properties = node.getProperties();
 			// log.debug("Property are : ");
 
-			while (properties.hasNext()) {
+			properties: while (properties.hasNext()) {
 				Property property = properties.nextProperty();
+				if (property.getType() == PropertyType.BINARY)
+					continue properties;// skip
 				if (property.getDefinition().isMultiple()) {
 					// A multi-valued property, print all values
 					Value[] values = property.getValues();
@@ -660,6 +687,43 @@ public class JcrUtils implements ArgeoJcrConstants {
 		binary.dispose();
 	}
 
+	/** Retrieve a {@link Binary} as a byte array */
+	public static byte[] getBinaryAsBytes(Property property) {
+		ByteArrayOutputStream out = new ByteArrayOutputStream();
+		InputStream in = null;
+		Binary binary = null;
+		try {
+			binary = property.getBinary();
+			in = binary.getStream();
+			IOUtils.copy(in, out);
+			return out.toByteArray();
+		} catch (Exception e) {
+			throw new ArgeoException("Cannot read binary " + property
+					+ " as bytes", e);
+		} finally {
+			IOUtils.closeQuietly(out);
+			IOUtils.closeQuietly(in);
+			closeQuietly(binary);
+		}
+	}
+
+	/** Writes a {@link Binary} from a byte array */
+	public static void setBinaryAsBytes(Node node, String property, byte[] bytes) {
+		InputStream in = null;
+		Binary binary = null;
+		try {
+			in = new ByteArrayInputStream(bytes);
+			binary = node.getSession().getValueFactory().createBinary(in);
+			node.setProperty(property, binary);
+		} catch (Exception e) {
+			throw new ArgeoException("Cannot read binary " + property
+					+ " as bytes", e);
+		} finally {
+			IOUtils.closeQuietly(in);
+			closeQuietly(binary);
+		}
+	}
+
 	/**
 	 * Creates depth from a string (typically a username) by adding levels based
 	 * on its first characters: "aBcD",2 => a/aB