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/22 00:48:13 UTC
svn commit: r1653706 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/contrib/
solr/contrib/dataimporthandler-extras/src/test/org/apache/solr/handler/dataimport/
solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/
solr/server/etc/
Author: sarowe
Date: Wed Jan 21 23:48:13 2015
New Revision: 1653706
URL: http://svn.apache.org/r1653706
Log:
SOLR-6991,SOLR-6387: Under Turkish locale, don't run solr-cell and dataimporthandler-extras tests that use Tika (merged trunk r1653704)
Added:
lucene/dev/branches/branch_5x/solr/server/etc/jetty-https-ssl.xml
- copied, changed from r1653612, lucene/dev/branches/branch_5x/solr/server/etc/jetty.xml
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/contrib/ (props changed)
lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler-extras/src/test/org/apache/solr/handler/dataimport/TestTikaEntityProcessor.java
lucene/dev/branches/branch_5x/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java
lucene/dev/branches/branch_5x/solr/server/etc/jetty.xml
Modified: lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler-extras/src/test/org/apache/solr/handler/dataimport/TestTikaEntityProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler-extras/src/test/org/apache/solr/handler/dataimport/TestTikaEntityProcessor.java?rev=1653706&r1=1653705&r2=1653706&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler-extras/src/test/org/apache/solr/handler/dataimport/TestTikaEntityProcessor.java (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler-extras/src/test/org/apache/solr/handler/dataimport/TestTikaEntityProcessor.java Wed Jan 21 23:48:13 2015
@@ -30,6 +30,7 @@ import javax.xml.transform.dom.DOMSource
import javax.xml.transform.stream.StreamResult;
import java.io.StringReader;
import java.io.StringWriter;
+import java.util.Locale;
/**Testcase for TikaEntityProcessor
*
@@ -73,6 +74,8 @@ public class TestTikaEntityProcessor ext
@BeforeClass
public static void beforeClass() throws Exception {
+ assumeFalse("This test fails on UNIX with Turkish default locale (https://issues.apache.org/jira/browse/SOLR-6387)",
+ new Locale("tr").getLanguage().equals(Locale.getDefault().getLanguage()));
initCore("dataimport-solrconfig.xml", "dataimport-schema-no-unique-key.xml", getFile("dihextras/solr").getAbsolutePath());
}
Modified: lucene/dev/branches/branch_5x/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java?rev=1653706&r1=1653705&r2=1653706&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java Wed Jan 21 23:48:13 2015
@@ -18,6 +18,8 @@ package org.apache.solr.handler.extracti
import java.util.ArrayList;
import java.util.List;
+import java.util.Locale;
+
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.util.ContentStream;
@@ -41,6 +43,8 @@ public class ExtractingRequestHandlerTes
@BeforeClass
public static void beforeClass() throws Exception {
+ assumeFalse("This test fails on UNIX with Turkish default locale (https://issues.apache.org/jira/browse/SOLR-6387)",
+ new Locale("tr").getLanguage().equals(Locale.getDefault().getLanguage()));
initCore("solrconfig.xml", "schema.xml", getFile("extraction/solr").getAbsolutePath());
}
Copied: lucene/dev/branches/branch_5x/solr/server/etc/jetty-https-ssl.xml (from r1653612, lucene/dev/branches/branch_5x/solr/server/etc/jetty.xml)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/server/etc/jetty-https-ssl.xml?p2=lucene/dev/branches/branch_5x/solr/server/etc/jetty-https-ssl.xml&p1=lucene/dev/branches/branch_5x/solr/server/etc/jetty.xml&r1=1653612&r2=1653706&rev=1653706&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/server/etc/jetty.xml (original)
+++ lucene/dev/branches/branch_5x/solr/server/etc/jetty-https-ssl.xml Wed Jan 21 23:48:13 2015
@@ -28,48 +28,14 @@
<!-- Set connectors -->
<!-- =========================================================== -->
- <!--
- <Call name="addConnector">
- <Arg>
- <New class="org.eclipse.jetty.server.nio.SelectChannelConnector">
- <Set name="host"><SystemProperty name="jetty.host" /></Set>
- <Set name="port"><SystemProperty name="jetty.port" default="8983"/></Set>
- <Set name="maxIdleTime">50000</Set>
- <Set name="Acceptors">2</Set>
- <Set name="statsOn">false</Set>
- <Set name="confidentialPort">8443</Set>
- <Set name="lowResourcesConnections">5000</Set>
- <Set name="lowResourcesMaxIdleTime">5000</Set>
- </New>
- </Arg>
- </Call>
- -->
-
- <!-- This connector is currently being used for Solr because it
- showed better performance than nio.SelectChannelConnector
- for typical Solr requests. -->
- <Call name="addConnector">
- <Arg>
- <New class="org.eclipse.jetty.server.bio.SocketConnector">
- <Set name="host"><SystemProperty name="jetty.host" /></Set>
- <Set name="port"><SystemProperty name="jetty.port" default="8983"/></Set>
- <Set name="maxIdleTime">50000</Set>
- <Set name="lowResourceMaxIdleTime">1500</Set>
- <Set name="statsOn">false</Set>
- </New>
- </Arg>
- </Call>
-
- <!-- If the connector below is uncommented, then jetty will also accept SSL
- connections 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.
+ <!-- Jetty will accept SSL connections 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.
For information about generating the SSL certificate, etc., see:
https://cwiki.apache.org/confluence/display/solr/Enabling+SSL
-->
- <!--
<Call name="addConnector">
<Arg>
<New class="org.eclipse.jetty.server.ssl.SslSelectChannelConnector">
@@ -85,7 +51,6 @@
</New>
</Arg>
</Call>
- -->
<!-- =========================================================== -->
<!-- Set handler Collection Structure -->
Modified: lucene/dev/branches/branch_5x/solr/server/etc/jetty.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/server/etc/jetty.xml?rev=1653706&r1=1653705&r2=1653706&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/server/etc/jetty.xml (original)
+++ lucene/dev/branches/branch_5x/solr/server/etc/jetty.xml Wed Jan 21 23:48:13 2015
@@ -60,33 +60,6 @@
</Arg>
</Call>
- <!-- If the connector below is uncommented, then jetty will also accept SSL
- connections 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.
-
- For information about generating the SSL certificate, etc., see:
-
- https://cwiki.apache.org/confluence/display/solr/Enabling+SSL
- -->
- <!--
- <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/solr-ssl.keystore.jks</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 -->
<!-- =========================================================== -->