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:15:34 UTC
svn commit: r1653553 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/server/ solr/server/etc/ solr/server/etc/test/ solr/test-framework/
solr/test-framework/src/java/org/apache/solr/util/
Author: sarowe
Date: Wed Jan 21 15:15:34 2015
New Revision: 1653553
URL: http://svn.apache.org/r1653553
Log:
SOLR-7008: Exclude server/etc/solrtest.keystore and create-solrtest.keystore.sh from the binary release packages (merged trunk r1653551)
Added:
lucene/dev/branches/branch_5x/solr/server/etc/test/
- copied from r1653551, lucene/dev/trunk/solr/server/etc/test/
Removed:
lucene/dev/branches/branch_5x/solr/server/etc/create-solrtest.keystore.sh
lucene/dev/branches/branch_5x/solr/server/etc/solrtest.keystore
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/build.xml (contents, props changed)
lucene/dev/branches/branch_5x/solr/server/ (props changed)
lucene/dev/branches/branch_5x/solr/test-framework/ (props changed)
lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java
Modified: lucene/dev/branches/branch_5x/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/build.xml?rev=1653553&r1=1653552&r2=1653553&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/build.xml (original)
+++ lucene/dev/branches/branch_5x/solr/build.xml Wed Jan 21 15:15:34 2015
@@ -481,14 +481,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/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java?rev=1653553&r1=1653552&r2=1653553&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java (original)
+++ lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java Wed Jan 21 15:15:34 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;