Author: tommaso
Date: Wed Aug 12 13:25:19 2015
New Revision: 1695507
URL: http://svn.apache.org/r1695507
Log:
OAK-3116 - a Solr QIP OSGi service will only be registered upon remote or
embedded SSP service registration
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrQueryIndexProviderService.java
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrQueryIndexProviderService.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrQueryIndexProviderService.java?rev=1695507&r1=1695506&r2=1695507&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrQueryIndexProviderService.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrQueryIndexProviderService.java
Wed Aug 12 13:25:19 2015
@@ -54,7 +54,7 @@ public class SolrQueryIndexProviderServi
private final List<ServiceRegistration> regs = Lists.newArrayList();
- @Reference
+ @Reference(target = "(|(server.type=embedded)(server.type=remote))")
private SolrServerProvider solrServerProvider;
@Reference