Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-7008: Exclude server/etc/solrtest.keystore and create-solrtest.keystore.sh from the binary release packages 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1653551 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Steven Rowe 2015-01-21 15:11:39 +00:00
parent 344be1a6b1
commit ab8d012df6
5 changed files with 5 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
solr/build.xml
View File

@ -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

37
solr/server/etc/jetty.xml
View File

@ -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 -->
<!-- =========================================================== -->

2
solr/server/etc/create-solrtest.keystore.sh → solr/server/etc/test/create-solrtest.keystore.sh
View File

@ -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

0
solr/server/etc/solrtest.keystore → solr/server/etc/test/solrtest.keystore
View File

2
solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java
View File

@ -39,7 +39,7 @@ import org.eclipse.jetty.util.security.CertificateUtils;
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;