svn commit: r1588154 - /jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java

[ch...@apache.org]

Author: chetanm
Date: Thu Apr 17 07:49:00 2014
New Revision: 1588154

URL: http://svn.apache.org/r1588154
Log:
OAK-1462 - Aggregate Index isn't usable in an osgi environment

Disabling the OSGi registration for now as it might cause issue when an aggregate index wrapper is also registered. As both of them would be invoked for Observer while we only require one.

Modified:
    jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java

Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java?rev=1588154&r1=1588153&r2=1588154&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java Thu Apr 17 07:49:00 2014
@@ -16,13 +16,11 @@
  */
 package org.apache.jackrabbit.oak.plugins.index.lucene;
 
+import java.io.Closeable;
 import java.util.List;
 
 import javax.annotation.Nonnull;
 
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Deactivate;
-import org.apache.felix.scr.annotations.Service;
 import org.apache.jackrabbit.oak.plugins.index.aggregate.NodeAggregator;
 import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
 import org.apache.jackrabbit.oak.spi.commit.Observer;
@@ -38,9 +36,7 @@ import com.google.common.collect.Immutab
  * 
  * @see LuceneIndex
  */
-@Component
-@Service({ QueryIndexProvider.class, Observer.class })
-public class LuceneIndexProvider implements QueryIndexProvider, Observer {
+public class LuceneIndexProvider implements QueryIndexProvider, Observer, Closeable {
 
     protected final IndexTracker tracker = new IndexTracker();
 
@@ -51,7 +47,6 @@ public class LuceneIndexProvider impleme
 
     protected NodeAggregator aggregator = null;
 
-    @Deactivate
     public void close() {
         tracker.close();
     }