Author: tommaso
Date: Thu Feb 19 14:41:56 2015
New Revision: 1660897
URL: http://svn.apache.org/r1660897
Log:
OAK-2534 - added missing AJ prefix to oak-solr OSGi services labels
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/EmbeddedSolrServerConfigurationProvider.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/OakSolrConfigurationProviderService.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/RemoteSolrServerConfigurationProvider.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrQueryIndexProviderService.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrServerProviderService.java
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/EmbeddedSolrServerConfigurationProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/EmbeddedSolrServerConfigurationProvider.java?rev=1660897&r1=1660896&r2=1660897&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/EmbeddedSolrServerConfigurationProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/EmbeddedSolrServerConfigurationProvider.java
Thu Feb 19 14:41:56 2015
@@ -35,7 +35,7 @@ import org.osgi.service.component.Compon
* An OSGi service {@link
org.apache.jackrabbit.oak.plugins.index.solr.configuration.SolrServerConfigurationProvider}
*/
@Component(metatype = true, immediate = true,
- label = "Oak Solr embedded server configuration")
+ label = "Apache Jackrabbit Oak Solr embedded server configuration")
@Service(value = SolrServerConfigurationProvider.class)
@Property(name = "name", value = "embedded", propertyPrivate = true)
public class EmbeddedSolrServerConfigurationProvider implements
SolrServerConfigurationProvider<EmbeddedSolrServerProvider> {
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/OakSolrConfigurationProviderService.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/OakSolrConfigurationProviderService.java?rev=1660897&r1=1660896&r2=1660897&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/OakSolrConfigurationProviderService.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/OakSolrConfigurationProviderService.java
Thu Feb 19 14:41:56 2015
@@ -40,7 +40,7 @@ import org.osgi.service.component.Compon
/**
* OSGi service for {@link
org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfigurationProvider}
*/
-@Component(label = "Oak Solr indexing / search configuration", metatype =
true, immediate = true)
+@Component(label = "Apache Jackrabbit Oak Solr indexing / search
configuration", metatype = true, immediate = true)
@Service(OakSolrConfigurationProvider.class)
public class OakSolrConfigurationProviderService implements
OakSolrConfigurationProvider {
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/RemoteSolrServerConfigurationProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/RemoteSolrServerConfigurationProvider.java?rev=1660897&r1=1660896&r2=1660897&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/RemoteSolrServerConfigurationProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/RemoteSolrServerConfigurationProvider.java
Thu Feb 19 14:41:56 2015
@@ -33,7 +33,7 @@ import org.osgi.service.component.Compon
/**
* {@link
org.apache.jackrabbit.oak.plugins.index.solr.server.SolrServerProvider} for
remote Solr installations.
*/
-@Component(metatype = true, immediate = true, label = "Oak Solr remote server
configuration")
+@Component(metatype = true, immediate = true, label = "Apache Jackrabbit Oak
Solr remote server configuration")
@Service(SolrServerConfigurationProvider.class)
@Property(name = "name", value = "remote", propertyPrivate = true)
public class RemoteSolrServerConfigurationProvider implements
SolrServerConfigurationProvider<RemoteSolrServerProvider> {
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=1660897&r1=1660896&r2=1660897&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
Thu Feb 19 14:41:56 2015
@@ -46,7 +46,7 @@ import org.slf4j.LoggerFactory;
* @see
org.apache.jackrabbit.oak.plugins.index.solr.query.SolrQueryIndexProvider
* @see QueryIndexProvider
*/
-@Component(metatype = true, immediate = true, label = "Oak Solr Query index
provider configuration")
+@Component(metatype = true, immediate = true, label = "Apache Jackrabbit Oak
Solr Query index provider configuration")
public class SolrQueryIndexProviderService {
private static final boolean QUERY_TIME_AGGREGATION_DEFAULT = false;
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrServerProviderService.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrServerProviderService.java?rev=1660897&r1=1660896&r2=1660897&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrServerProviderService.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrServerProviderService.java
Thu Feb 19 14:41:56 2015
@@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory;
/**
* OSGi service for {@link
org.apache.jackrabbit.oak.plugins.index.solr.server.SolrServerProvider}
*/
-@Component(metatype = true, label = "Oak Solr server provider", immediate =
true)
+@Component(metatype = true, label = "Apache Jackrabbit Oak Solr server
provider", immediate = true)
@References({
@Reference(name = "solrServerConfigurationProvider",
referenceInterface = SolrServerConfigurationProvider.class,
