diff --git a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/deploy/deploy-hot-static.adoc b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/deploy/deploy-hot-static.adoc index c7b8e90d65dc..9d682dcab909 100644 --- a/documentation/jetty-documentation/src/main/asciidoc/operations-guide/deploy/deploy-hot-static.adoc +++ b/documentation/jetty-documentation/src/main/asciidoc/operations-guide/deploy/deploy-hot-static.adoc @@ -16,23 +16,23 @@ The `DeploymentManager` scans the `$JETTY_BASE/webapps` directory for changes every `N` seconds, where `N` is configured via the `jetty.deploy.scanInterval` property. -By default, the scan interval is `1` second, which means that _hot_ deployment is enabled: if a file is added/changed/removed from the `$JETTY_BASE/webapps` directory, the `DeploymentManager` will notice the change and respectively deploy/redeploy/undeploy the web application. - -Setting the scan interval to `0` means that _static_ deployment is enabled, and the `DeploymentManager` will not scan the `$JETTY_BASE/webapps` directory for changes. +By default, the scan interval is `0` seconds, which means _static_ deployment, and the `DeploymentManager` will not scan the `$JETTY_BASE/webapps` directory for changes. This means that to deploy/redeploy/undeploy a web application you will need to stop and restart Jetty. -The following command line disables _hot_ deployment by specifying the `jetty.deploy.scanInterval` property on the command line, and therefore only for this particular run: +Setting the scan interval to a value of `1` second (or greater) means that _hot_ deployment is enabled: if a file is added/changed/removed from the `$JETTY_BASE/webapps` directory, the `DeploymentManager` will notice the change and respectively deploy/redeploy/undeploy the web application. + +The following command line enables _hot_ deployment by specifying the `jetty.deploy.scanInterval` property on the command line, and therefore only for this particular run: ---- -$ java -jar $JETTY_HOME/start.jar jetty.deploy.scanInterval=0 +$ java -jar $JETTY_HOME/start.jar jetty.deploy.scanInterval=1 ---- -To make _static_ deployment persistent, you need to edit the appropriate `-deploy` module configuration file, `$JETTY_BASE/start.d/-deploy.ini` (eg: `ee10-deploy.ini`), uncomment the module property `jetty.deploy.scanInterval` and change its value to `0`: +To make _hot_ deployment persistent, you need to edit the appropriate `-deploy` module configuration file, `$JETTY_BASE/start.d/-deploy.ini` (eg: `ee10-deploy.ini`), uncomment the module property `jetty.deploy.scanInterval` and change the value to `1` second (or greater): .-deploy.ini [source,subs="verbatim,quotes"] ---- --module=deploy -#jetty.deploy.scanInterval=0# +#jetty.deploy.scanInterval=1# ... ---- diff --git a/jetty-core/jetty-deploy/src/main/config/modules/core-deploy.mod b/jetty-core/jetty-deploy/src/main/config/modules/core-deploy.mod index 1ba1951a04b7..8de1a2de16e4 100644 --- a/jetty-core/jetty-deploy/src/main/config/modules/core-deploy.mod +++ b/jetty-core/jetty-deploy/src/main/config/modules/core-deploy.mod @@ -29,7 +29,7 @@ contextHandlerClass?=org.eclipse.jetty.server.handler.ResourceHandler$ResourceCo # jetty.deploy.deferInitialScan=false ## Monitored directory scan period (seconds) -# jetty.deploy.scanInterval=1 +# jetty.deploy.scanInterval=0 ## Default ContextHandler class for core deployments # contextHandlerClass=org.eclipse.jetty.server.handler.ResourceHandler$ResourceContext diff --git a/jetty-core/jetty-server/src/main/config/modules/server.mod b/jetty-core/jetty-server/src/main/config/modules/server.mod index 0f434af5ae55..2163a0938b44 100644 --- a/jetty-core/jetty-server/src/main/config/modules/server.mod +++ b/jetty-core/jetty-server/src/main/config/modules/server.mod @@ -115,7 +115,7 @@ etc/jetty.xml # end::documentation-scheduler-config[] ## Whether the handlers of the ContextHandlerCollection can be updated once the server is started -## If set to false, then eeN-deploy module jetty.deploy.scanInterval should also be set to 0. +## If set to false, then -deploy module jetty.deploy.scanInterval should also be set to 0. # jetty.server.contexts.dynamic=true ## Should the DefaultHandler serve the jetty favicon.ico from the root. diff --git a/jetty-ee10/jetty-ee10-webapp/src/main/config/modules/ee10-deploy.mod b/jetty-ee10/jetty-ee10-webapp/src/main/config/modules/ee10-deploy.mod index e01ce786df0f..a3e44ecc5c78 100644 --- a/jetty-ee10/jetty-ee10-webapp/src/main/config/modules/ee10-deploy.mod +++ b/jetty-ee10/jetty-ee10-webapp/src/main/config/modules/ee10-deploy.mod @@ -22,7 +22,7 @@ etc/jetty-ee10-deploy.xml # jetty.deploy.defaultsDescriptorPath=${jetty.base}/etc/webdefault-ee10.xml ## Monitored directory scan period (seconds) -# jetty.deploy.scanInterval=1 +# jetty.deploy.scanInterval=0 ## Whether to extract *.war files # jetty.deploy.extractWars=true diff --git a/jetty-ee8/jetty-ee8-webapp/src/main/config/modules/ee8-deploy.mod b/jetty-ee8/jetty-ee8-webapp/src/main/config/modules/ee8-deploy.mod index 58a416fdf0ca..3d44d7d5bedd 100644 --- a/jetty-ee8/jetty-ee8-webapp/src/main/config/modules/ee8-deploy.mod +++ b/jetty-ee8/jetty-ee8-webapp/src/main/config/modules/ee8-deploy.mod @@ -22,7 +22,7 @@ etc/jetty-ee8-deploy.xml # jetty.deploy.defaultsDescriptorPath=${jetty.base}/etc/webdefault-ee8.xml ## Monitored directory scan period (seconds) -# jetty.deploy.scanInterval=1 +# jetty.deploy.scanInterval=0 ## Whether to extract *.war files # jetty.deploy.extractWars=true diff --git a/jetty-ee9/jetty-ee9-webapp/src/main/config/modules/ee9-deploy.mod b/jetty-ee9/jetty-ee9-webapp/src/main/config/modules/ee9-deploy.mod index ca05b79ac112..742f44c76019 100644 --- a/jetty-ee9/jetty-ee9-webapp/src/main/config/modules/ee9-deploy.mod +++ b/jetty-ee9/jetty-ee9-webapp/src/main/config/modules/ee9-deploy.mod @@ -22,7 +22,7 @@ etc/jetty-ee9-deploy.xml # jetty.deploy.defaultsDescriptorPath=${jetty.base}/etc/webdefault-ee9.xml ## Monitored directory scan period (seconds) -# jetty.deploy.scanInterval=1 +# jetty.deploy.scanInterval=0 ## Whether to extract *.war files # jetty.deploy.extractWars=true