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

Introduced 4.0 versions of all XML configuration schemas

Browse Source 
Removed spring-beans.dtd (the 1.x variant) and spring-oxm-1.5.xsd (pre-Spring-Framework variant), in order to raise the backwards compatibility limit a little bit at least. We'll keep supporting the 2.0 and 2.5 xsd versions for the time being, as well as spring-beans-2.0.dtd.

Removed the ref 'local' attribute in spring-beans-4.0.xsd since 'local' lost its differentiating role to a regular bean ref back in the 3.1 days when we started allowing for the same bean id to reappear in a different beans section of the same configuration file (with a different profile).

Issue: SPR-10437
This commit is contained in:
Juergen Hoeller
2013-05-07 16:54:14 +02:00
committed by unknown
parent e1c25ff1a3
commit 0fc5a5d912
21 changed files with 4072 additions and 775 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-overrides.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
<beans>
@@ -19,7 +19,7 @@
<!--
We can use this to test the construction cost of beans with method overrides
-->
<bean id="overrideOnPrototype" singleton="false"
<bean id="overrideOnPrototype" scope="prototype"
class="org.springframework.beans.factory.xml.OverrideOneMethod">
<lookup-method name="getPrototypeDependency" bean="jenny"/>
<lookup-method name="protectedOverrideSingleton" bean="david"/>
@@ -35,7 +35,7 @@
</bean>
<bean id="jenny" class="org.springframework.tests.sample.beans.TestBean" singleton="false">
<bean id="jenny" class="org.springframework.tests.sample.beans.TestBean" scope="prototype">
<property name="name"><value>Jenny</value></property>
<property name="age"><value>30</value></property>
<property name="spouse">
@@ -54,7 +54,7 @@
</property>
</bean>
<bean id="jennyChild" class="org.springframework.tests.sample.beans.TestBean" parent="jennyParent" singleton="false">
<bean id="jennyChild" class="org.springframework.tests.sample.beans.TestBean" parent="jennyParent" scope="prototype">
<property name="spouse">
<ref local="david"/>
</property>

2
spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-recursiveImport.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
<beans>

10
spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resource.xml
View File

@@ -1,17 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
<beans>
<import resource="XmlBeanFactoryTests-resourceImport.xml"/>
<bean id="resource2" class="org.springframework.tests.sample.beans.ResourceTestBean">
<constructor-arg index="0">
<value>classpath:org/springframework/beans/factory/xml/test.properties</value>
</constructor-arg>
<constructor-arg index="1">
<value>classpath:org/springframework/beans/factory/xml/test.properties</value>
</constructor-arg>
<constructor-arg index="0" value="classpath:org/springframework/beans/factory/xml/test.properties"/>
<constructor-arg index="1" value="classpath:org/springframework/beans/factory/xml/test.properties"/>
</bean>
</beans>