Skip to content

Conversation

sbordet
Copy link
Contributor

@sbordet sbordet commented Sep 19, 2025

  • Updated jetty-deployment-scanner.xml to support a CSV list of directories.
  • Updated documentation.
  • Added tests, and cleaned up XmlConfigurationTest.

…nt-scanner.

* Updated jetty-deployment-scanner.xml to support a CVS list of directories.
* Updated documentation.
* Added tests, and cleaned up XmlConfigurationTest.

Signed-off-by: Simone Bordet <[email protected]>
@pzygielo
Copy link
Contributor

Tested with locally built (69c94c9).
Works very, very fine with multiple webdirs separated with ,.

Thanks!

@sbordet
Copy link
Contributor Author

sbordet commented Sep 19, 2025

@pzygielo thanks for the feedback!

Copy link
Contributor

@gregw gregw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sbordet If we support multiple directories, do we handle a foo.war in one directory and a foo.xml in another and a foo.properties in yet another? Should we?

Should we support property files in a deployment directory that apply to all webapps from that directory?

@sbordet
Copy link
Contributor Author

sbordet commented Sep 23, 2025

@gregw I think technically it would be possible to have foo.war in one directory, and foo.properties in another directory, but that would be extremely unlikely -- I don't see a user wanting to do that.

Should we support property files in a deployment directory that apply to all webapps from that directory?

I don't think so. If you mean a single *.properties file that specifies the environment for a directory that only deploys one environment, then I think it's assuming too much.

Multiple directories may be used for different environments, but I can also see multiple directories used for multiple web application sources (e.g. deptA-webapps, deptB-webapps), that each can deploy web applications for different environments.

I would just leave it to the users to not make it too complicated; we just offer multiple directories.

@sbordet sbordet requested a review from gregw September 23, 2025 16:16
gregw
gregw previously approved these changes Sep 23, 2025
#tag::documentation[]
## The web application deploy directory name (relative to $JETTY_BASE)
## The web application deploy directory name, or a comma-separated
## list of directories (relative to $JETTY_BASE).
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this true? Must they be relative to $JETTY_BASE? The javadoc on XmlConfiguration.csvSplitAndResolvePaths says it accepts relative or absolute paths.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I clarified the module comment, in this file as well as in other files.

lorban
lorban previously approved these changes Sep 24, 2025
Signed-off-by: Simone Bordet <[email protected]>
@sbordet sbordet dismissed stale reviews from lorban and gregw via 0c9d196 September 29, 2025 17:40
@sbordet sbordet requested a review from janbartel September 29, 2025 17:41
@sbordet sbordet merged commit 056adfd into jetty-12.1.x Oct 1, 2025
10 checks passed
@github-project-automation github-project-automation bot moved this from 👀 In review to ✅ Done in Jetty 12.1.2 - FROZEN Oct 1, 2025
@sbordet sbordet deleted the fix/jetty-12.1.x/13472/multiple-webapps-dirs branch October 1, 2025 21:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: ✅ Done
Development

Successfully merging this pull request may close these issues.

Support multiple directories to be scanned by deployment-scanner
6 participants