diff options
| author | Simone Bordet | 2015-04-13 14:21:48 +0000 |
|---|---|---|
| committer | Simone Bordet | 2015-04-13 14:21:48 +0000 |
| commit | 599ab9bb1bee454f190d964b67859e46a1e57f87 (patch) | |
| tree | b729472f7fc361ec6b84526c74cf193c383e77b7 /jetty-deploy/src | |
| parent | d78673f8f824d562bf181fe2aaf929bad6f6e695 (diff) | |
| download | org.eclipse.jetty.project-599ab9bb1bee454f190d964b67859e46a1e57f87.tar.gz org.eclipse.jetty.project-599ab9bb1bee454f190d964b67859e46a1e57f87.tar.xz org.eclipse.jetty.project-599ab9bb1bee454f190d964b67859e46a1e57f87.zip | |
460671 - Rationalize property names.
Property format is now "jetty.<module|component>.<propertyName>".
Updated all references with new properties.
Diffstat (limited to 'jetty-deploy/src')
| -rw-r--r-- | jetty-deploy/src/main/config/etc/jetty-deploy.xml | 2 | ||||
| -rw-r--r-- | jetty-deploy/src/main/config/modules/deploy.mod | 10 | ||||
| -rw-r--r-- | jetty-deploy/src/test/resources/jetty.xml | 12 |
3 files changed, 14 insertions, 10 deletions
diff --git a/jetty-deploy/src/main/config/etc/jetty-deploy.xml b/jetty-deploy/src/main/config/etc/jetty-deploy.xml index 6dfc7e509a..813012c2a5 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 @@ <Call id="webappprovider" name="addAppProvider"> <Arg> <New class="org.eclipse.jetty.deploy.providers.WebAppProvider"> - <Set name="monitoredDirName"><Property name="jetty.base" default="." />/<Property name="jetty.deploy.monitoredDirName" default="webapps"/></Set> + <Set name="monitoredDirName"><Property name="jetty.base" default="." />/<Property name="jetty.deploy.monitoredDir,jetty.deploy.monitoredDirName" default="webapps"/></Set> <Set name="defaultsDescriptor"><Property name="jetty.home" default="." />/etc/webdefault.xml</Set> <Set name="scanInterval"><Property name="jetty.deploy.scanInterval" default="1"/></Set> <Set name="extractWars"><Property name="jetty.deploy.extractWars" default="true"/></Set> diff --git a/jetty-deploy/src/main/config/modules/deploy.mod b/jetty-deploy/src/main/config/modules/deploy.mod index f16b3f2fff..3a2fc916d0 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 9beb268a95..18e6a403be 100644 --- a/jetty-deploy/src/test/resources/jetty.xml +++ b/jetty-deploy/src/test/resources/jetty.xml @@ -46,9 +46,9 @@ <Arg name="threadpool"><New id="threadpool" class="org.eclipse.jetty.util.thread.QueuedThreadPool"/></Arg> --> <Get name="ThreadPool"> - <Set name="minThreads" type="int"><Property name="threads.min" default="10"/></Set> - <Set name="maxThreads" type="int"><Property name="threads.max" default="200"/></Set> - <Set name="idleTimeout" type="int"><Property name="threads.timeout" default="60000"/></Set> + <Set name="minThreads" type="int"><Property name="jetty.threadPool.minThreads" default="10"/></Set> + <Set name="maxThreads" type="int"><Property name="jetty.threadPool.maxThreads" default="200"/></Set> + <Set name="idleTimeout" type="int"><Property name="jetty.threadPool.idleTimeout" default="60000"/></Set> <Set name="detailedDump">false</Set> </Get> @@ -78,7 +78,7 @@ <!-- =========================================================== --> <New id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration"> <Set name="secureScheme">https</Set> - <Set name="securePort" type="java.lang.Integer"><Property name="jetty.secure.port" default="8443" /></Set> + <Set name="securePort" type="java.lang.Integer"><Property name="jetty.httpConfig.securePort" default="8443" /></Set> <Set name="outputBufferSize">32768</Set> <Set name="requestHeaderSize">8192</Set> <Set name="responseHeaderSize">8192</Set> @@ -125,7 +125,7 @@ <!-- =========================================================== --> <Set name="stopAtShutdown">true</Set> <Set name="stopTimeout">5000</Set> - <Set name="dumpAfterStart"><Property name="jetty.dump.start" default="false"/></Set> - <Set name="dumpBeforeStop"><Property name="jetty.dump.stop" default="false"/></Set> + <Set name="dumpAfterStart"><Property name="jetty.server.dumpAfterStart" default="false"/></Set> + <Set name="dumpBeforeStop"><Property name="jetty.server.dumpBeforeStop" default="false"/></Set> </Configure> |