svn commit: r1653554 - in /lucene/dev/branches/lucene_solr_5_0: ./ solr/ solr/server/ solr/server/etc/ solr/server/etc/test/ solr/test-framework/ solr/test-framework/src/java/org/apache/solr/util/

[sa...@apache.org]

Author: sarowe
Date: Wed Jan 21 15:17:33 2015
New Revision: 1653554

URL: http://svn.apache.org/r1653554
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/lucene_solr_5_0/solr/server/etc/test/
      - copied from r1653551, lucene/dev/trunk/solr/server/etc/test/
Removed:
    lucene/dev/branches/lucene_solr_5_0/solr/server/etc/create-solrtest.keystore.sh
    lucene/dev/branches/lucene_solr_5_0/solr/server/etc/solrtest.keystore
Modified:
    lucene/dev/branches/lucene_solr_5_0/   (props changed)
    lucene/dev/branches/lucene_solr_5_0/solr/   (props changed)
    lucene/dev/branches/lucene_solr_5_0/solr/build.xml   (contents, props changed)
    lucene/dev/branches/lucene_solr_5_0/solr/server/   (props changed)
    lucene/dev/branches/lucene_solr_5_0/solr/test-framework/   (props changed)
    lucene/dev/branches/lucene_solr_5_0/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java

Modified: lucene/dev/branches/lucene_solr_5_0/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_0/solr/build.xml?rev=1653554&r1=1653553&r2=1653554&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_0/solr/build.xml (original)
+++ lucene/dev/branches/lucene_solr_5_0/solr/build.xml Wed Jan 21 15:17:33 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/lucene_solr_5_0/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_0/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java?rev=1653554&r1=1653553&r2=1653554&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_0/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java (original)
+++ lucene/dev/branches/lucene_solr_5_0/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java Wed Jan 21 15:17:33 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;