svn commit: r1665159 - in /lucene/dev/trunk/solr: CHANGES.txt core/src/java/org/apache/solr/client/solrj/embedded/JettyConfig.java test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java

[ro...@apache.org]

Author: romseygeek
Date: Mon Mar  9 09:15:57 2015
New Revision: 1665159

URL: http://svn.apache.org/r1665159
Log:
SOLR-7206: MiniSolrCloudCluster should deal with SSL mode

Modified:
    lucene/dev/trunk/solr/CHANGES.txt
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettyConfig.java
    lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java

Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1665159&r1=1665158&r2=1665159&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Mon Mar  9 09:15:57 2015
@@ -200,6 +200,9 @@ Bug Fixes
 * SOLR-6657:  DocumentDictionaryFactory requires weightField to be mandatory, but it shouldn't
   (Erick Erickson)
 
+* SOLR-7206: MiniSolrCloudCluster wasn't dealing with SSL mode correctly (Alan
+  Woodward)
+
 * SOLR-4464: DIH Processed documents counter resets to zero after first entity is processed.
   (Dave Cook, Shawn Heisey, Aaron Greenspan, Thomas Champagne via shalin)
 

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettyConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettyConfig.java?rev=1665159&r1=1665158&r2=1665159&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettyConfig.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettyConfig.java Mon Mar  9 09:15:57 2015
@@ -25,17 +25,17 @@ import java.util.TreeMap;
 
 public class JettyConfig {
 
-  final int port;
+  public final int port;
 
   public final String context;
 
-  final boolean stopAtShutdown;
+  public final boolean stopAtShutdown;
 
-  final Map<ServletHolder, String> extraServlets;
+  public final Map<ServletHolder, String> extraServlets;
 
-  final Map<Class<? extends Filter>, String> extraFilters;
+  public final Map<Class<? extends Filter>, String> extraFilters;
 
-  final SSLConfig sslConfig;
+  public final SSLConfig sslConfig;
 
   private JettyConfig(int port, String context, boolean stopAtShutdown, Map<ServletHolder, String> extraServlets,
                       Map<Class<? extends Filter>, String> extraFilters, SSLConfig sslConfig) {

Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java?rev=1665159&r1=1665158&r2=1665159&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java Mon Mar  9 09:15:57 2015
@@ -17,6 +17,7 @@ package org.apache.solr.cloud;
  * limitations under the License.
  */
 
+import com.google.common.base.Charsets;
 import org.apache.solr.client.solrj.SolrServerException;
 import org.apache.solr.client.solrj.embedded.JettyConfig;
 import org.apache.solr.client.solrj.embedded.JettySolrRunner;
@@ -25,6 +26,7 @@ import org.apache.solr.client.solrj.impl
 import org.apache.solr.client.solrj.request.QueryRequest;
 import org.apache.solr.common.cloud.SolrZkClient;
 import org.apache.solr.common.cloud.ZkConfigManager;
+import org.apache.solr.common.cloud.ZkStateReader;
 import org.apache.solr.common.params.CollectionParams.CollectionAction;
 import org.apache.solr.common.params.CoreAdminParams;
 import org.apache.solr.common.params.ModifiableSolrParams;
@@ -103,6 +105,9 @@ public class MiniSolrCloudCluster {
     try(SolrZkClient zkClient = new SolrZkClient(zkServer.getZkHost(),
         AbstractZkTestCase.TIMEOUT, 45000, null)) {
       zkClient.makePath("/solr/solr.xml", solrXml, false, true);
+      if (jettyConfig.sslConfig != null && jettyConfig.sslConfig.isSSLMode()) {
+        zkClient.makePath("/solr" + ZkStateReader.CLUSTER_PROPS, "{'urlScheme':'https'}".getBytes(Charsets.UTF_8), true);
+      }
     }
 
     // tell solr to look in zookeeper for solr.xml