You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by md...@apache.org on 2013/06/26 10:27:39 UTC
svn commit: r1496825 - in /jackrabbit/oak/trunk/oak-core/src:
main/java/org/apache/jackrabbit/oak/plugins/observation/
main/java/org/apache/jackrabbit/oak/spi/commit/
test/java/org/apache/jackrabbit/oak/
Author: mduerig
Date: Wed Jun 26 08:27:39 2013
New Revision: 1496825
URL: http://svn.apache.org/r1496825
Log:
OAK-144 Implement Observation
todo
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeProcessor.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/EventImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/RecursingNodeStateDiff.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/SecurableNodeStateDiff.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/SecureNodeStateDiff.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/PostCommitHook.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/SecureNodeStateDiffTest.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeProcessor.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeProcessor.java?rev=1496825&r1=1496824&r2=1496825&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeProcessor.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeProcessor.java Wed Jun 26 08:27:39 2013
@@ -230,7 +230,7 @@ class ChangeProcessor implements Runnabl
}
public EventGeneratingNodeStateDiff(ChangeSet changes) {
- // FIXME parent nodes should be the root here
+ // michid parent nodes should be the root here
this(changes, filterRef.get().getPath(), new ArrayList<Iterator<Event>>(PURGE_LIMIT), null, null, null, "");
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/EventImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/EventImpl.java?rev=1496825&r1=1496824&r2=1496825&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/EventImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/EventImpl.java Wed Jun 26 08:27:39 2013
@@ -26,9 +26,6 @@ import javax.jcr.RepositoryException;
import org.apache.jackrabbit.api.observation.JackrabbitEvent;
-/**
- * TODO document
- */
public class EventImpl implements JackrabbitEvent {
private final int type;
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/RecursingNodeStateDiff.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/RecursingNodeStateDiff.java?rev=1496825&r1=1496824&r2=1496825&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/RecursingNodeStateDiff.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/RecursingNodeStateDiff.java Wed Jun 26 08:27:39 2013
@@ -31,7 +31,8 @@ import org.apache.jackrabbit.oak.spi.sta
* should <em>not</em> recurse into child nodes but rather only be concerned about whether to continue
* diffing or not. The {@link #createChildDiff(String, NodeState, NodeState)} will be called instead
* for diffing child nodes.
- * TODO unify with NodeStateDiff
+ * michid unify with NodeStateDiff
+ * michid move
*/
public class RecursingNodeStateDiff extends DefaultNodeStateDiff {
public static final RecursingNodeStateDiff EMPTY = new RecursingNodeStateDiff();
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/SecurableNodeStateDiff.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/SecurableNodeStateDiff.java?rev=1496825&r1=1496824&r2=1496825&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/SecurableNodeStateDiff.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/SecurableNodeStateDiff.java Wed Jun 26 08:27:39 2013
@@ -28,6 +28,8 @@ import org.apache.jackrabbit.oak.spi.sta
* Base class for {@code NodeStateDiff} implementations that can be secured.
* That is its call back methods are only called when its receiver has sufficient
* rights to access respective items.
+ * michid doc
+ * michid move
*/
public abstract class SecurableNodeStateDiff implements NodeStateDiff {
private final SecurableNodeStateDiff parent;
@@ -108,7 +110,7 @@ public abstract class SecurableNodeState
@Override
public boolean childNodeChanged(final String name, final NodeState before, final NodeState after) {
- // FIXME temporary solution to skip look ahead on hidden child nodes
+ // michid temporary solution to skip look ahead on hidden child nodes
if (NodeStateUtils.isHidden(name)) {
return true;
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/SecureNodeStateDiff.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/SecureNodeStateDiff.java?rev=1496825&r1=1496824&r2=1496825&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/SecureNodeStateDiff.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/SecureNodeStateDiff.java Wed Jun 26 08:27:39 2013
@@ -23,6 +23,10 @@ import org.apache.jackrabbit.oak.api.Pro
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.NodeStateDiff;
+/**
+ * michid document
+ * michid move
+ */
public class SecureNodeStateDiff extends SecurableNodeStateDiff {
private SecureNodeStateDiff(RecursingNodeStateDiff diff) {
super(diff);
@@ -45,25 +49,25 @@ public class SecureNodeStateDiff extends
@Override
protected boolean canRead(PropertyState before, PropertyState after) {
- // TODO implement canRead
+ // michid implement canRead
return true;
}
@Override
protected boolean canRead(String name, NodeState before, NodeState after) {
- // TODO implement canRead
+ // michid implement canRead
return true;
}
@Override
protected NodeState secureBefore(String name, NodeState nodeState) {
- // TODO implement secureBefore
+ // michid implement secureBefore
return nodeState;
}
@Override
protected NodeState secureAfter(String name, NodeState nodeState) {
- // TODO implement secureAfter
+ // michid implement secureAfter
return nodeState;
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/PostCommitHook.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/PostCommitHook.java?rev=1496825&r1=1496824&r2=1496825&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/PostCommitHook.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/PostCommitHook.java Wed Jun 26 08:27:39 2013
@@ -24,7 +24,7 @@ import javax.annotation.Nonnull;
import org.apache.jackrabbit.oak.spi.state.NodeState;
/**
- * TODO unify with either Observer or CommitHook
+ * michid unify with either Observer or CommitHook
*/
public interface PostCommitHook {
PostCommitHook EMPTY = new PostCommitHook() {
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/SecureNodeStateDiffTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/SecureNodeStateDiffTest.java?rev=1496825&r1=1496824&r2=1496825&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/SecureNodeStateDiffTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/SecureNodeStateDiffTest.java Wed Jun 26 08:27:39 2013
@@ -31,6 +31,9 @@ import org.apache.jackrabbit.oak.spi.sta
import org.junit.Before;
import org.junit.Test;
+/**
+ * michid move
+ */
public class SecureNodeStateDiffTest {
private NodeState base;