Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support all labkey.xml/ROOT.xml settings via application.properties #5142

Merged
merged 3 commits into from
Jan 19, 2024

Conversation

labkey-jeckels
Copy link
Contributor

Rationale

We're enabling full compatibility for configuration via embedded Tomcat.

Changes

  • Update references to config files in comments

String path = getContextPath();

return "".equals(path) ? "ROOT.xml" : path.substring(1) + ".xml";
return "application.properties";
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 overridden somewhere so we can still return the .xml files? I think the tomcat10 branch will get merged before we are able to all be using embedded all the time.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No, it's now hard-coded to always return application.properties. I could do work to be able to differentiate between standalone and embedded Tomcat, but for the moment I'm proceeding optimistically that by 24.3 on-premise deployments (where users are most likely to see these messages) will all be configured via the properties file. If you think that's a bad idea, let me know

Copy link
Contributor

Choose a reason for hiding this comment

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

Seems OK (now that I've looked at what this method actually does) and easy enough to rework if need be.

@labkey-jeckels labkey-jeckels merged commit 188c23e into tomcat10 Jan 19, 2024
1 check passed
@labkey-jeckels labkey-jeckels deleted the tc10_moreProperties branch January 19, 2024 23:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[LK CI] Ensure we handle all properties currently configurable through ROOT.xml/labkey.xml
2 participants