diff options
author | Simone Bordet | 2015-04-13 14:21:48 +0000 |
---|---|---|
committer | Simone Bordet | 2015-04-13 14:21:48 +0000 |
commit | 599ab9bb1bee454f190d964b67859e46a1e57f87 (patch) | |
tree | b729472f7fc361ec6b84526c74cf193c383e77b7 /jetty-server/src | |
parent | d78673f8f824d562bf181fe2aaf929bad6f6e695 (diff) | |
download | org.eclipse.jetty.project-599ab9bb1bee454f190d964b67859e46a1e57f87.tar.gz org.eclipse.jetty.project-599ab9bb1bee454f190d964b67859e46a1e57f87.tar.xz org.eclipse.jetty.project-599ab9bb1bee454f190d964b67859e46a1e57f87.zip |
460671 - Rationalize property names.
Property format is now "jetty.<module|component>.<propertyName>".
Updated all references with new properties.
Diffstat (limited to 'jetty-server/src')
18 files changed, 283 insertions, 218 deletions
diff --git a/jetty-server/src/main/config/etc/jetty-debug.xml b/jetty-server/src/main/config/etc/jetty-debug.xml deleted file mode 100644 index 52b4bdb38e..0000000000 --- a/jetty-server/src/main/config/etc/jetty-debug.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> - -<!-- =============================================================== --> -<!-- Mixin the DebugHandler --> -<!-- =============================================================== --> - - -<Configure id="Server" class="org.eclipse.jetty.server.Server"> - <Get id="oldhandler" name="handler"/> - <Set name="handler"> - <New id="DebugHandler" class="org.eclipse.jetty.server.handler.DebugHandler"> - <Set name="handler"><Ref refid="oldhandler"/></Set> - <Set name="outputStream"> - <New class="org.eclipse.jetty.util.RolloverFileOutputStream"> - <Arg type="String"><Property name="jetty.logs" default="./logs"/>/yyyy_mm_dd.debug.log</Arg> - <Arg type="boolean">true</Arg> <!-- append --> - <Arg type="int">90</Arg> <!-- retain days --> - </New> - </Set> - </New> - </Set> -</Configure> diff --git a/jetty-server/src/main/config/etc/jetty-debuglog.xml b/jetty-server/src/main/config/etc/jetty-debuglog.xml new file mode 100644 index 0000000000..b4a2f5645a --- /dev/null +++ b/jetty-server/src/main/config/etc/jetty-debuglog.xml @@ -0,0 +1,25 @@ +<?xml version="1.0"?> +<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> + +<!-- =============================================================== --> +<!-- The DebugHandler --> +<!-- =============================================================== --> + +<Configure id="Server" class="org.eclipse.jetty.server.Server"> + <Get id="oldhandler" name="handler"/> + <Set name="handler"> + <New id="DebugHandler" class="org.eclipse.jetty.server.handler.DebugHandler"> + <Set name="handler"><Ref refid="oldhandler"/></Set> + <Set name="outputStream"> + <New class="org.eclipse.jetty.util.RolloverFileOutputStream"> + <Arg type="String"><Property name="jetty.debuglog.dir,jetty.logs" default="./logs"/>/yyyy_mm_dd.debug.log</Arg> + <Arg type="boolean"><Property name="jetty.debuglog.append" default="true"/></Arg> + <Arg type="int"><Property name="jetty.debuglog.retainDays" default="90"/></Arg> + <Arg> + <Call class="java.util.TimeZone" name="getTimeZone"><Arg><Property name="jetty.debuglog.timezone" default="GMT"/></Arg></Call> + </Arg> + </New> + </Set> + </New> + </Set> +</Configure> diff --git a/jetty-server/src/main/config/etc/jetty-gzip.xml b/jetty-server/src/main/config/etc/jetty-gzip.xml index 1034bb67a8..35c8dcc70b 100644 --- a/jetty-server/src/main/config/etc/jetty-gzip.xml +++ b/jetty-server/src/main/config/etc/jetty-gzip.xml @@ -13,12 +13,12 @@ <Set name="handler"> <New id="GzipHandler" class="org.eclipse.jetty.server.handler.gzip.GzipHandler"> <Set name="handler"><Ref refid="next" /></Set> - <Set name="minGzipSize"><Property name="gzip.minGzipSize" default="2048"/></Set> - <Set name="checkGzExists"><Property name="gzip.checkGzExists" default="false"/></Set> - <Set name="compressionLevel"><Property name="gzip.compressionLevel" default="-1"/></Set> + <Set name="minGzipSize"><Property name="jetty.gzip.minGzipSize,gzip.minGzipSize" default="2048"/></Set> + <Set name="checkGzExists"><Property name="jetty.gzip.checkGzExists,gzip.checkGzExists" default="false"/></Set> + <Set name="compressionLevel"><Property name="jetty.gzip.compressionLevel,gzip.compressionLevel" default="-1"/></Set> <Set name="excludedAgentPatterns"> <Array type="String"> - <Item><Property name="gzip.excludedUserAgent" default=".*MSIE.6\.0.*"/></Item> + <Item><Property name="jetty.gzip.excludedUserAgent,gzip.excludedUserAgent" default=".*MSIE.6\.0.*"/></Item> </Array> </Set> @@ -48,7 +48,7 @@ <Call name="addIncludedMimeTypes"> <Arg><Array type="String"> <Item>some/type</Item> - </Array></Arg> + </Array></Arg> </Call> --> @@ -56,7 +56,7 @@ <Call name="addExcludedMimeTypes"> <Arg><Array type="String"> <Item>some/type</Item> - </Array></Arg> + </Array></Arg> </Call> --> diff --git a/jetty-server/src/main/config/etc/jetty-http.xml b/jetty-server/src/main/config/etc/jetty-http.xml index adeeaae331..963f8db2b3 100644 --- a/jetty-server/src/main/config/etc/jetty-http.xml +++ b/jetty-server/src/main/config/etc/jetty-http.xml @@ -22,12 +22,12 @@ <Arg> <New id="httpConnector" class="org.eclipse.jetty.server.ServerConnector"> <Arg name="server"><Ref refid="Server" /></Arg> - <Arg name="acceptors" type="int"><Property name="http.acceptors" default="-1"/></Arg> - <Arg name="selectors" type="int"><Property name="http.selectors" default="-1"/></Arg> + <Arg name="acceptors" type="int"><Property name="jetty.http.acceptors,http.acceptors" default="-1"/></Arg> + <Arg name="selectors" type="int"><Property name="jetty.http.selectors,http.selectors" default="-1"/></Arg> <Arg name="factories"> <Array type="org.eclipse.jetty.server.ConnectionFactory"> <!-- uncomment to support proxy protocol - <Item> + <Item> <New class="org.eclipse.jetty.server.ProxyConnectionFactory"/> </Item>--> <Item> @@ -37,13 +37,12 @@ </Item> </Array> </Arg> - <Set name="host"><Property name="jetty.host" /></Set> - <Set name="port"><Property name="jetty.port" default="80" /></Set> - <Set name="idleTimeout"><Property name="http.timeout" default="30000"/></Set> - <Set name="soLingerTime"><Property name="http.soLingerTime" default="-1"/></Set> - <Set name="acceptorPriorityDelta"><Property name="http.acceptorPriorityDelta" default="0"/></Set> - <Set name="selectorPriorityDelta"><Property name="http.selectorPriorityDelta" default="0"/></Set> - <Set name="acceptQueueSize"><Property name="http.acceptQueueSize" default="0"/></Set> + <Set name="host"><Property name="jetty.http.host,jetty.host" /></Set> + <Set name="port"><Property name="jetty.http.port,jetty.port" default="80" /></Set> + <Set name="idleTimeout"><Property name="jetty.http.idleTimeout,http.timeout" default="30000"/></Set> + <Set name="soLingerTime"><Property name="jetty.http.soLingerTime,http.soLingerTime" default="-1"/></Set> + <Set name="acceptorPriorityDelta"><Property name="jetty.http.acceptorPriorityDelta,http.acceptorPriorityDelta" default="0"/></Set> + <Set name="acceptQueueSize"><Property name="jetty.http.acceptQueueSize,http.acceptQueueSize" default="0"/></Set> </New> </Arg> </Call> diff --git a/jetty-server/src/main/config/etc/jetty-ipaccess.xml b/jetty-server/src/main/config/etc/jetty-ipaccess.xml index a44aa1dc41..d87ca02cfa 100644 --- a/jetty-server/src/main/config/etc/jetty-ipaccess.xml +++ b/jetty-server/src/main/config/etc/jetty-ipaccess.xml @@ -2,30 +2,30 @@ <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> <!-- =============================================================== --> -<!-- Mixin the Statistics Handler --> +<!-- The IP Access Handler --> <!-- =============================================================== --> - <Configure id="Server" class="org.eclipse.jetty.server.Server"> - <Get id="oldhandler" name="handler"/> + <Get id="oldhandler" name="handler"/> - <Set name="handler"> - <New id="IPAccessHandler" class="org.eclipse.jetty.server.handler.IPAccessHandler"> + <Set name="handler"> + <New id="IPAccessHandler" class="org.eclipse.jetty.server.handler.IPAccessHandler"> <Set name="handler"><Ref refid="oldhandler"/></Set> <Set name="white"> <Array type="String"> - <Item>127.0.0.1</Item> - <Item>127.0.0.2/*.html</Item> - </Array> + <Item>127.0.0.1</Item> + <Item>127.0.0.2/*.html</Item> + </Array> </Set> <Set name="black"> <Array type="String"> - <Item>127.0.0.1/blacklisted</Item> - <Item>127.0.0.2/black.html</Item> - </Array> + <Item>127.0.0.1/blacklisted</Item> + <Item>127.0.0.2/black.html</Item> + </Array> </Set> <Set name="whiteListByPath">false</Set> - </New> - </Set> + </New> + </Set> + </Configure> diff --git a/jetty-server/src/main/config/etc/jetty-lowresources.xml b/jetty-server/src/main/config/etc/jetty-lowresources.xml index 060919a8d3..5884c42b99 100644 --- a/jetty-server/src/main/config/etc/jetty-lowresources.xml +++ b/jetty-server/src/main/config/etc/jetty-lowresources.xml @@ -10,12 +10,12 @@ <Arg> <New class="org.eclipse.jetty.server.LowResourceMonitor"> <Arg name="server"><Ref refid='Server'/></Arg> - <Set name="period"><Property name="lowresources.period" default="1000"/></Set> - <Set name="lowResourcesIdleTimeout"><Property name="lowresources.lowResourcesIdleTimeout" default="200"/></Set> - <Set name="monitorThreads"><Property name="lowresources.monitorThreads" default="true"/></Set> - <Set name="maxConnections"><Property name="lowresources.maxConnections" default="0"/></Set> - <Set name="maxMemory"><Property name="lowresources.maxMemory" default="0"/></Set> - <Set name="maxLowResourcesTime"><Property name="lowresources.maxLowResourcesTime" default="5000"/></Set> + <Set name="period"><Property name="jetty.lowresources.period,lowresources.period" default="1000"/></Set> + <Set name="lowResourcesIdleTimeout"><Property name="jetty.lowresources.idleTimeout,lowresources.lowResourcesIdleTimeout" default="1000"/></Set> + <Set name="monitorThreads"><Property name="jetty.lowresources.monitorThreads,lowresources.monitorThreads" default="true"/></Set> + <Set name="maxConnections"><Property name="jetty.lowresources.maxConnections,lowresources.maxConnections" default="0"/></Set> + <Set name="maxMemory"><Property name="jetty.lowresources.maxMemory,lowresources.maxMemory" default="0"/></Set> + <Set name="maxLowResourcesTime"><Property name="jetty.lowresources.maxLowResourcesTime,lowresources.maxLowResourcesTime" default="5000"/></Set> </New> </Arg> </Call> diff --git a/jetty-server/src/main/config/etc/jetty-requestlog.xml b/jetty-server/src/main/config/etc/jetty-requestlog.xml index 6b53b53e6d..a9c23369c7 100644 --- a/jetty-server/src/main/config/etc/jetty-requestlog.xml +++ b/jetty-server/src/main/config/etc/jetty-requestlog.xml @@ -12,13 +12,13 @@ <!-- =========================================================== --> <Set name="RequestLog"> <New id="RequestLog" class="org.eclipse.jetty.server.AsyncNCSARequestLog"> - <Set name="filename"><Property name="jetty.base" default="." /><Property name="requestlog.filename" default="/logs/yyyy_mm_dd.request.log"/></Set> - <Set name="filenameDateFormat"><Property name="requestlog.filenameDateFormat" default="yyyy_MM_dd"/></Set> - <Set name="retainDays"><Property name="requestlog.retain" default="90"/></Set> - <Set name="append"><Property name="requestlog.append" default="false"/></Set> - <Set name="extended"><Property name="requestlog.extended" default="false"/></Set> - <Set name="logCookies"><Property name="requestlog.cookies" default="false"/></Set> - <Set name="LogTimeZone"><Property name="requestlog.timezone" default="GMT"/></Set> + <Set name="filename"><Property name="jetty.base" default="." /><Property name="jetty.requestlog.filePath,requestlog.filename" default="/logs/yyyy_mm_dd.request.log"/></Set> + <Set name="filenameDateFormat"><Property name="jetty.requestlog.filenameDateFormat,requestlog.filenameDateFormat" default="yyyy_MM_dd"/></Set> + <Set name="retainDays"><Property name="jetty.requestlog.retainDays,requestlog.retain" default="90"/></Set> + <Set name="append"><Property name="jetty.requestlog.append,requestlog.append" default="false"/></Set> + <Set name="extended"><Property name="jetty.requestlog.extended,requestlog.extended" default="false"/></Set> + <Set name="logCookies"><Property name="jetty.requestlog.cookies,requestlog.cookies" default="false"/></Set> + <Set name="LogTimeZone"><Property name="jetty.requestlog.timezone,requestlog.timezone" default="GMT"/></Set> </New> </Set> </Configure> diff --git a/jetty-server/src/main/config/etc/jetty-ssl.xml b/jetty-server/src/main/config/etc/jetty-ssl.xml index c4f8879329..0b8bb17054 100644 --- a/jetty-server/src/main/config/etc/jetty-ssl.xml +++ b/jetty-server/src/main/config/etc/jetty-ssl.xml @@ -15,24 +15,23 @@ <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="acceptors" type="int"><Property name="jetty.ssl.acceptors,ssl.acceptors" default="-1"/></Arg> + <Arg name="selectors" type="int"><Property name="jetty.ssl.selectors,ssl.selectors" default="-1"/></Arg> <Arg name="factories"> <Array type="org.eclipse.jetty.server.ConnectionFactory"> <!-- uncomment to support proxy protocol - <Item> + <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> + <Set name="host"><Property name="jetty.ssl.host,jetty.host" /></Set> + <Set name="port"><Property name="jetty.ssl.port,ssl.port" default="443" /></Set> + <Set name="idleTimeout"><Property name="jetty.ssl.idleTimeout,ssl.timeout" default="30000"/></Set> + <Set name="soLingerTime"><Property name="jetty.ssl.soLingerTime,ssl.soLingerTime" default="-1"/></Set> + <Set name="acceptorPriorityDelta"><Property name="jetty.ssl.acceptorPriorityDelta,ssl.acceptorPriorityDelta" default="0"/></Set> + <Set name="acceptQueueSize"><Property name="jetty.ssl.acceptQueueSize,ssl.acceptQueueSize" default="0"/></Set> </New> </Arg> </Call> @@ -41,14 +40,14 @@ <!-- 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="KeyStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.sslConfig.keyStorePath,jetty.keystore" default="etc/keystore"/></Set> + <Set name="KeyStorePassword"><Property name="jetty.sslConfig.keyStorePassword,jetty.keystore.password" default="OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"/></Set> + <Set name="KeyManagerPassword"><Property name="jetty.sslConfig.keyManagerPassword,jetty.keymanager.password" default="OBF:1u2u1wml1z7s1z7a1wnl1u2g"/></Set> + <Set name="TrustStorePath"><Property name="jetty.base" default="." />/<Property name="jetty.sslConfig.trustStorePath,jetty.truststore" default="etc/keystore"/></Set> + <Set name="TrustStorePassword"><Property name="jetty.sslConfig.trustStorePassword,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="NeedClientAuth"><Property name="jetty.sslConfig.needClientAuth,jetty.ssl.needClientAuth" default="false"/></Set> + <Set name="WantClientAuth"><Property name="jetty.sslConfig.wantClientAuth,jetty.ssl.wantClientAuth" default="false"/></Set> <Set name="ExcludeCipherSuites"> <Array type="String"> <Item>SSL_RSA_WITH_DES_CBC_SHA</Item> diff --git a/jetty-server/src/main/config/etc/jetty.xml b/jetty-server/src/main/config/etc/jetty.xml index 91109f9f36..cbd0a1998e 100644 --- a/jetty-server/src/main/config/etc/jetty.xml +++ b/jetty-server/src/main/config/etc/jetty.xml @@ -46,9 +46,9 @@ <Arg name="threadpool"><New id="threadpool" class="org.eclipse.jetty.util.thread.QueuedThreadPool"/></Arg> --> <Get name="ThreadPool"> - <Set name="minThreads" type="int"><Property name="threads.min" default="10"/></Set> - <Set name="maxThreads" type="int"><Property name="threads.max" default="200"/></Set> - <Set name="idleTimeout" type="int"><Property name="threads.timeout" default="60000"/></Set> + <Set name="minThreads" type="int"><Property name="jetty.threadPool.minThreads,threads.min" default="10"/></Set> + <Set name="maxThreads" type="int"><Property name="jetty.threadPool.maxThreads,threads.max" default="200"/></Set> + <Set name="idleTimeout" type="int"><Property name="jetty.threadPool.idleTimeout,threads.timeout" default="60000"/></Set> <Set name="detailedDump">false</Set> </Get> @@ -77,16 +77,16 @@ <!-- 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="jetty.secure.port" default="8443" /></Set> - <Set name="outputBufferSize"><Property name="jetty.output.buffer.size" default="32768" /></Set> - <Set name="outputAggregationSize"><Property name="jetty.output.aggregation.size" default="8192" /></Set> - <Set name="requestHeaderSize"><Property name="jetty.request.header.size" default="8192" /></Set> - <Set name="responseHeaderSize"><Property name="jetty.response.header.size" default="8192" /></Set> - <Set name="sendServerVersion"><Property name="jetty.send.server.version" default="true" /></Set> - <Set name="sendDateHeader"><Property name="jetty.send.date.header" default="false" /></Set> - <Set name="headerCacheSize">512</Set> - <Set name="delayDispatchUntilContent"><Property name="jetty.delayDispatchUntilContent" default="true"/></Set> + <Set name="secureScheme"><Property name="jetty.httpConfig.secureScheme" default="https" /></Set> + <Set name="securePort"><Property name="jetty.httpConfig.securePort,jetty.secure.port" default="8443" /></Set> + <Set name="outputBufferSize"><Property name="jetty.httpConfig.outputBufferSize,jetty.output.buffer.size" default="32768" /></Set> + <Set name="outputAggregationSize"><Property name="jetty.httpConfig.outputAggregationSize,jetty.output.aggregation.size" default="8192" /></Set> + <Set name="requestHeaderSize"><Property name="jetty.httpConfig.requestHeaderSize,jetty.request.header.size" default="8192" /></Set> + <Set name="responseHeaderSize"><Property name="jetty.httpConfig.responseHeaderSize,jetty.response.header.size" default="8192" /></Set> + <Set name="sendServerVersion"><Property name="jetty.httpConfig.sendServerVersion,jetty.send.server.version" default="true" /></Set> + <Set name="sendDateHeader"><Property name="jetty.httpConfig.sendDateHeader,jetty.send.date.header" default="false" /></Set> + <Set name="headerCacheSize"><Property name="jetty.httpConfig.headerCacheSize" default="512" /></Set> + <Set name="delayDispatchUntilContent"><Property name="jetty.httpConfig.delayDispatchUntilContent,jetty.delayDispatchUntilContent" default="true"/></Set> <!-- Uncomment to enable handling of X-Forwarded- style headers <Call name="addCustomizer"> <Arg><New class="org.eclipse.jetty.server.ForwardedRequestCustomizer"/></Arg> @@ -94,7 +94,6 @@ --> </New> - <!-- =========================================================== --> <!-- Set the default handler structure for the Server --> <!-- A handler collection is used to pass received requests to --> @@ -124,9 +123,9 @@ <!-- =========================================================== --> <!-- extra server options --> <!-- =========================================================== --> - <Set name="stopAtShutdown">true</Set> + <Set name="stopAtShutdown"><Property name="jetty.server.stopAtShutdown" default="true"/></Set> <Set name="stopTimeout">5000</Set> - <Set name="dumpAfterStart"><Property name="jetty.dump.start" default="false"/></Set> - <Set name="dumpBeforeStop"><Property name="jetty.dump.stop" default="false"/></Set> + <Set name="dumpAfterStart"><Property name="jetty.server.dumpAfterStart,jetty.dump.start" default="false"/></Set> + <Set name="dumpBeforeStop"><Property name="jetty.server.dumpBeforeStop,jetty.dump.stop" default="false"/></Set> </Configure> diff --git a/jetty-server/src/main/config/modules/debug.mod b/jetty-server/src/main/config/modules/debug.mod deleted file mode 100644 index 5acce7aa90..0000000000 --- a/jetty-server/src/main/config/modules/debug.mod +++ /dev/null @@ -1,12 +0,0 @@ -# -# Debug module -# - -[depend] -server - -[files] -logs/ - -[xml] -etc/jetty-debug.xml diff --git a/jetty-server/src/main/config/modules/debuglog.mod b/jetty-server/src/main/config/modules/debuglog.mod new file mode 100644 index 0000000000..20bfa6ab38 --- /dev/null +++ b/jetty-server/src/main/config/modules/debuglog.mod @@ -0,0 +1,25 @@ +# +# Debug module +# + +[depend] +server + +[files] +logs/ + +[xml] +etc/jetty-debug.xml + +[ini-template] +## Logging directory (relative to $jetty.base) +# jetty.debuglog.dir=logs + +## Whether to append to existing file +# jetty.debuglog.append=false + +## How many days to retain old log files +# jetty.debuglog.retainDays=90 + +## Timezone of the log entries +# jetty.debuglog.timezone=GMT diff --git a/jetty-server/src/main/config/modules/gzip.mod b/jetty-server/src/main/config/modules/gzip.mod index c098092974..1efc834648 100644 --- a/jetty-server/src/main/config/modules/gzip.mod +++ b/jetty-server/src/main/config/modules/gzip.mod @@ -10,9 +10,14 @@ server etc/jetty-gzip.xml [ini-template] -### Gzip Handler +## Minimum content length after which gzip is enabled +# jetty.gzip.minGzipSize=2048 -gzip.minGzipSize=2048 -gzip.checkGzExists=false -gzip.compressionLevel=-1 -gzip.excludedUserAgent=.*MSIE.6\.0.* +## Check whether a file with *.gz extension exists +# jetty.gzip.checkGzExists=false + +## Gzip compression level (-1 for default) +# jetty.gzip.compressionLevel=-1 + +## User agents for which gzip is disabled +# jetty.gzip.excludedUserAgent=.*MSIE.6\.0.* diff --git a/jetty-server/src/main/config/modules/http.mod b/jetty-server/src/main/config/modules/http.mod index dc34bc3cb9..0957a796c5 100644 --- a/jetty-server/src/main/config/modules/http.mod +++ b/jetty-server/src/main/config/modules/http.mod @@ -11,17 +11,26 @@ etc/jetty-http.xml [ini-template] ### HTTP Connector Configuration -## HTTP port to listen on -jetty.port=8080 +## Connector host/address to bind to +# jetty.http.host=0.0.0.0 -## HTTP idle timeout in milliseconds -http.timeout=30000 +## Connector port to listen on +# jetty.http.port=80 -## HTTP Socket.soLingerTime in seconds. (-1 to disable) -# http.soLingerTime=-1 +## Connector idle timeout in milliseconds +# jetty.http.idleTimeout=30000 -## Parameters to control the number and priority of acceptors and selectors -# http.selectors=1 -# http.acceptors=1 -# http.selectorPriorityDelta=0 -# http.acceptorPriorityDelta=0 +## Connector socket linger time in seconds (-1 to disable) +# jetty.http.soLingerTime=-1 + +## Number of acceptors (-1 picks default based on number of cores) +# jetty.http.acceptors=-1 + +## Number of selectors (-1 picks default based on number of cores) +# jetty.http.selectors=-1 + +## ServerSocketChannel backlog (0 picks platform default) +# jetty.http.acceptorQueueSize=0 + +## Thread priority delta to give to acceptor threads +# jetty.http.acceptorPriorityDelta=0 diff --git a/jetty-server/src/main/config/modules/lowresources.mod b/jetty-server/src/main/config/modules/lowresources.mod index 99112d55fa..2f765d9af2 100644 --- a/jetty-server/src/main/config/modules/lowresources.mod +++ b/jetty-server/src/main/config/modules/lowresources.mod @@ -9,10 +9,20 @@ server etc/jetty-lowresources.xml [ini-template] -## Low Resources Configuration -# lowresources.period=1050 -# lowresources.lowResourcesIdleTimeout=200 -# lowresources.monitorThreads=true -# lowresources.maxConnections=0 -# lowresources.maxMemory=0 -# lowresources.maxLowResourcesTime=5000 +## Scan period to look for low resources (in milliseconds) +# jetty.lowresources.period=1000 + +## The idle timeout to apply to low resources (in milliseconds) +# jetty.lowresources.idleTimeout=1000 + +## Whether to monitor ThreadPool threads for low resources +# jetty.lowresources.monitorThreads=true + +## Max number of connections allowed before being in low resources mode +# jetty.lowresources.maxConnections=0 + +## Max memory allowed before being in low resources mode (in bytes) +# jetty.lowresources.maxMemory=0 + +## Max time a resource may stay in low resource mode before actions are taken (in milliseconds) +# jetty.lowresources.maxLowResourcesTime=5000 diff --git a/jetty-server/src/main/config/modules/requestlog.mod b/jetty-server/src/main/config/modules/requestlog.mod index f5e0614eb4..89ad071f01 100644 --- a/jetty-server/src/main/config/modules/requestlog.mod +++ b/jetty-server/src/main/config/modules/requestlog.mod @@ -12,19 +12,23 @@ etc/jetty-requestlog.xml logs/ [ini-template] -## Request Log Configuration -# Filename for Request Log output (relative to jetty.base) -# requestlog.filename=/logs/yyyy_mm_dd.request.log +## File path (relative to $jetty.base) +# jetty.requestlog.filePath=/logs/yyyy_mm_dd.request.log + # Date format for rollovered files (uses SimpleDateFormat syntax) -# requestlog.filenameDateFormat=yyyy_MM_dd -# How many days to retain the logs -# requestlog.retain=90 -# If an existing log with the same name is found, just append to it -# requestlog.append=true -# Use the extended log output -# requestlog.extended=true -# Log http cookie information as well -# requestlog.cookies=true -# Set the log output timezone -# requestlog.timezone=GMT +# jetty.requestlog.filenameDateFormat=yyyy_MM_dd + +# How many days to retain old log files +# jetty.requestlog.retainDays=90 + +## Whether to append to existing file +# jetty.requestlog.append=true + +# Whether to use the extended log output +# jetty.requestlog.extended=true + +# Whether to log http cookie information +# jetty.requestlog.cookies=true +## Timezone of the log entries +# jetty.requestlog.timezone=GMT diff --git a/jetty-server/src/main/config/modules/server.mod b/jetty-server/src/main/config/modules/server.mod index f729dc4394..6b5dbe95ba 100644 --- a/jetty-server/src/main/config/modules/server.mod +++ b/jetty-server/src/main/config/modules/server.mod @@ -20,41 +20,53 @@ lib/jetty-io-${jetty.version}.jar etc/jetty.xml [ini-template] -## -## Server Threading Configuration -## -# minimum number of threads -threads.min=10 +### ThreadPool configuration +## Minimum number of threads +# jetty.threadPool.minThreads=10 -# maximum number of threads -threads.max=200 +## Maximum number of threads +# jetty.threadPool.maxThreads=200 -# thread idle timeout in milliseconds -threads.timeout=60000 +## Thread idle timeout (in milliseconds) +# jetty.threadPool.idleTimeout=60000 -# buffer size for output -jetty.output.buffer.size=32768 +### Common HTTP configuration +## Scheme to use to build URIs for secure redirects +# jetty.httpConfig.secureScheme=https -# request header buffer size -jetty.request.header.size=8192 +## Port to use to build URIs for secure redirects +# jetty.httpConfig.securePort=8443 -# response header buffer size -jetty.response.header.size=8192 +## Response content buffer size (in bytes) +# jetty.httpConfig.outputBufferSize=32768 -# should jetty send the server version header? -jetty.send.server.version=true +## Max response content write length that is buffered (in bytes) +# jetty.httpConfig.outputAggregationSize=8192 -# should jetty send the date header? -jetty.send.date.header=false +## Max request headers size (in bytes) +# jetty.httpConfig.requestHeaderSize=8192 -# What host to listen on (leave commented to listen on all interfaces) -#jetty.host=myhost.com +## Max response headers size (in bytes) +# jetty.httpConfig.responseHeaderSize=8192 -# Enable delayed dispatch optimisation -jetty.delayDispatchUntilContent=true +## Whether to send the Server: header +# jetty.httpConfig.sendServerVersion=true -# Dump the state of the Jetty server, components, and webapps after startup -jetty.dump.start=false +## Whether to send the Date: header +# jetty.httpConfig.sendDateHeader=false -# Dump the state of the Jetty server, before stop -jetty.dump.stop=false +## Max per-connection header cache size (in nodes) +# jetty.httpConfig.headerCacheSize=512 + +## Whether, for requests with content, delay dispatch until some content has arrived +# jetty.httpConfig.delayDispatchUntilContent=true + +### Server configuration +## Whether ctrl+c on the console gracefully stops the Jetty server +# jetty.server.stopAtShutdown=true + +## Dump the state of the Jetty server, components, and webapps after startup +# jetty.server.dumpAfterStart=false + +## Dump the state of the Jetty server, components, and webapps before shutdown +# jetty.server.dumpBeforeStop=false diff --git a/jetty-server/src/main/config/modules/ssl.mod b/jetty-server/src/main/config/modules/ssl.mod index a4d105088b..e99ed7e3d7 100644 --- a/jetty-server/src/main/config/modules/ssl.mod +++ b/jetty-server/src/main/config/modules/ssl.mod @@ -12,36 +12,54 @@ etc/jetty-ssl.xml 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 - -# SSL port to listen on -ssl.port=8443 -# SSL idle timeout in milliseconds -ssl.timeout=30000 -# HTTPS Socket.soLingerTime in seconds. (-1 to disable) -# ssl.soLingerTime=-1 - -## Setup a demonstration keystore and truststore -jetty.keystore=etc/keystore -jetty.truststore=etc/keystore - -## Set the demonstration passwords. +### TLS(SSL) Connector Configuration + +## Connector host/address to bind to +# jetty.ssl.host=0.0.0.0 + +## Connector port to listen on +# jetty.ssl.port=443 + +## Connector idle timeout in milliseconds +# jetty.ssl.idleTimeout=30000 + +## Connector socket linger time in seconds (-1 to disable) +# jetty.ssl.soLingerTime=-1 + +## Number of acceptors (-1 picks default based on number of cores) +# jetty.ssl.acceptors=-1 + +## Number of selectors (-1 picks default based on number of cores) +# jetty.ssl.selectors=-1 + +## ServerSocketChannel backlog (0 picks platform default) +# jetty.ssl.acceptorQueueSize=0 + +## Thread priority delta to give to acceptor threads +# jetty.ssl.acceptorPriorityDelta=0 + +### SslContextFactory Configuration + +## Keystore file path (relative to $jetty.base) +# jetty.sslConfig.keyStorePath=etc/keystore + +## Truststore file path (relative to $jetty.base) +# jetty.sslConfig.trustStorePath=etc/keystore + ## 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 -# ssl.acceptorPriorityDelta=0 + +## Keystore password +# jetty.sslConfig.keyStorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 + +## KeyManager password +# jetty.sslConfig.keyManagerPassword=OBF:1u2u1wml1z7s1z7a1wnl1u2g + +## Truststore password +# jetty.sslConfig.trustStorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 + +## whether client certificate authentication is required +# jetty.sslConfig.needClientAuth=false + +## Whether client certificate authentication is desired +# jetty.sslConfig.wantClientAuth=false diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/ServerConnector.java b/jetty-server/src/main/java/org/eclipse/jetty/server/ServerConnector.java index e2bed86dcb..8adcc2cb0d 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/ServerConnector.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/ServerConnector.java @@ -197,7 +197,7 @@ public class ServerConnector extends AbstractNetworkConnector @Name("sslContextFactory") SslContextFactory sslContextFactory, @Name("factories") ConnectionFactory... factories) { - this(server,null,null,null,-1,-1,AbstractConnectionFactory.getFactories(sslContextFactory,factories)); + this(server, null, null, null, -1, -1, AbstractConnectionFactory.getFactories(sslContextFactory, factories)); } /** Generic Server Connection. @@ -259,24 +259,19 @@ public class ServerConnector extends AbstractNetworkConnector return channel!=null && channel.isOpen(); } - - @ManagedAttribute("The priority delta to apply to selector threads") + /** + * @deprecated not implemented + */ + @Deprecated public int getSelectorPriorityDelta() { return _manager.getSelectorPriorityDelta(); } /** - * Sets the selector thread priority delta to the given amount. - * <p>This allows the selector threads to run at a different priority. - * Typically this would be used to lower the priority to give preference - * to handling previously accepted connections rather than accepting - * new connections.</p> - * - * @param selectorPriorityDelta the amount to set the thread priority delta to - * (may be negative) - * @see Thread#getPriority() + * @deprecated not implemented */ + @Deprecated public void setSelectorPriorityDelta(int selectorPriorityDelta) { _manager.setSelectorPriorityDelta(selectorPriorityDelta); |