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 2014/08/15 12:37:15 UTC
svn commit: r1618147 - in /jackrabbit/oak/trunk/oak-jcr/src:
main/java/org/apache/jackrabbit/oak/jcr/observation/ObservationManagerImpl.java
test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationTest.java
Author: mduerig
Date: Fri Aug 15 10:37:15 2014
New Revision: 1618147
URL: http://svn.apache.org/r1618147
Log:
OAK-1978: Add path exclusion to JackrabbitEventFilter
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ObservationManagerImpl.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationTest.java
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ObservationManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ObservationManagerImpl.java?rev=1618147&r1=1618146&r2=1618147&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ObservationManagerImpl.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ObservationManagerImpl.java Fri Aug 15 10:37:15 2014
@@ -221,9 +221,7 @@ public class ObservationManagerImpl impl
if (absPath != null) {
includePaths.add(namePathMapper.getOakPath(absPath));
}
-// FIXME Use filter.getExcludedPaths()) as soon as we have the changes from JCR-3797. See OAK-1978
-// Set<String> excludedPaths = getOakPaths(namePathMapper, filter.getExcludedPaths());
- Set<String> excludedPaths = emptySet();
+ Set<String> excludedPaths = getOakPaths(namePathMapper, filter.getExcludedPaths());
optimise(includePaths, excludedPaths);
if (includePaths.isEmpty()) {
LOG.warn("The passed filter excludes all events. No event listener registered");
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationTest.java?rev=1618147&r1=1618146&r2=1618147&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationTest.java Fri Aug 15 10:37:15 2014
@@ -763,7 +763,6 @@ public class ObservationTest extends Abs
assertTrue("Unexpected events: " + unexpected, unexpected.isEmpty());
}
- @Ignore("OAK-1978") // FIXME OAK-1978
@Test
public void pathExclude() throws ExecutionException, InterruptedException, RepositoryException {
assumeTrue(observationManager instanceof JackrabbitObservationManager);
@@ -772,8 +771,7 @@ public class ObservationTest extends Abs
JackrabbitEventFilter filter = new JackrabbitEventFilter()
.setAbsPath(TEST_PATH)
.setIsDeep(true)
-// FIXME set exclude paths as soon as we have the changes from JCR-3797. See OAK-1978
-// .setExcludedPaths(TEST_PATH + "/c", TEST_PATH + "/d", "/x/y")
+ .setExcludedPaths(TEST_PATH + "/c", TEST_PATH + "/d", "/x/y")
.setEventTypes(ALL_EVENTS);
oManager.addEventListener(listener, filter);
@@ -792,7 +790,6 @@ public class ObservationTest extends Abs
assertTrue("Unexpected events: " + unexpected, unexpected.isEmpty());
}
- @Ignore("OAK-1978") // FIXME OAK-1978
@Test
public void parentPathExclude() throws ExecutionException, InterruptedException, RepositoryException {
assumeTrue(observationManager instanceof JackrabbitObservationManager);
@@ -805,8 +802,7 @@ public class ObservationTest extends Abs
JackrabbitEventFilter filter = new JackrabbitEventFilter()
.setAbsPath(n.getPath())
.setIsDeep(true)
-// FIXME set exclude paths as soon as we have the changes from JCR-3797. See OAK-1978
-// .setExcludedPaths(n.getParent().getPath())
+ .setExcludedPaths(n.getParent().getPath())
.setEventTypes(ALL_EVENTS);
oManager.addEventListener(listener, filter);