Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Jakarta EE 9 migration

Browse Source 
Upgrades many dependency declarations; removes old EJB 2.x support and outdated Servlet-based integrations (Commons FileUpload, FreeMarker JSP support, Tiles).

Closes gh-22093
Closes gh-25354
Closes gh-26185
Closes gh-27423
See gh-27424
This commit is contained in:
Juergen Hoeller
2021-09-17 09:14:07 +02:00
parent 5822f1bf85
commit d84ca2ba90
1291 changed files with 4992 additions and 25322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/empty-servlet.xml
View File

@@ -3,7 +3,7 @@
<beans>
<bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver"/>
<bean id="multipartResolver" class="org.springframework.web.multipart.support.StandardServletMultipartResolver"/>
<bean id="servletContextAwareBean" class="org.springframework.web.context.ServletContextAwareBean"/>

5
spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-resolution-content-negotiation.xml
View File

@@ -21,16 +21,11 @@
</mvc:content-negotiation>
<mvc:bean-name/>
<mvc:jsp/>
<mvc:tiles/>
<mvc:freemarker/>
<mvc:groovy/>
<mvc:script-template/>
</mvc:view-resolvers>
<mvc:tiles-configurer check-refresh="true">
<mvc:definitions location="/org/springframework/web/servlet/resource/tiles/tiles1.xml"/>
</mvc:tiles-configurer>
<mvc:freemarker-configurer>
<mvc:template-loader-path location="/org/springframework/web/servlet/view"/>
</mvc:freemarker-configurer>

8
spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-resolution.xml
View File

@@ -8,7 +8,6 @@
<mvc:view-resolvers>
<mvc:bean-name/>
<mvc:jsp view-class="org.springframework.web.servlet.view.InternalResourceView"/>
<mvc:tiles/>
<mvc:freemarker prefix="freemarker-" suffix=".freemarker" view-names="my*,*Report"/>
<mvc:groovy/>
<mvc:script-template/>
@@ -18,13 +17,6 @@
<bean id="customResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver"/>
<mvc:tiles-configurer check-refresh="true" validate-definitions="true"
definitions-factory="org.apache.tiles.definition.UnresolvingLocaleDefinitionsFactory"
preparer-factory="org.springframework.web.servlet.view.tiles3.SpringBeanPreparerFactory">
<mvc:definitions location="/org/springframework/web/servlet/resource/tiles/tiles1.xml"/>
<mvc:definitions location="/org/springframework/web/servlet/resource/tiles/tiles2.xml"/>
</mvc:tiles-configurer>
<mvc:freemarker-configurer>
<mvc:template-loader-path location="/"/>
<mvc:template-loader-path location="/test"/>