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 to...@apache.org on 2014/01/30 14:13:48 UTC
svn commit: r1562807 - in /jackrabbit/oak/trunk: oak-solr-embedded/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/embedded/osgi/ oak-solr-remote/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/http/

Author: tommaso
Date: Thu Jan 30 13:13:47 2014
New Revision: 1562807

URL: http://svn.apache.org/r1562807
Log:
OAK-1371 - moved OSGi property names to labels

Modified:
    jackrabbit/oak/trunk/oak-solr-embedded/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/embedded/osgi/EmbeddedSolrProviderService.java
    jackrabbit/oak/trunk/oak-solr-remote/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/http/RemoteSolrConfigurationProvider.java
    jackrabbit/oak/trunk/oak-solr-remote/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/http/RemoteSolrServerProvider.java

Modified: jackrabbit/oak/trunk/oak-solr-embedded/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/embedded/osgi/EmbeddedSolrProviderService.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-embedded/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/embedded/osgi/EmbeddedSolrProviderService.java?rev=1562807&r1=1562806&r2=1562807&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-embedded/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/embedded/osgi/EmbeddedSolrProviderService.java (original)
+++ jackrabbit/oak/trunk/oak-solr-embedded/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/embedded/osgi/EmbeddedSolrProviderService.java Thu Jan 30 13:13:47 2014
@@ -40,7 +40,7 @@ import org.osgi.service.component.Compon
 public class EmbeddedSolrProviderService implements SolrServerProvider,
         OakSolrConfigurationProvider {
 
-    @Property(value = "/oak:index/solrIdx", name = "configuration path", description = "path to node holding Solr configuration")
+    @Property(value = "/oak:index/solrIdx", label = "configuration path", description = "path to node holding Solr configuration")
     private static final String CONFIGURATION_PATH = "solr.configuration.node.path";
 
     @Reference

Modified: jackrabbit/oak/trunk/oak-solr-remote/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/http/RemoteSolrConfigurationProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-remote/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/http/RemoteSolrConfigurationProvider.java?rev=1562807&r1=1562806&r2=1562807&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-remote/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/http/RemoteSolrConfigurationProvider.java (original)
+++ jackrabbit/oak/trunk/oak-solr-remote/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/http/RemoteSolrConfigurationProvider.java Thu Jan 30 13:13:47 2014
@@ -43,16 +43,16 @@ public class RemoteSolrConfigurationProv
     private static final String DEFAULT_PARENT_FIELD = "path_anc";
     private static final String DEFAULT_PATH_FIELD = "path_exact";
 
-    @Property(value = DEFAULT_DESC_FIELD, name = "field for descendants search")
+    @Property(value = DEFAULT_DESC_FIELD, label = "field for descendants search")
     private static final String PATH_DESCENDANTS_FIELD = "path.desc.field";
 
-    @Property(value = DEFAULT_CHILD_FIELD, name = "field for children search")
+    @Property(value = DEFAULT_CHILD_FIELD, label = "field for children search")
     private static final String PATH_CHILDREN_FIELD = "path.child.field";
 
-    @Property(value = DEFAULT_PARENT_FIELD, name = "field for parent search")
+    @Property(value = DEFAULT_PARENT_FIELD, label = "field for parent search")
     private static final String PATH_PARENT_FIELD = "path.parent.field";
 
-    @Property(value = DEFAULT_PATH_FIELD, name = "field for path search")
+    @Property(value = DEFAULT_PATH_FIELD, label = "field for path search")
     private static final String PATH_EXACT_FIELD = "path.exact.field";
 
     private String pathChildrenFieldName;

Modified: jackrabbit/oak/trunk/oak-solr-remote/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/http/RemoteSolrServerProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-remote/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/http/RemoteSolrServerProvider.java?rev=1562807&r1=1562806&r2=1562807&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-remote/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/http/RemoteSolrServerProvider.java (original)
+++ jackrabbit/oak/trunk/oak-solr-remote/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/http/RemoteSolrServerProvider.java Thu Jan 30 13:13:47 2014
@@ -53,22 +53,22 @@ public class RemoteSolrServerProvider im
     private static final int DEFAULT_SHARDS_NO = 2;
     private static final int DEFAULT_REPLICATION_FACTOR = 2;
 
-    @Property(value = DEFAULT_HTTP_URL, name = "Solr HTTP URL")
+    @Property(value = DEFAULT_HTTP_URL, label = "Solr HTTP URL")
     private static final String SOLR_HTTP_URL = "solr.http.url";
 
-    @Property(value = DEFAULT_ZK_HOST, name = "ZooKeeper host")
+    @Property(value = DEFAULT_ZK_HOST, label = "ZooKeeper host")
     private static final String SOLR_ZK_HOST = "solr.zk.host";
 
-    @Property(value = DEFAULT_COLLECTION, name = "Solr collection")
+    @Property(value = DEFAULT_COLLECTION, label = "Solr collection")
     private static final String SOLR_COLLECTION = "solr.collection";
 
-    @Property(intValue = DEFAULT_SHARDS_NO, name = "No. of collection shards")
+    @Property(intValue = DEFAULT_SHARDS_NO, label = "No. of collection shards")
     private static final String SOLR_SHARDS_NO = "solr.shards.no";
 
-    @Property(intValue = DEFAULT_REPLICATION_FACTOR, name = "Replication factor")
+    @Property(intValue = DEFAULT_REPLICATION_FACTOR, label = "Replication factor")
     private static final String SOLR_REPLICATION_FACTOR = "solr.replication.factor";
 
-    @Property(value = "", name = "Solr configuration directory")
+    @Property(value = "", label = "Solr configuration directory")
     private static final String SOLR_CONF_DIR = "solr.conf.dir";
 
     private SolrServer solrServer;