From 69a676036d20215d678dcea91aae3675d4de38bb Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Wed, 19 Oct 2016 11:29:30 +1100 Subject: [PATCH] Improve logging modules and listing #984 Improve usage text for property assignment --- .../org/eclipse/jetty/start/usage.txt | 72 +++++++++---------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/jetty-start/src/main/resources/org/eclipse/jetty/start/usage.txt b/jetty-start/src/main/resources/org/eclipse/jetty/start/usage.txt index 1d76986863b..2aa02f82958 100644 --- a/jetty-start/src/main/resources/org/eclipse/jetty/start/usage.txt +++ b/jetty-start/src/main/resources/org/eclipse/jetty/start/usage.txt @@ -146,38 +146,6 @@ Startup / Shutdown Command Line: The server must have been started with a STOP.PORT= property set and the stop command must have the same property. -Properties: - - name=value - Set a property that can be expanded in XML files with the element. - - name+=value - Add to an existing property. - - name+=,value - Add to an existing property as a comma separated list. - - name?=value - Set a property only if it is not already set. - - STOP.HOST=[string] - The host to use to stop the running Jetty server (defaults to 127.0.0.1) - Required along with STOP.PORT if you want to use the --stop option above. - - STOP.PORT=[number] - The port to use to stop the running Jetty server. - Required along with STOP.KEY if you want to use the --stop option above. - - STOP.KEY=[alphanumeric] - The passphrase defined to stop the server. - Required along with STOP.PORT if you want to use the --stop option above. - - STOP.WAIT=[number] - The time (in seconds) to wait for confirmation that the running - Jetty server has stopped. If not specified, the stopper will wait - indefinitely. Use in conjunction with the --stop option. - - Advanced Commands: ------------------ @@ -201,11 +169,26 @@ Advanced Commands: Properties: ----------- + Properties are used to parameterize: + + XML files using the element + + Module files using the ${pname} syntax - These are set with a command line like "java -jar start.jar name=value" - and only affect the start mechanism. Some of these are defined in the - default start.config and will not be available if another configuration - file is used. NOTE: Not all properties are listed here: + Propertues may be set on the command line, in a ini file or in a [ini] + section of a module using the following syntax: + + name=value + Set a property that can be expanded in XML files with the element. + + name+=value + Append value to an existing property value. + + name+=,value + Append value to an existing property value, using a comma separator if needed. + + name?=value + Set a property only if it is not already set. + + Each module may definte it's own properties. Start properties defined include: jetty.home=[directory] Set the home directory of the jetty distribution. @@ -215,6 +198,23 @@ Properties: files will be looked for. If not found in jetty.base, they are looked for in jetty.home. + STOP.HOST=[string] + The host to use to stop the running Jetty server (defaults to 127.0.0.1) + Required along with STOP.PORT if you want to use the --stop option above. + + STOP.PORT=[number] + The port to use to stop the running Jetty server. + Required along with STOP.KEY if you want to use the --stop option above. + + STOP.KEY=[alphanumeric] + The passphrase defined to stop the server. + Required along with STOP.PORT if you want to use the --stop option above. + + STOP.WAIT=[number] + The time (in seconds) to wait for confirmation that the running + Jetty server has stopped. If not specified, the stopper will wait + indefinitely. Use in conjunction with the --stop option. + Defaults: ---------