Skip to content

Commit 47395f6

Browse files
committed
Dropped explicit paragraph on web.xml version declaration
Issue: SPR-11364 (cherry picked from commit 36ab65a)
1 parent 8570f60 commit 47395f6

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

spring-web/src/main/java/org/springframework/web/SpringServletContainerInitializer.java

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2012 the original author or authors.
2+
* Copyright 2002-2014 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
1717
package org.springframework.web;
1818

1919
import java.lang.reflect.Modifier;
20-
import java.util.Collections;
2120
import java.util.LinkedList;
2221
import java.util.List;
2322
import java.util.ServiceLoader;
@@ -47,12 +46,7 @@
4746
* Final Draft specification for complete details.
4847
*
4948
* <h3>In combination with {@code web.xml}</h3>
50-
* <p>If a web application includes a {@code WEB-INF/web.xml} file, it is important to
51-
* understand that neither this nor any other {@code ServletContextInitializer} will be
52-
* processed unless the {@code <web-app>} element's {@code version} attribute is >= "3.0"
53-
* and the {@code xsi:schemaLocation} for "http://java.sun.com/xml/ns/javaee" is set to
54-
* "http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd".
55-
* <p>A web application can choose to limit the amount of classpath scanning the Servlet
49+
* A web application can choose to limit the amount of classpath scanning the Servlet
5650
* container does at startup either through the {@code metadata-complete} attribute in
5751
* {@code web.xml}, which controls scanning for Servlet annotations or through an
5852
* {@code <absolute-ordering>} element also in {@code web.xml}, which controls which
@@ -174,7 +168,7 @@ public void onStartup(Set<Class<?>> webAppInitializerClasses, ServletContext ser
174168
return;
175169
}
176170

177-
Collections.sort(initializers, new AnnotationAwareOrderComparator());
171+
AnnotationAwareOrderComparator.sort(initializers);
178172
servletContext.log("Spring WebApplicationInitializers detected on classpath: " + initializers);
179173

180174
for (WebApplicationInitializer initializer : initializers) {

0 commit comments

Comments
 (0)