mirror of https://github.com/apache/lucene.git
make ReplicatorTestCase.newHttpServer respect tests.jettyConnector for freebsd issues
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1481914 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
2c76719401
commit
40e939c954
|
@ -62,7 +62,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.httpcomponents</groupId>
|
<groupId>org.apache.httpcomponents</groupId>
|
||||||
<artifactId>httpclient</artifactId>
|
<artifactId>httpclient</artifactId>
|
||||||
<!-- HttpSolrServer requires this dependency. -->
|
<!-- HttpReplicator requires this dependency. -->
|
||||||
<exclusions>
|
<exclusions>
|
||||||
<exclusion>
|
<exclusion>
|
||||||
<groupId>commons-logging</groupId>
|
<groupId>commons-logging</groupId>
|
||||||
|
@ -88,6 +88,19 @@
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<build>
|
<build>
|
||||||
|
<pluginManagement>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-surefire-plugin</artifactId>
|
||||||
|
<configuration>
|
||||||
|
<systemPropertyVariables>
|
||||||
|
<tests.jettyConnector>${tests.jettyConnector}</tests.jettyConnector>
|
||||||
|
</systemPropertyVariables>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</pluginManagement>
|
||||||
<sourceDirectory>${module-path}/src/java</sourceDirectory>
|
<sourceDirectory>${module-path}/src/java</sourceDirectory>
|
||||||
<testSourceDirectory>${module-path}/src/test</testSourceDirectory>
|
<testSourceDirectory>${module-path}/src/test</testSourceDirectory>
|
||||||
<testResources>
|
<testResources>
|
||||||
|
|
|
@ -18,6 +18,7 @@ package org.apache.lucene.replicator;
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import java.net.SocketException;
|
import java.net.SocketException;
|
||||||
|
import java.util.Random;
|
||||||
|
|
||||||
import org.apache.http.conn.ClientConnectionManager;
|
import org.apache.http.conn.ClientConnectionManager;
|
||||||
import org.apache.http.impl.conn.PoolingClientConnectionManager;
|
import org.apache.http.impl.conn.PoolingClientConnectionManager;
|
||||||
|
@ -26,6 +27,12 @@ import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
|
||||||
import org.eclipse.jetty.server.Connector;
|
import org.eclipse.jetty.server.Connector;
|
||||||
import org.eclipse.jetty.server.Handler;
|
import org.eclipse.jetty.server.Handler;
|
||||||
import org.eclipse.jetty.server.Server;
|
import org.eclipse.jetty.server.Server;
|
||||||
|
import org.eclipse.jetty.server.bio.SocketConnector;
|
||||||
|
import org.eclipse.jetty.server.nio.SelectChannelConnector;
|
||||||
|
import org.eclipse.jetty.server.session.HashSessionIdManager;
|
||||||
|
import org.eclipse.jetty.server.ssl.SslSelectChannelConnector;
|
||||||
|
import org.eclipse.jetty.server.ssl.SslSocketConnector;
|
||||||
|
import org.eclipse.jetty.util.ssl.SslContextFactory;
|
||||||
import org.eclipse.jetty.util.thread.QueuedThreadPool;
|
import org.eclipse.jetty.util.thread.QueuedThreadPool;
|
||||||
import org.junit.AfterClass;
|
import org.junit.AfterClass;
|
||||||
|
|
||||||
|
@ -61,10 +68,67 @@ public abstract class ReplicatorTestCase extends LuceneTestCase {
|
||||||
|
|
||||||
server.setHandler(handler);
|
server.setHandler(handler);
|
||||||
|
|
||||||
QueuedThreadPool threadPool = new QueuedThreadPool();
|
final String connectorName = System.getProperty("tests.jettyConnector", "SelectChannel");
|
||||||
threadPool.setDaemon(true);
|
|
||||||
threadPool.setMaxIdleTimeMs(0);
|
// if this property is true, then jetty will be configured to use SSL
|
||||||
server.setThreadPool(threadPool);
|
// leveraging the same system properties as java to specify
|
||||||
|
// the keystore/truststore if they are set
|
||||||
|
//
|
||||||
|
// This means we will use the same truststore, keystore (and keys) for
|
||||||
|
// the server as well as any client actions taken by this JVM in
|
||||||
|
// talking to that server, but for the purposes of testing that should
|
||||||
|
// be good enough
|
||||||
|
final boolean useSsl = Boolean.getBoolean("tests.jettySsl");
|
||||||
|
final SslContextFactory sslcontext = new SslContextFactory(false);
|
||||||
|
|
||||||
|
if (useSsl) {
|
||||||
|
if (null != System.getProperty("javax.net.ssl.keyStore")) {
|
||||||
|
sslcontext.setKeyStorePath
|
||||||
|
(System.getProperty("javax.net.ssl.keyStore"));
|
||||||
|
}
|
||||||
|
if (null != System.getProperty("javax.net.ssl.keyStorePassword")) {
|
||||||
|
sslcontext.setKeyStorePassword
|
||||||
|
(System.getProperty("javax.net.ssl.keyStorePassword"));
|
||||||
|
}
|
||||||
|
if (null != System.getProperty("javax.net.ssl.trustStore")) {
|
||||||
|
sslcontext.setTrustStore
|
||||||
|
(System.getProperty("javax.net.ssl.trustStore"));
|
||||||
|
}
|
||||||
|
if (null != System.getProperty("javax.net.ssl.trustStorePassword")) {
|
||||||
|
sslcontext.setTrustStorePassword
|
||||||
|
(System.getProperty("javax.net.ssl.trustStorePassword"));
|
||||||
|
}
|
||||||
|
sslcontext.setNeedClientAuth(Boolean.getBoolean("tests.jettySsl.clientAuth"));
|
||||||
|
}
|
||||||
|
|
||||||
|
final Connector connector;
|
||||||
|
final QueuedThreadPool threadPool;
|
||||||
|
if ("SelectChannel".equals(connectorName)) {
|
||||||
|
final SelectChannelConnector c = useSsl ? new SslSelectChannelConnector(sslcontext) : new SelectChannelConnector();
|
||||||
|
c.setReuseAddress(true);
|
||||||
|
c.setLowResourcesMaxIdleTime(1500);
|
||||||
|
connector = c;
|
||||||
|
threadPool = (QueuedThreadPool) c.getThreadPool();
|
||||||
|
} else if ("Socket".equals(connectorName)) {
|
||||||
|
final SocketConnector c = useSsl ? new SslSocketConnector(sslcontext) : new SocketConnector();
|
||||||
|
c.setReuseAddress(true);
|
||||||
|
connector = c;
|
||||||
|
threadPool = (QueuedThreadPool) c.getThreadPool();
|
||||||
|
} else {
|
||||||
|
throw new IllegalArgumentException("Illegal value for system property 'tests.jettyConnector': " + connectorName);
|
||||||
|
}
|
||||||
|
|
||||||
|
connector.setPort(port);
|
||||||
|
connector.setHost("127.0.0.1");
|
||||||
|
if (threadPool != null) {
|
||||||
|
threadPool.setDaemon(true);
|
||||||
|
threadPool.setMaxThreads(10000);
|
||||||
|
threadPool.setMaxIdleTimeMs(5000);
|
||||||
|
threadPool.setMaxStopTimeMs(30000);
|
||||||
|
}
|
||||||
|
|
||||||
|
server.setConnectors(new Connector[] {connector});
|
||||||
|
server.setSessionIdManager(new HashSessionIdManager(new Random()));
|
||||||
|
|
||||||
// this will test the port
|
// this will test the port
|
||||||
server.start();
|
server.start();
|
||||||
|
|
Loading…
Reference in New Issue