package org.argeo.cms.internal.kernel;
import java.util.GregorianCalendar;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
import javax.jcr.Node;
import javax.jcr.Property;
// private final static String MIX_ETAG = "mix:etag";
private final static String JCR_ETAG = "jcr:etag";
- private final static String JCR_LAST_MODIFIED = "jcr:lastModified";
- private final static String JCR_LAST_MODIFIED_BY = "jcr:lastModifiedBy";
+// private final static String JCR_LAST_MODIFIED = "jcr:lastModified";
+// private final static String JCR_LAST_MODIFIED_BY = "jcr:lastModifiedBy";
+// private final static String JCR_MIXIN_TYPES = "jcr:mixinTypes";
private final static String JCR_DATA = "jcr:data";
+ private final static String JCR_CONTENT = "jcr:data";
private String cn;
private String workspaceName;
try {
String[] nodeTypes = { NodeType.NT_FILE, NodeType.MIX_LAST_MODIFIED };
session.getWorkspace().getObservationManager().addEventListener(this,
- Event.NODE_ADDED | Event.NODE_REMOVED | Event.PROPERTY_CHANGED, "/", true, null, nodeTypes, true);
+ Event.NODE_ADDED | Event.PROPERTY_CHANGED, "/", true, null, nodeTypes, true);
versionManager = session.getWorkspace().getVersionManager();
} catch (RepositoryException e1) {
throw new IllegalStateException(e1);
}
private synchronized void processEvents(EventIterator events) {
+ long begin = System.currentTimeMillis();
+ long count = 0;
while (events.hasNext()) {
Event event = events.nextEvent();
processEvent(event);
+ count++;
}
+ long duration = System.currentTimeMillis() - begin;
+ if (log.isTraceEnabled())
+ log.trace("Processed " + count + " events in " + duration + " ms");
notifyAll();
}
protected synchronized void processEvent(Event event) {
try {
+ String eventPath = event.getPath();
if (event.getType() == Event.NODE_ADDED) {
- if (!versionManager.isCheckedOut(event.getPath()))
+ if (!versionManager.isCheckedOut(eventPath))
return;// ignore checked-in nodes
- session.refresh(true);
- Node node = session.getNode(event.getPath());
- if (node.getParent().isNodeType(NodeType.NT_FILE)) {
+ if (log.isTraceEnabled())
+ log.trace("NODE_ADDED " + eventPath);
+// session.refresh(true);
+ session.refresh(false);
+ Node node = session.getNode(eventPath);
+ Node parentNode = node.getParent();
+ if (parentNode.isNodeType(NodeType.NT_FILE)) {
if (node.isNodeType(NodeType.NT_UNSTRUCTURED)) {
if (!node.isNodeType(NodeType.MIX_LAST_MODIFIED))
node.addMixin(NodeType.MIX_LAST_MODIFIED);
Property property = node.getProperty(Property.JCR_DATA);
String etag = toEtag(property.getValue());
+ session.save();
node.setProperty(JCR_ETAG, etag);
+ if (log.isTraceEnabled())
+ log.trace("ETag and last modified added to new " + node);
} else if (node.isNodeType(NodeType.NT_RESOURCE)) {
// if (!node.isNodeType(MIX_ETAG))
// node.addMixin(MIX_ETAG);
// node.setProperty(JCR_ETAG, etag);
// session.save();
}
- setLastModified(node.getParent(), event);
- session.save();
- if (log.isTraceEnabled())
- log.trace("ETag and last modified added to new " + node);
+// setLastModifiedRecursive(parentNode, event);
+// session.save();
+// if (log.isTraceEnabled())
+// log.trace("ETag and last modified added to new " + node);
}
+
+// if (node.isNodeType(NodeType.NT_FOLDER)) {
+// setLastModifiedRecursive(node, event);
+// session.save();
+// if (log.isTraceEnabled())
+// log.trace("Last modified added to new " + node);
+// }
} else if (event.getType() == Event.PROPERTY_CHANGED) {
- if (!session.propertyExists(event.getPath()))
- return;
- session.refresh(true);
- Property property = session.getProperty(event.getPath());
- String propertyName = property.getName();
+ String propertyName = extractItemName(eventPath);
// skip if last modified properties are explicitly set
- if (propertyName.equals(JCR_LAST_MODIFIED))
+ if (!propertyName.equals(JCR_DATA))
return;
- if (propertyName.equals(JCR_LAST_MODIFIED_BY))
+// if (propertyName.equals(JCR_LAST_MODIFIED))
+// return;
+// if (propertyName.equals(JCR_LAST_MODIFIED_BY))
+// return;
+// if (propertyName.equals(JCR_MIXIN_TYPES))
+// return;
+// if (propertyName.equals(JCR_ETAG))
+// return;
+
+ if (log.isTraceEnabled())
+ log.trace("PROPERTY_CHANGED " + eventPath);
+
+ if (!session.propertyExists(eventPath))
return;
+ session.refresh(false);
+ Property property = session.getProperty(eventPath);
Node node = property.getParent();
if (property.getType() == PropertyType.BINARY && propertyName.equals(JCR_DATA)
&& node.isNodeType(NodeType.NT_UNSTRUCTURED)) {
String etag = toEtag(property.getValue());
node.setProperty(JCR_ETAG, etag);
+ Node parentNode = node.getParent();
+ if (parentNode.isNodeType(NodeType.MIX_LAST_MODIFIED)) {
+ setLastModified(parentNode, event);
+ }
+ if (log.isTraceEnabled())
+ log.trace("ETag and last modified updated for " + node);
}
- setLastModified(node, event);
- session.save();
- if (log.isTraceEnabled())
- log.trace("ETag and last modified updated for " + node);
+// setLastModified(node, event);
+// session.save();
+// if (log.isTraceEnabled())
+// log.trace("ETag and last modified updated for " + node);
} else if (event.getType() == Event.NODE_REMOVED) {
- String removeNodePath = event.getPath();
- String parentPath = JcrUtils.parentPath(removeNodePath);
- session.refresh(true);
- setLastModified(parentPath, event);
- session.save();
+ String removeNodePath = eventPath;
+ String nodeName = extractItemName(eventPath);
+ if (JCR_CONTENT.equals(nodeName)) // parent is a file, deleted anyhow
+ return;
+ if (log.isTraceEnabled())
+ log.trace("NODE_REMOVED " + eventPath);
+// String parentPath = JcrUtils.parentPath(removeNodePath);
+// session.refresh(true);
+// setLastModified(parentPath, event);
+// session.save();
if (log.isTraceEnabled())
log.trace("Last modified updated for parents of removed " + removeNodePath);
}
}
+ private String extractItemName(String path) {
+ if (path == null || path.length() <= 1)
+ return null;
+ int lastIndex = path.lastIndexOf('/');
+ if (lastIndex >= 0) {
+ return path.substring(lastIndex + 1);
+ } else {
+ return path;
+ }
+ }
+
@Override
public void onEvent(EventIterator events) {
Runnable toRun = new Runnable() {
processEvents(events);
}
};
- Activator.getInternalExecutorService().execute(toRun);
+ Future<?> future = Activator.getInternalExecutorService().submit(toRun);
+ try {
+ // make the call synchronous
+ future.get(60, TimeUnit.SECONDS);
+ } catch (TimeoutException | ExecutionException | InterruptedException e) {
+ // silent
+ }
}
static String toEtag(Value v) {
}
- /** Recursively set the last updated time on parents. */
protected synchronized void setLastModified(Node node, Event event) throws RepositoryException {
+ GregorianCalendar calendar = new GregorianCalendar();
+ calendar.setTimeInMillis(event.getDate());
+ node.setProperty(Property.JCR_LAST_MODIFIED, calendar);
+ node.setProperty(Property.JCR_LAST_MODIFIED_BY, event.getUserID());
+ if (log.isTraceEnabled())
+ log.trace("Last modified set on " + node);
+ }
+
+ /** Recursively set the last updated time on parents. */
+ protected synchronized void setLastModifiedRecursive(Node node, Event event) throws RepositoryException {
if (versionManager.isCheckedOut(node.getPath())) {
- GregorianCalendar calendar = new GregorianCalendar();
- calendar.setTimeInMillis(event.getDate());
if (node.isNodeType(NodeType.MIX_LAST_MODIFIED)) {
- node.setProperty(Property.JCR_LAST_MODIFIED, calendar);
- node.setProperty(Property.JCR_LAST_MODIFIED_BY, event.getUserID());
+ setLastModified(node, event);
}
if (node.isNodeType(NodeType.NT_FOLDER) && !node.isNodeType(NodeType.MIX_LAST_MODIFIED)) {
node.addMixin(NodeType.MIX_LAST_MODIFIED);
+ if (log.isTraceEnabled())
+ log.trace("Last modified mix-in added to " + node);
}
- try {
- node.getSession().save();
- } catch (RepositoryException e) {
- // fail silently and keep recursing
- }
}
- if (node.getDepth() == 0)
+
+ // end condition
+ if (node.getDepth() == 0) {
+// try {
+// node.getSession().save();
+// } catch (RepositoryException e) {
+// log.warn("Cannot index workspace", e);
+// }
return;
- Node parent = node.getParent();
- setLastModified(parent, event);
+ } else {
+ Node parent = node.getParent();
+ setLastModifiedRecursive(parent, event);
+ }
}
/**
* Recursively set the last updated time on parents. Useful to use paths when
* dealing with deletions.
*/
- protected synchronized void setLastModified(String path, Event event) throws RepositoryException {
+ protected synchronized void setLastModifiedRecursive(String path, Event event) throws RepositoryException {
// root node will always exist, so end condition is delegated to the other
// recursive setLastModified method
if (session.nodeExists(path)) {
- setLastModified(session.getNode(path), event);
+ setLastModifiedRecursive(session.getNode(path), event);
} else {
- setLastModified(JcrUtils.parentPath(path), event);
+ setLastModifiedRecursive(JcrUtils.parentPath(path), event);
}
}
projects / lgpl / argeo-commons.git / blobdiff