From afe5044d8c313906ef62f971a9f1fc8dcce5be2c Mon Sep 17 00:00:00 2001 From: gregw Date: Wed, 16 Sep 2020 16:20:16 +0200 Subject: [PATCH] Fixes #5281 Added work module to create work directory reviewed by janbartel --- jetty-server/src/main/config/modules/resources.mod | 2 +- jetty-server/src/main/config/modules/work.mod | 14 ++++++++++++++ .../src/main/config/modules/demo.mod | 1 + 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 jetty-server/src/main/config/modules/work.mod diff --git a/jetty-server/src/main/config/modules/resources.mod b/jetty-server/src/main/config/modules/resources.mod index ae04265ffc5..3760f3c9156 100644 --- a/jetty-server/src/main/config/modules/resources.mod +++ b/jetty-server/src/main/config/modules/resources.mod @@ -1,7 +1,7 @@ # DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html [description] -Adds the $JETTY_HOME/resources and/or $JETTY_BASE/resources directory to the server classpath. +Adds the $JETTY_BASE/resources directory to the server classpath. Useful for configuration property files (eg jetty-logging.properties) [tags] diff --git a/jetty-server/src/main/config/modules/work.mod b/jetty-server/src/main/config/modules/work.mod new file mode 100644 index 00000000000..2d93c2bbe5e --- /dev/null +++ b/jetty-server/src/main/config/modules/work.mod @@ -0,0 +1,14 @@ +# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html + +[description] +Creates the $JETTY_BASE/work directory as a persistent temp directory. +If a work directory exists, it is used for context temp directories, but +they are persisted between runs of Jetty, so generated files (eg JSPs) +can be kept. + +[tags] +server + +[files] +work/ + diff --git a/tests/test-webapps/test-jetty-webapp/src/main/config/modules/demo.mod b/tests/test-webapps/test-jetty-webapp/src/main/config/modules/demo.mod index d5fcd0b7ee2..00218545d12 100644 --- a/tests/test-webapps/test-jetty-webapp/src/main/config/modules/demo.mod +++ b/tests/test-webapps/test-jetty-webapp/src/main/config/modules/demo.mod @@ -11,6 +11,7 @@ Configure the Jetty Demo base. rewrite jaas test-keystore +work [tags] demo