Synchronize webdefault.xml and web.xml with Jetty 12#4153
Synchronize webdefault.xml and web.xml with Jetty 12#4153dsmiley wants to merge 1 commit intoapache:mainfrom
Conversation
with Jetty 12
dsmiley
left a comment
There was a problem hiding this comment.
Also, I retained the default directory listing as false, even though OOTB Jetty it's true.
| xmlns="http://java.sun.com/xml/ns/javaee" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" | ||
| metadata-complete="true" |
There was a problem hiding this comment.
the default is actually metadata-complete="false", albeit it doesn't matter since we are explicit in our web.xml.
| </servlet-mapping> | ||
|
|
||
|
|
||
| <!-- ==================================================================== --> |
There was a problem hiding this comment.
I removed this, even though it's in the base/template.
| <!-- --> | ||
| <!-- A copy of this file is also placed into the $JETTY_HOME/etc dir of --> | ||
| <!-- the distribution, and is referenced by some of the other xml files, --> | ||
| <!-- eg the jetty-deploy.xml file. --> |
There was a problem hiding this comment.
In Solr, this file is referenced by solr-jetty-context.xml.
https://github.com/apache/solr/blob/6d95533fbe01130f6538262b9a895096f529f604/solr/server/contexts/solr-jetty-context.xml#L6C3-L6C88
There was a problem hiding this comment.
We don't have jetty-deploy.xml, though the Jetty project has this file.
There was a problem hiding this comment.
Okay. To be clearer than I stated in the description, this file is a verbatim copy, plus some specific modifications. Maybe I should add a comment at the top to make this point clear because I don't think we should edit its comments. It'll be easier to see what our changes are, this way.
I noticed our web.xml and webdefault.xml have become out of date, especially since they were not referring to jakarta.
For debdefault.xml, I copied the latest version and made some edits (see inline review). I reviewed the changelog of this file to see where we made intentional edits.
Not sure if needs a JIRA... not really aiming for a side-effect. Albeit it's nice to see a useless log message go away about JSP :-) No more: