Return-Path: X-Original-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Delivered-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 82571E9E4 for ; Mon, 25 Feb 2013 13:04:12 +0000 (UTC) Received: (qmail 72478 invoked by uid 500); 25 Feb 2013 13:04:12 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 72453 invoked by uid 500); 25 Feb 2013 13:04:12 -0000 Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oak-dev@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 72441 invoked by uid 99); 25 Feb 2013 13:04:11 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Feb 2013 13:04:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Feb 2013 13:04:09 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E21A4238890B; Mon, 25 Feb 2013 13:03:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1449692 - in /jackrabbit/oak/trunk/oak-solr-remote/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/http: RemoteSolrConfigurationProvider.java RemoteSolrServerProvider.java Date: Mon, 25 Feb 2013 13:03:48 -0000 To: oak-commits@jackrabbit.apache.org From: tommaso@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130225130348.E21A4238890B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tommaso Date: Mon Feb 25 13:03:48 2013 New Revision: 1449692 URL: http://svn.apache.org/r1449692 Log: OAK-651 - added constructors to instantiate configuration and server providers Modified: 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-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=1449692&r1=1449691&r2=1449692&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 Mon Feb 25 13:03:48 2013 @@ -53,8 +53,19 @@ public class RemoteSolrConfigurationProv private String pathParentFieldName; private String pathDescendantsFieldName; private String pathExactFieldName; + private OakSolrConfiguration oakSolrConfiguration; + public RemoteSolrConfigurationProvider() { + } + + public RemoteSolrConfigurationProvider(String pathChildrenFieldName, String pathParentFieldName, + String pathDescendantsFieldName, String pathExactFieldName) { + this.pathChildrenFieldName = pathChildrenFieldName; + this.pathParentFieldName = pathParentFieldName; + this.pathDescendantsFieldName = pathDescendantsFieldName; + this.pathExactFieldName = pathExactFieldName; + } protected void activate(ComponentContext componentContext) throws Exception { pathChildrenFieldName = String.valueOf(componentContext.getProperties().get(PATH_CHILDREN_FIELD)); 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=1449692&r1=1449691&r2=1449692&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 Mon Feb 25 13:03:48 2013 @@ -54,6 +54,14 @@ public class RemoteSolrServerProvider im private String solrHttpUrl; private String solrZkHost; + public RemoteSolrServerProvider() { + } + + public RemoteSolrServerProvider(String solrHttpUrl, String solrZkHost) { + this.solrHttpUrl = solrHttpUrl; + this.solrZkHost = solrZkHost; + } + @Activate protected void activate(ComponentContext componentContext) throws Exception { solrHttpUrl = String.valueOf(componentContext.getProperties().get(SOLR_HTTP_URL));