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 2016/12/09 13:30:02 UTC
svn commit: r1773381 - in /jackrabbit/oak/trunk/oak-lucene/src:
main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java
test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderServiceTest.java
Author: chetanm
Date: Fri Dec 9 13:30:02 2016
New Revision: 1773381
URL: http://svn.apache.org/viewvc?rev=1773381&view=rev
Log:
OAK-5256 - Add type property to LuceneIndexEditorProvider
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderServiceTest.java
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java?rev=1773381&r1=1773380&r2=1773381&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java Fri Dec 9 13:30:02 2016
@@ -21,6 +21,8 @@ package org.apache.jackrabbit.oak.plugin
import java.io.File;
import java.io.IOException;
+import java.util.Dictionary;
+import java.util.Hashtable;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ExecutorService;
@@ -387,7 +389,9 @@ public class LuceneIndexProviderService
}
editorProvider.setBlobStore(blobStore);
- regs.add(bundleContext.registerService(IndexEditorProvider.class.getName(), editorProvider, null));
+ Dictionary<String, Object> props = new Hashtable<String, Object>();
+ props.put("type", "lucene");
+ regs.add(bundleContext.registerService(IndexEditorProvider.class.getName(), editorProvider, props));
oakRegs.add(registerMBean(whiteboard,
TextExtractionStatsMBean.class,
editorProvider.getExtractedTextCache().getStatsMBean(),
Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderServiceTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderServiceTest.java?rev=1773381&r1=1773380&r2=1773381&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderServiceTest.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderServiceTest.java Fri Dec 9 13:30:02 2016
@@ -57,6 +57,7 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
+import org.osgi.framework.ServiceReference;
public class LuceneIndexProviderServiceTest {
/*
@@ -118,6 +119,13 @@ public class LuceneIndexProviderServiceT
}
@Test
+ public void typeProperty() throws Exception{
+ MockOsgi.activate(service, context.bundleContext(), getDefaultConfig());
+ ServiceReference sr = context.bundleContext().getServiceReference(IndexEditorProvider.class.getName());
+ assertEquals("lucene", sr.getProperty("type"));
+ }
+
+ @Test
public void disableOpenIndexAsync() throws Exception{
Map<String,Object> config = getDefaultConfig();
config.put("enableOpenIndexAsync", false);