dsmiley commented on code in PR #4153: URL: https://github.com/apache/solr/pull/4153#discussion_r2835792457
########## solr/server/etc/webdefault.xml: ########## @@ -1,59 +1,68 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> +<?xml version="1.0" encoding="UTF-8"?> +<web-app + xmlns="https://jakarta.ee/xml/ns/jakartaee"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"; + metadata-complete="false" + version="6.0"> <!-- ===================================================================== --> <!-- This file contains the default descriptor for web applications. --> <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> <!-- The intent of this descriptor is to include jetty specific or common --> - <!-- configuration for all webapps. If a context has a webdefault.xml --> - <!-- descriptor, it is applied before the contexts own web.xml file --> + <!-- configuration for all webapps. If a context has a webdefault-ee10.xml --> + <!-- descriptor, it is applied before the context's own web.xml file --> <!-- --> - <!-- A context may be assigned a default descriptor by: --> - <!-- + Calling WebApplicationContext.setDefaultsDescriptor --> - <!-- + Passed an arg to addWebApplications --> + <!-- A context may be assigned a default descriptor by calling --> + <!-- WebAppContext.setDefaultsDescriptor(String). --> <!-- --> - <!-- This file is used both as the resource within the jetty.jar (which is --> - <!-- used as the default if no explicit defaults descriptor is set) and it --> - <!-- is copied to the etc directory of the Jetty distro and explicitly --> - <!-- by the jetty.xml file. --> + <!-- This file is present in the jetty-webapp.jar, and is used as the --> + <!-- defaults descriptor if no other is explicitly set on a context. --> <!-- --> + <!-- 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. --> <!-- ===================================================================== --> -<web-app - 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" Review Comment: the default is actually metadata-complete="false", albeit it doesn't matter since we are explicit in our web.xml. ########## solr/server/etc/webdefault.xml: ########## @@ -169,167 +177,17 @@ <url-pattern>/</url-pattern> </servlet-mapping> - - <!-- ==================================================================== --> Review Comment: I removed this, even though it's in the base/template. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
