From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 20 Apr 2011 07:56:13 +0000 (+0000)
Subject: Last modified support
X-Git-Tag: argeo-commons-2.1.30~1276
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=4a466f59df24fa18799297486b8d084b2a1aecba;p=lgpl%2Fargeo-commons.git

Last modified support

ASSIGNED - bug 17: Generalize agent management and registration beyond JMS
https://bugzilla.argeo.org/show_bug.cgi?id=17

git-svn-id: https://svn.argeo.org/commons/trunk@4460 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

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 ccaef384d..ebcb4ee9f 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
@@ -367,11 +367,16 @@ public class JcrUtils implements ArgeoJcrConstants {
 	}
 
 	/**
-	 * Copies recursively the content of a node to another one. Mixin are NOT
-	 * copied.
+	 * Copies recursively the content of a node to another one. Do NOT copy the
+	 * property values of {@link NodeType#MIX_CREATED} and
+	 * {@link NodeType#MIX_LAST_MODIFIED}, but update the
+	 * {@link Property#JCR_LAST_MODIFIED} and
+	 * {@link Property#JCR_LAST_MODIFIED_BY} properties if the target node has
+	 * the {@link NodeType#MIX_LAST_MODIFIED} mixin.
 	 */
 	public static void copy(Node fromNode, Node toNode) {
 		try {
+			// process properties
 			PropertyIterator pit = fromNode.getProperties();
 			properties: while (pit.hasNext()) {
 				Property fromProperty = pit.nextProperty();
@@ -381,10 +386,32 @@ public class JcrUtils implements ArgeoJcrConstants {
 								.isProtected())
 					continue properties;
 
-				toNode.setProperty(fromProperty.getName(),
-						fromProperty.getValue());
+				if (fromProperty.getDefinition().isProtected())
+					continue properties;
+
+				if (propertyName.equals("jcr:created")
+						|| propertyName.equals("jcr:createdBy")
+						|| propertyName.equals("jcr:lastModified")
+						|| propertyName.equals("jcr:lastModifiedBy"))
+					continue properties;
+
+				if (fromProperty.isMultiple()) {
+					toNode.setProperty(propertyName, fromProperty.getValues());
+				} else {
+					toNode.setProperty(propertyName, fromProperty.getValue());
+				}
+			}
+
+			// update jcr:lastModified and jcr:lastModifiedBy in toNode in case
+			// they existed, before adding the mixins
+			updateLastModified(toNode);
+
+			// add mixins
+			for (NodeType mixinType : fromNode.getMixinNodeTypes()) {
+				toNode.addMixin(mixinType.getName());
 			}
 
+			// process children nodes
 			NodeIterator nit = fromNode.getNodes();
 			while (nit.hasNext()) {
 				Node fromChild = nit.nextNode();
@@ -790,4 +817,26 @@ public class JcrUtils implements ArgeoJcrConstants {
 						+ eventListener);
 		}
 	}
+
+	/**
+	 * If this node is has the {@link NodeType#MIX_LAST_MODIFIED} mixin, it
+	 * updates the {@link Property#JCR_LAST_MODIFIED} property with the current
+	 * time and the {@link Property#JCR_LAST_MODIFIED_BY} property with the
+	 * underlying session user id. In Jackrabbit 2.x, <a
+	 * href="https://issues.apache.org/jira/browse/JCR-2233">these properties
+	 * are not automatically updated</a>, hence the need for manual update. The
+	 * session is not saved.
+	 */
+	public static void updateLastModified(Node node) {
+		try {
+			if (node.isNodeType(NodeType.MIX_LAST_MODIFIED)) {
+				node.setProperty(Property.JCR_LAST_MODIFIED,
+						new GregorianCalendar());
+				node.setProperty(Property.JCR_LAST_MODIFIED_BY, node
+						.getSession().getUserID());
+			}
+		} catch (RepositoryException e) {
+			throw new ArgeoException("Cannot update last modified", e);
+		}
+	}
 }