You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by kr...@apache.org on 2016/10/27 20:09:40 UTC
[36/50] [abbrv] lucene-solr:jira/solr-8593: SOLR-9481: Fix test
errors by using coreContainer.getSolrHome instead of
SolrResourceLoader.locateSolrHome() in SecurityConfHandlerLocal
SOLR-9481: Fix test errors by using coreContainer.getSolrHome instead of SolrResourceLoader.locateSolrHome() in SecurityConfHandlerLocal
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/24446f50
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/24446f50
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/24446f50
Branch: refs/heads/jira/solr-8593
Commit: 24446f5085468627136e38ca8f874f383be9d3f3
Parents: feb1a5d
Author: Jan H�ydahl <ja...@apache.org>
Authored: Wed Oct 26 16:39:22 2016 +0200
Committer: Jan H�ydahl <ja...@apache.org>
Committed: Wed Oct 26 16:39:22 2016 +0200
----------------------------------------------------------------------
.../org/apache/solr/handler/admin/SecurityConfHandlerLocal.java | 3 ++-
.../solr/handler/admin/SecurityConfHandlerLocalForTesting.java | 4 ----
.../test/org/apache/solr/security/BasicAuthStandaloneTest.java | 1 -
3 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/24446f50/solr/core/src/java/org/apache/solr/handler/admin/SecurityConfHandlerLocal.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/SecurityConfHandlerLocal.java b/solr/core/src/java/org/apache/solr/handler/admin/SecurityConfHandlerLocal.java
index d6745c5..985a070 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/SecurityConfHandlerLocal.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/SecurityConfHandlerLocal.java
@@ -23,6 +23,7 @@ import java.io.OutputStream;
import java.lang.invoke.MethodHandles;
import java.nio.file.Files;
import java.nio.file.Path;
+import java.nio.file.Paths;
import java.util.Collections;
import org.apache.solr.common.SolrException;
@@ -43,7 +44,7 @@ public class SecurityConfHandlerLocal extends SecurityConfHandler {
public SecurityConfHandlerLocal(CoreContainer coreContainer) {
super(coreContainer);
- securityJsonPath = SolrResourceLoader.locateSolrHome().resolve("security.json");
+ securityJsonPath = Paths.get(coreContainer.getSolrHome()).resolve("security.json");
}
/**
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/24446f50/solr/core/src/test/org/apache/solr/handler/admin/SecurityConfHandlerLocalForTesting.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/SecurityConfHandlerLocalForTesting.java b/solr/core/src/test/org/apache/solr/handler/admin/SecurityConfHandlerLocalForTesting.java
index 92a18b1..e56dd5b 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/SecurityConfHandlerLocalForTesting.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/SecurityConfHandlerLocalForTesting.java
@@ -20,20 +20,16 @@ package org.apache.solr.handler.admin;
import java.io.IOException;
import org.apache.solr.core.CoreContainer;
-import org.apache.solr.core.SolrResourceLoader;
/**
* Wrapper for use in tests
*/
public class SecurityConfHandlerLocalForTesting extends SecurityConfHandlerLocal {
-
public SecurityConfHandlerLocalForTesting(CoreContainer coreContainer) {
super(coreContainer);
}
public boolean persistConf(SecurityConfig securityConfig) throws IOException {
- // Set JSON_PATH again since the test may have
- securityJsonPath = SolrResourceLoader.locateSolrHome().resolve("security.json");
return super.persistConf(securityConfig);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/24446f50/solr/core/src/test/org/apache/solr/security/BasicAuthStandaloneTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/security/BasicAuthStandaloneTest.java b/solr/core/src/test/org/apache/solr/security/BasicAuthStandaloneTest.java
index 829ce9c..33c0ab3 100644
--- a/solr/core/src/test/org/apache/solr/security/BasicAuthStandaloneTest.java
+++ b/solr/core/src/test/org/apache/solr/security/BasicAuthStandaloneTest.java
@@ -70,7 +70,6 @@ public class BasicAuthStandaloneTest extends AbstractSolrTestCase {
super.setUp();
instance = new SolrInstance("inst", null);
instance.setUp();
- System.setProperty("solr.solr.home", instance.getHomeDir().toString());
jetty = createJetty(instance);
initCore("solrconfig.xml", "schema.xml", instance.getHomeDir().toString());
securityConfHandler = new SecurityConfHandlerLocalForTesting(jetty.getCoreContainer());