Update of /cvsroot/fink/pdb/solr/etc In directory vz-cvs-3.sog:/tmp/cvs-serv32221/etc
Modified Files: jetty.xml webdefault.xml Log Message: upgrade solr to the latest version (3.3) Index: webdefault.xml =================================================================== RCS file: /cvsroot/fink/pdb/solr/etc/webdefault.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- webdefault.xml 5 Sep 2010 08:53:43 -0000 1.2 +++ webdefault.xml 20 Jul 2011 18:07:51 -0000 1.3 @@ -52,7 +52,7 @@ <context-param> <param-name>org.mortbay.jetty.webapp.NoTLDJarPattern</param-name> - <param-value>start.jar|ant-.*\.jar|dojo-.*\.jar|jetty-.*\.jar|jsp-api-.*\.jar|junit-.*\.jar|servlet-api-.*\.jar|dnsns\.jar|rt\.jar|jsse\.jar|tools\.jar|sunpkcs11\.jar|sunjce_provider\.jar|xerces.*\.jar|</param-value> + <param-value>start.jar|ant-.*\.jar|dojo-.*\.jar|jetty-.*\.jar|jsp-api-.*\.jar|junit-.*\.jar|servlet-api-.*\.jar|dnsns\.jar|rt\.jar|jsse\.jar|tools\.jar|sunpkcs11\.jar|sunjce_provider\.jar|xerces.*\.jar</param-value> </context-param> @@ -69,6 +69,10 @@ <!-- dirAllowed If true, directory listings are returned if no --> <!-- welcome file is found. Else 403 Forbidden. --> <!-- --> + <!-- welcomeServlets If true, attempt to dispatch to welcome files --> + <!-- that are servlets, if no matching static --> + <!-- resources can be found. --> + <!-- --> <!-- redirectWelcome If true, redirect welcome file requests --> <!-- else use request dispatcher forwards --> <!-- --> @@ -93,6 +97,18 @@ <!-- --> <!-- cacheControl If set, all static content will have this value --> <!-- set as the cache-control header. --> + <!-- --> + <!-- maxCacheSize Maximum size of the static resource cache --> + <!-- --> + <!-- maxCachedFileSize Maximum size of any single file in the cache --> + <!-- --> + <!-- maxCachedFiles Maximum number of files in the cache --> + <!-- --> + <!-- cacheType "nio", "bio" or "both" to determine the type(s) --> + <!-- of resource cache. A bio cached buffer may be used--> + <!-- by nio but is not as efficient as a nio buffer. --> + <!-- An nio cached buffer may not be used by bio. --> + <!-- --> <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> <servlet> <servlet-name>default</servlet-name> @@ -106,28 +122,36 @@ <param-value>true</param-value> </init-param> <init-param> + <param-name>welcomeServlets</param-name> + <param-value>false</param-value> + </init-param> + <init-param> <param-name>redirectWelcome</param-name> <param-value>false</param-value> </init-param> <init-param> <param-name>maxCacheSize</param-name> - <param-value>2000000</param-value> + <param-value>256000000</param-value> </init-param> <init-param> <param-name>maxCachedFileSize</param-name> - <param-value>254000</param-value> + <param-value>10000000</param-value> </init-param> <init-param> <param-name>maxCachedFiles</param-name> <param-value>1000</param-value> </init-param> <init-param> + <param-name>cacheType</param-name> + <param-value>both</param-value> + </init-param> + <init-param> <param-name>gzip</param-name> - <param-value>false</param-value> + <param-value>true</param-value> </init-param> <init-param> <param-name>useFileMappedBuffer</param-name> - <param-value>false</param-value> + <param-value>true</param-value> </init-param> <!-- <init-param> @@ -372,8 +396,15 @@ <locale-encoding-mapping><locale>zh</locale><encoding>GB2312</encoding></locale-encoding-mapping> <locale-encoding-mapping><locale>zh_TW</locale><encoding>Big5</encoding></locale-encoding-mapping> </locale-encoding-mapping-list> - + <security-constraint> + <web-resource-collection> + <web-resource-name>Disable TRACE</web-resource-name> + <url-pattern>/</url-pattern> + <http-method>TRACE</http-method> + </web-resource-collection> + <auth-constraint/> + </security-constraint> </web-app> Index: jetty.xml =================================================================== RCS file: /cvsroot/fink/pdb/solr/etc/jetty.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- jetty.xml 5 Sep 2010 08:53:43 -0000 1.5 +++ jetty.xml 20 Jul 2011 18:07:51 -0000 1.6 @@ -22,19 +22,17 @@ <!-- Server Thread Pool --> <!-- =========================================================== --> <Set name="ThreadPool"> - <!-- Default bounded blocking threadpool - --> - <New class="org.mortbay.thread.BoundedThreadPool"> + + <New class="org.mortbay.thread.QueuedThreadPool"> <Set name="minThreads">10</Set> - <Set name="lowThreads">50</Set> <Set name="maxThreads">10000</Set> + <Set name="lowThreads">20</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> + <Set name="corePoolSize">50</Set> + <Set name="maximumPoolSize">50</Set> </New> --> </Set> @@ -48,7 +46,9 @@ <!-- =========================================================== --> <!-- Use this connector for many frequently idle connections - and for threadless continuations. --> + and for threadless continuations. + --> + <!-- <Call name="addConnector"> <Arg> <New class="org.mortbay.jetty.nio.SelectChannelConnector"> @@ -56,18 +56,18 @@ <Set name="port"><SystemProperty name="jetty.port" default="8983"/></Set> <Set name="maxIdleTime">30000</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"> @@ -75,16 +75,24 @@ <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> - --> <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> <!-- 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 --> <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> + <!-- To allow Jetty to be started from xinetd --> + <!-- mixin jetty-xinetd.xml: --> + <!-- java -jar start.jar etc/jetty.xml etc/jetty-xinetd.xml --> + <!-- --> + <!-- See jetty-xinetd.xml for further instructions. --> + <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> <!-- =========================================================== --> <!-- Set up global session ID manager --> @@ -134,7 +142,7 @@ <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> + <Set name="scanInterval">5</Set> </New> </Arg> </Call> @@ -157,9 +165,9 @@ <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="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> </Arg> @@ -172,18 +180,19 @@ <!-- 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> + <Set name="refreshInterval">0</Set> </New> </Item> - --> </Array> </Set> + --> <!-- =========================================================== --> <!-- Configure Request Log --> @@ -195,21 +204,22 @@ <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="filename"><SystemProperty name="jetty.logs" default="./logs"/>/yyyy_mm_dd.request.log</Set> + <Set name="filenameDateFormat">yyyy_MM_dd</Set> <Set name="retainDays">30</Set> <Set name="append">true</Set> <Set name="extended">false</Set> + <Set name="logCookies">false</Set> <Set name="LogTimeZone">GMT</Set> </New> </Set> </Ref> - <!-- =========================================================== --> <!-- extra options --> <!-- =========================================================== --> <Set name="stopAtShutdown">true</Set> - <!-- ensure/prevent Server: header being sent to browsers --> - <Set name="sendServerVersion">true</Set> + <Set name="sendServerVersion">false</Set> + <Set name="sendDateHeader">false</Set> + <Set name="gracefulShutdown">1000</Set> </Configure> - ------------------------------------------------------------------------------ 10 Tips for Better Web Security Learn 10 ways to better secure your business today. Topics covered include: Web security, SSL, hacker attacks & Denial of Service (DoS), private keys, security Microsoft Exchange, secure Instant Messaging, and much more. http://www.accelacomm.com/jaw/sfnl/114/51426210/ _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs