Fix #10411 default environment #10415
Conversation
Implemented a simpler default environment algorithm where an application that does not specify an environment is always attempted in the default.
…10411/default-environment
|
As this is ready, I have moved it back for consideration in 12.0.1 |
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Deployable.java
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Please go do file deploy-jetty-adoc line 40 and modify the sentence from:
The Jetty content XML file must be accompanied...
to
The Jetty content XML file may be accompanied...
Also, modify DistributionTests.testXmlDeployWarNotInWebapps() so that it has 1 more boolean parameter, namely whether to write the demo.properties file or not.
In this way, we are testing that your fixes work as intended even in the case the *.war is not inside $JETTY_HOME/webapps/.
If you wan to go the extra mile, I would not mind in DistributionTests to add a test with 2 XML files and different environments that also verifies that one of them must have the *.properties file to be deployed correctly.
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Deployable.java
Outdated
Show resolved
Hide resolved
update documentation
Small fixes and clarifications. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Implemented a simpler default environment algorithm where an application that does not specify an environment is always attempted in the default. Updated documentation. Signed-off-by: Simone Bordet <simone.bordet@gmail.com> Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
Fix #10411
Implemented a simpler default environment algorithm where an application that does not specify an environment is always attempted in the default.