You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by gc...@apache.org on 2015/05/19 01:11:48 UTC
svn commit: r1680121 - in /lucene/dev/branches/branch_5x/solr:
core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
solrj/src/java/org/apache/solr/common/cloud/ZkCredentialsProvider.java
Author: gchanan
Date: Mon May 18 23:11:47 2015
New Revision: 1680121
URL: http://svn.apache.org/r1680121
Log:
SOLR-7552: Support using ZkCredentialsProvider/ZkACLProvider in custom filter
Modified:
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/cloud/ZkCredentialsProvider.java
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java?rev=1680121&r1=1680120&r2=1680121&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java Mon May 18 23:11:47 2015
@@ -128,7 +128,12 @@ public class SolrDispatchFilter extends
return cores;
}
- private NodeConfig loadNodeConfig(String solrHome, Properties nodeProperties) {
+ /**
+ * Get the NodeConfig whether stored on disk, in ZooKeeper, etc.
+ * This may also be used by custom filters to load relevant configuration.
+ * @return the NodeConfig
+ */
+ public static NodeConfig loadNodeConfig(String solrHome, Properties nodeProperties) {
SolrResourceLoader loader = new SolrResourceLoader(solrHome, null, nodeProperties);
Modified: lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/cloud/ZkCredentialsProvider.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/cloud/ZkCredentialsProvider.java?rev=1680121&r1=1680120&r2=1680121&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/cloud/ZkCredentialsProvider.java (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/cloud/ZkCredentialsProvider.java Mon May 18 23:11:47 2015
@@ -31,11 +31,11 @@ public interface ZkCredentialsProvider {
this.auth = auth;
}
- String getScheme() {
+ public String getScheme() {
return scheme;
}
- byte[] getAuth() {
+ public byte[] getAuth() {
return auth;
}
}