You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2015/04/26 17:22:14 UTC
svn commit: r1676114 [2/2] - in /lucene/dev/branches/branch_5x: ./
dev-tools/ dev-tools/maven/lucene/replicator/ dev-tools/maven/solr/
dev-tools/scripts/ lucene/ lucene/licenses/ lucene/replicator/
lucene/replicator/src/test/org/apache/lucene/replicato...
Copied: lucene/dev/branches/branch_5x/solr/server/etc/jetty-ssl.xml (from r1649552, lucene/dev/trunk/solr/server/etc/jetty-ssl.xml)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/server/etc/jetty-ssl.xml?p2=lucene/dev/branches/branch_5x/solr/server/etc/jetty-ssl.xml&p1=lucene/dev/trunk/solr/server/etc/jetty-ssl.xml&r1=1649552&r2=1676114&rev=1676114&view=diff
==============================================================================
--- lucene/dev/trunk/solr/server/etc/jetty-ssl.xml (original)
+++ lucene/dev/branches/branch_5x/solr/server/etc/jetty-ssl.xml Sun Apr 26 15:22:12 2015
@@ -1,83 +1,29 @@
<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<!-- ============================================================= -->
-<!-- Base SSL configuration -->
-<!-- This configuration needs to be used together with 1 or more -->
-<!-- of jetty-https.xml, jetty-spdy.xml and/or jetty-http2.xml -->
+<!-- Configure a TLS (SSL) Context Factory -->
+<!-- This configuration must be used in conjunction with jetty.xml -->
+<!-- and either jetty-https.xml or jetty-spdy.xml (but not both) -->
<!-- ============================================================= -->
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-
- <!-- =========================================================== -->
- <!-- Add a SSL Connector with no protocol factories -->
- <!-- =========================================================== -->
- <Call name="addConnector">
- <Arg>
- <New id="sslConnector" class="org.eclipse.jetty.server.ServerConnector">
- <Arg name="server"><Ref refid="Server" /></Arg>
- <Arg name="acceptors" type="int"><Property name="ssl.acceptors" default="-1"/></Arg>
- <Arg name="selectors" type="int"><Property name="ssl.selectors" default="-1"/></Arg>
- <Arg name="factories">
- <Array type="org.eclipse.jetty.server.ConnectionFactory">
- <!-- uncomment to support proxy protocol
- <Item>
- <New class="org.eclipse.jetty.server.ProxyConnectionFactory"/>
- </Item>-->
- </Array>
- </Arg>
-
- <Set name="host"><Property name="jetty.host" /></Set>
- <Set name="port"><Property name="ssl.port" default="443" /></Set>
- <Set name="idleTimeout"><Property name="ssl.timeout" default="30000"/></Set>
- <Set name="soLingerTime"><Property name="ssl.soLingerTime" default="-1"/></Set>
- <Set name="acceptorPriorityDelta"><Property name="ssl.acceptorPriorityDelta" default="0"/></Set>
- <Set name="selectorPriorityDelta"><Property name="ssl.selectorPriorityDelta" default="0"/></Set>
- <Set name="acceptQueueSize"><Property name="ssl.acceptQueueSize" default="0"/></Set>
- </New>
- </Arg>
- </Call>
-
- <!-- ============================================================= -->
- <!-- Create a TLS (SSL) Context Factory for later reuse -->
- <!-- ============================================================= -->
- <New id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
- <Set name="KeyStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.keystore" default="etc/keystore"/></Set>
- <Set name="KeyStorePassword"><Property name="jetty.keystore.password" default="OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"/></Set>
- <Set name="KeyManagerPassword"><Property name="jetty.keymanager.password" default="OBF:1u2u1wml1z7s1z7a1wnl1u2g"/></Set>
- <Set name="TrustStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.truststore" default="etc/keystore"/></Set>
- <Set name="TrustStorePassword"><Property name="jetty.truststore.password" default="OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"/></Set>
- <Set name="EndpointIdentificationAlgorithm"></Set>
- <Set name="NeedClientAuth"><Property name="jetty.ssl.needClientAuth" default="false"/></Set>
- <Set name="WantClientAuth"><Property name="jetty.ssl.wantClientAuth" default="false"/></Set>
- <Set name="ExcludeCipherSuites">
- <Array type="String">
- <Item>SSL_RSA_WITH_DES_CBC_SHA</Item>
- <Item>SSL_DHE_RSA_WITH_DES_CBC_SHA</Item>
- <Item>SSL_DHE_DSS_WITH_DES_CBC_SHA</Item>
- <Item>SSL_RSA_EXPORT_WITH_RC4_40_MD5</Item>
- <Item>SSL_RSA_EXPORT_WITH_DES40_CBC_SHA</Item>
- <Item>SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA</Item>
- <Item>SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA</Item>
- </Array>
- </Set>
- </New>
+<Configure id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
+ <Set name="KeyStorePath"><Property name="solr.jetty.keystore" default="./etc/solr-ssl.keystore.jks"/></Set>
+ <Set name="KeyStorePassword"><Property name="solr.jetty.keystore.password" default="secret"/></Set>
+ <Set name="TrustStorePath"><Property name="solr.jetty.truststore" default="./etc/solr-ssl.keystore.jks"/></Set>
+ <Set name="TrustStorePassword"><Property name="solr.jetty.truststore.password" default="secret"/></Set>
+ <Set name="NeedClientAuth"><Property name="solr.jetty.ssl.needClientAuth" default="false"/></Set>
+ <Set name="WantClientAuth"><Property name="solr.jetty.ssl.wantClientAuth" default="false"/></Set>
+ <Set name="ExcludeCipherSuites">
+ <Array type="String">
+ <Item>SSL_RSA_WITH_DES_CBC_SHA</Item>
+ <Item>SSL_DHE_RSA_WITH_DES_CBC_SHA</Item>
+ <Item>SSL_DHE_DSS_WITH_DES_CBC_SHA</Item>
+ <Item>SSL_RSA_EXPORT_WITH_RC4_40_MD5</Item>
+ <Item>SSL_RSA_EXPORT_WITH_DES40_CBC_SHA</Item>
+ <Item>SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA</Item>
+ <Item>SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA</Item>
+ </Array>
+ </Set>
<!-- =========================================================== -->
<!-- Create a TLS specific HttpConfiguration based on the -->
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=1676114&r1=1676113&r2=1676114&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/server/etc/jetty.xml (original)
+++ lucene/dev/branches/branch_5x/solr/server/etc/jetty.xml Sun Apr 26 15:22:12 2015
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<!-- =============================================================== -->
<!-- Configure the Jetty Server -->
@@ -12,53 +12,67 @@
<Configure id="Server" class="org.eclipse.jetty.server.Server">
- <!-- =========================================================== -->
- <!-- Server Thread Pool -->
- <!-- =========================================================== -->
- <Set name="ThreadPool">
- <!-- Default queued blocking threadpool -->
- <New class="org.eclipse.jetty.util.thread.QueuedThreadPool">
- <Set name="minThreads">10</Set>
- <Set name="maxThreads">10000</Set>
- <Set name="detailedDump">false</Set>
- </New>
- </Set>
-
- <!-- =========================================================== -->
- <!-- 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>
+ <!-- =========================================================== -->
+ <!-- Configure the Server Thread Pool. -->
+ <!-- The server holds a common thread pool which is used by -->
+ <!-- default as the executor used by all connectors and servlet -->
+ <!-- dispatches. -->
+ <!-- -->
+ <!-- Configuring a fixed thread pool is vital to controlling the -->
+ <!-- maximal memory footprint of the server and is a key tuning -->
+ <!-- parameter for tuning. In an application that rarely blocks -->
+ <!-- then maximal threads may be close to the number of 5*CPUs. -->
+ <!-- In an application that frequently blocks, then maximal -->
+ <!-- threads should be set as high as possible given the memory -->
+ <!-- available. -->
+ <!-- -->
+ <!-- Consult the javadoc of o.e.j.util.thread.QueuedThreadPool -->
+ <!-- for all configuration that may be set here. -->
+ <!-- =========================================================== -->
+ <!-- uncomment to change type of threadpool
+ <Arg name="threadpool"><New id="threadpool" class="org.eclipse.jetty.util.thread.QueuedThreadPool"/></Arg>
-->
-
- <!-- 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>
+ <Get name="ThreadPool">
+ <Set name="minThreads" type="int"><Property name="solr.jetty.threads.min" default="10"/></Set>
+ <Set name="maxThreads" type="int"><Property name="solr.jetty.threads.max" default="10000"/></Set>
+ <Set name="idleTimeout" type="int"><Property name="solr.jetty.threads.idle.timeout" default="5000"/></Set>
+ <Set name="stopTimeout" type="int"><Property name="solr.jetty.threads.stop.timeout" default="60000"/></Set>
+ <Set name="detailedDump">false</Set>
+ </Get>
+
+
+ <!-- =========================================================== -->
+ <!-- Http Configuration. -->
+ <!-- This is a common configuration instance used by all -->
+ <!-- connectors that can carry HTTP semantics (HTTP, HTTPS, SPDY)-->
+ <!-- It configures the non wire protocol aspects of the HTTP -->
+ <!-- semantic. -->
+ <!-- -->
+ <!-- This configuration is only defined here and is used by -->
+ <!-- reference from the jetty-http.xml, jetty-https.xml and -->
+ <!-- jetty-spdy.xml configuration files which instantiate the -->
+ <!-- connectors. -->
+ <!-- -->
+ <!-- Consult the javadoc of o.e.j.server.HttpConfiguration -->
+ <!-- for all configuration that may be set here. -->
+ <!-- =========================================================== -->
+ <New id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
+ <Set name="secureScheme">https</Set>
+ <Set name="securePort"><Property name="solr.jetty.secure.port" default="8443" /></Set>
+ <Set name="outputBufferSize"><Property name="solr.jetty.output.buffer.size" default="32768" /></Set>
+ <Set name="outputAggregationSize"><Property name="solr.jetty.output.aggregation.size" default="8192" /></Set>
+ <Set name="requestHeaderSize"><Property name="solr.jetty.request.header.size" default="8192" /></Set>
+ <Set name="responseHeaderSize"><Property name="solr.jetty.response.header.size" default="8192" /></Set>
+ <Set name="sendServerVersion"><Property name="solr.jetty.send.server.version" default="false" /></Set>
+ <Set name="sendDateHeader"><Property name="solr.jetty.send.date.header" default="false" /></Set>
+ <Set name="headerCacheSize"><Property name="solr.jetty.header.cache.size" default="512" /></Set>
+ <Set name="delayDispatchUntilContent"><Property name="solr.jetty.delayDispatchUntilContent" default="false"/></Set>
+ <!-- Uncomment to enable handling of X-Forwarded- style headers
+ <Call name="addCustomizer">
+ <Arg><New class="org.eclipse.jetty.server.ForwardedRequestCustomizer"/></Arg>
</Call>
+ -->
+ </New>
<!-- =========================================================== -->
<!-- Set handler Collection Structure -->
@@ -105,7 +119,7 @@
<!-- =========================================================== -->
<!-- Configure Request Log -->
<!-- =========================================================== -->
- <!--
+ <!--
<Ref id="Handlers">
<Call name="addHandler">
<Arg>
@@ -133,21 +147,24 @@
<!-- extra options -->
<!-- =========================================================== -->
<Set name="stopAtShutdown">true</Set>
- <Set name="sendServerVersion">false</Set>
- <Set name="sendDateHeader">false</Set>
- <Set name="gracefulShutdown">1000</Set>
<Set name="dumpAfterStart">false</Set>
<Set name="dumpBeforeStop">false</Set>
-
-
-
<Call name="addBean">
<Arg>
<New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager">
<Set name="contexts">
- <Ref id="Contexts" />
+ <Ref refid="Contexts" />
</Set>
+
+ <Call name="addAppProvider">
+ <Arg>
+ <New class="org.eclipse.jetty.deploy.providers.WebAppProvider">
+ <Set name="monitoredDirName"><Property name="jetty.base" default="."/>/contexts</Set>
+ <Set name="scanInterval">0</Set>
+ </New>
+ </Arg>
+ </Call>
<!-- Add a customize step to the deployment lifecycle -->
<!-- uncomment and replace DebugBinding with your extended AppLifeCycle.Binding class
@@ -169,15 +186,4 @@
</Arg>
</Call>
- <Ref id="DeploymentManager">
- <Call name="addAppProvider">
- <Arg>
- <New class="org.eclipse.jetty.deploy.providers.ContextProvider">
- <Set name="monitoredDirName"><SystemProperty name="jetty.home" default="."/>/contexts</Set>
- <Set name="scanInterval">0</Set>
- </New>
- </Arg>
- </Call>
- </Ref>
-
</Configure>
Modified: lucene/dev/branches/branch_5x/solr/server/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/server/ivy.xml?rev=1676114&r1=1676113&r2=1676114&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/server/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/solr/server/ivy.xml Sun Apr 26 15:22:12 2015
@@ -41,14 +41,16 @@
<dependency org="org.eclipse.jetty" name="jetty-security" rev="${/org.eclipse.jetty/jetty-security}" conf="jetty"/>
<dependency org="org.eclipse.jetty" name="jetty-server" rev="${/org.eclipse.jetty/jetty-server}" conf="jetty"/>
<dependency org="org.eclipse.jetty" name="jetty-servlet" rev="${/org.eclipse.jetty/jetty-servlet}" conf="jetty"/>
+ <dependency org="org.eclipse.jetty" name="jetty-servlets" rev="${/org.eclipse.jetty/jetty-servlets}" conf="jetty"/>
<dependency org="org.eclipse.jetty" name="jetty-util" rev="${/org.eclipse.jetty/jetty-util}" conf="jetty"/>
<dependency org="org.eclipse.jetty" name="jetty-webapp" rev="${/org.eclipse.jetty/jetty-webapp}" conf="jetty"/>
<dependency org="org.eclipse.jetty" name="jetty-xml" rev="${/org.eclipse.jetty/jetty-xml}" conf="jetty"/>
+ <dependency org="javax.servlet" name="javax.servlet-api" rev="${/javax.servlet/javax.servlet-api}" conf="jetty"/>
+
<dependency org="org.eclipse.jetty" name="jetty-start" rev="${/org.eclipse.jetty/jetty-start}" conf="start"/>
- <dependency org="javax.servlet" name="javax.servlet-api" rev="${/javax.servlet/javax.servlet-api}" conf="servlet"/>
- <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
+ <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
</ivy-module>
Modified: lucene/dev/branches/branch_5x/solr/server/modules/http.mod
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/server/modules/http.mod?rev=1676114&r1=1649552&r2=1676114&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/server/modules/http.mod (original)
+++ lucene/dev/branches/branch_5x/solr/server/modules/http.mod Sun Apr 26 15:22:12 2015
@@ -6,21 +6,4 @@
server
[xml]
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
etc/jetty-http.xml
\ No newline at end of file
Modified: lucene/dev/branches/branch_5x/solr/server/modules/https.mod
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/server/modules/https.mod?rev=1676114&r1=1649552&r2=1676114&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/server/modules/https.mod (original)
+++ lucene/dev/branches/branch_5x/solr/server/modules/https.mod Sun Apr 26 15:22:12 2015
@@ -6,31 +6,4 @@
ssl
[xml]
-etc/jetty-https.xml
-
-[ini-template]
-## HTTPS Configuration
-# HTTP port to listen on
-https.port=8443
-# HTTPS idle timeout in milliseconds
-https.timeout=30000
-# HTTPS Socket.soLingerTime in seconds. (-1 to disable)
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-https.soLingerTime=-1
-
+etc/jetty-https.xml
\ No newline at end of file
Modified: lucene/dev/branches/branch_5x/solr/server/modules/server.mod
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/server/modules/server.mod?rev=1676114&r1=1649552&r2=1676114&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/server/modules/server.mod (original)
+++ lucene/dev/branches/branch_5x/solr/server/modules/server.mod Sun Apr 26 15:22:12 2015
@@ -2,32 +2,10 @@
# Base Server Module
#
-[optional]
-jvm
-ext
-resources
-
[lib]
lib/*.jar
lib/ext/*.jar
resources/
[xml]
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
etc/jetty.xml
\ No newline at end of file
Modified: lucene/dev/branches/branch_5x/solr/server/modules/ssl.mod
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/server/modules/ssl.mod?rev=1676114&r1=1649552&r2=1676114&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/server/modules/ssl.mod (original)
+++ lucene/dev/branches/branch_5x/solr/server/modules/ssl.mod Sun Apr 26 15:22:12 2015
@@ -6,52 +6,4 @@
server
[xml]
-etc/jetty-ssl.xml
-
-[files]
-http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/src/main/config/etc/keystore|etc/keystore
-
-[ini-template]
-### SSL Keystore Configuration
-# define the port to use for secure redirection
-jetty.secure.port=8443
-
-## Setup a demonstration keystore and truststore
-jetty.keystore=etc/keystore
-jetty.truststore=etc/keystore
-
-## Set the demonstration passwords.
-## Note that OBF passwords are not secure, just protected from casual observation
-## See http://www.eclipse.org/jetty/documentation/current/configuring-security-secure-passwords.html
-jetty.keystore.password=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4
-jetty.keymanager.password=OBF:1u2u1wml1z7s1z7a1wnl1u2g
-jetty.truststore.password=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4
-
-### Set the client auth behavior
-## Set to true if client certificate authentication is required
-# jetty.ssl.needClientAuth=true
-## Set to true if client certificate authentication is desired
-# jetty.ssl.wantClientAuth=true
-
-## Parameters to control the number and priority of acceptors and selectors
-# ssl.selectors=1
-# ssl.acceptors=1
-# ssl.selectorPriorityDelta=0
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-ssl.acceptorPriorityDelta=0
+etc/jetty-ssl.xml
\ No newline at end of file
Copied: lucene/dev/branches/branch_5x/solr/server/resources/jetty-logging.properties (from r1649552, lucene/dev/trunk/solr/server/resources/jetty-logging.properties)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/server/resources/jetty-logging.properties?p2=lucene/dev/branches/branch_5x/solr/server/resources/jetty-logging.properties&p1=lucene/dev/trunk/solr/server/resources/jetty-logging.properties&r1=1649552&r2=1676114&rev=1676114&view=diff
==============================================================================
--- lucene/dev/trunk/solr/server/resources/jetty-logging.properties (original)
+++ lucene/dev/branches/branch_5x/solr/server/resources/jetty-logging.properties Sun Apr 26 15:22:12 2015
@@ -1,18 +1 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.Slf4jLog
\ No newline at end of file
Modified: lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/StartSolrJetty.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/StartSolrJetty.java?rev=1676114&r1=1676113&r2=1676114&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/StartSolrJetty.java (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/StartSolrJetty.java Sun Apr 26 15:22:12 2015
@@ -18,8 +18,9 @@
package org.apache.solr.client.solrj;
import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.bio.SocketConnector;
+import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.webapp.WebAppContext;
/**
@@ -32,9 +33,9 @@ public class StartSolrJetty
//System.setProperty("solr.solr.home", "../../../example/solr");
Server server = new Server();
- SocketConnector connector = new SocketConnector();
+ ServerConnector connector = new ServerConnector(server, new HttpConnectionFactory());
// Set some timeout options to make debugging easier.
- connector.setMaxIdleTime(1000 * 60 * 60);
+ connector.setIdleTimeout(1000 * 60 * 60);
connector.setSoLingerTime(-1);
connector.setPort(8983);
server.setConnectors(new Connector[] { connector });
Modified: lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java?rev=1676114&r1=1676113&r2=1676114&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java Sun Apr 26 15:22:12 2015
@@ -28,8 +28,9 @@ import org.apache.solr.SolrJettyTestBase
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.util.ExternalPaths;
import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.bio.SocketConnector;
+import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.session.HashSessionIdManager;
import org.eclipse.jetty.webapp.WebAppContext;
import org.junit.Rule;
@@ -71,8 +72,8 @@ public class JettyWebappTest extends Sol
server.setSessionIdManager(new HashSessionIdManager(new Random(random().nextLong())));
new WebAppContext(server, path, context );
- SocketConnector connector = new SocketConnector();
- connector.setMaxIdleTime(1000 * 60 * 60);
+ ServerConnector connector = new ServerConnector(server, new HttpConnectionFactory());
+ connector.setIdleTimeout(1000 * 60 * 60);
connector.setSoLingerTime(-1);
connector.setPort(0);
server.setConnectors(new Connector[]{connector});