You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2015/01/21 16:11:40 UTC
svn commit: r1653551 - in /lucene/dev/trunk/solr: ./ server/etc/
server/etc/test/ test-framework/src/java/org/apache/solr/util/
Author: sarowe
Date: Wed Jan 21 15:11:39 2015
New Revision: 1653551
URL: http://svn.apache.org/r1653551
Log:
SOLR-7008: Exclude server/etc/solrtest.keystore and create-solrtest.keystore.sh from the binary release packages
Added:
lucene/dev/trunk/solr/server/etc/test/
lucene/dev/trunk/solr/server/etc/test/create-solrtest.keystore.sh
- copied, changed from r1653418, lucene/dev/trunk/solr/server/etc/create-solrtest.keystore.sh
lucene/dev/trunk/solr/server/etc/test/solrtest.keystore
- copied unchanged from r1653418, lucene/dev/trunk/solr/server/etc/solrtest.keystore
Removed:
lucene/dev/trunk/solr/server/etc/create-solrtest.keystore.sh
lucene/dev/trunk/solr/server/etc/solrtest.keystore
Modified:
lucene/dev/trunk/solr/build.xml
lucene/dev/trunk/solr/server/etc/jetty.xml
lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java
Modified: lucene/dev/trunk/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/build.xml?rev=1653551&r1=1653550&r2=1653551&view=diff
==============================================================================
--- lucene/dev/trunk/solr/build.xml (original)
+++ lucene/dev/trunk/solr/build.xml Wed Jan 21 15:11:39 2015
@@ -478,14 +478,15 @@
excludes="licenses/README.committers.txt **/data/ **/logs/*
**/classes/ **/*.sh **/ivy.xml **/build.xml
**/bin/ **/*.iml **/*.ipr **/*.iws **/pom.xml
- **/*pom.xml.template" />
+ **/*pom.xml.template server/etc/test/" />
<tarfileset dir="${dest}/contrib-lucene-libs-to-package"
prefix="${fullnamever}"
includes="**" />
<tarfileset dir="."
filemode="755"
prefix="${fullnamever}"
- includes="bin/** server/**/*.sh example/**/*.sh example/**/bin/" />
+ includes="bin/** server/**/*.sh example/**/*.sh example/**/bin/"
+ excludes="server/etc/test/**" />
<tarfileset dir="."
prefix="${fullnamever}"
includes="dist/*.jar
Modified: lucene/dev/trunk/solr/server/etc/jetty.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/server/etc/jetty.xml?rev=1653551&r1=1653550&r2=1653551&view=diff
==============================================================================
--- lucene/dev/trunk/solr/server/etc/jetty.xml (original)
+++ lucene/dev/trunk/solr/server/etc/jetty.xml Wed Jan 21 15:11:39 2015
@@ -12,43 +12,6 @@
<Configure id="Server" class="org.eclipse.jetty.server.Server">
- <!-- if the connector below is uncommented, then jetty will also accept SSL
- connections on port 8984, using a self signed certificate and can
- optionally require the client to authenticate with a certificate.
- (which can be the same as the server certificate_
-
- # Run solr example with SSL on port 8984
- java -jar start.jar
- #
- # Run post.jar so that it trusts the server cert...
- java -Djavax.net.ssl.trustStore=../etc/solrtest.keystore -Durl=https://localhost:8984/solr/update -jar post.jar *.xml
-
- # Run solr example with SSL requiring client certs on port 8984
- java -Djetty.ssl.clientAuth=true -jar start.jar
- #
- # Run post.jar so that it trusts the server cert,
- # and authenticates with a client cert
- java -Djavax.net.ssl.keyStorePassword=secret -Djavax.net.ssl.keyStore=../etc/solrtest.keystore -Djavax.net.ssl.trustStore=../etc/solrtest.keystore -Durl=https://localhost:8984/solr/update -jar post.jar *.xml
-
- -->
- <!--
- <Call name="addConnector">
- <Arg>
- <New class="org.eclipse.jetty.server.ssl.SslSelectChannelConnector">
- <Arg>
- <New class="org.eclipse.jetty.http.ssl.SslContextFactory">
- <Set name="keyStore"><SystemProperty name="jetty.home" default="."/>/etc/solrtest.keystore</Set>
- <Set name="keyStorePassword">secret</Set>
- <Set name="needClientAuth"><SystemProperty name="jetty.ssl.clientAuth" default="false"/></Set>
- </New>
- </Arg>
- <Set name="port"><SystemProperty name="jetty.ssl.port" default="8984"/></Set>
- <Set name="maxIdleTime">30000</Set>
- </New>
- </Arg>
- </Call>
- -->
-
<!-- =========================================================== -->
<!-- Set handler Collection Structure -->
<!-- =========================================================== -->
Copied: lucene/dev/trunk/solr/server/etc/test/create-solrtest.keystore.sh (from r1653418, lucene/dev/trunk/solr/server/etc/create-solrtest.keystore.sh)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/server/etc/test/create-solrtest.keystore.sh?p2=lucene/dev/trunk/solr/server/etc/test/create-solrtest.keystore.sh&p1=lucene/dev/trunk/solr/server/etc/create-solrtest.keystore.sh&r1=1653418&r2=1653551&rev=1653551&view=diff
==============================================================================
--- lucene/dev/trunk/solr/server/etc/create-solrtest.keystore.sh (original)
+++ lucene/dev/trunk/solr/server/etc/test/create-solrtest.keystore.sh Wed Jan 21 15:11:39 2015
@@ -18,7 +18,7 @@
############
# This script shows how the solrtest.keystore file used for solr tests
-# and these example configs was generated.
+# was generated.
#
# Running this script should only be necessary if the keystore file
# needs to be replaced, which shouldn't be required until sometime around
Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java?rev=1653551&r1=1653550&r2=1653551&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java Wed Jan 21 15:11:39 2015
@@ -39,7 +39,7 @@ import org.eclipse.jetty.util.security.C
public class SSLTestConfig extends SSLConfig {
public static File TEST_KEYSTORE = ExternalPaths.SERVER_HOME == null ? null
- : new File(ExternalPaths.SERVER_HOME, "../etc/solrtest.keystore");
+ : new File(ExternalPaths.SERVER_HOME, "../etc/test/solrtest.keystore");
private static String TEST_KEYSTORE_PATH = TEST_KEYSTORE != null
&& TEST_KEYSTORE.exists() ? TEST_KEYSTORE.getAbsolutePath() : null;