Permalink
Browse files

upgrade to solr 4

  • Loading branch information...
1 parent 87fca06 commit 3b92352394b82e4edceb6fa74c28027bfcafedc4 @bru bru committed Feb 18, 2013
Showing 422 changed files with 62,538 additions and 1,288 deletions.
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<Configure class="org.eclipse.jetty.webapp.WebAppContext">
+ <Set name="contextPath"><SystemProperty name="hostContext" default="/solr"/></Set>
+ <Set name="war"><SystemProperty name="jetty.home"/>/webapps/solr.war</Set>
+ <Set name="defaultsDescriptor"><SystemProperty name="jetty.home"/>/etc/webdefault.xml</Set>
+ <Set name="tempDirectory"><Property name="jetty.home" default="."/>/solr-webapp</Set>
+</Configure>
@@ -1,219 +1,167 @@
<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
<!-- =============================================================== -->
<!-- Configure the Jetty Server -->
<!-- -->
<!-- Documentation of this file format can be found at: -->
-<!-- http://docs.codehaus.org/display/JETTY/jetty.xml -->
+<!-- http://wiki.eclipse.org/Jetty/Reference/jetty.xml_syntax -->
<!-- -->
<!-- =============================================================== -->
-<Configure id="Server" class="org.mortbay.jetty.Server">
-
- <!-- Increase the maximum POST size to 1 MB to be able to handle large shard requests -->
- <Call class="java.lang.System" name="setProperty">
- <Arg>org.mortbay.jetty.Request.maxFormContentSize</Arg>
- <Arg>1000000</Arg>
- </Call>
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- =========================================================== -->
<!-- Server Thread Pool -->
<!-- =========================================================== -->
<Set name="ThreadPool">
- <!-- Default bounded blocking threadpool
- -->
- <New class="org.mortbay.thread.BoundedThreadPool">
+ <!-- Default queued blocking threadpool -->
+ <New class="org.eclipse.jetty.util.thread.QueuedThreadPool">
<Set name="minThreads">10</Set>
- <Set name="lowThreads">50</Set>
<Set name="maxThreads">10000</Set>
+ <Set name="detailedDump">false</Set>
</New>
-
- <!-- Optional Java 5 bounded threadpool with job queue
- <New class="org.mortbay.thread.concurrent.ThreadPool">
- <Arg type="int">0</Arg>
- <Set name="corePoolSize">10</Set>
- <Set name="maximumPoolSize">250</Set>
- </New>
- -->
</Set>
-
-
<!-- =========================================================== -->
<!-- Set connectors -->
<!-- =========================================================== -->
- <!-- One of each type! -->
- <!-- =========================================================== -->
- <!-- Use this connector for many frequently idle connections
- and for threadless continuations.
+ <!--
<Call name="addConnector">
<Arg>
- <New class="org.mortbay.jetty.nio.SelectChannelConnector">
+ <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">30000</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>
- -->
+ -->
- <!-- Use this connector if NIO is not available. -->
- <!-- This connector is currently being used for Solr because the
- nio.SelectChannelConnector showed poor performance under WindowsXP
- from a single client with non-persistent connections (35s vs ~3min)
- to complete 10,000 requests)
- -->
+ <!-- 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.mortbay.jetty.bio.SocketConnector">
- <Set name="host"><SystemProperty name="jetty.host" default="0.0.0.0"/></Set>
+ <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>
- <!-- Increase header buffer size from default of 4KB to 64KB to
- prevent Solr from reaching this limit during large queries
- -->
- <Set name="headerBufferSize">65536</Set>
+ <Set name="statsOn">false</Set>
</New>
</Arg>
</Call>
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <!-- To add a HTTPS SSL listener -->
- <!-- see jetty-ssl.xml to add an ssl connector. use -->
- <!-- java -jar start.jar etc/jetty.xml etc/jetty-ssl.xml -->
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
- <!-- =========================================================== -->
- <!-- Set up global session ID manager -->
- <!-- =========================================================== -->
- <!--
- <Set name="sessionIdManager">
- <New class="org.mortbay.jetty.servlet.HashSessionIdManager">
- <Set name="workerName">node1</Set>
- </New>
- </Set>
- -->
-
<!-- =========================================================== -->
<!-- Set handler Collection Structure -->
<!-- =========================================================== -->
<Set name="handler">
- <New id="Handlers" class="org.mortbay.jetty.handler.HandlerCollection">
+ <New id="Handlers" class="org.eclipse.jetty.server.handler.HandlerCollection">
<Set name="handlers">
- <Array type="org.mortbay.jetty.Handler">
+ <Array type="org.eclipse.jetty.server.Handler">
<Item>
- <New id="Contexts" class="org.mortbay.jetty.handler.ContextHandlerCollection"/>
+ <New id="Contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection"/>
</Item>
<Item>
- <New id="DefaultHandler" class="org.mortbay.jetty.handler.DefaultHandler"/>
+ <New id="DefaultHandler" class="org.eclipse.jetty.server.handler.DefaultHandler"/>
</Item>
<Item>
- <New id="RequestLog" class="org.mortbay.jetty.handler.RequestLogHandler"/>
+ <New id="RequestLog" class="org.eclipse.jetty.server.handler.RequestLogHandler"/>
</Item>
</Array>
</Set>
</New>
</Set>
<!-- =========================================================== -->
- <!-- Configure the context deployer -->
- <!-- A context deployer will deploy contexts described in -->
- <!-- configuration files discovered in a directory. -->
- <!-- The configuration directory can be scanned for hot -->
- <!-- deployments at the configured scanInterval. -->
- <!-- -->
- <!-- This deployer is configured to deploy contexts configured -->
- <!-- in the $JETTY_HOME/contexts directory -->
- <!-- -->
+ <!-- Configure Request Log -->
<!-- =========================================================== -->
- <Call name="addLifeCycle">
- <Arg>
- <New class="org.mortbay.jetty.deployer.ContextDeployer">
- <Set name="contexts"><Ref id="Contexts"/></Set>
- <Set name="configurationDir"><SystemProperty name="jetty.home" default="."/>/contexts</Set>
- <Set name="scanInterval">1</Set>
- </New>
- </Arg>
- </Call>
+ <!--
+ <Ref id="Handlers">
+ <Call name="addHandler">
+ <Arg>
+ <New id="RequestLog" class="org.eclipse.jetty.server.handler.RequestLogHandler">
+ <Set name="requestLog">
+ <New id="RequestLogImpl" class="org.eclipse.jetty.server.NCSARequestLog">
+ <Set name="filename">
+ logs/request.yyyy_mm_dd.log
+ </Set>
+ <Set name="filenameDateFormat">yyyy_MM_dd</Set>
+ <Set name="retainDays">90</Set>
+ <Set name="append">true</Set>
+ <Set name="extended">false</Set>
+ <Set name="logCookies">false</Set>
+ <Set name="LogTimeZone">UTC</Set>
+ </New>
+ </Set>
+ </New>
+ </Arg>
+ </Call>
+ </Ref>
+ -->
<!-- =========================================================== -->
- <!-- Configure the webapp deployer. -->
- <!-- A webapp deployer will deploy standard webapps discovered -->
- <!-- in a directory at startup, without the need for additional -->
- <!-- configuration files. It does not support hot deploy or -->
- <!-- non standard contexts (see ContextDeployer above). -->
- <!-- -->
- <!-- This deployer is configured to deploy webapps from the -->
- <!-- $JETTY_HOME/webapps directory -->
- <!-- -->
- <!-- Normally only one type of deployer need be used. -->
- <!-- -->
+ <!-- extra options -->
<!-- =========================================================== -->
- <Call name="addLifeCycle">
+ <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 class="org.mortbay.jetty.deployer.WebAppDeployer">
- <Set name="contexts"><Ref id="Contexts"/></Set>
- <Set name="webAppDir"><SystemProperty name="jetty.home" default="."/>/webapps</Set>
- <Set name="parentLoaderPriority">false</Set>
- <Set name="extract">true</Set>
- <Set name="allowDuplicates">false</Set>
- <Set name="defaultsDescriptor"><SystemProperty name="jetty.home" default="."/>/etc/webdefault.xml</Set>
+ <New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager">
+ <Set name="contexts">
+ <Ref id="Contexts" />
+ </Set>
+ <Call name="setContextAttribute">
+ <Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg>
+ <Arg>.*/servlet-api-[^/]*\.jar$</Arg>
+ </Call>
+
+
+ <!-- Add a customize step to the deployment lifecycle -->
+ <!-- uncomment and replace DebugBinding with your extended AppLifeCycle.Binding class
+ <Call name="insertLifeCycleNode">
+ <Arg>deployed</Arg>
+ <Arg>starting</Arg>
+ <Arg>customise</Arg>
+ </Call>
+ <Call name="addLifeCycleBinding">
+ <Arg>
+ <New class="org.eclipse.jetty.deploy.bindings.DebugBinding">
+ <Arg>customise</Arg>
+ </New>
+ </Arg>
+ </Call>
+ -->
+
</New>
</Arg>
</Call>
-
- <!-- =========================================================== -->
- <!-- Configure Authentication Realms -->
- <!-- Realms may be configured for the entire server here, or -->
- <!-- they can be configured for a specific web app in a context -->
- <!-- configuration (see $(jetty.home)/contexts/test.xml for an -->
- <!-- example). -->
- <!-- =========================================================== -->
- <Set name="UserRealms">
- <Array type="org.mortbay.jetty.security.UserRealm">
- <!--
- <Item>
- <New class="org.mortbay.jetty.security.HashUserRealm">
- <Set name="name">Test Realm</Set>
- <Set name="config"><SystemProperty name="jetty.home" default="."/>/etc/realm.properties</Set>
+
+ <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>
- </Item>
- -->
- </Array>
- </Set>
-
- <!-- =========================================================== -->
- <!-- Configure Request Log -->
- <!-- Request logs may be configured for the entire server here, -->
- <!-- or they can be configured for a specific web app in a -->
- <!-- contexts configuration (see $(jetty.home)/contexts/test.xml -->
- <!-- for an example). -->
- <!-- =========================================================== -->
- <!--
- <Ref id="RequestLog">
- <Set name="requestLog">
- <New id="RequestLogImpl" class="org.mortbay.jetty.NCSARequestLog">
- <Arg><SystemProperty name="jetty.logs" default="./logs"/>/yyyy_mm_dd.request.log</Arg>
- <Set name="retainDays">90</Set>
- <Set name="append">true</Set>
- <Set name="extended">false</Set>
- <Set name="LogTimeZone">GMT</Set>
- </New>
- </Set>
+ </Arg>
+ </Call>
</Ref>
- -->
-
- <!-- =========================================================== -->
- <!-- extra options -->
- <!-- =========================================================== -->
- <Set name="stopAtShutdown">true</Set>
- <!-- ensure/prevent Server: header being sent to browsers -->
- <Set name="sendServerVersion">true</Set>
</Configure>
-
@@ -0,0 +1,38 @@
+#
+# 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.
+#
+
+# To use this log config, start solr with the following system property:
+# -Djava.util.logging.config.file=etc/logging.properties
+
+## Default global logging level:
+.level = INFO
+
+## Log every update command (add, delete, commit, ...)
+#org.apache.solr.update.processor.LogUpdateProcessor.level = FINE
+
+## Where to log (space separated list).
+handlers = java.util.logging.FileHandler
+
+java.util.logging.FileHandler.level = FINE
+
+java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter
+
+# 1 GB limit per file
+java.util.logging.FileHandler.limit = 1073741824
+
+# Log to the logs directory, with log files named solrxxx.log
+java.util.logging.FileHandler.pattern = ./logs/solr%u.log
Oops, something went wrong.

0 comments on commit 3b92352

Please sign in to comment.