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

Streamline XML namespace support towards unversioned schemas

Browse Source 
This commit also removes support code for outdated options which were only available in older schema versions.

Issue: SPR-13499
This commit is contained in:
Juergen Hoeller
2016-07-05 20:50:00 +02:00
parent 12d373659a
commit bc2c22d51e
217 changed files with 413 additions and 41094 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java
View File

@@ -278,11 +278,6 @@ public class MvcNamespaceTests {
doTestCustomValidator("mvc-config-custom-validator.xml");
}
@Test
public void testCustomValidator32() throws Exception {
doTestCustomValidator("mvc-config-custom-validator-32.xml");
}
private void doTestCustomValidator(String xml) throws Exception {
loadBeanDefinitions(xml, 14);

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

@@ -33,13 +33,13 @@
<bean id="kerry" class="org.springframework.tests.sample.beans.TestBean">
<property name="name"><value>Kerry</value></property>
<property name="age"><value>34</value></property>
<property name="spouse"><ref local="rod"/></property>
<property name="spouse"><ref bean="rod"/></property>
</bean>
<bean id="typeMismatch" class="org.springframework.tests.sample.beans.TestBean" scope="prototype">
<property name="name"><value>typeMismatch</value></property>
<property name="age"><value>34x</value></property>
<property name="spouse"><ref local="rod"/></property>
<property name="spouse"><ref bean="rod"/></property>
</bean>
<bean id="singletonFactory" class="org.springframework.tests.sample.beans.factory.DummyFactory">

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

@@ -11,7 +11,7 @@
<bean id="kerryX" class="org.springframework.tests.sample.beans.TestBean">
<property name="name"><value>Kerry</value></property>
<property name="age"><value>34</value></property>
<property name="spouse"><ref local="rod"/></property>
<property name="spouse"><ref bean="rod"/></property>
</bean>
</beans>

13
spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-custom-validator-32.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:mvc="http://www.springframework.org/schema/mvc"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd">
<mvc:annotation-driven validator="validator"
ignoreDefaultModelOnRedirect="true" enableMatrixVariables="true" />
<bean id="validator" class="org.springframework.web.servlet.config.MvcNamespaceTests$TestValidator" />
</beans>

24
spring-webmvc/src/test/resources/org/springframework/web/servlet/handler/map2.xml
View File

@@ -4,27 +4,27 @@
<beans>
<bean id="urlMapping" class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
<property name="defaultHandler"><ref local="starController"/></property>
<property name="rootHandler"><ref local="mainController"/></property>
<property name="defaultHandler"><ref bean="starController"/></property>
<property name="rootHandler"><ref bean="mainController"/></property>
<property name="useTrailingSlashMatch" value="true"/>
<property name="urlMap">
<map>
<entry key="/welcome*"><ref local="otherController"/></entry>
<entry key="/welcome.html"><ref local="mainController"/></entry>
<entry key="/show.html"><ref local="mainController"/></entry>
<entry key="/bookseats.html"><ref local="mainController"/></entry>
<entry key="/reservation.html"><ref local="mainController"/></entry>
<entry key="/payment.html"><ref local="mainController"/></entry>
<entry key="/confirmation.html"><ref local="mainController"/></entry>
<entry key="/welcome*"><ref bean="otherController"/></entry>
<entry key="/welcome.html"><ref bean="mainController"/></entry>
<entry key="/show.html"><ref bean="mainController"/></entry>
<entry key="/bookseats.html"><ref bean="mainController"/></entry>
<entry key="/reservation.html"><ref bean="mainController"/></entry>
<entry key="/payment.html"><ref bean="mainController"/></entry>
<entry key="/confirmation.html"><ref bean="mainController"/></entry>
</map>
</property>
</bean>
<bean id="urlMappingWithProps" class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
<property name="defaultHandler"><ref local="starController"/></property>
<property name="rootHandler"><ref local="mainController"/></property>
<property name="defaultHandler"><ref bean="starController"/></property>
<property name="rootHandler"><ref bean="mainController"/></property>
<property name="useTrailingSlashMatch" value="true"/>
<property name="mappings"><ref local="propsForUrlMapping2"/></property>
<property name="mappings"><ref bean="propsForUrlMapping2"/></property>
</bean>
<bean id="propsForUrlMapping2" class="org.springframework.beans.factory.config.PropertiesFactoryBean">

16
spring-webmvc/src/test/resources/org/springframework/web/servlet/handler/map2err.xml
View File

@@ -4,22 +4,22 @@
<beans>
<bean id="urlMapping" class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
<property name="defaultHandler"><ref local="starController"/></property>
<property name="defaultHandler"><ref bean="starController"/></property>
<property name="urlMap">
<map>
<entry key="/welcome.html"><ref local="mainController"/></entry>
<entry key="/show.html"><ref local="mainController"/></entry>
<entry key="/bookseats.html"><ref local="mainController"/></entry>
<entry key="/welcome.html"><ref bean="mainController"/></entry>
<entry key="/show.html"><ref bean="mainController"/></entry>
<entry key="/bookseats.html"><ref bean="mainController"/></entry>
<entry key="/reservation.html"><ref bean="mainControlle"/></entry>
<entry key="/payment.html"><ref local="mainController"/></entry>
<entry key="/confirmation.html"><ref local="mainController"/></entry>
<entry key="/payment.html"><ref bean="mainController"/></entry>
<entry key="/confirmation.html"><ref bean="mainController"/></entry>
</map>
</property>
</bean>
<bean id="urlMappingWithProps" class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
<property name="defaultHandler"><ref local="starController"/></property>
<property name="mappings"><ref local="propsForUrlMapping2"/></property>
<property name="defaultHandler"><ref bean="starController"/></property>
<property name="mappings"><ref bean="propsForUrlMapping2"/></property>
</bean>
<bean id="propsForUrlMapping2" class="org.springframework.beans.factory.config.PropertiesFactoryBean">