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/11/26 11:40:33 UTC
svn commit: r1545602 - in /jackrabbit/oak/trunk:
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/
oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/
Author: mduerig
Date: Tue Nov 26 10:40:33 2013
New Revision: 1545602
URL: http://svn.apache.org/r1545602
Log:
OAK-1133: Observation listener PLUS
Rename FilterProvider to JcrFilterProvider
Added:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/JcrFilterProvider.java
- copied, changed from r1545598, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/FilterProvider.java
Removed:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/FilterProvider.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeProcessor.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ObservationManagerImpl.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=1545602&r1=1545601&r2=1545602&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 Tue Nov 26 10:40:33 2013
@@ -53,7 +53,7 @@ import org.slf4j.LoggerFactory;
/**
* A {@code ChangeProcessor} generates observation {@link javax.jcr.observation.Event}s
- * based on a {@link FilterProvider filter} and delivers them to an {@link EventListener}.
+ * based on a {@link JcrFilterProvider filter} and delivers them to an {@link EventListener}.
* <p>
* After instantiation a {@code ChangeProcessor} must be started in order to start
* delivering observation events and stopped to stop doing so.
@@ -66,7 +66,7 @@ public class ChangeProcessor implements
private final NamePathMapper namePathMapper;
private final ListenerTracker tracker;
private final EventListener eventListener;
- private final AtomicReference<FilterProvider> filterProvider;
+ private final AtomicReference<JcrFilterProvider> filterProvider;
private Closeable observer;
private Registration mbean;
@@ -76,21 +76,21 @@ public class ChangeProcessor implements
ContentSession contentSession,
PermissionProvider permissionProvider,
NamePathMapper namePathMapper,
- ListenerTracker tracker, FilterProvider filter) {
+ ListenerTracker tracker, JcrFilterProvider filter) {
checkArgument(contentSession instanceof Observable);
this.contentSession = contentSession;
this.permissionProvider = permissionProvider;
this.namePathMapper = namePathMapper;
this.tracker = tracker;
eventListener = tracker.getTrackedListener();
- filterProvider = new AtomicReference<FilterProvider>(filter);
+ filterProvider = new AtomicReference<JcrFilterProvider>(filter);
}
/**
* Set the filter for the events this change processor will generate.
* @param filter
*/
- public void setFilterProvider(FilterProvider filter) {
+ public void setFilterProvider(JcrFilterProvider filter) {
filterProvider.set(filter);
}
@@ -127,7 +127,7 @@ public class ChangeProcessor implements
public void contentChanged(@Nonnull NodeState root, @Nullable CommitInfo info) {
if (previousRoot != null) {
try {
- FilterProvider provider = filterProvider.get();
+ JcrFilterProvider provider = filterProvider.get();
// FIXME don't rely on toString for session id
if (provider.includeCommit(contentSession.toString(), info)) {
String path = namePathMapper.getOakPath(provider.getPath());
Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/JcrFilterProvider.java (from r1545598, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/FilterProvider.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/JcrFilterProvider.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/JcrFilterProvider.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/FilterProvider.java&r1=1545598&r2=1545602&rev=1545602&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/FilterProvider.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/JcrFilterProvider.java Tue Nov 26 10:40:33 2013
@@ -46,7 +46,7 @@ import org.apache.jackrabbit.oak.spi.sec
/**
* Provider for a filter filtering observation events according to a certain criterion.
*/
-public class FilterProvider {
+public class JcrFilterProvider {
private static final int ALL_EVENTS = NODE_ADDED | NODE_REMOVED | NODE_MOVED | PROPERTY_ADDED |
PROPERTY_REMOVED | PROPERTY_CHANGED | PERSIST;
@@ -61,7 +61,7 @@ public class FilterProvider {
private final boolean includeClusterExternal;
/**
- * Create a new instance of a {@code FilterProvider} for certain criteria
+ * Create a new instance of a {@code JcrFilterProvider} for certain criteria
*
* @param ntManager node type manager
* @param eventTypes event types to include encoded as a bit mask
@@ -76,7 +76,7 @@ public class FilterProvider {
* Exclude otherwise.
*
* @see javax.jcr.observation.ObservationManager#addEventListener(javax.jcr.observation.EventListener, int, String, boolean, String[], String[], boolean) */
- public FilterProvider(ReadOnlyNodeTypeManager ntManager, int eventTypes, String path,
+ public JcrFilterProvider(ReadOnlyNodeTypeManager ntManager, int eventTypes, String path,
boolean deep, String[] uuids, String[] nodeTypeName,
boolean includeSessionLocal, boolean includeClusterExternal) {
this.ntManager = ntManager;
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=1545602&r1=1545601&r2=1545602&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 Tue Nov 26 10:40:33 2013
@@ -42,7 +42,7 @@ import org.apache.jackrabbit.oak.namepat
import org.apache.jackrabbit.oak.plugins.nodetype.ReadOnlyNodeTypeManager;
import org.apache.jackrabbit.oak.plugins.observation.ChangeProcessor;
import org.apache.jackrabbit.oak.plugins.observation.ExcludeExternal;
-import org.apache.jackrabbit.oak.plugins.observation.FilterProvider;
+import org.apache.jackrabbit.oak.plugins.observation.JcrFilterProvider;
import org.apache.jackrabbit.oak.spi.commit.Observable;
import org.apache.jackrabbit.oak.spi.security.authorization.permission.PermissionProvider;
import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard;
@@ -110,7 +110,7 @@ public class ObservationManagerImpl impl
public synchronized void addEventListener(EventListener listener, int eventTypes, String absPath,
boolean isDeep, String[] uuid, String[] nodeTypeName, boolean noLocal) throws RepositoryException {
boolean includeExternal = !(listener instanceof ExcludeExternal);
- FilterProvider filterProvider = new FilterProvider(ntMgr, eventTypes, oakPath(absPath), isDeep,
+ JcrFilterProvider filterProvider = new JcrFilterProvider(ntMgr, eventTypes, oakPath(absPath), isDeep,
uuid, validateNodeTypeNames(nodeTypeName), !noLocal, includeExternal);
ChangeProcessor processor = processors.get(listener);
if (processor == null) {