You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ro...@apache.org on 2015/10/28 20:58:38 UTC
svn commit: r1711113 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/core/ solr/core/src/test/org/apache/solr/cloud/
solr/core/src/test/org/apache/solr/handler/
solr/core/src/test/org/apache/solr/search/stats/ solr/solrj/
solr/solrj/src/test/org/apa...
Author: romseygeek
Date: Wed Oct 28 19:58:38 2015
New Revision: 1711113
URL: http://svn.apache.org/viewvc?rev=1711113&view=rev
Log:
SOLR-8221: Ensure that SSL config is passed to MiniSolrCloudCluster
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/core/ (props changed)
lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/ConcurrentDeleteAndCreateCollectionTest.java
lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithKerberosAlt.java
lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/handler/PingRequestHandlerTest.java
lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/stats/TestDistribIDF.java
lucene/dev/branches/branch_5x/solr/solrj/ (props changed)
lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/impl/TestCloudSolrClientConnections.java
lucene/dev/branches/branch_5x/solr/test-framework/ (props changed)
lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/ConcurrentDeleteAndCreateCollectionTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/ConcurrentDeleteAndCreateCollectionTest.java?rev=1711113&r1=1711112&r2=1711113&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/ConcurrentDeleteAndCreateCollectionTest.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/ConcurrentDeleteAndCreateCollectionTest.java Wed Oct 28 19:58:38 2015
@@ -43,7 +43,7 @@ public class ConcurrentDeleteAndCreateCo
@Before
public void setUp() throws Exception {
super.setUp();
- solrCluster = new MiniSolrCloudCluster(1, createTempDir());
+ solrCluster = new MiniSolrCloudCluster(1, createTempDir(), buildJettyConfig("/solr"));
}
@Override
Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithKerberosAlt.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithKerberosAlt.java?rev=1711113&r1=1711112&r2=1711113&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithKerberosAlt.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithKerberosAlt.java Wed Oct 28 19:58:38 2015
@@ -33,6 +33,7 @@ import org.apache.lucene.util.Constants;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.client.solrj.embedded.JettyConfig;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
import org.apache.solr.client.solrj.impl.CloudSolrClient;
import org.apache.solr.client.solrj.impl.HttpClientUtil;
@@ -158,7 +159,8 @@ public class TestSolrCloudWithKerberosAl
HttpClientUtil.setConfigurer(new Krb5HttpClientConfigurer());
String collectionName = "testkerberoscollection";
- MiniSolrCloudCluster miniCluster = new MiniSolrCloudCluster(NUM_SERVERS, createTempDir());
+ MiniSolrCloudCluster miniCluster
+ = new MiniSolrCloudCluster(NUM_SERVERS, createTempDir(), JettyConfig.builder().setContext("/solr").build());
CloudSolrClient cloudSolrClient = miniCluster.getSolrClient();
cloudSolrClient.setDefaultCollection(collectionName);
Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/handler/PingRequestHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/handler/PingRequestHandlerTest.java?rev=1711113&r1=1711112&r2=1711113&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/handler/PingRequestHandlerTest.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/handler/PingRequestHandlerTest.java Wed Oct 28 19:58:38 2015
@@ -175,7 +175,7 @@ public class PingRequestHandlerTest exte
public void testPingInClusterWithNoHealthCheck() throws Exception {
- MiniSolrCloudCluster miniCluster = new MiniSolrCloudCluster(NUM_SERVERS, createTempDir());
+ MiniSolrCloudCluster miniCluster = new MiniSolrCloudCluster(NUM_SERVERS, createTempDir(), buildJettyConfig("/solr"));
final CloudSolrClient cloudSolrClient = miniCluster.getSolrClient();
Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/stats/TestDistribIDF.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/stats/TestDistribIDF.java?rev=1711113&r1=1711112&r2=1711113&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/stats/TestDistribIDF.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/stats/TestDistribIDF.java Wed Oct 28 19:58:38 2015
@@ -52,7 +52,7 @@ public class TestDistribIDF extends Solr
}
super.setUp();
- solrCluster = new MiniSolrCloudCluster(3, createTempDir());
+ solrCluster = new MiniSolrCloudCluster(3, createTempDir(), buildJettyConfig("/solr"));
// set some system properties for use by tests
System.setProperty("solr.test.sys.prop1", "propone");
System.setProperty("solr.test.sys.prop2", "proptwo");
Modified: lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/impl/TestCloudSolrClientConnections.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/impl/TestCloudSolrClientConnections.java?rev=1711113&r1=1711112&r2=1711113&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/impl/TestCloudSolrClientConnections.java (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/impl/TestCloudSolrClientConnections.java Wed Oct 28 19:58:38 2015
@@ -33,7 +33,7 @@ public class TestCloudSolrClientConnecti
public void testCloudClientCanConnectAfterClusterComesUp() throws Exception {
// Start by creating a cluster with no jetties
- MiniSolrCloudCluster cluster = new MiniSolrCloudCluster(0, createTempDir());
+ MiniSolrCloudCluster cluster = new MiniSolrCloudCluster(0, createTempDir(), buildJettyConfig("/solr"));
try {
CloudSolrClient client = cluster.getSolrClient();
@@ -65,7 +65,7 @@ public class TestCloudSolrClientConnecti
Path configPath = getFile("solrj").toPath().resolve("solr/configsets/configset-2/conf");
- MiniSolrCloudCluster cluster = new MiniSolrCloudCluster(0, createTempDir());
+ MiniSolrCloudCluster cluster = new MiniSolrCloudCluster(0, createTempDir(), buildJettyConfig("/solr"));
try {
CloudSolrClient client = cluster.getSolrClient();
try {
Modified: lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java?rev=1711113&r1=1711112&r2=1711113&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java (original)
+++ lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java Wed Oct 28 19:58:38 2015
@@ -87,8 +87,6 @@ public class MiniSolrCloudCluster {
" \n" +
"</solr>\n";
- public static final JettyConfig DEFAULT_JETTY_CONFIG = JettyConfig.builder().setContext("/solr").build();
-
private final ZkTestServer zkServer;
private final boolean externalZkServer;
private final List<JettySolrRunner> jettys = new LinkedList<>();
@@ -101,18 +99,6 @@ public class MiniSolrCloudCluster {
private final AtomicInteger nodeIds = new AtomicInteger();
/**
- * Create a MiniSolrCloudCluster with default configuration
- *
- * @param numServers number of Solr servers to start
- * @param baseDir base directory that the mini cluster should be run from
- *
- * @throws Exception if there was an error starting the cluster
- */
- public MiniSolrCloudCluster(int numServers, Path baseDir) throws Exception {
- this(numServers, baseDir, DEFAULT_CLOUD_SOLR_XML, DEFAULT_JETTY_CONFIG, null);
- }
-
- /**
* Create a MiniSolrCloudCluster with default solr.xml
*
* @param numServers number of Solr servers to start