From 599ab9bb1bee454f190d964b67859e46a1e57f87 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Mon, 13 Apr 2015 16:21:48 +0200 Subject: [PATCH] 460671 - Rationalize property names. Property format is now "jetty..". Updated all references with new properties. --- .../jetty/example/asyncrest/DemoServer.java | 2 +- .../src/main/config/etc/jetty-alpn.xml | 8 +- .../src/main/config/modules/alpn.mod | 7 +- .../src/test/scripts/start-jetty.sh | 2 +- .../src/main/config/etc/jetty-deploy.xml | 2 +- .../src/main/config/modules/deploy.mod | 10 +- jetty-deploy/src/test/resources/jetty.xml | 12 +- .../src/main/resources/bin/jetty.sh | 2 +- .../src/main/resources/etc/hawtio.xml | 10 +- .../src/main/resources/etc/jamon.xml | 14 +-- .../src/main/resources/etc/jminix.xml | 2 +- .../src/main/resources/etc/jolokia.xml | 10 +- .../src/main/config/modules/fcgi.mod | 2 +- .../src/main/config/etc/jetty-http2.xml | 3 +- .../src/main/config/etc/jetty-http2c.xml | 3 +- .../src/main/config/modules/http2.mod | 6 +- .../src/main/config/modules/http2c.mod | 14 +-- .../org/eclipse/jetty/io/SelectorManager.java | 15 +-- jetty-jaas/src/main/config/etc/jetty-jaas.xml | 3 +- jetty-jaas/src/main/config/modules/jaas.mod | 5 +- .../src/main/config/etc/jetty-jmx-remote.xml | 43 ++++--- jetty-jmx/src/main/config/etc/jetty-jmx.xml | 11 -- .../src/main/config/modules/jmx-remote.mod | 12 +- .../jetty/maven/plugin/AbstractJettyMojo.java | 5 +- .../maven/plugin/JettyRunForkedMojo.java | 12 -- .../maven/plugin/MavenServerConnector.java | 2 +- .../jetty/maven/plugin/ServerSupport.java | 4 +- .../eclipse/jetty/maven/plugin/Starter.java | 2 - .../src/main/config/etc/jetty-monitor.xml | 2 +- .../jettyhome/etc/jetty-selector.xml | 4 +- .../jetty-osgi-boot/jettyhome/etc/jetty.xml | 2 +- .../jetty/osgi/boot/OSGiServerConstants.java | 10 +- .../DefaultJettyAtJettyHomeHelper.java | 16 +-- .../src/main/context/acme.xml | 2 +- .../main/java/com/acme/osgi/Activator.java | 2 +- .../src/test/config/etc/jetty-http.xml | 7 +- .../src/test/config/etc/jetty-http2.xml | 2 +- .../src/test/config/etc/jetty-ssl.xml | 22 ++-- .../src/test/config/etc/jetty.xml | 2 +- .../TestJettyOSGiBootContextAsService.java | 19 ++- .../osgi/test/TestJettyOSGiBootCore.java | 13 +-- .../osgi/test/TestJettyOSGiBootHTTP2.java | 13 +-- .../TestJettyOSGiBootWebAppAsService.java | 19 ++- .../TestJettyOSGiBootWithAnnotations.java | 17 ++- .../osgi/test/TestJettyOSGiBootWithJsp.java | 41 ++++--- .../src/main/config/etc/jetty-overlay.xml | 2 +- .../instances/myfoo=blue/WEB-INF/overlay.xml | 2 +- .../instances/myfoo=green/WEB-INF/overlay.xml | 2 +- .../instances/myfoo=red/WEB-INF/overlay.xml | 2 +- .../instances/root=root/WEB-INF/overlay.xml | 2 +- .../templates/myfoo=foo/WEB-INF/jetty-web.xml | 4 +- .../templates/myfoo=foo/WEB-INF/template.xml | 2 +- .../templates/root/WEB-INF/overlay.xml | 2 +- .../src/main/config/etc/jetty-proxy.xml | 54 ++++----- jetty-proxy/src/main/config/modules/proxy.mod | 12 +- .../src/main/config/etc/jetty-rewrite.xml | 50 ++++---- .../src/main/config/modules/rewrite.mod | 10 ++ .../jetty-rewrite.xml | 9 +- jetty-security/src/main/config/etc/krb5.ini | 6 +- .../src/main/config/etc/jetty-debug.xml | 23 ---- .../src/main/config/etc/jetty-debuglog.xml | 25 ++++ .../src/main/config/etc/jetty-gzip.xml | 12 +- .../src/main/config/etc/jetty-http.xml | 19 ++- .../src/main/config/etc/jetty-ipaccess.xml | 26 ++--- .../main/config/etc/jetty-lowresources.xml | 12 +- .../src/main/config/etc/jetty-requestlog.xml | 14 +-- .../src/main/config/etc/jetty-ssl.xml | 33 +++--- jetty-server/src/main/config/etc/jetty.xml | 33 +++--- .../src/main/config/modules/debug.mod | 12 -- .../src/main/config/modules/debuglog.mod | 25 ++++ jetty-server/src/main/config/modules/gzip.mod | 15 ++- jetty-server/src/main/config/modules/http.mod | 31 +++-- .../src/main/config/modules/lowresources.mod | 24 ++-- .../src/main/config/modules/requestlog.mod | 34 +++--- .../src/main/config/modules/server.mod | 66 ++++++----- jetty-server/src/main/config/modules/ssl.mod | 70 ++++++----- .../eclipse/jetty/server/ServerConnector.java | 19 ++- .../jetty/start/IncludeJettyDirTest.java | 110 +++++++++--------- .../org/eclipse/jetty/start/MainTest.java | 12 +- .../org/eclipse/jetty/start/ModulesTest.java | 10 +- .../jetty/start/config/ConfigSourcesTest.java | 102 ++++++++-------- .../test/resources/assert-home-with-http2.txt | 45 ++++--- .../test/resources/assert-home-with-jvm.txt | 27 +++-- .../src/test/resources/assert-home.txt | 25 ++-- .../{jetty-debug.xml => jetty-debuglog.xml} | 0 .../test/resources/dist-home/modules/alpn.mod | 14 ++- .../resources/dist-home/modules/debug.mod | 12 -- .../resources/dist-home/modules/debuglog.mod | 25 ++++ .../resources/dist-home/modules/deploy.mod | 10 +- .../test/resources/dist-home/modules/fcgi.mod | 2 +- .../test/resources/dist-home/modules/gzip.mod | 15 ++- .../test/resources/dist-home/modules/http.mod | 31 +++-- .../resources/dist-home/modules/http2.mod | 6 +- .../resources/dist-home/modules/http2c.mod | 14 +-- .../test/resources/dist-home/modules/jaas.mod | 5 +- .../dist-home/modules/jmx-remote.mod | 12 +- .../resources/dist-home/modules/logging.mod | 17 ++- .../dist-home/modules/lowresources.mod | 24 ++-- .../resources/dist-home/modules/proxy.mod | 12 +- .../dist-home/modules/requestlog.mod | 34 +++--- .../resources/dist-home/modules/rewrite.mod | 10 ++ .../resources/dist-home/modules/server.mod | 77 +++++++----- .../test/resources/dist-home/modules/ssl.mod | 70 ++++++----- .../src/test/resources/dist-home/start.ini | 40 +++---- .../usecases/agent-properties.assert.txt | 26 ++--- .../usecases/agent-properties/start.ini | 2 +- .../assert-enable-spdy-bad-npn-version.txt | 12 +- .../assert-with-module-persistence.txt | 12 +- .../resources/usecases/barebones.assert.txt | 26 ++--- .../resources/usecases/barebones/start.ini | 2 +- .../usecases/basic-properties.assert.txt | 26 ++--- .../usecases/basic-properties/start.ini | 2 +- .../resources/usecases/database.assert.txt | 26 ++--- .../resources/usecases/database/start.ini | 2 +- .../resources/usecases/deep-ext.assert.txt | 26 ++--- .../resources/usecases/deep-ext/start.ini | 2 +- .../test/resources/usecases/http2.assert.txt | 45 ++++--- .../test/resources/usecases/http2/start.ini | 12 +- .../include-jetty-dir-logging.assert.txt | 26 ++--- .../include-jetty-dir-logging/start.ini | 2 +- .../test/resources/usecases/jmx.assert.txt | 26 ++--- .../src/test/resources/usecases/jmx/start.ini | 2 +- .../test/resources/usecases/jsp.assert.txt | 26 ++--- .../src/test/resources/usecases/jsp/start.ini | 2 +- .../resources/usecases/logging.assert.txt | 27 ++--- .../test/resources/usecases/logging/start.ini | 2 +- .../src/main/config/etc/jetty-logging.xml | 11 +- .../src/main/config/modules/logging.mod | 17 ++- .../org/eclipse/jetty/xml/mortbay.xml | 2 +- .../jetty/test/support/JettyDistro.java | 2 +- .../src/test/resources/BIOHttp.xml | 2 +- .../src/test/resources/BIOHttps.xml | 2 +- .../src/test/resources/NIOHttp.xml | 4 +- .../src/test/resources/NIOHttps.xml | 2 +- .../src/test/resources/ssl.xml | 10 +- .../src/test/scripts/start-jetty.sh | 2 +- .../main/config/demo-base/etc/test-realm.xml | 2 +- .../src/main/config/demo-base/start.ini | 4 +- 138 files changed, 1189 insertions(+), 1034 deletions(-) delete mode 100644 jetty-server/src/main/config/etc/jetty-debug.xml create mode 100644 jetty-server/src/main/config/etc/jetty-debuglog.xml delete mode 100644 jetty-server/src/main/config/modules/debug.mod create mode 100644 jetty-server/src/main/config/modules/debuglog.mod rename jetty-start/src/test/resources/dist-home/etc/{jetty-debug.xml => jetty-debuglog.xml} (100%) delete mode 100644 jetty-start/src/test/resources/dist-home/modules/debug.mod create mode 100644 jetty-start/src/test/resources/dist-home/modules/debuglog.mod diff --git a/examples/async-rest/async-rest-webapp/src/test/java/org/eclipse/jetty/example/asyncrest/DemoServer.java b/examples/async-rest/async-rest-webapp/src/test/java/org/eclipse/jetty/example/asyncrest/DemoServer.java index c6172dad2fb..91b08bf6f9e 100644 --- a/examples/async-rest/async-rest-webapp/src/test/java/org/eclipse/jetty/example/asyncrest/DemoServer.java +++ b/examples/async-rest/async-rest-webapp/src/test/java/org/eclipse/jetty/example/asyncrest/DemoServer.java @@ -28,7 +28,7 @@ public class DemoServer { String jetty_home = System.getProperty("jetty.home","."); - Server server = new Server(Integer.getInteger("jetty.port",8080).intValue()); + Server server = new Server(Integer.getInteger("jetty.http.port",8080).intValue()); WebAppContext webapp = new WebAppContext(); webapp.setContextPath("/"); diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/etc/jetty-alpn.xml b/jetty-alpn/jetty-alpn-server/src/main/config/etc/jetty-alpn.xml index fabbbe5f396..5f16222c28f 100644 --- a/jetty-alpn/jetty-alpn-server/src/main/config/etc/jetty-alpn.xml +++ b/jetty-alpn/jetty-alpn-server/src/main/config/etc/jetty-alpn.xml @@ -16,17 +16,17 @@ - + - + - - + + diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn.mod index 99bfb6e2a38..cc3d6862b91 100644 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn.mod +++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn.mod @@ -38,10 +38,13 @@ lib/alpn/ # Overrides the order protocols are chosen by the server. # The default order is that specified by the order of the # modules declared in start.ini. -# alpn.protocols=h2-14,http/1.1 +# jetty.alpn.protocols=h2-16,http/1.1 # Specifies what protocol to use when negotiation fails. -# alpn.defaultProtocol=http/1.1 +# jetty.alpn.defaultProtocol=http/1.1 + +# ALPN debug logging on System.err +# jetty.alpn.debug=false [license] ALPN is a hosted at github under the GPL v2 with ClassPath Exception. diff --git a/jetty-cdi/test-cdi-it/src/test/scripts/start-jetty.sh b/jetty-cdi/test-cdi-it/src/test/scripts/start-jetty.sh index 1d0f9eb89c7..ea7843bf256 100755 --- a/jetty-cdi/test-cdi-it/src/test/scripts/start-jetty.sh +++ b/jetty-cdi/test-cdi-it/src/test/scripts/start-jetty.sh @@ -11,7 +11,7 @@ echo \${jetty.base} : $JETTY_BASE cd "$JETTY_BASE" "$JAVA_HOME/bin/java" -jar "$JETTY_HOME/start.jar" \ - jetty.port=58080 \ + jetty.http.port=58080 \ STOP.PORT=58181 STOP.KEY=it diff --git a/jetty-deploy/src/main/config/etc/jetty-deploy.xml b/jetty-deploy/src/main/config/etc/jetty-deploy.xml index 6dfc7e509a2..813012c2a55 100644 --- a/jetty-deploy/src/main/config/etc/jetty-deploy.xml +++ b/jetty-deploy/src/main/config/etc/jetty-deploy.xml @@ -39,7 +39,7 @@ - / + / /etc/webdefault.xml diff --git a/jetty-deploy/src/main/config/modules/deploy.mod b/jetty-deploy/src/main/config/modules/deploy.mod index f16b3f2fffb..3a2fc916d08 100644 --- a/jetty-deploy/src/main/config/modules/deploy.mod +++ b/jetty-deploy/src/main/config/modules/deploy.mod @@ -15,7 +15,11 @@ webapps/ etc/jetty-deploy.xml [ini-template] -## DeployManager configuration -# Monitored Directory name (relative to jetty.base) -# jetty.deploy.monitoredDirName=webapps +# Monitored directory name (relative to jetty.base) +# jetty.deploy.monitoredDir=webapps +# Monitored directory scan period (seconds) +# jetty.deploy.scanInterval=1 + +# Whether to extract *.war files +# jetty.deploy.extractWars=true diff --git a/jetty-deploy/src/test/resources/jetty.xml b/jetty-deploy/src/test/resources/jetty.xml index 9beb268a95c..18e6a403bea 100644 --- a/jetty-deploy/src/test/resources/jetty.xml +++ b/jetty-deploy/src/test/resources/jetty.xml @@ -46,9 +46,9 @@ --> - - - + + + false @@ -78,7 +78,7 @@ https - + 32768 8192 8192 @@ -125,7 +125,7 @@ true 5000 - - + + diff --git a/jetty-distribution/src/main/resources/bin/jetty.sh b/jetty-distribution/src/main/resources/bin/jetty.sh index 8707f8753df..82a652d7240 100755 --- a/jetty-distribution/src/main/resources/bin/jetty.sh +++ b/jetty-distribution/src/main/resources/bin/jetty.sh @@ -69,7 +69,7 @@ NAME=$(echo $(basename $0) | sed -e 's/^[SK][0-9]*//' -e 's/\.sh$//') # JETTY_ARGS # The default arguments to pass to jetty. # For example -# JETTY_ARGS=jetty.port=8080 jetty.secure.port=443 +# JETTY_ARGS=jetty.http.port=8080 jetty.ssl.port=8443 # # JETTY_USER # if set, then used as a username to run the server as diff --git a/jetty-distribution/src/main/resources/etc/hawtio.xml b/jetty-distribution/src/main/resources/etc/hawtio.xml index 228adc159a3..d6144358ec7 100644 --- a/jetty-distribution/src/main/resources/etc/hawtio.xml +++ b/jetty-distribution/src/main/resources/etc/hawtio.xml @@ -5,11 +5,11 @@ - /hawtio - /lib/hawtio/hawtio.war - true - false - /etc/webdefault.xml + /hawtio + /lib/hawtio/hawtio.war + true + false + /etc/webdefault.xml diff --git a/jetty-distribution/src/main/resources/etc/jamon.xml b/jetty-distribution/src/main/resources/etc/jamon.xml index d00d9c7f51e..4a1c0d371d0 100644 --- a/jetty-distribution/src/main/resources/etc/jamon.xml +++ b/jetty-distribution/src/main/resources/etc/jamon.xml @@ -18,13 +18,13 @@ - - /jamon - /lib/jamon/jamon.war - true - false - /etc/webdefault.xml - + + /jamon + /lib/jamon/jamon.war + true + false + /etc/webdefault.xml + diff --git a/jetty-distribution/src/main/resources/etc/jminix.xml b/jetty-distribution/src/main/resources/etc/jminix.xml index 1be47579cb8..21206666a23 100644 --- a/jetty-distribution/src/main/resources/etc/jminix.xml +++ b/jetty-distribution/src/main/resources/etc/jminix.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-distribution/src/main/resources/etc/jolokia.xml b/jetty-distribution/src/main/resources/etc/jolokia.xml index 575912f9b78..3bc4dc1cc2e 100644 --- a/jetty-distribution/src/main/resources/etc/jolokia.xml +++ b/jetty-distribution/src/main/resources/etc/jolokia.xml @@ -5,11 +5,11 @@ - /jolokia - /lib/jolokia/jolokia.war - true - false - /etc/webdefault.xml + /jolokia + /lib/jolokia/jolokia.war + true + false + /etc/webdefault.xml diff --git a/jetty-fcgi/fcgi-server/src/main/config/modules/fcgi.mod b/jetty-fcgi/fcgi-server/src/main/config/modules/fcgi.mod index e837b009c15..14152d5f2bd 100644 --- a/jetty-fcgi/fcgi-server/src/main/config/modules/fcgi.mod +++ b/jetty-fcgi/fcgi-server/src/main/config/modules/fcgi.mod @@ -12,4 +12,4 @@ lib/fcgi/*.jar [ini-template] ## For configuration of FastCGI contexts, see -## TODO: documentation url here +## https://www.eclipse.org/jetty/documentation/current/fastcgi.html diff --git a/jetty-http2/http2-server/src/main/config/etc/jetty-http2.xml b/jetty-http2/http2-server/src/main/config/etc/jetty-http2.xml index b0ad6581e10..18880e6846a 100644 --- a/jetty-http2/http2-server/src/main/config/etc/jetty-http2.xml +++ b/jetty-http2/http2-server/src/main/config/etc/jetty-http2.xml @@ -9,7 +9,8 @@ - + + diff --git a/jetty-http2/http2-server/src/main/config/etc/jetty-http2c.xml b/jetty-http2/http2-server/src/main/config/etc/jetty-http2c.xml index 1077a5c9d2a..bf021e386d4 100644 --- a/jetty-http2/http2-server/src/main/config/etc/jetty-http2c.xml +++ b/jetty-http2/http2-server/src/main/config/etc/jetty-http2c.xml @@ -9,7 +9,8 @@ - + + diff --git a/jetty-http2/http2-server/src/main/config/modules/http2.mod b/jetty-http2/http2-server/src/main/config/modules/http2.mod index 2be7e7e5241..585c1fa5ee6 100644 --- a/jetty-http2/http2-server/src/main/config/modules/http2.mod +++ b/jetty-http2/http2-server/src/main/config/modules/http2.mod @@ -13,6 +13,8 @@ lib/http2/*.jar etc/jetty-http2.xml [ini-template] -## HTTP2 Configuration +## Max number of concurrent streams per connection +# jetty.http2.maxConcurrentStreams=1024 -# http2.maxConcurrentStreams=1024 +## Initial stream send (server to client) window +# jetty.http2.initialStreamSendWindow=65535 diff --git a/jetty-http2/http2-server/src/main/config/modules/http2c.mod b/jetty-http2/http2-server/src/main/config/modules/http2c.mod index 1073181bb38..15883cab2ce 100644 --- a/jetty-http2/http2-server/src/main/config/modules/http2c.mod +++ b/jetty-http2/http2-server/src/main/config/modules/http2c.mod @@ -1,5 +1,8 @@ # # HTTP2 Clear Text Support Module +# This module adds support for HTTP/2 clear text to the +# HTTP/1 clear text connector (defined in jetty-http.xml). +# The resulting connector will accept both HTTP/1 and HTTP/2 connections. # [depend] @@ -12,11 +15,8 @@ lib/http2/*.jar etc/jetty-http2c.xml [ini-template] -## HTTP2c Configuration +## Max number of concurrent streams per connection +# jetty.http2.maxConcurrentStreams=1024 -# This module adds support for HTTP/2 clear text to the -# HTTP/1 clear text connector (defined in jetty-http.xml) -# The resulting connector will accept both HTTP/1 and HTTP/2 -# connections - -# http2.maxConcurrentStreams=1024 +## Initial stream send (server to client) window +# jetty.http2.initialStreamSendWindow=65535 diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java b/jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java index 56952c4239b..c58331f9fa4 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java @@ -28,7 +28,6 @@ import java.nio.channels.SocketChannel; import java.util.concurrent.Executor; import org.eclipse.jetty.util.TypeUtil; -import org.eclipse.jetty.util.annotation.ManagedAttribute; import org.eclipse.jetty.util.component.AbstractLifeCycle; import org.eclipse.jetty.util.component.ContainerLifeCycle; import org.eclipse.jetty.util.component.Dumpable; @@ -97,7 +96,9 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa _connectTimeout = milliseconds; } - @ManagedAttribute("The priority delta to apply to selector threads") + /** + * @deprecated not implemented + */ @Deprecated public int getSelectorPriorityDelta() { @@ -105,15 +106,7 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa } /** - * Sets the selector thread priority delta to the given amount. - *

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.

- * - * @param selectorPriorityDelta the amount to change the thread priority - * delta to (may be negative) - * @see Thread#getPriority() + * @deprecated not implemented */ @Deprecated public void setSelectorPriorityDelta(int selectorPriorityDelta) diff --git a/jetty-jaas/src/main/config/etc/jetty-jaas.xml b/jetty-jaas/src/main/config/etc/jetty-jaas.xml index 9381d10b848..262591140c3 100644 --- a/jetty-jaas/src/main/config/etc/jetty-jaas.xml +++ b/jetty-jaas/src/main/config/etc/jetty-jaas.xml @@ -3,7 +3,6 @@ - @@ -11,7 +10,7 @@ java.security.auth.login.config - / + / diff --git a/jetty-jaas/src/main/config/modules/jaas.mod b/jetty-jaas/src/main/config/modules/jaas.mod index 4932140ca65..fee3f59d871 100644 --- a/jetty-jaas/src/main/config/modules/jaas.mod +++ b/jetty-jaas/src/main/config/modules/jaas.mod @@ -12,5 +12,6 @@ lib/jetty-jaas-${jetty.version}.jar etc/jetty-jaas.xml [ini-template] -## JAAS Configuration -jaas.login.conf=etc/login.conf +## The file location (relative to $jetty.base) for the +## JAAS "java.security.auth.login.config" system property +# jetty.jaas.login.conf=etc/login.conf diff --git a/jetty-jmx/src/main/config/etc/jetty-jmx-remote.xml b/jetty-jmx/src/main/config/etc/jetty-jmx-remote.xml index 3527d8b375c..c71b7a8aa39 100644 --- a/jetty-jmx/src/main/config/etc/jetty-jmx-remote.xml +++ b/jetty-jmx/src/main/config/etc/jetty-jmx-remote.xml @@ -2,27 +2,38 @@ + + + + + + - - - rmi - - - /jndi/rmi://:/jmxrmi - - - org.eclipse.jetty.jmx:name=rmiconnectorserver + + + rmi + + + /jndi/rmi://:/jmxrmi + + + org.eclipse.jetty.jmx:name=rmiconnectorserver diff --git a/jetty-jmx/src/main/config/etc/jetty-jmx.xml b/jetty-jmx/src/main/config/etc/jetty-jmx.xml index aca96f7c2ca..4c67b8bc78d 100644 --- a/jetty-jmx/src/main/config/etc/jetty-jmx.xml +++ b/jetty-jmx/src/main/config/etc/jetty-jmx.xml @@ -3,17 +3,6 @@ - - - - - - diff --git a/jetty-jmx/src/main/config/modules/jmx-remote.mod b/jetty-jmx/src/main/config/modules/jmx-remote.mod index b6be74afc92..f8a5111d8f8 100644 --- a/jetty-jmx/src/main/config/modules/jmx-remote.mod +++ b/jetty-jmx/src/main/config/modules/jmx-remote.mod @@ -9,10 +9,8 @@ jmx etc/jetty-jmx-remote.xml [ini-template] -## JMX Configuration -## Enable for an open port accessible by remote machines -# jetty.jmxrmihost=localhost -# jetty.jmxrmiport=1099 -## Strictly speaking you shouldn't need --exec to use this in most environments. -## If this isn't working, make sure you enable --exec as well -# -Dcom.sun.management.jmxremote +## The host/address to bind RMI to +# jetty.jmxremote.rmihost=localhost + +## The port RMI listens to +# jetty.jmxremote.rmiport=1099 diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/AbstractJettyMojo.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/AbstractJettyMojo.java index 4a2ddaa12d7..652b2087e86 100644 --- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/AbstractJettyMojo.java +++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/AbstractJettyMojo.java @@ -40,7 +40,6 @@ import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.util.FileUtils; import org.eclipse.jetty.security.LoginService; -import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.RequestLog; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ShutdownMonitor; @@ -491,8 +490,8 @@ public abstract class AbstractJettyMojo extends AbstractMojo // check that its port was set if (httpConnector.getPort() <= 0) { - //use any jetty.port settings provided - String tmp = System.getProperty(MavenServerConnector.PORT_SYSPROPERTY, MavenServerConnector.DEFAULT_PORT_STR); + //use any jetty.http.port settings provided + String tmp = System.getProperty(MavenServerConnector.PORT_SYSPROPERTY, System.getProperty("jetty.port", MavenServerConnector.DEFAULT_PORT_STR)); httpConnector.setPort(Integer.parseInt(tmp.trim())); } httpConnector.setServer(server); diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunForkedMojo.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunForkedMojo.java index bdde6cc017a..a7539305bcc 100644 --- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunForkedMojo.java +++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunForkedMojo.java @@ -45,7 +45,6 @@ import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugin.descriptor.PluginDescriptor; import org.eclipse.jetty.annotations.AnnotationConfiguration; -import org.eclipse.jetty.quickstart.QuickStartDescriptorGenerator; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.util.IO; import org.eclipse.jetty.util.resource.Resource; @@ -82,17 +81,6 @@ import org.eclipse.jetty.util.thread.QueuedThreadPool; */ public class JettyRunForkedMojo extends JettyRunMojo { - public static final String DEFAULT_WEBAPP_SRC = "src"+File.separator+"main"+File.separator+"webapp"; - public static final String FAKE_WEBAPP = "webapp-tmp"; - - - public String PORT_SYSPROPERTY = "jetty.port"; - - - - - - /** * The target directory * diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/MavenServerConnector.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/MavenServerConnector.java index 86de699c822..5cd754e3d5f 100644 --- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/MavenServerConnector.java +++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/MavenServerConnector.java @@ -47,7 +47,7 @@ import org.eclipse.jetty.util.thread.Scheduler; */ public class MavenServerConnector extends AbstractLifeCycle implements Connector { - public static String PORT_SYSPROPERTY = "jetty.port"; + public static String PORT_SYSPROPERTY = "jetty.http.port"; public static final int DEFAULT_PORT = 8080; public static final String DEFAULT_PORT_STR = String.valueOf(DEFAULT_PORT); diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/ServerSupport.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/ServerSupport.java index 4dd4c167fca..83e08d64d06 100644 --- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/ServerSupport.java +++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/ServerSupport.java @@ -110,8 +110,8 @@ public class ServerSupport { //Make a new default connector MavenServerConnector tmp = new MavenServerConnector(); - //use any jetty.port settings provided - String port = System.getProperty(MavenServerConnector.PORT_SYSPROPERTY, MavenServerConnector.DEFAULT_PORT_STR); + //use any jetty.http.port settings provided + String port = System.getProperty(MavenServerConnector.PORT_SYSPROPERTY, System.getProperty("jetty.port", MavenServerConnector.DEFAULT_PORT_STR)); tmp.setPort(Integer.parseInt(port.trim())); tmp.setServer(server); server.setConnectors(new Connector[] {tmp}); diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/Starter.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/Starter.java index 258e822b43e..7775e9e3670 100644 --- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/Starter.java +++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/Starter.java @@ -31,7 +31,6 @@ import java.util.Properties; import java.util.Set; import java.util.TreeMap; -import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ShutdownMonitor; @@ -52,7 +51,6 @@ import org.eclipse.jetty.xml.XmlConfiguration; */ public class Starter { - public static final String PORT_SYSPROPERTY = "jetty.port"; private static final Logger LOG = Log.getLogger(Starter.class); private List jettyXmls; // list of jetty.xml config files to apply - Mandatory diff --git a/jetty-monitor/src/main/config/etc/jetty-monitor.xml b/jetty-monitor/src/main/config/etc/jetty-monitor.xml index 61270b5bd51..dcb15a6c40b 100644 --- a/jetty-monitor/src/main/config/etc/jetty-monitor.xml +++ b/jetty-monitor/src/main/config/etc/jetty-monitor.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-selector.xml b/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-selector.xml index 67cd87c2a7e..0613a1ab05a 100644 --- a/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-selector.xml +++ b/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty-selector.xml @@ -21,8 +21,8 @@ - - + + 300000 diff --git a/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml b/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml index 5c882b05143..881e69cafc4 100644 --- a/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml +++ b/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml @@ -43,7 +43,7 @@ https - + 32768 8192 8192 diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiServerConstants.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiServerConstants.java index a91af45a833..6b846a7e5d4 100644 --- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiServerConstants.java +++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiServerConstants.java @@ -43,21 +43,20 @@ public class OSGiServerConstants * Usual system property used as the hostname for a typical jetty * configuration. */ - public static final String JETTY_HOST = "jetty.host"; + public static final String JETTY_HOST = "jetty.http.host"; /** * Usual system property used as the port for http for a typical jetty * configuration. */ - public static final String JETTY_PORT = "jetty.port"; + public static final String JETTY_PORT = "jetty.http.port"; /** * Usual system property used as the port for https for a typical jetty * configuration. */ - public static final String JETTY_PORT_SSL = "ssl.port"; - - + public static final String JETTY_PORT_SSL = "jetty.ssl.port"; + //for managed jetty instances, name of the configuration parameters /** * PID of the jetty servers's ManagedFactory @@ -86,5 +85,4 @@ public class OSGiServerConstants * List of URLs to the folders where the legacy J2EE shared libraries are stored aka lib/ext, lib/jsp etc. */ public static final String MANAGED_JETTY_SHARED_LIB_FOLDER_URLS = "managedJettySharedLibFolderUrls"; - } diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/DefaultJettyAtJettyHomeHelper.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/DefaultJettyAtJettyHomeHelper.java index 48fc6ebb9b9..2377f54117f 100644 --- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/DefaultJettyAtJettyHomeHelper.java +++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/serverfactory/DefaultJettyAtJettyHomeHelper.java @@ -88,8 +88,8 @@ public class DefaultJettyAtJettyHomeHelper * files. *

*

- * In both cases the system properties jetty.host, jetty.port and - * jetty.port.ssl are passed to the configuration files that might use them + * In both cases the system properties jetty.http.host, jetty.http.port and + * jetty.ssl.port are passed to the configuration files that might use them * as part of their properties. *

*/ @@ -158,7 +158,7 @@ public class DefaultJettyAtJettyHomeHelper String home=properties.get(OSGiServerConstants.JETTY_HOME); String base=properties.get(OSGiServerConstants.JETTY_BASE); if (base==null) - base=home; + base=home; LOG.info("JETTY.HOME="+home); LOG.info("JETTY.BASE="+base); ClassLoader contextCl = Thread.currentThread().getContextClassLoader(); @@ -169,9 +169,9 @@ public class DefaultJettyAtJettyHomeHelper // these properties usually are the ones passed to this type of // configuration. properties.put(OSGiServerConstants.MANAGED_JETTY_SERVER_NAME, OSGiServerConstants.MANAGED_JETTY_SERVER_DEFAULT_NAME); - Util.setProperty(properties, OSGiServerConstants.JETTY_HOST, System.getProperty(OSGiServerConstants.JETTY_HOST)); - Util.setProperty(properties, OSGiServerConstants.JETTY_PORT, System.getProperty(OSGiServerConstants.JETTY_PORT)); - Util.setProperty(properties, OSGiServerConstants.JETTY_PORT_SSL, System.getProperty(OSGiServerConstants.JETTY_PORT_SSL)); + Util.setProperty(properties, OSGiServerConstants.JETTY_HOST, System.getProperty(OSGiServerConstants.JETTY_HOST, System.getProperty("jetty.host"))); + Util.setProperty(properties, OSGiServerConstants.JETTY_PORT, System.getProperty(OSGiServerConstants.JETTY_PORT, System.getProperty("jetty.port"))); + Util.setProperty(properties, OSGiServerConstants.JETTY_PORT_SSL, System.getProperty(OSGiServerConstants.JETTY_PORT_SSL, System.getProperty("ssl.port"))); Util.setProperty(properties, OSGiServerConstants.JETTY_HOME, home); Util.setProperty(properties, OSGiServerConstants.JETTY_BASE, base); Server server = ServerInstanceWrapper.configure(null, configURLs, properties); @@ -185,8 +185,8 @@ public class DefaultJettyAtJettyHomeHelper } catch (Exception e) { - LOG.warn(e); - throw e; + LOG.warn(e); + throw e; } finally { diff --git a/jetty-osgi/test-jetty-osgi-context/src/main/context/acme.xml b/jetty-osgi/test-jetty-osgi-context/src/main/context/acme.xml index 1ff97a49fc6..ef5122d24bc 100644 --- a/jetty-osgi/test-jetty-osgi-context/src/main/context/acme.xml +++ b/jetty-osgi/test-jetty-osgi-context/src/main/context/acme.xml @@ -1,5 +1,5 @@ - + diff --git a/jetty-osgi/test-jetty-osgi-webapp/src/main/java/com/acme/osgi/Activator.java b/jetty-osgi/test-jetty-osgi-webapp/src/main/java/com/acme/osgi/Activator.java index 0863fe918bc..8ad84d8c8b3 100644 --- a/jetty-osgi/test-jetty-osgi-webapp/src/main/java/com/acme/osgi/Activator.java +++ b/jetty-osgi/test-jetty-osgi-webapp/src/main/java/com/acme/osgi/Activator.java @@ -51,7 +51,7 @@ public class Activator implements BundleActivator Dictionary serverProps = new Hashtable(); //define the unique name of the server instance serverProps.put("managedServerName", serverName); - serverProps.put("jetty.port", "9999"); + serverProps.put("jetty.http.port", "9999"); //let Jetty apply some configuration files to the Server instance serverProps.put("jetty.etc.config.urls", "file:/opt/jetty/etc/jetty.xml,file:/opt/jetty/etc/jetty-selector.xml,file:/opt/jetty/etc/jetty-deployer.xml"); //register as an OSGi Service for Jetty to find diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http.xml index c3f74f3e668..dd35c6f3745 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http.xml @@ -31,10 +31,9 @@ - - - - + + + diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http2.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http2.xml index b0ad6581e10..13258ae68f9 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http2.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-http2.xml @@ -9,7 +9,7 @@ - + diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-ssl.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-ssl.xml index ef65019001e..d80cf81b3ed 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-ssl.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-ssl.xml @@ -19,10 +19,10 @@ - - - - + + + + @@ -31,14 +31,14 @@ - / - - - / - + / + + + / + - - + + SSL_RSA_WITH_DES_CBC_SHA diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml index 170530b80e6..bf96e218072 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml +++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml @@ -43,7 +43,7 @@ https - + 32768 8192 8192 diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootContextAsService.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootContextAsService.java index b448cd73690..a53846572dc 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootContextAsService.java +++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootContextAsService.java @@ -18,18 +18,10 @@ package org.eclipse.jetty.osgi.test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.ops4j.pax.exam.CoreOptions.mavenBundle; -import static org.ops4j.pax.exam.CoreOptions.options; -import static org.ops4j.pax.exam.CoreOptions.systemProperty; - import java.io.File; import java.util.ArrayList; import java.util.Arrays; import java.util.List; - import javax.inject.Inject; import org.eclipse.jetty.client.HttpClient; @@ -48,6 +40,13 @@ import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.ops4j.pax.exam.CoreOptions.mavenBundle; +import static org.ops4j.pax.exam.CoreOptions.options; +import static org.ops4j.pax.exam.CoreOptions.systemProperty; + /** * TestJettyOSGiBootContextAsService * @@ -99,8 +98,8 @@ public class TestJettyOSGiBootContextAsService + "/jetty-deployer.xml;" + etc + "/jetty-testrealm.xml")); - options.add(systemProperty("jetty.port").value(String.valueOf(TestJettyOSGiBootCore.DEFAULT_HTTP_PORT))); - options.add(systemProperty("ssl.port").value(String.valueOf(TestJettyOSGiBootCore.DEFAULT_SSL_PORT))); + options.add(systemProperty("jetty.http.port").value(String.valueOf(TestJettyOSGiBootCore.DEFAULT_HTTP_PORT))); + options.add(systemProperty("jetty.ssl.port").value(String.valueOf(TestJettyOSGiBootCore.DEFAULT_SSL_PORT))); options.add(systemProperty("jetty.home").value(etcFolder.getParentFile().getAbsolutePath())); return options; } diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootCore.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootCore.java index 94190c00353..19db6154cc5 100644 --- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootCore.java +++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootCore.java @@ -18,14 +18,9 @@ package org.eclipse.jetty.osgi.test; -import static org.ops4j.pax.exam.CoreOptions.mavenBundle; -import static org.ops4j.pax.exam.CoreOptions.options; -import static org.ops4j.pax.exam.CoreOptions.systemProperty; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; - import javax.inject.Inject; import org.junit.Ignore; @@ -39,6 +34,10 @@ import org.ops4j.pax.exam.junit.PaxExam; import org.ops4j.pax.exam.options.MavenUrlReference.VersionResolver; import org.osgi.framework.BundleContext; +import static org.ops4j.pax.exam.CoreOptions.mavenBundle; +import static org.ops4j.pax.exam.CoreOptions.options; +import static org.ops4j.pax.exam.CoreOptions.systemProperty; + /** * Default OSGi setup integration test @@ -74,8 +73,8 @@ public class TestJettyOSGiBootCore { List --> @@ -56,7 +56,7 @@ some/type - + --> diff --git a/jetty-server/src/main/config/etc/jetty-http.xml b/jetty-server/src/main/config/etc/jetty-http.xml index adeeaae331a..963f8db2b3d 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 @@ - - + + @@ -37,13 +37,12 @@ - - - - - - - + + + + + + diff --git a/jetty-server/src/main/config/etc/jetty-ipaccess.xml b/jetty-server/src/main/config/etc/jetty-ipaccess.xml index a44aa1dc418..d87ca02cfa8 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 @@ - + - - + - - + + - 127.0.0.1 - 127.0.0.2/*.html - + 127.0.0.1 + 127.0.0.2/*.html + - 127.0.0.1/blacklisted - 127.0.0.2/black.html - + 127.0.0.1/blacklisted + 127.0.0.2/black.html + false - - + + + diff --git a/jetty-server/src/main/config/etc/jetty-lowresources.xml b/jetty-server/src/main/config/etc/jetty-lowresources.xml index 060919a8d3c..5884c42b99b 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 @@ - - - - - - + + + + + + diff --git a/jetty-server/src/main/config/etc/jetty-requestlog.xml b/jetty-server/src/main/config/etc/jetty-requestlog.xml index 6b53b53e6d7..a9c23369c70 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 @@ - - - - - - - + + + + + + + diff --git a/jetty-server/src/main/config/etc/jetty-ssl.xml b/jetty-server/src/main/config/etc/jetty-ssl.xml index c4f8879329a..0b8bb170541 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 @@ - - + + - - - - - - - + + + + + + @@ -41,14 +40,14 @@ - / - - - / - + / + + + / + - - + + SSL_RSA_WITH_DES_CBC_SHA diff --git a/jetty-server/src/main/config/etc/jetty.xml b/jetty-server/src/main/config/etc/jetty.xml index 91109f9f36c..cbd0a1998e0 100644 --- a/jetty-server/src/main/config/etc/jetty.xml +++ b/jetty-server/src/main/config/etc/jetty.xml @@ -46,9 +46,9 @@ --> - - - + + + false @@ -77,16 +77,16 @@ - https - - - - - - - - 512 - + + + + + + + + + + - @@ -124,9 +123,9 @@ - true + 5000 - - + + 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 5acce7aa904..00000000000 --- 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 00000000000..20bfa6ab38f --- /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 c0980929749..1efc8346489 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 dc34bc3cb98..0957a796c59 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 99112d55fa9..2f765d9af2c 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 f5e0614eb48..89ad071f01d 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 -# 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 +## File path (relative to $jetty.base) +# jetty.requestlog.filePath=/logs/yyyy_mm_dd.request.log +# Date format for rollovered files (uses SimpleDateFormat syntax) +# 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 f729dc4394c..6b5dbe95ba0 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 a4d105088bb..e99ed7e3d7a 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 +### TLS(SSL) Connector Configuration -# 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 +## Connector host/address to bind to +# jetty.ssl.host=0.0.0.0 -## Setup a demonstration keystore and truststore -jetty.keystore=etc/keystore -jetty.truststore=etc/keystore +## 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 -## 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 +## Keystore password +# jetty.sslConfig.keyStorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 -## Parameters to control the number and priority of acceptors and selectors -# ssl.selectors=1 -# ssl.acceptors=1 -# ssl.selectorPriorityDelta=0 -# ssl.acceptorPriorityDelta=0 +## 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 e2bed86dcb8..8adcc2cb0d3 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. - *

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.

- * - * @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); diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/IncludeJettyDirTest.java b/jetty-start/src/test/java/org/eclipse/jetty/start/IncludeJettyDirTest.java index ba19edf1ea9..3c353dfd6e8 100644 --- a/jetty-start/src/test/java/org/eclipse/jetty/start/IncludeJettyDirTest.java +++ b/jetty-start/src/test/java/org/eclipse/jetty/start/IncludeJettyDirTest.java @@ -18,10 +18,6 @@ package org.eclipse.jetty.start; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.notNullValue; - import java.io.File; import java.util.ArrayList; import java.util.List; @@ -36,6 +32,10 @@ import org.junit.Assert; import org.junit.Rule; import org.junit.Test; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; + public class IncludeJettyDirTest { private static class MainResult @@ -97,7 +97,7 @@ public class IncludeJettyDirTest File base = testdir.getFile("base"); FS.ensureEmpty(base); TestEnv.makeFile(base,"start.ini", // - "jetty.host=127.0.0.1"); + "jetty.http.host=127.0.0.1"); // Simple command line - no reference to include-jetty-dirs MainResult result = runMain(base,home); @@ -107,7 +107,7 @@ public class IncludeJettyDirTest expectedSearchOrder.add("${jetty.home}"); result.assertSearchOrder(expectedSearchOrder); - result.assertProperty("jetty.host","127.0.0.1"); + result.assertProperty("jetty.http.host","127.0.0.1"); } @Test @@ -121,13 +121,13 @@ public class IncludeJettyDirTest // Create common File common = testdir.getFile("common"); FS.ensureEmpty(common); - TestEnv.makeFile(common,"start.ini","jetty.port=8080"); + TestEnv.makeFile(common,"start.ini","jetty.http.port=8080"); // Create base File base = testdir.getFile("base"); FS.ensureEmpty(base); TestEnv.makeFile(base,"start.ini", // - "jetty.host=127.0.0.1"); + "jetty.http.host=127.0.0.1"); // Simple command line reference to include-jetty-dir MainResult result = runMain(base,home, @@ -140,8 +140,8 @@ public class IncludeJettyDirTest expectedSearchOrder.add("${jetty.home}"); result.assertSearchOrder(expectedSearchOrder); - result.assertProperty("jetty.host","127.0.0.1"); - result.assertProperty("jetty.port","8080"); // from 'common' + result.assertProperty("jetty.http.host","127.0.0.1"); + result.assertProperty("jetty.http.port","8080"); // from 'common' } @Test @@ -155,13 +155,13 @@ public class IncludeJettyDirTest // Create common File common = testdir.getFile("common"); FS.ensureEmpty(common); - TestEnv.makeFile(common,"start.ini","jetty.port=8080"); + TestEnv.makeFile(common,"start.ini","jetty.http.port=8080"); // Create base File base = testdir.getFile("base"); FS.ensureEmpty(base); TestEnv.makeFile(base,"start.ini", // - "jetty.host=127.0.0.1"); + "jetty.http.host=127.0.0.1"); // Simple command line reference to include-jetty-dir via property (also on command line) MainResult result = runMain(base,home, @@ -176,8 +176,8 @@ public class IncludeJettyDirTest expectedSearchOrder.add("${jetty.home}"); result.assertSearchOrder(expectedSearchOrder); - result.assertProperty("jetty.host","127.0.0.1"); - result.assertProperty("jetty.port","8080"); // from 'common' + result.assertProperty("jetty.http.host","127.0.0.1"); + result.assertProperty("jetty.http.port","8080"); // from 'common' } @Test @@ -195,13 +195,13 @@ public class IncludeJettyDirTest // Create common File common = new File(opt,"common"); FS.ensureEmpty(common); - TestEnv.makeFile(common,"start.ini","jetty.port=8080"); + TestEnv.makeFile(common,"start.ini","jetty.http.port=8080"); // Create base File base = testdir.getFile("base"); FS.ensureEmpty(base); TestEnv.makeFile(base,"start.ini", // - "jetty.host=127.0.0.1"); + "jetty.http.host=127.0.0.1"); String dirRef = "${my.opt}" + File.separator + "common"; @@ -218,8 +218,8 @@ public class IncludeJettyDirTest expectedSearchOrder.add("${jetty.home}"); result.assertSearchOrder(expectedSearchOrder); - result.assertProperty("jetty.host","127.0.0.1"); - result.assertProperty("jetty.port","8080"); // from 'common' + result.assertProperty("jetty.http.host","127.0.0.1"); + result.assertProperty("jetty.http.port","8080"); // from 'common' } @Test @@ -237,13 +237,13 @@ public class IncludeJettyDirTest // Create common File common = new File(opt,"common"); FS.ensureEmpty(common); - TestEnv.makeFile(common,"start.ini","jetty.port=8080"); + TestEnv.makeFile(common,"start.ini","jetty.http.port=8080"); // Create base File base = testdir.getFile("base"); FS.ensureEmpty(base); TestEnv.makeFile(base,"start.ini", // - "jetty.host=127.0.0.1"); + "jetty.http.host=127.0.0.1"); String dirRef = "${my.opt}" + File.separator + "${my.dir}"; @@ -262,8 +262,8 @@ public class IncludeJettyDirTest expectedSearchOrder.add("${jetty.home}"); result.assertSearchOrder(expectedSearchOrder); - result.assertProperty("jetty.host","127.0.0.1"); - result.assertProperty("jetty.port","8080"); // from 'common' + result.assertProperty("jetty.http.host","127.0.0.1"); + result.assertProperty("jetty.http.port","8080"); // from 'common' } @Test @@ -277,13 +277,13 @@ public class IncludeJettyDirTest // Create common File common = testdir.getFile("common"); FS.ensureEmpty(common); - TestEnv.makeFile(common,"start.ini","jetty.port=8080"); + TestEnv.makeFile(common,"start.ini","jetty.http.port=8080"); // Create base File base = testdir.getFile("base"); FS.ensureEmpty(base); TestEnv.makeFile(base,"start.ini", // - "jetty.host=127.0.0.1",// + "jetty.http.host=127.0.0.1",// "--include-jetty-dir=" + common.getAbsolutePath()); MainResult result = runMain(base,home); @@ -294,8 +294,8 @@ public class IncludeJettyDirTest expectedSearchOrder.add("${jetty.home}"); result.assertSearchOrder(expectedSearchOrder); - result.assertProperty("jetty.host","127.0.0.1"); - result.assertProperty("jetty.port","8080"); // from 'common' + result.assertProperty("jetty.http.host","127.0.0.1"); + result.assertProperty("jetty.http.port","8080"); // from 'common' } @Test @@ -309,7 +309,7 @@ public class IncludeJettyDirTest // Create common File common = testdir.getFile("common"); FS.ensureEmpty(common); - TestEnv.makeFile(common,"start.ini","jetty.port=8080"); + TestEnv.makeFile(common,"start.ini","jetty.http.port=8080"); // Create corp File corp = testdir.getFile("corp"); @@ -319,7 +319,7 @@ public class IncludeJettyDirTest File base = testdir.getFile("base"); FS.ensureEmpty(base); TestEnv.makeFile(base,"start.ini", // - "jetty.host=127.0.0.1",// + "jetty.http.host=127.0.0.1",// "--include-jetty-dir=" + common.getAbsolutePath(), // "--include-jetty-dir=" + corp.getAbsolutePath()); @@ -332,8 +332,8 @@ public class IncludeJettyDirTest expectedSearchOrder.add("${jetty.home}"); result.assertSearchOrder(expectedSearchOrder); - result.assertProperty("jetty.host","127.0.0.1"); - result.assertProperty("jetty.port","8080"); // from 'common' + result.assertProperty("jetty.http.host","127.0.0.1"); + result.assertProperty("jetty.http.port","8080"); // from 'common' } @Test @@ -347,20 +347,20 @@ public class IncludeJettyDirTest // Create corp File corp = testdir.getFile("corp"); FS.ensureEmpty(corp); - TestEnv.makeFile(corp,"start.ini","jetty.port=9090"); + TestEnv.makeFile(corp,"start.ini","jetty.http.port=9090"); // Create common File common = testdir.getFile("common"); FS.ensureEmpty(common); TestEnv.makeFile(common,"start.ini", // "--include-jetty-dir=" + corp.getAbsolutePath(), // - "jetty.port=8080"); + "jetty.http.port=8080"); // Create base File base = testdir.getFile("base"); FS.ensureEmpty(base); TestEnv.makeFile(base,"start.ini", // - "jetty.host=127.0.0.1",// + "jetty.http.host=127.0.0.1",// "--include-jetty-dir=" + common.getAbsolutePath()); MainResult result = runMain(base,home); @@ -372,8 +372,8 @@ public class IncludeJettyDirTest expectedSearchOrder.add("${jetty.home}"); result.assertSearchOrder(expectedSearchOrder); - result.assertProperty("jetty.host","127.0.0.1"); - result.assertProperty("jetty.port","8080"); // from 'common' + result.assertProperty("jetty.http.host","127.0.0.1"); + result.assertProperty("jetty.http.port","8080"); // from 'common' } @Test @@ -388,7 +388,7 @@ public class IncludeJettyDirTest File corp = testdir.getFile("corp"); FS.ensureEmpty(corp); TestEnv.makeFile(corp,"start.ini", // - "jetty.port=9090"); + "jetty.http.port=9090"); // Create common File common = testdir.getFile("common"); @@ -396,13 +396,13 @@ public class IncludeJettyDirTest TestEnv.makeFile(common,"start.ini", // "my.corp=" + corp.getAbsolutePath(), // "--include-jetty-dir=${my.corp}", // - "jetty.port=8080"); + "jetty.http.port=8080"); // Create base File base = testdir.getFile("base"); FS.ensureEmpty(base); TestEnv.makeFile(base,"start.ini", // - "jetty.host=127.0.0.1",// + "jetty.http.host=127.0.0.1",// "my.common=" + common.getAbsolutePath(), // "--include-jetty-dir=${my.common}"); @@ -415,8 +415,8 @@ public class IncludeJettyDirTest expectedSearchOrder.add("${jetty.home}"); result.assertSearchOrder(expectedSearchOrder); - result.assertProperty("jetty.host","127.0.0.1"); - result.assertProperty("jetty.port","8080"); // from 'common' + result.assertProperty("jetty.http.host","127.0.0.1"); + result.assertProperty("jetty.http.port","8080"); // from 'common' } @Test @@ -432,26 +432,26 @@ public class IncludeJettyDirTest FS.ensureEmpty(devops); TestEnv.makeFile(devops,"start.ini", // "--module=logging", // - "jetty.port=2222"); + "jetty.http.port=2222"); // Create corp File corp = testdir.getFile("corp"); FS.ensureEmpty(corp); TestEnv.makeFile(corp,"start.ini", // - "jetty.port=9090"); + "jetty.http.port=9090"); // Create common File common = testdir.getFile("common"); FS.ensureEmpty(common); TestEnv.makeFile(common,"start.ini", // "--include-jetty-dir=" + corp.getAbsolutePath(), // - "jetty.port=8080"); + "jetty.http.port=8080"); // Create base File base = testdir.getFile("base"); FS.ensureEmpty(base); TestEnv.makeFile(base,"start.ini", // - "jetty.host=127.0.0.1",// + "jetty.http.host=127.0.0.1",// "--include-jetty-dir=" + common.getAbsolutePath()); MainResult result = runMain(base,home, @@ -466,8 +466,8 @@ public class IncludeJettyDirTest expectedSearchOrder.add("${jetty.home}"); result.assertSearchOrder(expectedSearchOrder); - result.assertProperty("jetty.host","127.0.0.1"); - result.assertProperty("jetty.port","2222"); // from 'devops' + result.assertProperty("jetty.http.host","127.0.0.1"); + result.assertProperty("jetty.http.port","2222"); // from 'devops' } @Test @@ -482,25 +482,25 @@ public class IncludeJettyDirTest File corp = testdir.getFile("corp"); FS.ensureEmpty(corp); TestEnv.makeFile(corp,"start.ini", // - "jetty.port=9090"); + "jetty.http.port=9090"); // Create common File common = testdir.getFile("common"); FS.ensureEmpty(common); TestEnv.makeFile(common,"start.ini", // "--include-jetty-dir=" + corp.getAbsolutePath(), // - "jetty.port=8080"); + "jetty.http.port=8080"); // Create base File base = testdir.getFile("base"); FS.ensureEmpty(base); TestEnv.makeFile(base,"start.ini", // - "jetty.host=127.0.0.1",// + "jetty.http.host=127.0.0.1",// "--include-jetty-dir=" + common.getAbsolutePath()); MainResult result = runMain(base,home, // command line property should override all others - "jetty.port=7070"); + "jetty.http.port=7070"); List expectedSearchOrder = new ArrayList<>(); expectedSearchOrder.add("${jetty.base}"); @@ -509,8 +509,8 @@ public class IncludeJettyDirTest expectedSearchOrder.add("${jetty.home}"); result.assertSearchOrder(expectedSearchOrder); - result.assertProperty("jetty.host","127.0.0.1"); - result.assertProperty("jetty.port","7070"); // from command line + result.assertProperty("jetty.http.host","127.0.0.1"); + result.assertProperty("jetty.http.port","7070"); // from command line } @Test @@ -530,14 +530,14 @@ public class IncludeJettyDirTest FS.ensureEmpty(corp); TestEnv.makeFile(corp,"start.ini", // standard property - "jetty.port=9090", + "jetty.http.port=9090", // INTENTIONAL BAD Reference (duplicate) "--include-jetty-dir=" + common.getAbsolutePath()); // Populate common TestEnv.makeFile(common,"start.ini", // standard property - "jetty.port=8080", + "jetty.http.port=8080", // reference to corp "--include-jetty-dir=" + corp.getAbsolutePath()); @@ -545,7 +545,7 @@ public class IncludeJettyDirTest File base = testdir.getFile("base"); FS.ensureEmpty(base); TestEnv.makeFile(base,"start.ini", // - "jetty.host=127.0.0.1",// + "jetty.http.host=127.0.0.1",// "--include-jetty-dir=" + common.getAbsolutePath()); try diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java b/jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java index ca61c3d8e23..5a71fdf7dcd 100644 --- a/jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java +++ b/jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java @@ -18,10 +18,6 @@ package org.eclipse.jetty.start; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; - import java.io.File; import java.nio.file.Files; import java.nio.file.Path; @@ -35,6 +31,10 @@ import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThat; + public class MainTest { @Rule @@ -54,7 +54,7 @@ public class MainTest File testJettyHome = MavenTestingUtils.getTestResourceDir("dist-home").getAbsoluteFile(); cmdLineArgs.add("user.dir=" + testJettyHome); cmdLineArgs.add("jetty.home=" + testJettyHome); - cmdLineArgs.add("jetty.port=9090"); + cmdLineArgs.add("jetty.http.port=9090"); Main main = new Main(); StartArgs args = main.processCommandLine(cmdLineArgs.toArray(new String[cmdLineArgs.size()])); @@ -90,7 +90,7 @@ public class MainTest List cmdLineArgs = new ArrayList<>(); File testJettyHome = MavenTestingUtils.getTestResourceDir("dist-home"); cmdLineArgs.add("jetty.home=" + testJettyHome); - cmdLineArgs.add("jetty.port=9090"); + cmdLineArgs.add("jetty.http.port=9090"); cmdLineArgs.add("--list-config"); // cmdLineArgs.add("--debug"); diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/ModulesTest.java b/jetty-start/src/test/java/org/eclipse/jetty/start/ModulesTest.java index b4fbb83b2ca..b902dbdbf44 100644 --- a/jetty-start/src/test/java/org/eclipse/jetty/start/ModulesTest.java +++ b/jetty-start/src/test/java/org/eclipse/jetty/start/ModulesTest.java @@ -18,10 +18,6 @@ package org.eclipse.jetty.start; -import static org.hamcrest.Matchers.contains; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; - import java.io.File; import java.io.IOException; import java.util.ArrayList; @@ -41,6 +37,10 @@ import org.eclipse.jetty.toolchain.test.TestingDir; import org.junit.Rule; import org.junit.Test; +import static org.hamcrest.Matchers.contains; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertThat; + public class ModulesTest { private final static String TEST_SOURCE = ""; @@ -92,7 +92,7 @@ public class ModulesTest expected.add("cdi"); expected.add("client"); expected.add("continuation"); - expected.add("debug"); + expected.add("debuglog"); expected.add("deploy"); expected.add("ext"); expected.add("fcgi"); diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/config/ConfigSourcesTest.java b/jetty-start/src/test/java/org/eclipse/jetty/start/config/ConfigSourcesTest.java index 1388f7e56d8..84c205ca968 100644 --- a/jetty-start/src/test/java/org/eclipse/jetty/start/config/ConfigSourcesTest.java +++ b/jetty-start/src/test/java/org/eclipse/jetty/start/config/ConfigSourcesTest.java @@ -18,10 +18,6 @@ package org.eclipse.jetty.start.config; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.notNullValue; - import java.io.File; import java.io.IOException; import java.util.ArrayList; @@ -38,6 +34,10 @@ import org.junit.Assert; import org.junit.Rule; import org.junit.Test; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; + public class ConfigSourcesTest { @Rule @@ -91,7 +91,7 @@ public class ConfigSourcesTest File base = testdir.getFile("base"); FS.ensureEmpty(base); TestEnv.makeFile(base,"start.ini", // - "jetty.host=127.0.0.1"); + "jetty.http.host=127.0.0.1"); ConfigSources sources = new ConfigSources(); @@ -119,7 +119,7 @@ public class ConfigSourcesTest File base = testdir.getFile("base"); FS.ensureEmpty(base); TestEnv.makeFile(base,"start.ini", // - "jetty.host=127.0.0.1",// + "jetty.http.host=127.0.0.1",// "--include-jetty-dir=" + common.getAbsolutePath()); ConfigSources sources = new ConfigSources(); @@ -143,13 +143,13 @@ public class ConfigSourcesTest // Create common File common = testdir.getFile("common"); FS.ensureEmpty(common); - TestEnv.makeFile(common,"start.ini","jetty.port=8080"); + TestEnv.makeFile(common,"start.ini","jetty.http.port=8080"); // Create base File base = testdir.getFile("base"); FS.ensureEmpty(base); TestEnv.makeFile(base,"start.ini", // - "jetty.host=127.0.0.1"); + "jetty.http.host=127.0.0.1"); ConfigSources sources = new ConfigSources(); @@ -169,8 +169,8 @@ public class ConfigSourcesTest assertDirOrder(sources,base,common,home); - assertProperty(sources,"jetty.host","127.0.0.1"); - assertProperty(sources,"jetty.port","8080"); // from 'common' + assertProperty(sources,"jetty.http.host","127.0.0.1"); + assertProperty(sources,"jetty.http.port","8080"); // from 'common' } @Test @@ -188,13 +188,13 @@ public class ConfigSourcesTest // Create common File common = new File(opt,"common"); FS.ensureEmpty(common); - TestEnv.makeFile(common,"start.ini","jetty.port=8080"); + TestEnv.makeFile(common,"start.ini","jetty.http.port=8080"); // Create base File base = testdir.getFile("base"); FS.ensureEmpty(base); TestEnv.makeFile(base,"start.ini", // - "jetty.host=127.0.0.1"); + "jetty.http.host=127.0.0.1"); String dirRef = "${my.opt}" + File.separator + "common"; @@ -215,8 +215,8 @@ public class ConfigSourcesTest assertDirOrder(sources,base,common,home); - assertProperty(sources,"jetty.host","127.0.0.1"); - assertProperty(sources,"jetty.port","8080"); // from 'common' + assertProperty(sources,"jetty.http.host","127.0.0.1"); + assertProperty(sources,"jetty.http.port","8080"); // from 'common' } @Test @@ -234,13 +234,13 @@ public class ConfigSourcesTest // Create common File common = new File(opt,"common"); FS.ensureEmpty(common); - TestEnv.makeFile(common,"start.ini","jetty.port=8080"); + TestEnv.makeFile(common,"start.ini","jetty.http.port=8080"); // Create base File base = testdir.getFile("base"); FS.ensureEmpty(base); TestEnv.makeFile(base,"start.ini", // - "jetty.host=127.0.0.1"); + "jetty.http.host=127.0.0.1"); String dirRef = "${my.opt}" + File.separator + "${my.dir}"; @@ -264,8 +264,8 @@ public class ConfigSourcesTest assertDirOrder(sources,base,common,home); - assertProperty(sources,"jetty.host","127.0.0.1"); - assertProperty(sources,"jetty.port","8080"); // from 'common' + assertProperty(sources,"jetty.http.host","127.0.0.1"); + assertProperty(sources,"jetty.http.port","8080"); // from 'common' } @Test @@ -279,13 +279,13 @@ public class ConfigSourcesTest // Create common File common = testdir.getFile("common"); FS.ensureEmpty(common); - TestEnv.makeFile(common,"start.ini","jetty.port=8080"); + TestEnv.makeFile(common,"start.ini","jetty.http.port=8080"); // Create base File base = testdir.getFile("base"); FS.ensureEmpty(base); TestEnv.makeFile(base,"start.ini", // - "jetty.host=127.0.0.1",// + "jetty.http.host=127.0.0.1",// "--include-jetty-dir=" + common.getAbsolutePath()); ConfigSources sources = new ConfigSources(); @@ -299,8 +299,8 @@ public class ConfigSourcesTest assertDirOrder(sources,base,common,home); - assertProperty(sources,"jetty.host","127.0.0.1"); - assertProperty(sources,"jetty.port","8080"); // from 'common' + assertProperty(sources,"jetty.http.host","127.0.0.1"); + assertProperty(sources,"jetty.http.port","8080"); // from 'common' } @Test @@ -314,7 +314,7 @@ public class ConfigSourcesTest // Create common File common = testdir.getFile("common"); FS.ensureEmpty(common); - TestEnv.makeFile(common,"start.ini","jetty.port=8080"); + TestEnv.makeFile(common,"start.ini","jetty.http.port=8080"); // Create corp File corp = testdir.getFile("corp"); @@ -324,7 +324,7 @@ public class ConfigSourcesTest File base = testdir.getFile("base"); FS.ensureEmpty(base); TestEnv.makeFile(base,"start.ini", // - "jetty.host=127.0.0.1",// + "jetty.http.host=127.0.0.1",// "--include-jetty-dir=" + common.getAbsolutePath(), // "--include-jetty-dir=" + corp.getAbsolutePath()); @@ -342,8 +342,8 @@ public class ConfigSourcesTest assertDirOrder(sources,base,common,corp,home); - assertProperty(sources,"jetty.host","127.0.0.1"); - assertProperty(sources,"jetty.port","8080"); // from 'common' + assertProperty(sources,"jetty.http.host","127.0.0.1"); + assertProperty(sources,"jetty.http.port","8080"); // from 'common' } @Test @@ -358,20 +358,20 @@ public class ConfigSourcesTest File corp = testdir.getFile("corp"); FS.ensureEmpty(corp); TestEnv.makeFile(corp,"start.ini", // - "jetty.port=9090"); + "jetty.http.port=9090"); // Create common File common = testdir.getFile("common"); FS.ensureEmpty(common); TestEnv.makeFile(common,"start.ini", // "--include-jetty-dir=" + corp.getAbsolutePath(), // - "jetty.port=8080"); + "jetty.http.port=8080"); // Create base File base = testdir.getFile("base"); FS.ensureEmpty(base); TestEnv.makeFile(base,"start.ini", // - "jetty.host=127.0.0.1",// + "jetty.http.host=127.0.0.1",// "--include-jetty-dir=" + common.getAbsolutePath()); ConfigSources sources = new ConfigSources(); @@ -388,8 +388,8 @@ public class ConfigSourcesTest assertDirOrder(sources,base,common,corp,home); - assertProperty(sources,"jetty.host","127.0.0.1"); - assertProperty(sources,"jetty.port","8080"); // from 'common' + assertProperty(sources,"jetty.http.host","127.0.0.1"); + assertProperty(sources,"jetty.http.port","8080"); // from 'common' } @Test @@ -404,7 +404,7 @@ public class ConfigSourcesTest File corp = testdir.getFile("corp"); FS.ensureEmpty(corp); TestEnv.makeFile(corp,"start.ini", // - "jetty.port=9090"); + "jetty.http.port=9090"); // Create common File common = testdir.getFile("common"); @@ -412,13 +412,13 @@ public class ConfigSourcesTest TestEnv.makeFile(common,"start.ini", // "my.corp=" + corp.getAbsolutePath(), // "--include-jetty-dir=${my.corp}", // - "jetty.port=8080"); + "jetty.http.port=8080"); // Create base File base = testdir.getFile("base"); FS.ensureEmpty(base); TestEnv.makeFile(base,"start.ini", // - "jetty.host=127.0.0.1",// + "jetty.http.host=127.0.0.1",// "my.common="+common.getAbsolutePath(), // "--include-jetty-dir=${my.common}"); @@ -437,8 +437,8 @@ public class ConfigSourcesTest assertDirOrder(sources,base,common,corp,home); - assertProperty(sources,"jetty.host","127.0.0.1"); - assertProperty(sources,"jetty.port","8080"); // from 'common' + assertProperty(sources,"jetty.http.host","127.0.0.1"); + assertProperty(sources,"jetty.http.port","8080"); // from 'common' } @Test @@ -454,26 +454,26 @@ public class ConfigSourcesTest FS.ensureEmpty(devops); TestEnv.makeFile(devops,"start.ini", // "--module=logging", // - "jetty.port=2222"); + "jetty.http.port=2222"); // Create corp File corp = testdir.getFile("corp"); FS.ensureEmpty(corp); TestEnv.makeFile(corp,"start.ini", // - "jetty.port=9090"); + "jetty.http.port=9090"); // Create common File common = testdir.getFile("common"); FS.ensureEmpty(common); TestEnv.makeFile(common,"start.ini", // "--include-jetty-dir=" + corp.getAbsolutePath(), // - "jetty.port=8080"); + "jetty.http.port=8080"); // Create base File base = testdir.getFile("base"); FS.ensureEmpty(base); TestEnv.makeFile(base,"start.ini", // - "jetty.host=127.0.0.1",// + "jetty.http.host=127.0.0.1",// "--include-jetty-dir=" + common.getAbsolutePath()); ConfigSources sources = new ConfigSources(); @@ -494,8 +494,8 @@ public class ConfigSourcesTest assertDirOrder(sources,base,devops,common,corp,home); - assertProperty(sources,"jetty.host","127.0.0.1"); - assertProperty(sources,"jetty.port","2222"); // from 'common' + assertProperty(sources,"jetty.http.host","127.0.0.1"); + assertProperty(sources,"jetty.http.port","2222"); // from 'common' } @Test @@ -510,27 +510,27 @@ public class ConfigSourcesTest File corp = testdir.getFile("corp"); FS.ensureEmpty(corp); TestEnv.makeFile(corp,"start.ini", // - "jetty.port=9090"); + "jetty.http.port=9090"); // Create common File common = testdir.getFile("common"); FS.ensureEmpty(common); TestEnv.makeFile(common,"start.ini", // "--include-jetty-dir=" + corp.getAbsolutePath(), // - "jetty.port=8080"); + "jetty.http.port=8080"); // Create base File base = testdir.getFile("base"); FS.ensureEmpty(base); TestEnv.makeFile(base,"start.ini", // - "jetty.host=127.0.0.1",// + "jetty.http.host=127.0.0.1",// "--include-jetty-dir=" + common.getAbsolutePath()); ConfigSources sources = new ConfigSources(); String cmdLine[] = new String[]{ // command line property should override all others - "jetty.port=7070" + "jetty.http.port=7070" }; sources.add(new CommandLineConfigSource(cmdLine)); sources.add(new JettyHomeConfigSource(home.toPath())); @@ -543,8 +543,8 @@ public class ConfigSourcesTest assertDirOrder(sources,base,common,corp,home); - assertProperty(sources,"jetty.host","127.0.0.1"); - assertProperty(sources,"jetty.port","7070"); // from + assertProperty(sources,"jetty.http.host","127.0.0.1"); + assertProperty(sources,"jetty.http.port","7070"); // from } @Test @@ -564,14 +564,14 @@ public class ConfigSourcesTest FS.ensureEmpty(corp); TestEnv.makeFile(corp,"start.ini", // standard property - "jetty.port=9090", + "jetty.http.port=9090", // INTENTIONAL BAD Reference (duplicate) "--include-jetty-dir=" + common.getAbsolutePath()); // Populate common TestEnv.makeFile(common,"start.ini", // standard property - "jetty.port=8080", + "jetty.http.port=8080", // reference to corp "--include-jetty-dir=" + corp.getAbsolutePath()); @@ -579,7 +579,7 @@ public class ConfigSourcesTest File base = testdir.getFile("base"); FS.ensureEmpty(base); TestEnv.makeFile(base,"start.ini", // - "jetty.host=127.0.0.1",// + "jetty.http.host=127.0.0.1",// "--include-jetty-dir=" + common.getAbsolutePath()); ConfigSources sources = new ConfigSources(); diff --git a/jetty-start/src/test/resources/assert-home-with-http2.txt b/jetty-start/src/test/resources/assert-home-with-http2.txt index b852b13650c..527e91f8d30 100644 --- a/jetty-start/src/test/resources/assert-home-with-http2.txt +++ b/jetty-start/src/test/resources/assert-home-with-http2.txt @@ -51,29 +51,28 @@ LIB|${jetty.base}/lib/servlet-api-3.1.jar # The Properties we expect (order is irrelevant) # (these are the properties we actually set in the configuration) PROP|java.version=1.7.0_60 -PROP|jetty.keymanager.password=OBF:1u2u1wml1z7s1z7a1wnl1u2g -PROP|jetty.keystore=etc/keystore -PROP|jetty.keystore.password=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 -PROP|jetty.secure.port=8443 -PROP|jetty.truststore=etc/keystore -PROP|jetty.truststore.password=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 -PROP|ssl.port=8443 -PROP|ssl.timeout=30000 +# PROP|jetty.sslConfig.keyManagerPassword=OBF:1u2u1wml1z7s1z7a1wnl1u2g +# PROP|jetty.sslConfig.keystorePath=etc/keystore +# PROP|jetty.sslConfig.keystorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 +# PROP|jetty.httpConfig.securePort=8443 +# PROP|jetty.sslConfig.truststorePath=etc/keystore +# PROP|jetty.sslConfig.truststorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 +# PROP|jetty.ssl.port=8443 +# PROP|jetty.ssl.idleTimeout=30000 # (these are the ones set by default from jetty.home modules) -PROP|jetty.port=8080 -PROP|http.timeout=30000 -PROP|jetty.delayDispatchUntilContent=false -PROP|jetty.dump.start=false -PROP|jetty.dump.stop=false -PROP|jetty.output.buffer.size=32768 -PROP|jetty.request.header.size=8192 -PROP|jetty.response.header.size=8192 -PROP|jetty.send.date.header=false -PROP|jetty.send.server.version=true -PROP|threads.max=200 -PROP|threads.min=10 -PROP|threads.timeout=60000 - +PROP|jetty.alpn.debug=false +PROP|jetty.http.port=8080 +PROP|jetty.httpConfig.delayDispatchUntilContent=false +PROP|jetty.server.dumpAfterStart=false +PROP|jetty.server.dumpBeforeStop=false +PROP|jetty.httpConfig.outputBufferSize=32768 +PROP|jetty.httpConfig.requestHeaderSize=8192 +PROP|jetty.httpConfig.responseHeaderSize=8192 +PROP|jetty.httpConfig.sendDateHeader=false +PROP|jetty.httpConfig.sendServerVersion=true +PROP|jetty.threadPool.maxThreads=200 +PROP|jetty.threadPool.minThreads=10 +PROP|jetty.threadPool.idleTimeout=60000 # JVM Args JVM|-Xms1024m @@ -89,5 +88,3 @@ FILE|lib/ext/ FILE|lib/alpn/ FILE|resources/ FILE|webapps/ - - diff --git a/jetty-start/src/test/resources/assert-home-with-jvm.txt b/jetty-start/src/test/resources/assert-home-with-jvm.txt index c8b69bd4c60..771f6da1bed 100644 --- a/jetty-start/src/test/resources/assert-home-with-jvm.txt +++ b/jetty-start/src/test/resources/assert-home-with-jvm.txt @@ -47,21 +47,20 @@ LIB|${jetty.base}/lib/websocket/websocket-servlet-TEST.jar # The Properties we expect (order is irrelevant) # (these are the properties we actually set in the configuration) -# PROP|jetty.port=8080 +# PROP|jetty.http.port=8080 # (these are the ones set by default from jetty.home modules) -PROP|jetty.port=8080 -PROP|http.timeout=30000 -PROP|jetty.delayDispatchUntilContent=false -PROP|jetty.dump.start=false -PROP|jetty.dump.stop=false -PROP|jetty.output.buffer.size=32768 -PROP|jetty.request.header.size=8192 -PROP|jetty.response.header.size=8192 -PROP|jetty.send.date.header=false -PROP|jetty.send.server.version=true -PROP|threads.max=200 -PROP|threads.min=10 -PROP|threads.timeout=60000 +PROP|jetty.http.port=8080 +PROP|jetty.httpConfig.delayDispatchUntilContent=false +PROP|jetty.server.dumpAfterStart=false +PROP|jetty.server.dumpBeforeStop=false +PROP|jetty.httpConfig.outputBufferSize=32768 +PROP|jetty.httpConfig.requestHeaderSize=8192 +PROP|jetty.httpConfig.responseHeaderSize=8192 +PROP|jetty.httpConfig.sendDateHeader=false +PROP|jetty.httpConfig.sendServerVersion=true +PROP|jetty.threadPool.maxThreads=200 +PROP|jetty.threadPool.minThreads=10 +PROP|jetty.threadPool.idleTimeout=60000 # JVM Args JVM|-Xms1024m diff --git a/jetty-start/src/test/resources/assert-home.txt b/jetty-start/src/test/resources/assert-home.txt index 3abc8000e08..aab1bae2e9d 100644 --- a/jetty-start/src/test/resources/assert-home.txt +++ b/jetty-start/src/test/resources/assert-home.txt @@ -43,20 +43,19 @@ LIB|${jetty.base}/lib/websocket/websocket-servlet-TEST.jar # The Properties we expect (order is irrelevant) # (these are the properties we actually set in the configuration) -PROP|jetty.port=9090 +PROP|jetty.http.port=9090 # (these are the ones set by default from jetty.home modules) -PROP|http.timeout=30000 -PROP|jetty.delayDispatchUntilContent=false -PROP|jetty.dump.start=false -PROP|jetty.dump.stop=false -PROP|jetty.output.buffer.size=32768 -PROP|jetty.request.header.size=8192 -PROP|jetty.response.header.size=8192 -PROP|jetty.send.date.header=false -PROP|jetty.send.server.version=true -PROP|threads.max=200 -PROP|threads.min=10 -PROP|threads.timeout=60000 +PROP|jetty.httpConfig.delayDispatchUntilContent=false +PROP|jetty.server.dumpAfterStart=false +PROP|jetty.server.dumpBeforeStop=false +PROP|jetty.httpConfig.outputBufferSize=32768 +PROP|jetty.httpConfig.requestHeaderSize=8192 +PROP|jetty.httpConfig.responseHeaderSize=8192 +PROP|jetty.httpConfig.sendDateHeader=false +PROP|jetty.httpConfig.sendServerVersion=true +PROP|jetty.threadPool.maxThreads=200 +PROP|jetty.threadPool.minThreads=10 +PROP|jetty.threadPool.idleTimeout=60000 # Files FILE|lib/ diff --git a/jetty-start/src/test/resources/dist-home/etc/jetty-debug.xml b/jetty-start/src/test/resources/dist-home/etc/jetty-debuglog.xml similarity index 100% rename from jetty-start/src/test/resources/dist-home/etc/jetty-debug.xml rename to jetty-start/src/test/resources/dist-home/etc/jetty-debuglog.xml diff --git a/jetty-start/src/test/resources/dist-home/modules/alpn.mod b/jetty-start/src/test/resources/dist-home/modules/alpn.mod index 2a6a1785ec3..41a6f295d3e 100644 --- a/jetty-start/src/test/resources/dist-home/modules/alpn.mod +++ b/jetty-start/src/test/resources/dist-home/modules/alpn.mod @@ -35,13 +35,19 @@ lib/ lib/alpn/ [ini-template] -# Configuration for ALPN -# alpn.protocols=h2-14,http/1.1 -# alpn.defaultProtocol=http/1.1 +# Overrides the order protocols are chosen by the server. +# The default order is that specified by the order of the +# modules declared in start.ini. +# jetty.alpn.protocols=h2-16,http/1.1 + +# Specifies what protocol to use when negotiation fails. +# jetty.alpn.defaultProtocol=http/1.1 + +# ALPN debug logging on System.err +jetty.alpn.debug=false [license] ALPN is a hosted at github under the GPL v2 with ClassPath Exception. ALPN replaces/modifies OpenJDK classes in the java.sun.security.ssl package. http://github.com/jetty-project/jetty-alpn http://openjdk.java.net/legal/gplv2+ce.html - diff --git a/jetty-start/src/test/resources/dist-home/modules/debug.mod b/jetty-start/src/test/resources/dist-home/modules/debug.mod deleted file mode 100644 index 5acce7aa904..00000000000 --- a/jetty-start/src/test/resources/dist-home/modules/debug.mod +++ /dev/null @@ -1,12 +0,0 @@ -# -# Debug module -# - -[depend] -server - -[files] -logs/ - -[xml] -etc/jetty-debug.xml diff --git a/jetty-start/src/test/resources/dist-home/modules/debuglog.mod b/jetty-start/src/test/resources/dist-home/modules/debuglog.mod new file mode 100644 index 00000000000..20bfa6ab38f --- /dev/null +++ b/jetty-start/src/test/resources/dist-home/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-start/src/test/resources/dist-home/modules/deploy.mod b/jetty-start/src/test/resources/dist-home/modules/deploy.mod index f16b3f2fffb..3a2fc916d08 100644 --- a/jetty-start/src/test/resources/dist-home/modules/deploy.mod +++ b/jetty-start/src/test/resources/dist-home/modules/deploy.mod @@ -15,7 +15,11 @@ webapps/ etc/jetty-deploy.xml [ini-template] -## DeployManager configuration -# Monitored Directory name (relative to jetty.base) -# jetty.deploy.monitoredDirName=webapps +# Monitored directory name (relative to jetty.base) +# jetty.deploy.monitoredDir=webapps +# Monitored directory scan period (seconds) +# jetty.deploy.scanInterval=1 + +# Whether to extract *.war files +# jetty.deploy.extractWars=true diff --git a/jetty-start/src/test/resources/dist-home/modules/fcgi.mod b/jetty-start/src/test/resources/dist-home/modules/fcgi.mod index e837b009c15..14152d5f2bd 100644 --- a/jetty-start/src/test/resources/dist-home/modules/fcgi.mod +++ b/jetty-start/src/test/resources/dist-home/modules/fcgi.mod @@ -12,4 +12,4 @@ lib/fcgi/*.jar [ini-template] ## For configuration of FastCGI contexts, see -## TODO: documentation url here +## https://www.eclipse.org/jetty/documentation/current/fastcgi.html diff --git a/jetty-start/src/test/resources/dist-home/modules/gzip.mod b/jetty-start/src/test/resources/dist-home/modules/gzip.mod index c0980929749..1efc8346489 100644 --- a/jetty-start/src/test/resources/dist-home/modules/gzip.mod +++ b/jetty-start/src/test/resources/dist-home/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-start/src/test/resources/dist-home/modules/http.mod b/jetty-start/src/test/resources/dist-home/modules/http.mod index dc34bc3cb98..0957a796c59 100644 --- a/jetty-start/src/test/resources/dist-home/modules/http.mod +++ b/jetty-start/src/test/resources/dist-home/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-start/src/test/resources/dist-home/modules/http2.mod b/jetty-start/src/test/resources/dist-home/modules/http2.mod index 2be7e7e5241..585c1fa5ee6 100644 --- a/jetty-start/src/test/resources/dist-home/modules/http2.mod +++ b/jetty-start/src/test/resources/dist-home/modules/http2.mod @@ -13,6 +13,8 @@ lib/http2/*.jar etc/jetty-http2.xml [ini-template] -## HTTP2 Configuration +## Max number of concurrent streams per connection +# jetty.http2.maxConcurrentStreams=1024 -# http2.maxConcurrentStreams=1024 +## Initial stream send (server to client) window +# jetty.http2.initialStreamSendWindow=65535 diff --git a/jetty-start/src/test/resources/dist-home/modules/http2c.mod b/jetty-start/src/test/resources/dist-home/modules/http2c.mod index 1073181bb38..15883cab2ce 100644 --- a/jetty-start/src/test/resources/dist-home/modules/http2c.mod +++ b/jetty-start/src/test/resources/dist-home/modules/http2c.mod @@ -1,5 +1,8 @@ # # HTTP2 Clear Text Support Module +# This module adds support for HTTP/2 clear text to the +# HTTP/1 clear text connector (defined in jetty-http.xml). +# The resulting connector will accept both HTTP/1 and HTTP/2 connections. # [depend] @@ -12,11 +15,8 @@ lib/http2/*.jar etc/jetty-http2c.xml [ini-template] -## HTTP2c Configuration +## Max number of concurrent streams per connection +# jetty.http2.maxConcurrentStreams=1024 -# This module adds support for HTTP/2 clear text to the -# HTTP/1 clear text connector (defined in jetty-http.xml) -# The resulting connector will accept both HTTP/1 and HTTP/2 -# connections - -# http2.maxConcurrentStreams=1024 +## Initial stream send (server to client) window +# jetty.http2.initialStreamSendWindow=65535 diff --git a/jetty-start/src/test/resources/dist-home/modules/jaas.mod b/jetty-start/src/test/resources/dist-home/modules/jaas.mod index 4932140ca65..fee3f59d871 100644 --- a/jetty-start/src/test/resources/dist-home/modules/jaas.mod +++ b/jetty-start/src/test/resources/dist-home/modules/jaas.mod @@ -12,5 +12,6 @@ lib/jetty-jaas-${jetty.version}.jar etc/jetty-jaas.xml [ini-template] -## JAAS Configuration -jaas.login.conf=etc/login.conf +## The file location (relative to $jetty.base) for the +## JAAS "java.security.auth.login.config" system property +# jetty.jaas.login.conf=etc/login.conf diff --git a/jetty-start/src/test/resources/dist-home/modules/jmx-remote.mod b/jetty-start/src/test/resources/dist-home/modules/jmx-remote.mod index b6be74afc92..f8a5111d8f8 100644 --- a/jetty-start/src/test/resources/dist-home/modules/jmx-remote.mod +++ b/jetty-start/src/test/resources/dist-home/modules/jmx-remote.mod @@ -9,10 +9,8 @@ jmx etc/jetty-jmx-remote.xml [ini-template] -## JMX Configuration -## Enable for an open port accessible by remote machines -# jetty.jmxrmihost=localhost -# jetty.jmxrmiport=1099 -## Strictly speaking you shouldn't need --exec to use this in most environments. -## If this isn't working, make sure you enable --exec as well -# -Dcom.sun.management.jmxremote +## The host/address to bind RMI to +# jetty.jmxremote.rmihost=localhost + +## The port RMI listens to +# jetty.jmxremote.rmiport=1099 diff --git a/jetty-start/src/test/resources/dist-home/modules/logging.mod b/jetty-start/src/test/resources/dist-home/modules/logging.mod index a39bfe4d23a..1fe67627e1f 100644 --- a/jetty-start/src/test/resources/dist-home/modules/logging.mod +++ b/jetty-start/src/test/resources/dist-home/modules/logging.mod @@ -23,9 +23,14 @@ resources/ # Configure jetty logging for java.util.logging # -Dorg.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.JavaUtilLog -# STDERR / STDOUT Logging -# Number of days to retain logs -# jetty.log.retain=90 -# Directory for logging output -# Either a path relative to ${jetty.base} or an absolute path -# jetty.logs=logs +## Logging directory (relative to jetty.base) +# jetty.logging.dir=logs + +## Whether to append to existing file +# jetty.logging.append=false + +## How many days to retain old log files +# jetty.logging.retainDays=90 + +## Timezone of the log timestamps +# jetty.logging.timezone=GMT diff --git a/jetty-start/src/test/resources/dist-home/modules/lowresources.mod b/jetty-start/src/test/resources/dist-home/modules/lowresources.mod index 99112d55fa9..2f765d9af2c 100644 --- a/jetty-start/src/test/resources/dist-home/modules/lowresources.mod +++ b/jetty-start/src/test/resources/dist-home/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-start/src/test/resources/dist-home/modules/proxy.mod b/jetty-start/src/test/resources/dist-home/modules/proxy.mod index a879ae123e9..6b91f689145 100644 --- a/jetty-start/src/test/resources/dist-home/modules/proxy.mod +++ b/jetty-start/src/test/resources/dist-home/modules/proxy.mod @@ -14,9 +14,9 @@ etc/jetty-proxy.xml [ini-template] ## Proxy Configuration -#jetty.proxy.servletClass=org.eclipse.jetty.proxy.ProxyServlet -#jetty.proxy.servletMapping=/* -#jetty.proxy.maxThreads=128 -#jetty.proxy.maxConnections=256 -#jetty.proxy.idleTimeout=30000 -#jetty.proxy.timeout=60000 +# jetty.proxy.servletClass=org.eclipse.jetty.proxy.ProxyServlet +# jetty.proxy.servletMapping=/* +# jetty.proxy.maxThreads=128 +# jetty.proxy.maxConnections=256 +# jetty.proxy.idleTimeout=30000 +# jetty.proxy.timeout=60000 diff --git a/jetty-start/src/test/resources/dist-home/modules/requestlog.mod b/jetty-start/src/test/resources/dist-home/modules/requestlog.mod index f5e0614eb48..89ad071f01d 100644 --- a/jetty-start/src/test/resources/dist-home/modules/requestlog.mod +++ b/jetty-start/src/test/resources/dist-home/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 -# 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 +## File path (relative to $jetty.base) +# jetty.requestlog.filePath=/logs/yyyy_mm_dd.request.log +# Date format for rollovered files (uses SimpleDateFormat syntax) +# 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-start/src/test/resources/dist-home/modules/rewrite.mod b/jetty-start/src/test/resources/dist-home/modules/rewrite.mod index d2e00c8e89e..c8a1750618a 100644 --- a/jetty-start/src/test/resources/dist-home/modules/rewrite.mod +++ b/jetty-start/src/test/resources/dist-home/modules/rewrite.mod @@ -10,3 +10,13 @@ lib/jetty-rewrite-${jetty.version}.jar [xml] etc/jetty-rewrite.xml + +[ini-template] +## Whether to rewrite the request URI +# jetty.rewrite.rewriteRequestURI=true + +## Whether to rewrite the path info +# jetty.rewrite.rewritePathInfo=false + +## Request attribute key under with the original path is stored +# jetty.rewrite.originalPathAttribute=requestedPath diff --git a/jetty-start/src/test/resources/dist-home/modules/server.mod b/jetty-start/src/test/resources/dist-home/modules/server.mod index b3f87de162b..6b5dbe95ba0 100644 --- a/jetty-start/src/test/resources/dist-home/modules/server.mod +++ b/jetty-start/src/test/resources/dist-home/modules/server.mod @@ -20,30 +20,53 @@ lib/jetty-io-${jetty.version}.jar etc/jetty.xml [ini-template] -## -## Server Threading Configuration -## -# minimum number of threads -threads.min=10 -# maximum number of threads -threads.max=200 -# thread idle timeout in milliseconds -threads.timeout=60000 -# buffer size for output -jetty.output.buffer.size=32768 -# request header buffer size -jetty.request.header.size=8192 -# response header buffer size -jetty.response.header.size=8192 -# should jetty send the server version header? -jetty.send.server.version=true -# should jetty send the date header? -jetty.send.date.header=false -# What host to listen on (leave commented to listen on all interfaces) -#jetty.host=myhost.com -# Dump the state of the Jetty server, components, and webapps after startup -jetty.dump.start=false -# Dump the state of the Jetty server, before stop -jetty.dump.stop=false -# Enable delayed dispatch optimisation -jetty.delayDispatchUntilContent=false +### ThreadPool configuration +## Minimum number of threads +# jetty.threadPool.minThreads=10 + +## Maximum number of threads +# jetty.threadPool.maxThreads=200 + +## Thread idle timeout (in milliseconds) +# jetty.threadPool.idleTimeout=60000 + +### Common HTTP configuration +## Scheme to use to build URIs for secure redirects +# jetty.httpConfig.secureScheme=https + +## Port to use to build URIs for secure redirects +# jetty.httpConfig.securePort=8443 + +## Response content buffer size (in bytes) +# jetty.httpConfig.outputBufferSize=32768 + +## Max response content write length that is buffered (in bytes) +# jetty.httpConfig.outputAggregationSize=8192 + +## Max request headers size (in bytes) +# jetty.httpConfig.requestHeaderSize=8192 + +## Max response headers size (in bytes) +# jetty.httpConfig.responseHeaderSize=8192 + +## Whether to send the Server: header +# jetty.httpConfig.sendServerVersion=true + +## Whether to send the Date: header +# jetty.httpConfig.sendDateHeader=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-start/src/test/resources/dist-home/modules/ssl.mod b/jetty-start/src/test/resources/dist-home/modules/ssl.mod index a4d105088bb..44b4e24ac66 100644 --- a/jetty-start/src/test/resources/dist-home/modules/ssl.mod +++ b/jetty-start/src/test/resources/dist-home/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 +### TLS(SSL) Connector Configuration -# 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 +## Connector host/address to bind to +# jetty.ssl.host=0.0.0.0 -## Setup a demonstration keystore and truststore -jetty.keystore=etc/keystore -jetty.truststore=etc/keystore +## 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 -## 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 +## Keystore password +# jetty.sslConfig.keystorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 -## Parameters to control the number and priority of acceptors and selectors -# ssl.selectors=1 -# ssl.acceptors=1 -# ssl.selectorPriorityDelta=0 -# ssl.acceptorPriorityDelta=0 +## 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-start/src/test/resources/dist-home/start.ini b/jetty-start/src/test/resources/dist-home/start.ini index 141836874d6..76987d97fa2 100644 --- a/jetty-start/src/test/resources/dist-home/start.ini +++ b/jetty-start/src/test/resources/dist-home/start.ini @@ -43,29 +43,29 @@ ## Server Threading Configuration ## # minimum number of threads -threads.min=10 +jetty.threadPool.minThreads=10 # maximum number of threads -threads.max=200 +jetty.threadPool.maxThreads=200 # thread idle timeout in milliseconds -threads.timeout=60000 +jetty.threadPool.idleTimeout=60000 # buffer size for output -jetty.output.buffer.size=32768 +jetty.httpConfig.outputBufferSize=32768 # request header buffer size -jetty.request.header.size=8192 +jetty.httpConfig.requestHeaderSize=8192 # response header buffer size -jetty.response.header.size=8192 +jetty.httpConfig.responseHeaderSize=8192 # should jetty send the server version header? -jetty.send.server.version=true +jetty.httpConfig.sendServerVersion=true # should jetty send the date header? -jetty.send.date.header=false +jetty.httpConfig.sendDateHeader=false # What host to listen on (leave commented to listen on all interfaces) -#jetty.host=myhost.com +#jetty.http.host=myhost.com # Dump the state of the Jetty server, components, and webapps after startup -jetty.dump.start=false +jetty.server.dumpAfterStart=false # Dump the state of the Jetty server, before stop -jetty.dump.stop=false +jetty.server.dumpBeforeStop=false # Enable delayed dispatch optimisation -jetty.delayDispatchUntilContent=false +jetty.httpConfig.delayDispatchUntilContent=false # --------------------------------------- # Module: http @@ -73,19 +73,18 @@ jetty.delayDispatchUntilContent=false ### HTTP Connector Configuration ## HTTP port to listen on -jetty.port=8080 +jetty.http.port=8080 ## HTTP idle timeout in milliseconds -http.timeout=30000 +# jetty.http.idleTimeout=30000 ## HTTP Socket.soLingerTime in seconds. (-1 to disable) -# http.soLingerTime=-1 +# jetty.http.soLingerTime=-1 ## Parameters to control the number and priority of acceptors and selectors -# http.selectors=1 -# http.acceptors=1 -# http.selectorPriorityDelta=0 -# http.acceptorPriorityDelta=0 +# jetty.http.selectors=1 +# jetty.http.acceptors=1 +# jetty.http.acceptorPriorityDelta=0 # --------------------------------------- # Module: jndi @@ -108,8 +107,7 @@ http.timeout=30000 --module=deploy ## DeployManager configuration # Monitored Directory name (relative to jetty.base) -# jetty.deploy.monitoredDirName=webapps - +# jetty.deploy.monitoredDir=webapps # --------------------------------------- # Module: plus diff --git a/jetty-start/src/test/resources/usecases/agent-properties.assert.txt b/jetty-start/src/test/resources/usecases/agent-properties.assert.txt index 19f00c3a97d..e1a69ed047d 100644 --- a/jetty-start/src/test/resources/usecases/agent-properties.assert.txt +++ b/jetty-start/src/test/resources/usecases/agent-properties.assert.txt @@ -16,18 +16,18 @@ LIB|${jetty.base}/lib/agent-jdk-1.6.jar # The Properties we expect (order is irrelevant) # (this is the property we actually set in jetty.base) -PROP|jetty.port=9090 +PROP|jetty.http.port=9090 PROP|java.vm.specification.version=1.6 # (these are the ones set by default from jetty.home modules) -PROP|http.timeout=30000 -PROP|jetty.delayDispatchUntilContent=false -PROP|jetty.dump.start=false -PROP|jetty.dump.stop=false -PROP|jetty.output.buffer.size=32768 -PROP|jetty.request.header.size=8192 -PROP|jetty.response.header.size=8192 -PROP|jetty.send.date.header=false -PROP|jetty.send.server.version=true -PROP|threads.max=200 -PROP|threads.min=10 -PROP|threads.timeout=60000 +# PROP|jetty.http.idleTimeout=30000 +# PROP|jetty.httpConfig.delayDispatchUntilContent=false +# PROP|jetty.server.dumpAfterStart=false +# PROP|jetty.server.dumpBeforeStop=false +# PROP|jetty.httpConfig.outputBufferSize=32768 +# PROP|jetty.httpConfig.requestHeaderSize=8192 +# PROP|jetty.httpConfig.responseHeaderSize=8192 +# PROP|jetty.httpConfig.sendDateHeader=false +# PROP|jetty.httpConfig.sendServerVersion=true +# PROP|jetty.threadPool.maxThreads=200 +# PROP|jetty.threadPool.minThreads=10 +# PROP|jetty.threadPool.idleTimeout=60000 diff --git a/jetty-start/src/test/resources/usecases/agent-properties/start.ini b/jetty-start/src/test/resources/usecases/agent-properties/start.ini index 198a07c4994..db061d885b3 100644 --- a/jetty-start/src/test/resources/usecases/agent-properties/start.ini +++ b/jetty-start/src/test/resources/usecases/agent-properties/start.ini @@ -1,4 +1,4 @@ --module=http,agent -jetty.port=9090 +jetty.http.port=9090 diff --git a/jetty-start/src/test/resources/usecases/assert-enable-spdy-bad-npn-version.txt b/jetty-start/src/test/resources/usecases/assert-enable-spdy-bad-npn-version.txt index 84c8867d38c..76a5b5c3b2c 100644 --- a/jetty-start/src/test/resources/usecases/assert-enable-spdy-bad-npn-version.txt +++ b/jetty-start/src/test/resources/usecases/assert-enable-spdy-bad-npn-version.txt @@ -3,12 +3,12 @@ # The LIBs we expect (order is irrelevant) # The Properties we expect (order is irrelevant) -PROP|jetty.port=9090 -PROP|jetty.keystore=etc/keystore -PROP|jetty.keystore.password=friendly -PROP|jetty.keymanager.password=icecream -PROP|jetty.truststore=etc/keystore -PROP|jetty.truststore.password=sundae +PROP|jetty.http.port=9090 +PROP|jetty.sslConfig.keyStorePath=etc/keystore +PROP|jetty.sslConfig.keyStorePassword=friendly +PROP|jetty.sslConfig.keyManagerPassword=icecream +PROP|jetty.sslConfig.trustStorePath=etc/keystore +PROP|jetty.sslConfig.trustStorePassword=sundae PROP|java.version=1.7.0_01 # The Downloads diff --git a/jetty-start/src/test/resources/usecases/assert-with-module-persistence.txt b/jetty-start/src/test/resources/usecases/assert-with-module-persistence.txt index 75fb89ce9f0..c72fa647d89 100644 --- a/jetty-start/src/test/resources/usecases/assert-with-module-persistence.txt +++ b/jetty-start/src/test/resources/usecases/assert-with-module-persistence.txt @@ -33,12 +33,12 @@ LIB|${jetty.home}/lib/websocket/websocket-server-TEST.jar LIB|${jetty.home}/lib/websocket/websocket-servlet-TEST.jar # The Properties we expect (order is irrelevant) -PROP|jetty.port=12345 -PROP|jetty.keystore=etc/keystore -PROP|jetty.keystore.password=friendly -PROP|jetty.keymanager.password=icecream -PROP|jetty.truststore=etc/keystore -PROP|jetty.truststore.password=sundae +PROP|jetty.http.port=12345 +PROP|jetty.sslConfig.keyStorePath=etc/keystore +PROP|jetty.sslConfig.keyStorePassword=friendly +PROP|jetty.sslConfig.keyManagerPassword=icecream +PROP|jetty.sslConfig.trustStorePath=etc/keystore +PROP|jetty.sslConfig.trustStorePassword=sundae # JVM Args # JVM|-Xms1024m diff --git a/jetty-start/src/test/resources/usecases/barebones.assert.txt b/jetty-start/src/test/resources/usecases/barebones.assert.txt index 3393d78759c..6f933edd33d 100644 --- a/jetty-start/src/test/resources/usecases/barebones.assert.txt +++ b/jetty-start/src/test/resources/usecases/barebones.assert.txt @@ -13,17 +13,17 @@ LIB|${jetty.home}/lib/servlet-api-3.1.jar # The Properties we expect (order is irrelevant) # (this is the property we actually set in jetty.base) -PROP|jetty.port=9090 +PROP|jetty.http.port=9090 # (these are the ones set by default from jetty.home modules) -PROP|http.timeout=30000 -PROP|jetty.delayDispatchUntilContent=false -PROP|jetty.dump.start=false -PROP|jetty.dump.stop=false -PROP|jetty.output.buffer.size=32768 -PROP|jetty.request.header.size=8192 -PROP|jetty.response.header.size=8192 -PROP|jetty.send.date.header=false -PROP|jetty.send.server.version=true -PROP|threads.max=200 -PROP|threads.min=10 -PROP|threads.timeout=60000 +# PROP|jetty.http.idleTimeout=30000 +# PROP|jetty.httpConfig.delayDispatchUntilContent=false +# PROP|jetty.server.dumpAfterStart=false +# PROP|jetty.server.dumpBeforeStop=false +# PROP|jetty.httpConfig.outputBufferSize=32768 +# PROP|jetty.httpConfig.requestHeaderSize=8192 +# PROP|jetty.httpConfig.responseHeaderSize=8192 +# PROP|jetty.httpConfig.sendDateHeader=false +# PROP|jetty.httpConfig.sendServerVersion=true +# PROP|jetty.threadPool.maxThreads=200 +# PROP|jetty.threadPool.minThreads=10 +# PROP|jetty.threadPool.idleTimeout=60000 diff --git a/jetty-start/src/test/resources/usecases/barebones/start.ini b/jetty-start/src/test/resources/usecases/barebones/start.ini index 1c0e065afdc..a3d92b9524b 100644 --- a/jetty-start/src/test/resources/usecases/barebones/start.ini +++ b/jetty-start/src/test/resources/usecases/barebones/start.ini @@ -2,4 +2,4 @@ --module=server --module=http -jetty.port=9090 +jetty.http.port=9090 diff --git a/jetty-start/src/test/resources/usecases/basic-properties.assert.txt b/jetty-start/src/test/resources/usecases/basic-properties.assert.txt index 7dbf4fcbd40..df9ae27f5bb 100644 --- a/jetty-start/src/test/resources/usecases/basic-properties.assert.txt +++ b/jetty-start/src/test/resources/usecases/basic-properties.assert.txt @@ -13,18 +13,18 @@ LIB|${jetty.home}/lib/servlet-api-3.1.jar # The Properties we expect (order is irrelevant) # (this is the property we actually set in jetty.base) -PROP|jetty.port=9090 +PROP|jetty.http.port=9090 PROP|port=9090 # (these are the ones set by default from jetty.home modules) -PROP|http.timeout=30000 -PROP|jetty.delayDispatchUntilContent=false -PROP|jetty.dump.start=false -PROP|jetty.dump.stop=false -PROP|jetty.output.buffer.size=32768 -PROP|jetty.request.header.size=8192 -PROP|jetty.response.header.size=8192 -PROP|jetty.send.date.header=false -PROP|jetty.send.server.version=true -PROP|threads.max=200 -PROP|threads.min=10 -PROP|threads.timeout=60000 \ No newline at end of file +# PROP|jetty.http.idleTimeout=30000 +# PROP|jetty.httpConfig.delayDispatchUntilContent=false +# PROP|jetty.server.dumpAfterStart=false +# PROP|jetty.server.dumpBeforeStop=false +# PROP|jetty.httpConfig.outputBufferSize=32768 +# PROP|jetty.httpConfig.requestHeaderSize=8192 +# PROP|jetty.httpConfig.responseHeaderSize=8192 +# PROP|jetty.httpConfig.sendDateHeader=false +# PROP|jetty.httpConfig.sendServerVersion=true +# PROP|jetty.threadPool.maxThreads=200 +# PROP|jetty.threadPool.minThreads=10 +# PROP|jetty.threadPool.idleTimeout=60000 diff --git a/jetty-start/src/test/resources/usecases/basic-properties/start.ini b/jetty-start/src/test/resources/usecases/basic-properties/start.ini index f80bdb23b1b..eaef9da9e08 100644 --- a/jetty-start/src/test/resources/usecases/basic-properties/start.ini +++ b/jetty-start/src/test/resources/usecases/basic-properties/start.ini @@ -2,4 +2,4 @@ --module=server --module=http -jetty.port=${port} +jetty.http.port=${port} diff --git a/jetty-start/src/test/resources/usecases/database.assert.txt b/jetty-start/src/test/resources/usecases/database.assert.txt index 31d9c276327..fbd4bebd840 100644 --- a/jetty-start/src/test/resources/usecases/database.assert.txt +++ b/jetty-start/src/test/resources/usecases/database.assert.txt @@ -26,22 +26,22 @@ LIB|${jetty.base}/lib/db/bonecp.jar # The Properties we expect (order is irrelevant) # (this is the property we actually set in jetty.base) -PROP|jetty.port=9090 +PROP|jetty.http.port=9090 PROP|mysql.user=frank PROP|mysql.pass=secret # (these are the ones set by default from jetty.home modules) -PROP|http.timeout=30000 -PROP|jetty.delayDispatchUntilContent=false -PROP|jetty.dump.start=false -PROP|jetty.dump.stop=false -PROP|jetty.output.buffer.size=32768 -PROP|jetty.request.header.size=8192 -PROP|jetty.response.header.size=8192 -PROP|jetty.send.date.header=false -PROP|jetty.send.server.version=true -PROP|threads.max=200 -PROP|threads.min=10 -PROP|threads.timeout=60000 +# PROP|jetty.http.idleTimeout=30000 +# PROP|jetty.httpConfig.delayDispatchUntilContent=false +# PROP|jetty.server.dumpAfterStart=false +# PROP|jetty.server.dumpBeforeStop=false +# PROP|jetty.httpConfig.outputBufferSize=32768 +# PROP|jetty.httpConfig.requestHeaderSize=8192 +# PROP|jetty.httpConfig.responseHeaderSize=8192 +# PROP|jetty.httpConfig.sendDateHeader=false +# PROP|jetty.httpConfig.sendServerVersion=true +# PROP|jetty.threadPool.maxThreads=200 +# PROP|jetty.threadPool.minThreads=10 +# PROP|jetty.threadPool.idleTimeout=60000 # Files / Directories to create FILE|webapps/ diff --git a/jetty-start/src/test/resources/usecases/database/start.ini b/jetty-start/src/test/resources/usecases/database/start.ini index d5513df249c..a9a013bb45a 100644 --- a/jetty-start/src/test/resources/usecases/database/start.ini +++ b/jetty-start/src/test/resources/usecases/database/start.ini @@ -4,4 +4,4 @@ mysql.user=frank mysql.pass=secret -jetty.port=9090 +jetty.http.port=9090 diff --git a/jetty-start/src/test/resources/usecases/deep-ext.assert.txt b/jetty-start/src/test/resources/usecases/deep-ext.assert.txt index 38712d95784..8b18c198665 100644 --- a/jetty-start/src/test/resources/usecases/deep-ext.assert.txt +++ b/jetty-start/src/test/resources/usecases/deep-ext.assert.txt @@ -19,20 +19,20 @@ LIB|${jetty.base}/lib/ext/logging/logback-classic.jar # The Properties we expect (order is irrelevant) # (this is the property we actually set in jetty.base) -PROP|jetty.port=9090 +PROP|jetty.http.port=9090 # (these are the ones set by default from jetty.home modules) -PROP|http.timeout=30000 -PROP|jetty.delayDispatchUntilContent=false -PROP|jetty.dump.start=false -PROP|jetty.dump.stop=false -PROP|jetty.output.buffer.size=32768 -PROP|jetty.request.header.size=8192 -PROP|jetty.response.header.size=8192 -PROP|jetty.send.date.header=false -PROP|jetty.send.server.version=true -PROP|threads.max=200 -PROP|threads.min=10 -PROP|threads.timeout=60000 +# PROP|jetty.http.idleTimeout=30000 +# PROP|jetty.httpConfig.delayDispatchUntilContent=false +# PROP|jetty.server.dumpAfterStart=false +# PROP|jetty.server.dumpBeforeStop=false +# PROP|jetty.httpConfig.outputBufferSize=32768 +# PROP|jetty.httpConfig.requestHeaderSize=8192 +# PROP|jetty.httpConfig.responseHeaderSize=8192 +# PROP|jetty.httpConfig.sendDateHeader=false +# PROP|jetty.httpConfig.sendServerVersion=true +# PROP|jetty.threadPool.maxThreads=200 +# PROP|jetty.threadPool.minThreads=10 +# PROP|jetty.threadPool.idleTimeout=60000 # Files / Directories to create FILE|lib/ diff --git a/jetty-start/src/test/resources/usecases/deep-ext/start.ini b/jetty-start/src/test/resources/usecases/deep-ext/start.ini index c8fa93065c4..2165a30ff58 100644 --- a/jetty-start/src/test/resources/usecases/deep-ext/start.ini +++ b/jetty-start/src/test/resources/usecases/deep-ext/start.ini @@ -3,4 +3,4 @@ --module=http --module=ext -jetty.port=9090 +jetty.http.port=9090 diff --git a/jetty-start/src/test/resources/usecases/http2.assert.txt b/jetty-start/src/test/resources/usecases/http2.assert.txt index 7510468136b..ed4b8d1f2c2 100644 --- a/jetty-start/src/test/resources/usecases/http2.assert.txt +++ b/jetty-start/src/test/resources/usecases/http2.assert.txt @@ -23,30 +23,30 @@ LIB|${jetty.home}/lib/http2/http2-server-TEST.jar # The Properties we expect (order is irrelevant) # (this is the property we actually set in jetty.base) -PROP|jetty.port=9090 -PROP|jetty.secure.port=8443 -PROP|jetty.keystore=etc/keystore -PROP|jetty.keystore.password=friendly -PROP|jetty.keymanager.password=icecream -PROP|jetty.truststore=etc/keystore -PROP|jetty.truststore.password=sundae +PROP|jetty.http.port=9090 PROP|java.version=1.7.0_60 -PROP|ssl.port=8443 -PROP|ssl.timeout=30000 +PROP|jetty.sslConfig.keyStorePath=etc/keystore +PROP|jetty.sslConfig.keyStorePassword=friendly +PROP|jetty.sslConfig.keyManagerPassword=icecream +PROP|jetty.sslConfig.trustStorePath=etc/keystore +PROP|jetty.sslConfig.trustStorePassword=sundae # (these are the ones set by default from jetty.home modules) -PROP|http.timeout=30000 -PROP|jetty.delayDispatchUntilContent=false -PROP|jetty.dump.start=false -PROP|jetty.dump.stop=false -PROP|jetty.output.buffer.size=32768 -PROP|jetty.request.header.size=8192 -PROP|jetty.response.header.size=8192 -PROP|jetty.send.date.header=false -PROP|jetty.send.server.version=true -PROP|threads.max=200 -PROP|threads.min=10 -PROP|threads.timeout=60000 - +PROP|jetty.alpn.debug=false +# PROP|jetty.httpConfig.securePort=8443 +# PROP|jetty.ssl.port=8443 +# PROP|jetty.ssl.idleTimeout=30000 +# PROP|jetty.http.idleTimeout=30000 +# PROP|jetty.httpConfig.delayDispatchUntilContent=false +# PROP|jetty.server.dumpAfterStart=false +# PROP|jetty.server.dumpBeforeStop=false +# PROP|jetty.httpConfig.outputBufferSize=32768 +# PROP|jetty.httpConfig.requestHeaderSize=8192 +# PROP|jetty.httpConfig.responseHeaderSize=8192 +# PROP|jetty.httpConfig.sendDateHeader=false +# PROP|jetty.httpConfig.sendServerVersion=true +# PROP|jetty.threadPool.maxThreads=200 +# PROP|jetty.threadPool.minThreads=10 +# PROP|jetty.threadPool.idleTimeout=60000 # The Downloads DOWNLOAD|maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar @@ -58,4 +58,3 @@ BOOTLIB|-Xbootclasspath/p:lib/alpn/alpn-boot-7.1.0.v20141016.jar # The Files FILE|lib/ FILE|lib/alpn/ - diff --git a/jetty-start/src/test/resources/usecases/http2/start.ini b/jetty-start/src/test/resources/usecases/http2/start.ini index 5faab281610..efd563084e4 100644 --- a/jetty-start/src/test/resources/usecases/http2/start.ini +++ b/jetty-start/src/test/resources/usecases/http2/start.ini @@ -1,12 +1,12 @@ --module=server,http,jmx,http2 -jetty.port=9090 +jetty.http.port=9090 # Some SSL keystore configuration -jetty.keystore=etc/keystore -jetty.keystore.password=friendly -jetty.keymanager.password=icecream -jetty.truststore=etc/keystore -jetty.truststore.password=sundae +jetty.sslConfig.keyStorePath=etc/keystore +jetty.sslConfig.keyStorePassword=friendly +jetty.sslConfig.keyManagerPassword=icecream +jetty.sslConfig.trustStorePath=etc/keystore +jetty.sslConfig.trustStorePassword=sundae diff --git a/jetty-start/src/test/resources/usecases/include-jetty-dir-logging.assert.txt b/jetty-start/src/test/resources/usecases/include-jetty-dir-logging.assert.txt index d2381960596..85453e86742 100644 --- a/jetty-start/src/test/resources/usecases/include-jetty-dir-logging.assert.txt +++ b/jetty-start/src/test/resources/usecases/include-jetty-dir-logging.assert.txt @@ -18,20 +18,20 @@ LIB|${maven-test-resources}/extra-jetty-dirs/logging/lib/logging/logback.jar # The Properties we expect (order is irrelevant) # (this is the property we actually set in jetty.base) -PROP|jetty.port=9090 +PROP|jetty.http.port=9090 # (these are the ones set by default from jetty.home modules) -PROP|http.timeout=30000 -PROP|jetty.delayDispatchUntilContent=false -PROP|jetty.dump.start=false -PROP|jetty.dump.stop=false -PROP|jetty.output.buffer.size=32768 -PROP|jetty.request.header.size=8192 -PROP|jetty.response.header.size=8192 -PROP|jetty.send.date.header=false -PROP|jetty.send.server.version=true -PROP|threads.max=200 -PROP|threads.min=10 -PROP|threads.timeout=60000 +# PROP|jetty.http.idleTimeout=30000 +# PROP|jetty.httpConfig.delayDispatchUntilContent=false +# PROP|jetty.server.dumpAfterStart=false +# PROP|jetty.server.dumpBeforeStop=false +# PROP|jetty.httpConfig.outputBufferSize=32768 +# PROP|jetty.httpConfig.requestHeaderSize=8192 +# PROP|jetty.httpConfig.responseHeaderSize=8192 +# PROP|jetty.httpConfig.sendDateHeader=false +# PROP|jetty.httpConfig.sendServerVersion=true +# PROP|jetty.threadPool.maxThreads=200 +# PROP|jetty.threadPool.minThreads=10 +# PROP|jetty.threadPool.idleTimeout=60000 # Files FILE|logs/ diff --git a/jetty-start/src/test/resources/usecases/include-jetty-dir-logging/start.ini b/jetty-start/src/test/resources/usecases/include-jetty-dir-logging/start.ini index ce3bff24b10..d44a453ed06 100644 --- a/jetty-start/src/test/resources/usecases/include-jetty-dir-logging/start.ini +++ b/jetty-start/src/test/resources/usecases/include-jetty-dir-logging/start.ini @@ -3,4 +3,4 @@ --module=server,http,jmx #--module=resources -jetty.port=9090 +jetty.http.port=9090 diff --git a/jetty-start/src/test/resources/usecases/jmx.assert.txt b/jetty-start/src/test/resources/usecases/jmx.assert.txt index 28dea2e98bf..4bfc6903d87 100644 --- a/jetty-start/src/test/resources/usecases/jmx.assert.txt +++ b/jetty-start/src/test/resources/usecases/jmx.assert.txt @@ -15,17 +15,17 @@ LIB|${jetty.home}/lib/servlet-api-3.1.jar # The Properties we expect (order is irrelevant) # (this is the property we actually set in jetty.base) -PROP|jetty.port=9090 +PROP|jetty.http.port=9090 # (these are the ones set by default from jetty.home modules) -PROP|http.timeout=30000 -PROP|jetty.delayDispatchUntilContent=false -PROP|jetty.dump.start=false -PROP|jetty.dump.stop=false -PROP|jetty.output.buffer.size=32768 -PROP|jetty.request.header.size=8192 -PROP|jetty.response.header.size=8192 -PROP|jetty.send.date.header=false -PROP|jetty.send.server.version=true -PROP|threads.max=200 -PROP|threads.min=10 -PROP|threads.timeout=60000 +# PROP|jetty.http.idleTimeout=30000 +# PROP|jetty.httpConfig.delayDispatchUntilContent=false +# PROP|jetty.server.dumpAfterStart=false +# PROP|jetty.server.dumpBeforeStop=false +# PROP|jetty.httpConfig.outputBufferSize=32768 +# PROP|jetty.httpConfig.requestHeaderSize=8192 +# PROP|jetty.httpConfig.responseHeaderSize=8192 +# PROP|jetty.httpConfig.sendDateHeader=false +# PROP|jetty.httpConfig.sendServerVersion=true +# PROP|jetty.threadPool.maxThreads=200 +# PROP|jetty.threadPool.minThreads=10 +# PROP|jetty.threadPool.idleTimeout=60000 diff --git a/jetty-start/src/test/resources/usecases/jmx/start.ini b/jetty-start/src/test/resources/usecases/jmx/start.ini index d3950e6c029..5339629da2f 100644 --- a/jetty-start/src/test/resources/usecases/jmx/start.ini +++ b/jetty-start/src/test/resources/usecases/jmx/start.ini @@ -1,4 +1,4 @@ --module=server,http,jmx -jetty.port=9090 +jetty.http.port=9090 diff --git a/jetty-start/src/test/resources/usecases/jsp.assert.txt b/jetty-start/src/test/resources/usecases/jsp.assert.txt index 533a51fcdf8..cf6d3a4ab08 100644 --- a/jetty-start/src/test/resources/usecases/jsp.assert.txt +++ b/jetty-start/src/test/resources/usecases/jsp.assert.txt @@ -30,20 +30,20 @@ LIB|${jetty.home}/lib/apache-jsp/org.mortbay.jasper.apache-jsp-8.0.9.M3.jar # The Properties we expect (order is irrelevant) # (these are the properties we actually set in the configuration) -PROP|jetty.port=9090 +PROP|jetty.http.port=9090 # (these are the ones set by default from jetty.home modules) -PROP|http.timeout=30000 -PROP|jetty.delayDispatchUntilContent=false -PROP|jetty.dump.start=false -PROP|jetty.dump.stop=false -PROP|jetty.output.buffer.size=32768 -PROP|jetty.request.header.size=8192 -PROP|jetty.response.header.size=8192 -PROP|jetty.send.date.header=false -PROP|jetty.send.server.version=true -PROP|threads.max=200 -PROP|threads.min=10 -PROP|threads.timeout=60000 +# PROP|jetty.http.idleTimeout=30000 +# PROP|jetty.httpConfig.delayDispatchUntilContent=false +# PROP|jetty.server.dumpAfterStart=false +# PROP|jetty.server.dumpBeforeStop=false +# PROP|jetty.httpConfig.outputBufferSize=32768 +# PROP|jetty.httpConfig.requestHeaderSize=8192 +# PROP|jetty.httpConfig.responseHeaderSize=8192 +# PROP|jetty.httpConfig.sendDateHeader=false +# PROP|jetty.httpConfig.sendServerVersion=true +# PROP|jetty.threadPool.maxThreads=200 +# PROP|jetty.threadPool.minThreads=10 +# PROP|jetty.threadPool.idleTimeout=60000 # Files / Directories to create # FILE|lib/ diff --git a/jetty-start/src/test/resources/usecases/jsp/start.ini b/jetty-start/src/test/resources/usecases/jsp/start.ini index bf58fa82d77..f01871c4ef7 100644 --- a/jetty-start/src/test/resources/usecases/jsp/start.ini +++ b/jetty-start/src/test/resources/usecases/jsp/start.ini @@ -3,4 +3,4 @@ --module=http --module=jsp -jetty.port=9090 +jetty.http.port=9090 diff --git a/jetty-start/src/test/resources/usecases/logging.assert.txt b/jetty-start/src/test/resources/usecases/logging.assert.txt index ce72b68ec40..4b5df4c365f 100644 --- a/jetty-start/src/test/resources/usecases/logging.assert.txt +++ b/jetty-start/src/test/resources/usecases/logging.assert.txt @@ -18,20 +18,21 @@ LIB|${jetty.base}/resources # The Properties we expect (order is irrelevant) # (this is the property we actually set in jetty.base) -PROP|jetty.port=9090 +PROP|jetty.http.port=9090 # (these are the ones set by default from jetty.home modules) -PROP|http.timeout=30000 -PROP|jetty.delayDispatchUntilContent=false -PROP|jetty.dump.start=false -PROP|jetty.dump.stop=false -PROP|jetty.output.buffer.size=32768 -PROP|jetty.request.header.size=8192 -PROP|jetty.response.header.size=8192 -PROP|jetty.send.date.header=false -PROP|jetty.send.server.version=true -PROP|threads.max=200 -PROP|threads.min=10 -PROP|threads.timeout=60000 +# PROP|jetty.http.idleTimeout=30000 +# PROP|jetty.httpConfig.delayDispatchUntilContent=false +# PROP|jetty.server.dumpAfterStart=false +# PROP|jetty.server.dumpBeforeStop=false +# PROP|jetty.httpConfig.outputBufferSize=32768 +# PROP|jetty.httpConfig.requestHeaderSize=8192 +# PROP|jetty.httpConfig.responseHeaderSize=8192 +# PROP|jetty.httpConfig.sendDateHeader=false +# PROP|jetty.httpConfig.sendServerVersion=true +# PROP|jetty.threadPool.maxThreads=200 +# PROP|jetty.threadPool.minThreads=10 +# PROP|jetty.threadPool.idleTimeout=60000 + # Other File References FILE|logs/ FILE|resources/ diff --git a/jetty-start/src/test/resources/usecases/logging/start.ini b/jetty-start/src/test/resources/usecases/logging/start.ini index e18ff3dbf7b..083675e1837 100644 --- a/jetty-start/src/test/resources/usecases/logging/start.ini +++ b/jetty-start/src/test/resources/usecases/logging/start.ini @@ -4,4 +4,4 @@ --module=logging --module=resources -jetty.port=9090 +jetty.http.port=9090 diff --git a/jetty-util/src/main/config/etc/jetty-logging.xml b/jetty-util/src/main/config/etc/jetty-logging.xml index 52589eefe75..3f3e72b51b9 100644 --- a/jetty-util/src/main/config/etc/jetty-logging.xml +++ b/jetty-util/src/main/config/etc/jetty-logging.xml @@ -1,7 +1,6 @@ - @@ -13,10 +12,12 @@ - /yyyy_mm_dd.stderrout.log - false - 90 - GMT + /yyyy_mm_dd.stderrout.log + + + + + diff --git a/jetty-util/src/main/config/modules/logging.mod b/jetty-util/src/main/config/modules/logging.mod index a39bfe4d23a..1fe67627e1f 100644 --- a/jetty-util/src/main/config/modules/logging.mod +++ b/jetty-util/src/main/config/modules/logging.mod @@ -23,9 +23,14 @@ resources/ # Configure jetty logging for java.util.logging # -Dorg.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.JavaUtilLog -# STDERR / STDOUT Logging -# Number of days to retain logs -# jetty.log.retain=90 -# Directory for logging output -# Either a path relative to ${jetty.base} or an absolute path -# jetty.logs=logs +## Logging directory (relative to jetty.base) +# jetty.logging.dir=logs + +## Whether to append to existing file +# jetty.logging.append=false + +## How many days to retain old log files +# jetty.logging.retainDays=90 + +## Timezone of the log timestamps +# jetty.logging.timezone=GMT diff --git a/jetty-xml/src/test/resources/org/eclipse/jetty/xml/mortbay.xml b/jetty-xml/src/test/resources/org/eclipse/jetty/xml/mortbay.xml index e1c18086011..08e75df1814 100644 --- a/jetty-xml/src/test/resources/org/eclipse/jetty/xml/mortbay.xml +++ b/jetty-xml/src/test/resources/org/eclipse/jetty/xml/mortbay.xml @@ -1,4 +1,4 @@ - + diff --git a/tests/test-integration/src/test/java/org/eclipse/jetty/test/support/JettyDistro.java b/tests/test-integration/src/test/java/org/eclipse/jetty/test/support/JettyDistro.java index 56e2884d6c1..474254d1ff7 100644 --- a/tests/test-integration/src/test/java/org/eclipse/jetty/test/support/JettyDistro.java +++ b/tests/test-integration/src/test/java/org/eclipse/jetty/test/support/JettyDistro.java @@ -525,7 +525,7 @@ public class JettyDistro // Do a dry run first to get the exact command line for Jetty process commands.add("-jar"); commands.add("start.jar"); - commands.add("jetty.port=0"); + commands.add("jetty.http.port=0"); if (_debug) { commands.add("-D.DEBUG=true"); diff --git a/tests/test-integration/src/test/resources/BIOHttp.xml b/tests/test-integration/src/test/resources/BIOHttp.xml index 1afdbe58de5..6702f2dd325 100644 --- a/tests/test-integration/src/test/resources/BIOHttp.xml +++ b/tests/test-integration/src/test/resources/BIOHttp.xml @@ -10,7 +10,7 @@ - + 300000 2 false diff --git a/tests/test-integration/src/test/resources/BIOHttps.xml b/tests/test-integration/src/test/resources/BIOHttps.xml index 7a8f2f84b2c..d9f94b7d202 100644 --- a/tests/test-integration/src/test/resources/BIOHttps.xml +++ b/tests/test-integration/src/test/resources/BIOHttps.xml @@ -10,7 +10,7 @@ - + 300000 2 false diff --git a/tests/test-integration/src/test/resources/NIOHttp.xml b/tests/test-integration/src/test/resources/NIOHttp.xml index 648c945664d..a140c177453 100644 --- a/tests/test-integration/src/test/resources/NIOHttp.xml +++ b/tests/test-integration/src/test/resources/NIOHttp.xml @@ -20,8 +20,8 @@ - - + + diff --git a/tests/test-integration/src/test/resources/NIOHttps.xml b/tests/test-integration/src/test/resources/NIOHttps.xml index d80f1da78ef..cef54b53bf7 100644 --- a/tests/test-integration/src/test/resources/NIOHttps.xml +++ b/tests/test-integration/src/test/resources/NIOHttps.xml @@ -25,7 +25,7 @@ - + 30000 diff --git a/tests/test-integration/src/test/resources/ssl.xml b/tests/test-integration/src/test/resources/ssl.xml index 84de070987e..25ed42c431e 100644 --- a/tests/test-integration/src/test/resources/ssl.xml +++ b/tests/test-integration/src/test/resources/ssl.xml @@ -1,9 +1,9 @@ - / - - - / - + / + + + / + diff --git a/tests/test-jmx/jmx-webapp-it/src/test/scripts/start-jetty.sh b/tests/test-jmx/jmx-webapp-it/src/test/scripts/start-jetty.sh index 1d0f9eb89c7..ea7843bf256 100755 --- a/tests/test-jmx/jmx-webapp-it/src/test/scripts/start-jetty.sh +++ b/tests/test-jmx/jmx-webapp-it/src/test/scripts/start-jetty.sh @@ -11,7 +11,7 @@ echo \${jetty.base} : $JETTY_BASE cd "$JETTY_BASE" "$JAVA_HOME/bin/java" -jar "$JETTY_HOME/start.jar" \ - jetty.port=58080 \ + jetty.http.port=58080 \ STOP.PORT=58181 STOP.KEY=it diff --git a/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/etc/test-realm.xml b/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/etc/test-realm.xml index d5c776ba08d..f5f32e1f0cc 100644 --- a/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/etc/test-realm.xml +++ b/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/etc/test-realm.xml @@ -12,7 +12,7 @@ Test Realm - + 0 diff --git a/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/start.ini b/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/start.ini index 9a840f4db07..5921b619377 100644 --- a/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/start.ini +++ b/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/start.ini @@ -6,7 +6,7 @@ # Enable security via jaas, and configure it --module=jaas -jaas.login.conf=etc/login.conf +jetty.jaas.login.conf=etc/login.conf # Enable rewrite examples --module=rewrite @@ -19,5 +19,5 @@ org.eclipse.jetty.websocket.jsr356=false # Create and configure the test realm etc/test-realm.xml -demo.realm=etc/realm.properties +jetty.demo.realm=etc/realm.properties