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 ch...@apache.org on 2014/04/17 10:00:14 UTC

svn commit: r1588157 - /jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java

Author: chetanm
Date: Thu Apr 17 08:00:13 2014
New Revision: 1588157

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

Disable the OSGi registration for 1.0
 - merged to 1.0

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

Modified: jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java?rev=1588157&r1=1588156&r2=1588157&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java (original)
+++ jackrabbit/oak/branches/1.0/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java Thu Apr 17 08:00:13 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();
     }