You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2010/08/01 18:38:28 UTC
svn commit: r981265 - in /lucene/dev/trunk/solr: ./
contrib/dataimporthandler/ contrib/extraction/
src/test/org/apache/solr/client/solrj/embedded/
src/webapp/src/org/apache/solr/client/solrj/embedded/
Author: mikemccand
Date: Sun Aug 1 16:38:27 2010
New Revision: 981265
URL: http://svn.apache.org/viewvc?rev=981265&view=rev
Log:
SOLR-2019: force Jetty to use insecure randomness source when running tests
Modified:
lucene/dev/trunk/solr/build.xml
lucene/dev/trunk/solr/contrib/dataimporthandler/build.xml
lucene/dev/trunk/solr/contrib/extraction/build.xml
lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
Modified: lucene/dev/trunk/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/build.xml?rev=981265&r1=981264&r2=981265&view=diff
==============================================================================
--- lucene/dev/trunk/solr/build.xml (original)
+++ lucene/dev/trunk/solr/build.xml Sun Aug 1 16:38:27 2010
@@ -436,6 +436,7 @@
<sysproperty key="java.util.logging.config.file" value="${common-solr.dir}/testlogging.properties"/>
<sysproperty key="tests.luceneMatchVersion" value="${tests.luceneMatchVersion}"/>
<sysproperty key="tests.codec" value="${tests.codec}"/>
+ <sysproperty key="jetty.insecurerandom" value="1"/>
<jvmarg line="${dir.prop}"/>
<jvmarg line="${args}"/>
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/build.xml?rev=981265&r1=981264&r2=981265&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/build.xml (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/build.xml Sun Aug 1 16:38:27 2010
@@ -151,6 +151,7 @@
dir="src/test/resources/"
tempdir="${junit.output.dir}"
>
+ <sysproperty key="jetty.insecurerandom" value="1"/>
<formatter type="brief" usefile="false" if="junit.details"/>
<classpath refid="test.classpath"/>
<formatter type="xml"/>
@@ -191,6 +192,7 @@
failureProperty="tests.failed"
dir="src/extras/test/resources/"
>
+ <sysproperty key="jetty.insecurerandom" value="1"/>
<formatter type="brief" usefile="false" if="junit.details"/>
<classpath refid="test.extras.classpath"/>
<assertions>
Modified: lucene/dev/trunk/solr/contrib/extraction/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/extraction/build.xml?rev=981265&r1=981264&r2=981265&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/extraction/build.xml (original)
+++ lucene/dev/trunk/solr/contrib/extraction/build.xml Sun Aug 1 16:38:27 2010
@@ -99,6 +99,7 @@
dir="src/test/resources/"
tempdir="${junit.output.dir}"
>
+ <sysproperty key="jetty.insecurerandom" value="1"/>
<formatter type="brief" usefile="false" if="junit.details"/>
<classpath refid="test.classpath"/>
<assertions>
Modified: lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java?rev=981265&r1=981264&r2=981265&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java (original)
+++ lucene/dev/trunk/solr/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java Sun Aug 1 16:38:27 2010
@@ -19,6 +19,7 @@ package org.apache.solr.client.solrj.emb
import java.io.File;
import java.net.URL;
+import java.util.Random;
import junit.framework.TestCase;
@@ -26,6 +27,7 @@ import org.apache.commons.io.IOUtils;
import org.mortbay.jetty.Connector;
import org.mortbay.jetty.Server;
import org.mortbay.jetty.bio.SocketConnector;
+import org.mortbay.jetty.servlet.HashSessionIdManager;
import org.mortbay.jetty.webapp.WebAppContext;
/**
@@ -52,6 +54,8 @@ public class JettyWebappTest extends Tes
String path = "../../webapp/web";
server = new Server(port);
+ // insecure: only use for tests!!!!
+ server.setSessionIdManager(new HashSessionIdManager(new Random()));
new WebAppContext(server, path, context );
SocketConnector connector = new SocketConnector();
Modified: lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/JettySolrRunner.java?rev=981265&r1=981264&r2=981265&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/JettySolrRunner.java (original)
+++ lucene/dev/trunk/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/JettySolrRunner.java Sun Aug 1 16:38:27 2010
@@ -20,6 +20,7 @@ package org.apache.solr.client.solrj.emb
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
+import java.util.Random;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
@@ -31,6 +32,7 @@ import org.mortbay.jetty.Server;
import org.mortbay.jetty.Connector;
import org.mortbay.jetty.servlet.Context;
import org.mortbay.jetty.servlet.FilterHolder;
+import org.mortbay.jetty.servlet.HashSessionIdManager;
import org.mortbay.log.Logger;
/**
@@ -75,6 +77,9 @@ public class JettySolrRunner
{
this.context = context;
server = new Server( port );
+ if (System.getProperty("jetty.insecurerandom") != null)
+ server.setSessionIdManager(new HashSessionIdManager(new Random()));
+
server.setStopAtShutdown( true );
// Initialize the servlets