353/feature/config resolve #399
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
VictorHarbo
requested changes
Aug 10, 2023
There was a problem hiding this comment.
I've tested all three config placements and found one issue.
I can't seem to get the context.xml configuration working. When I add a path to get config from it does not update when i restart the tomcat. If i then redeploy the webapp, the contenxt.xml gets overwritten.
| * <li>As {@code env:user.dir/resource}, {@code env:user.dir/../resource} etc</li> | ||
| * <li>As {@code env:user.home/resource}</li> | ||
| * </ul> | ||
| * When running under Tomcat, {@code catalina.home} is guaranteed to be set and {@code catalina.home} might be set. |
There was a problem hiding this comment.
You are referencing catalina.home twice here. One of them should be catalina.base
| * <li>As {@code env:user.dir/resource}, {@code env:user.dir/../resource} etc</li> | ||
| * <li>As {@code env:user.home/resource}</li> | ||
| * </ul> | ||
| * When running under Tomcat, {@code catalina.home} is guaranteed to be set and {@code catalina.home} might be set. |
There was a problem hiding this comment.
Again, home twice, no base
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds more flexible resolving of the config files. The use case is for the SolrWayback bundle, where the config files can now be placed directly in the bundle folder. It it also be possible to place the config files in the root of the project folder with the source code, when running under jetty.
If the location of the two property files are not specified in the WAR context, they are sought resolved from the container (e.g. tomcat or jetty) root. If not there, the parent folder is checked and so forth. If that does not yield results, the current folder as well as the user's home folder is checked in a similar manner.
Testing this properly is cumbersome as it requires at least
solrwayback.xml) for SolrWayback using tomcat and checking that this is used instead of another config placed directly in the tomcat folder. See thewebapp/META-INF/context.xmlfor how to specify the location explicitlyThis closes #353